diff --git a/.gitignore b/.gitignore index 1afdec1a..22efa789 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ DSWeb/Properties/PublishProfiles/FolderProfile.pubxml /DSWeb.DJY_RESP/packages /DSWeb.DJY_RESP/publish /DSWeb/INVOICEPDF +/DSWeb/DSWeb.csproj.user diff --git a/DSWeb/Areas/CommMng/DAL/PubSysDAL.cs b/DSWeb/Areas/CommMng/DAL/PubSysDAL.cs index ea10d453..80db9a51 100644 --- a/DSWeb/Areas/CommMng/DAL/PubSysDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/PubSysDAL.cs @@ -873,7 +873,7 @@ namespace DSWeb.Areas.CommMng.DAL YARD = yard, VESSEL = vessel, VOYNO = voynoinner, - ETD = SetDayMinute_Str(YgtETD), + ETD = SetDayMinute_Str(etd), //ETD = SetDayMinute_Str(YgtETD), ETA = SetDayZero_Str(eta), ATD = SetDayMinute_Str(atd), @@ -897,7 +897,7 @@ namespace DSWeb.Areas.CommMng.DAL PAYABLEAT = payableat, SERVICE = service, MARKS = 设置换行(marks), - CUSTSERVICE = service, + CUSTSERVICE = custservice, HSCODE = hscode, GOODSNAME = 货物名称, DESCRIPTION = 设置换行(description), @@ -925,7 +925,7 @@ namespace DSWeb.Areas.CommMng.DAL //合同号 = pono, ORDERNO = pono, //合同号备注 = pono, - FRCUSTSERVICE = custservice, + //CUSTSERVICE = custservice, OP = op, DOC = doc, @@ -1271,6 +1271,7 @@ namespace DSWeb.Areas.CommMng.DAL ctnbsno = "*"; var newctn = new MsOpSeaeDetail { + CTN_ID = Guid.NewGuid().ToString(), CTNCODE = 箱型info.CTNID, SIZE = 箱型info.CTNSIZE, CTN = 箱型info.CTN, diff --git a/DSWeb/Areas/MvcShipping/DAL/OP_SERVICEBILL/OP_SERVICEBILLDAL.cs b/DSWeb/Areas/MvcShipping/DAL/OP_SERVICEBILL/OP_SERVICEBILLDAL.cs index bd771eae..994aef86 100644 --- a/DSWeb/Areas/MvcShipping/DAL/OP_SERVICEBILL/OP_SERVICEBILLDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/OP_SERVICEBILL/OP_SERVICEBILLDAL.cs @@ -46,7 +46,7 @@ namespace DSWeb.MvcShipping.DAL.OP_SERVICEBILLDAL { #region 查询 - const string HeadSql = " SELECT BSNO,PARENTID,CORPID,SALECORPID,DEPT,SALEDEPT,SALE,BILLSTATUS,BSSTATUS,FEESTATS,MBLNO,CUSTNO,CUSTOMNO,CONTRACTNO,SERVICETYPE,INPUTBY,TEL,ACCDATE,BSDATE,MODIFIEDUSER,MODIFIEDTIME,ETA,ATA,VESSEL,VOYNO,FORWARDER,SHIPAGENCY,CARRIER,CUSTOMERNAME,FEE_1 ,FEE_2,REMARK,SERVICE,DJYID FROM OP_SERVICEBILL where 1=1 "; + const string HeadSql = " SELECT BSNO,PARENTID,CORPID,SALECORPID,DEPT,SALEDEPT,SALE,BILLSTATUS,BSSTATUS,FEESTATS,MBLNO,CUSTNO,CUSTOMNO,CONTRACTNO,SERVICETYPE,INPUTBY,TEL,ACCDATE,BSDATE,MODIFIEDUSER,MODIFIEDTIME,ETA,ATA,VESSEL,VOYNO,FORWARDER,SHIPAGENCY,CARRIER,CUSTOMERNAME,FEE_1 ,FEE_2,REMARK,SERVICE,DJYID,''OT1,''OT2,''OT3,''OT4 FROM OP_SERVICEBILL where 1=1 "; public static List GetDataList(int start, int limit, string sort, string condition, VW_user_md userinfo, ref int count) diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index 9dae8fd5..e4a8a332 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -1255,9 +1255,23 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { header: Zi.LAN.ISSUEDATE, //'货物标识', width: 70 }, { - dataIndex: 'TRADETERM', - header: Zi.LAN.TRADETERM, //'货物标识', + dataIndex: 'TRADETERM', + header: Zi.LAN.TRADETERM, //'贸易条款', width: 70 + }, { + sortable: false, + dataIndex: 'DJYID', + text: Zi.LAN.ISDJYORDER, + width: 90, + renderer: function (value, meta, record) { + + if (value) { + meta.tdCls = 'feestatus_pass'; + return "是"; + } else { + return ""; + } + } }, { dataIndex: 'ISCANCEL', header: Zi.LAN.TUI_B, //'退舱', @@ -1448,10 +1462,12 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { return ""; } } - }, { + } + + , { sortable: false, - dataIndex: 'RCVESTATUS', - text: Zi.LAN.RCVESTATUS, + dataIndex: 'RCVESTATUS', + text: Zi.LAN.RCVESTATUS, width: 56, renderer: function (value, meta, record) { var openSet = "height=230, width=750, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 250) / 2 + ",Left= " + (screen.width - 700) / 2 @@ -1468,7 +1484,11 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { return ""; } } - }]; + } + + + + ]; this.girdcolums = this.initgirdcolums; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js index 93a61749..a5756d22 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js @@ -227,7 +227,8 @@ { name: 'PROFITRATE', type: 'string' }, { name: 'GROUPBS', type: 'string' }, { name: 'IRCODE', type: 'string' }, - { name: 'BillFeeStatus', type: 'string' } + { name: 'BillFeeStatus', type: 'string' }, + { name: 'DJYID', type: 'string' } ] diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js index 51623c6c..ce6fe969 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js @@ -845,3 +845,4 @@ Zi.LAN.ImportAndClose = "引入并关闭"; Zi.LAN.SERVICETYPE = "业务类型"; Zi.LAN.SERVICEBILLService = "费用项目"; Zi.LAN.ATA = "ATA"; +Zi.LAN.ISDJYORDER = "是否大简云订舱"; \ No newline at end of file diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLEdit.js index 75359160..9aedd071 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLEdit.js @@ -692,7 +692,14 @@ Ext.extend(Shipping.OP_SERVICEBILLEdit, Ext.Panel, { dataIndex: 'RECEIPTTYPE', header: '单据类型', editor: this.comboxReceiptid_DOC, - width: 80 + width: 80, + renderer: function (value, p, record) { + if (value != "发票" && value != "账单") { + return "原始单据" + } else { + return value; + } + } }, { sortable: true, hidden: true, @@ -1709,11 +1716,11 @@ Ext.extend(Shipping.OP_SERVICEBILLEdit, Ext.Panel, { buttonCfg: { iconCls: 'uploaddialog' }, anchor: '98%' }, { - xtype: 'textfield', + xtype: 'textfield', hidden:true, id: 'FILETYPEField', name: 'FILETYPE', - fieldLabel: '随附单证代码', - values:'原始单据' + fieldLabel: '文件类型', + values:'' } , { @@ -1747,7 +1754,7 @@ Ext.extend(Shipping.OP_SERVICEBILLEdit, Ext.Panel, { params: { CUSTNO: billno, BSNO: BSNO, - TYPE: comboxFileType.getRawValue(), + TYPE: "",//Ext.getCmp('FILETYPEField').getValue(), DOCUMENTATTACHEDCODE: Ext.getCmp('DOCUMENTATTACHEDCODE').getValue(), //需求编号：SR2017081100003 DOCUMENTATTACHEDNO: Ext.getCmp('DOCUMENTATTACHEDNO').getValue() //需求编号：SR2017081100003 }, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLIndex.js index 6e4ac7e8..ff7d999d 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLIndex.js @@ -832,18 +832,18 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, { scope: this } - //, { - // text: "打印", id: "print", - // tooltip: 'print', - // handler: function (button, event) { - // //this.PushState("30011"); - // this.Print(); - // }, - // scope: this - //} + , { + text: "导出", id: "export", + tooltip: 'export', + handler: function (button, event) { + //this.PushState("30011"); + this.onExportClick(); + }, + scope: this + } , { - xtype: 'button', + xtype: 'button',hidden:true, text: "高级查询", iconCls: "btnmore", handler: function (button, event) { @@ -1352,9 +1352,7 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, { } , onExportClick: function (button, event) { - if (this.storeBodyList.getCount() == 0) { - return; - } + _this = this; var sortstr = ''; if (this.sortfield != '' && this.sortdire != '') { @@ -1378,11 +1376,11 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, { Ext.MessageBox.hide(); var jsonresult = Ext.JSON.decode(response.responseText); if (jsonresult.Success) { - var returnstr = jsonresult.Data; + var returnstr = jsonresult.data; var sql1 = returnstr; sql1 = sql1.replace(/\+/g, "@@@") if (sql1 != '') { - GridExportBySql(sql1, _this.formname + 'bill', '委托结算服务.xls'); + GridExportBySql(sql1, _this.formname , '委托结算服务.xls'); } diff --git a/DSWeb/Areas/SoftMng/Common/Common.cs b/DSWeb/Areas/SoftMng/Common/Common.cs index 9f81c9c2..12edfb78 100644 --- a/DSWeb/Areas/SoftMng/Common/Common.cs +++ b/DSWeb/Areas/SoftMng/Common/Common.cs @@ -19,7 +19,7 @@ namespace DSWeb.SoftMng.Common /// 如果参数存在不安全字符，则返回true public static bool SqlFilterExist(string source) { - string pattern = @"(insert|delete|database|go|db_name|sys.|exec|create|grant|revoke|alter|execute|drop|openrowset|\(|drop table|update|truncate|asc\(|mid\(|char\(|xp_cmdshell|netlocalgroup administrators|net user|dec|exec|database|chr|declare)([\s+.*]|$)"; + string pattern = @"(insert|delete|database|go|db_name|sys.|exec|create|grant|revoke|alter|execute|drop|openrowset|drop table|update|truncate|asc\(|mid\(|char\(|xp_cmdshell|netlocalgroup administrators|net user|dec|exec|database|chr|declare)([\s+.*]|$)"; if (Regex.IsMatch(source, pattern, RegexOptions.IgnoreCase)) return true; return false; diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user deleted file mode 100644 index a8615099..00000000 --- a/DSWeb/DSWeb.csproj.user +++ /dev/null @@ -1,40 +0,0 @@ - - - - ShowAllFiles - 配置文件1 - true - Debug|Any CPU - - - - - - - - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - True - True - - - - - \ No newline at end of file