From 57999a3f1f0c21d82484325caa92cd863bdbf289 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Tue, 16 Apr 2024 17:57:33 +0800 Subject: [PATCH 1/3] 1 --- DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js index 2d122c76..51623c6c 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js @@ -110,7 +110,7 @@ Zi.LAN.DOC = "单证"; Zi.LAN.DocEdit = "单据管理"; Zi.LAN.DOORADDR = "到门地址"; Zi.LAN.DPAGE = "危险品页号"; -Zi.LAN.FEE = "费用"; +Zi.LAN.FEETITLE = "费用"; Zi.LAN.DRFEESTATUS = "应收费用"; Zi.LAN.DRINVSTATUS = "应收开票"; Zi.LAN.DSManifest = "直发舱单"; From 9c69973f730a35343365c572b4e500a1365e2b56 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Tue, 16 Apr 2024 17:58:12 +0800 Subject: [PATCH 2/3] 2 --- .../Controllers/PublicInterfaceController.cs | 55 ++++++++++++ DSWeb/Areas/CommMng/DAL/PubSysDAL.cs | 2 +- .../Controllers/OP_SERVICEBILLController.cs | 6 +- .../OP_SERVICEBILL/OP_SERVICEBILLEdit.js | 38 +++++---- .../OP_SERVICEBILL/OP_SERVICEBILLIndex.js | 84 ++++++++++++++++--- 5 files changed, 154 insertions(+), 31 deletions(-) diff --git a/DSWeb/Areas/CommMng/Controllers/PublicInterfaceController.cs b/DSWeb/Areas/CommMng/Controllers/PublicInterfaceController.cs index 5fac9e93..0af66e4b 100644 --- a/DSWeb/Areas/CommMng/Controllers/PublicInterfaceController.cs +++ b/DSWeb/Areas/CommMng/Controllers/PublicInterfaceController.cs @@ -205,6 +205,61 @@ namespace DSWeb.Areas.CommMng.Controllers } } + public void PublicInterface() + { + + var sr = new StreamReader(Request.InputStream, Encoding.UTF8); + var strJson = sr.ReadToEnd(); + //BasicDataRefDAL.SaveLog(strJson, "", "大简云比对", "删除业务"); + var param = JsonConvert.Deserialize(strJson); + try + { + //param.Save(); + InterfaceLog.Save("PublicInterface", strJson); + + Assembly assembly = Assembly.Load("DSWeb"); + var classname = "DSWeb.Areas.CommMng.PublicInterfaceDAL.DJYBILLDELETE"; + var type = assembly.GetType(classname); + + Object obj = type.Assembly.CreateInstance(type.ToString()); + + var doset = type.GetMethod("DoSet"); + var _param = new object[] { param }; + DJYBILLDELETE_REPLY result = (DJYBILLDELETE_REPLY)doset.Invoke(obj, BindingFlags.Instance | BindingFlags.NonPublic, null, _param, null); + + //var str = JsonConvert.Serialize(result); + + string json = JsonConvert.Serialize(result); + //Response.Clear(); + Response.AddHeader("Content-type", "text/json"); + Response.AddHeader("Content-type", "application/json"); + Response.ContentType = "application/json"; + Response.Write(json); + + } + catch (Exception e) + { + var _r = new DJYINFOBASE(); + _r.Code = 1; + + var msg = e.Message; + if (e.InnerException != null && e.InnerException.Message != null) + { + msg += "//InnerException.Message:" + e.InnerException.Message; + } + var _rs = BasicDataRefDAL.SaveLog(msg, "", "大简云比对", "删除业务"); + //var _rr = JsonConvert.Deserialize(_rs.Content); + _r.Message = msg; + + string json = JsonConvert.Serialize(_r); + //Response.Clear(); + Response.AddHeader("Content-type", "text/json"); + Response.AddHeader("Content-type", "application/json"); + Response.ContentType = "application/json"; + Response.Write(json); + + } + } } public class InterfaceResult { diff --git a/DSWeb/Areas/CommMng/DAL/PubSysDAL.cs b/DSWeb/Areas/CommMng/DAL/PubSysDAL.cs index 23dc4ab6..ea10d453 100644 --- a/DSWeb/Areas/CommMng/DAL/PubSysDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/PubSysDAL.cs @@ -1244,7 +1244,7 @@ namespace DSWeb.Areas.CommMng.DAL var ctnbsno = BSNO; - if (BSNO != "*" && !CurrCtnList.Exists(x => x.DJYCTNID == ctn.id)) + if (BSNO != "*" && CurrCtnList.Exists(x => x.DJYCTNID == ctn.id)) { ctnbsno = BSNO; var updctn = CurrCtnList.FirstOrDefault(x => x.DJYCTNID == ctn.id); diff --git a/DSWeb/Areas/MvcShipping/Controllers/OP_SERVICEBILLController.cs b/DSWeb/Areas/MvcShipping/Controllers/OP_SERVICEBILLController.cs index 7ee0362f..953a7b14 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/OP_SERVICEBILLController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/OP_SERVICEBILLController.cs @@ -377,7 +377,11 @@ namespace DSWeb.MvcShipping.Controllers { var result = new DBResult(); - SERVICEBILL_MqWorkDAL.Do_SERVICEBILLToDS7("{\"Status\":3,\"StatusDesc\":\"已缴费\",\"Remark\":\"测试已缴费状态\",\"FeeList\":[{\"FeeId\":535437616636677,\"FeeName\":\"费用111\",\"FeeAmount\":21.32},{\"FeeId\":535437616636678,\"FeeName\":\"费用222\",\"FeeAmount\":4.00},{\"FeeId\":535438616036101,\"FeeAmount\":0.00},{\"FeeId\":535439141819142,\"FeeAmount\":0.00}],\"MessageType\":1,\"MessageDesc\":\"状态更新推送\",\"OrderId\":535437278618373,\"Mblno\":\"0412\"}"); + //SERVICEBILL_MqWorkDAL.Do_SERVICEBILLToDS7("{\"Status\":3,\"StatusDesc\":\"已缴费\",\"Remark\":\"测试已缴费状态\",\"FeeList\":[{\"FeeId\":535437616636677,\"FeeName\":\"费用111\",\"FeeAmount\":21.32},{\"FeeId\":535437616636678,\"FeeName\":\"费用222\",\"FeeAmount\":4.00},{\"FeeId\":535438616036101,\"FeeAmount\":0.00},{\"FeeId\":535439141819142,\"FeeAmount\":0.00}],\"MessageType\":1,\"MessageDesc\":\"状态更新推送\",\"OrderId\":535437278618373,\"Mblno\":\"0412\"}"); + + var teststr = "[{\"SyncType\":null,\"Id\":536952397844550,\"BSNO\":null,\"BSSTATUS\":null,\"BSSTATUSNAME\":\"已收到BC\",\"BSDATE\":\"2024-04-16T00:00:00\",\"MBLNO\":\"238327548\",\"HBLNO\":null,\"BOOKINGNO\":\"536952397844549\",\"CONTRACTNO\":\"299026908\",\"SERVICECONTRACTNO\":null,\"SHIPPERID\":null,\"CONSIGNEEID\":null,\"NOTIFYPARTYID\":null,\"SHIPPER\":\"SHENZHEN SOUTH-TRANS LOGISTICS CO.,LTD\",\"CONSIGNEE\":\"TO ORDER\",\"NOTIFYPARTY\":\"TO ORDER\",\"NOTIFYPARTY2\":null,\"YARDID\":null,\"YARD\":null,\"VESSELID\":null,\"VESSEL\":\"COSCO FELIXSTOWE\",\"VOYNO\":\"1234\",\"VOYNOINNER\":\"187S\",\"ETD\":\"2024-04-27T00:00:00\",\"ATD\":null,\"CLOSINGDATE\":null,\"CLOSEDOCDATE\":null,\"CLOSEVGMDATE\":null,\"ETA\":\"2024-05-20T00:00:00\",\"PLACERECEIPTID\":null,\"PLACERECEIPT\":\"ZHUHAI\",\"PORTLOADID\":null,\"PORTLOAD\":\"ZHUHAI\",\"PORTDISCHARGEID\":\"NZLYT\",\"PORTDISCHARGE\":\"LYTTELTON, NEW ZEALAND\",\"PLACEDELIVERYID\":\"NZLYT\",\"PLACEDELIVERY\":\"LYTTELTON, NEW ZEALAND\",\"DESTINATIONID\":\"NZLYT\",\"DESTINATION\":\"LYTTELTON, NEW ZEALAND\",\"NOBILL\":null,\"COPYNOBILL\":null,\"ISSUETYPE\":null,\"ISSUEDATE\":null,\"ISSUEPLACEID\":null,\"ISSUEPLACE\":null,\"BLFRT\":null,\"PREPARDAT\":null,\"PAYABLEAT\":null,\"SERVICE\":null,\"MARKS\":null,\"HSCODE\":\"39241000 \",\"DESCRIPTION\":\":CAP-ZHENHU JINGYUN 800G 9.6ML V02-32.5MM\\nCAP-ZHENHU JINGYUN 800G 9.6ML V02-32.5M\\nSCOOP-ZHENHU JINGYUN STAGE 1 NEW GB 9.6ML GOLDEN\\nHS CODE: 39241000 \\n:5 \",\"PKGS\":300,\"KINDPKGS\":\"CTNS\",\"KGS\":5000.00000,\"CBM\":65.0000,\"TOTALNO\":\"SAY:THREE HUNDRED CTNS ONLY.\",\"CNTRTOTAL\":\"40HC*1\",\"CARRIERID\":\"MSK\",\"CARRIER\":\"马士基\",\"CARGOID\":null,\"DCLASS\":null,\"DUNNO\":null,\"DPAGE\":null,\"DLABEL\":null,\"LINKMAN\":null,\"TEMPID\":null,\"TEMPSET\":null,\"REEFERF\":null,\"HUMIDITY\":null,\"TEMPMIN\":null,\"TEMPMAX\":null,\"ISCONTAINERSOC\":null,\"SOREMARK\":null,\"SIREMARK\":null,\"YARDREMARK\":null,\"COMPID\":null,\"COMPNAME\":null,\"SHIPPERNAME\":null,\"SHIPPERADDR1\":null,\"SHIPPERADDR2\":null,\"SHIPPERADDR3\":null,\"SHIPPERCITY\":null,\"SHIPPERPROVINCE\":null,\"SHIPPERPOSTCODE\":null,\"SHIPPERCOUNTRY\":null,\"SHIPPERATTN\":null,\"SHIPPERTEL\":null,\"CONSIGNEENAME\":null,\"CONSIGNEEADDR1\":null,\"CONSIGNEEADDR2\":null,\"CONSIGNEEADDR3\":null,\"CONSIGNEECITY\":null,\"CONSIGNEEPROVINCE\":null,\"CONSIGNEEPOSTCODE\":null,\"CONSIGNEERCOUNTRY\":null,\"CONSIGNEEATTN\":null,\"CONSIGNEETEL\":null,\"NOTIFYPARTYNAME\":null,\"NOTIFYPARTYADDR1\":null,\"NOTIFYPARTYADDR2\":null,\"NOTIFYPARTYADDR3\":null,\"NOTIFYPARTYCITY\":null,\"NOTIFYPARTYPROVINCE\":null,\"NOTIFYPARTYPOSTCODE\":null,\"NOTIFYPARTYCOUNTRY\":null,\"NOTIFYPARTYATTN\":null,\"NOTIFYPARTYTEL\":null,\"PONO\":null,\"OPID\":\"524224711663685\",\"DOCID\":\"524224711577669\",\"OP\":\"周荟瑾\",\"DOC\":\"邵长叶\",\"SALEID\":\"536590290546757\",\"SALE\":\"武程功\",\"CUSTSERVICEID\":\"524224711577669\",\"CUSTSERVICE\":\"邵长叶\",\"CUSTOMERNAME\":\"深圳市南鼎\",\"FORWARDER\":null,\"SHIPAGENCY\":null,\"CUSTOMSER\":null,\"TRUCKER\":null,\"AGENTID\":null,\"CUSTOMERID\":530585598480489,\"FORWARDERID\":null,\"SHIPAGENCYID\":null,\"CUSTOMSERID\":null,\"TRUCKERID\":null,\"AGENTNAME\":null,\"WEITUO\":null,\"CONSIGNEEDOORADDR\":null,\"SHIPPERDOORADDR\":null,\"SCACCODE\":null,\"ITNCODE\":null,\"PREPARDATID\":null,\"PAYABLEATID\":null,\"CUSTNO\":null,\"TRANSPORTID\":null,\"TRANSPORT\":null,\"THIRDPAYADDR\":null,\"YARDCONTRACT\":null,\"YARDCONTRACTTEL\":null,\"YARDCONTRACTEMAIL\":null,\"FEESELF\":null,\"LANECODE\":null,\"LANENAME\":null,\"FREIGHTPAYER\":null,\"GOODSCODE\":null,\"GOODSNAME\":null,\"PKGSTOTAL\":null,\"KGSTOTAL\":null,\"CBMTOTAL\":null,\"ROUTEID\":\"\",\"ROUTE\":null,\"Warehouse\":null,\"WarehouseID\":null,\"EPCode\":null,\"LineName\":null,\"DZRemark\":null,\"CZRemark\":null,\"TMBLNO\":null,\"ShippingMethod\":null,\"CtnDayNum\":null,\"CreatedUserName\":\"邵长叶\",\"ZhanCangFlag\":null,\"SourceCode\":null,\"SourceName\":null,\"YgtETD\":null,\"StartETA\":null,\"StartATA\":null,\"MiddleETA\":null,\"MiddleETD\":null,\"MiddleATA\":null,\"MiddleATD\":null,\"ATA\":null,\"ShenQingXiangShi\":null,\"ForeignAgent\":null,\"VERSION\":\"c69512eb-d405-4f1b-b101-0bba9f2b1632\",\"ThirdPay\":null,\"ThirdPayCode\":null,\"ctnInputs\":[{\"Id\":536952397865029,\"BILLID\":536952397844550,\"CTNCODE\":\"45G11\",\"CTNALL\":\"40HC\",\"CTNNUM\":1,\"TEU\":0,\"CNTRNO\":\"\",\"SEALNO\":\"\",\"PKGS\":0,\"KINDPKGS\":\"CTNS\",\"KGS\":0.0000,\"CBM\":0.0000,\"TAREWEIGHT\":0.0000,\"CTNSTATUS\":null,\"WEIGHTYPE\":null,\"WEIGHKGS\":0.0000,\"WEIGHATTN\":null,\"VGMCONNCOM\":null,\"WEIGHTEL\":null,\"WEIGHDATE\":\"\",\"VGMADDR\":null,\"VGMEMAIL\":null,\"REMARK\":null,\"ctnDetailInputs\":[]}],\"BookingEDIExt\":{\"WeiTuoFang\":\"\",\"SendCode\":\"\",\"ReceiveCode\":\"\",\"NotifyCdoe\":\"\",\"SalerCode\":\"\",\"MasterBolIndicator\":\"\",\"EmanifestHbl\":\"\",\"ConsigneeEdiCode\":\"\",\"ShipperEdiCode\":\"\",\"EDIAttn\":\"\",\"EDIAttnTel\":\"\",\"EDIAttnMail\":\"\",\"AMSConsignee\":\"\",\"AMSNotifyParty\":\"\",\"OpEName\":\"\",\"OpTel\":\"\",\"OpEmail\":\"\",\"ACIHBL\":\"\",\"S0CC0C\":\"\",\"GoodsName\":\"\",\"MasterBolIndicatorName\":\"\",\"SalerCodeName\":\"\",\"CKHI\":\"\",\"CNCM\":\"\",\"WNCM\":\"\",\"OrderRemark\":\"\",\"ExRemark1\":\"\",\"ExRemark2\":\"\",\"ExRemark3\":\"\",\"ExRemark4\":\"\",\"KingTareweight\":null,\"CNPTNo\":null,\"XMCYWY\":null,\"EmcNameAccount\":null},\"LineManage\":null,\"LineManageID\":\"\",\"childrens\":[],\"GoodsStatus\":[{\"StatusName\":\"已收到BC\",\"FinishTime\":\"2024-04-16T16:58:26\",\"Remark\":null,\"ExtData\":null}],\"Files\":[{\"Id\":536952399233093,\"FileName\":\"DB_aabhbcicbhce0x049A.pdf\",\"FileType\":\"bc\",\"FilePath\":\"BookingAttach\\\\536952397844550\\\\20240416164456\\\\DB_aabhbcicbhce0x049A.pdf\"},{\"Id\":536952399372357,\"FileName\":\"DB_aabhbcicbhce0x049A_MODIFY.pdf\",\"FileType\":\"bc_notice\",\"FilePath\":\"BookingAttach\\\\bcnoticefile\\\\536952397844550\\\\20240416164456\\\\DB_aabhbcicbhce0x049A_MODIFY.pdf\"}]}]"; + + MqWorkDAL.DingCangToDS7(teststr); return BasicDataRefDAL.GetContentResult(result); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLEdit.js index 08c31f8a..75359160 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLEdit.js @@ -1673,21 +1673,21 @@ Ext.extend(Shipping.OP_SERVICEBILLEdit, Ext.Panel, { } //var FILETYPE = "订舱附件"; //枚举维护表tSysEnumValue_附件类型97048 //需求编号：SR2017081100003 - this.storeFileType = Ext.create('DsExt.ux.RefTableStore', { - model: 'DsShipping.ux.TSysEnumValueDataModel', - proxy: { url: '/CommMng/BasicDataRef/GetTSysEnumValueList' } - }); - this.storeFileType.load({ params: { condition: " and EnumTypeID=97048" } }); - var comboxFileType = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '附件类型', - hidden:true, - store: this.storeFileType, - forceSelection: true, - id: 'FILETYPE', - name: 'FILETYPE', - valueField: 'EnumValueName', - displayField: 'EnumValueName' - }); + //this.storeFileType = Ext.create('DsExt.ux.RefTableStore', { + // model: 'DsShipping.ux.TSysEnumValueDataModel', + // proxy: { url: '/CommMng/BasicDataRef/GetTSysEnumValueList' } + //}); + //this.storeFileType.load({ params: { condition: " and EnumTypeID=97048" } }); + //var comboxFileType = Ext.create('DsExt.ux.RefTableCombox', { + // fieldLabel: '附件类型', + // hidden:true, + // store: this.storeFileType, + // forceSelection: true, + // id: 'FILETYPE', + // name: 'FILETYPE', + // valueField: 'EnumValueName', + // displayField: 'EnumValueName' + //}); _this = this; var imgform = new Ext.FormPanel({ @@ -1708,7 +1708,13 @@ Ext.extend(Shipping.OP_SERVICEBILLEdit, Ext.Panel, { allowBlank: false, buttonCfg: { iconCls: 'uploaddialog' }, anchor: '98%' - }, comboxFileType + }, { + xtype: 'textfield', + id: 'FILETYPEField', + name: 'FILETYPE', + fieldLabel: '随附单证代码', + values:'原始单据' + } , { xtype: 'textfield', hidden: true, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLIndex.js index 9930b184..6e4ac7e8 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLIndex.js @@ -182,7 +182,7 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, { { sortable: true, dataIndex: 'FEE_1', - header: Zi.LAN.FEE, + header: Zi.LAN.FEETITLE, width: 80 }, { @@ -830,15 +830,19 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, { this.onDeleteClick(button, event); }, scope: this - }, { - text: "打印", id: "print", - tooltip: 'print', - handler: function (button, event) { - //this.PushState("30011"); - this.Print(); - }, - scope: this - }, { + } + + //, { + // text: "打印", id: "print", + // tooltip: 'print', + // handler: function (button, event) { + // //this.PushState("30011"); + // this.Print(); + // }, + // scope: this + //} + + , { xtype: 'button', text: "高级查询", iconCls: "btnmore", @@ -917,6 +921,11 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, { Ext.apply(store.proxy.extraParams, { condition: this.sqlcontext, sort: sortstr }); }, this); + this.gridList.addListener('sortchange', function (ct, column, direction, eOpts) { + this.sortfield = column.dataIndex; + this.sortdire = direction; + }, this); + //#endregion this.LoadInitData(); @@ -1223,9 +1232,9 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, { //}, //onDeleteClick - onExportClick: function (button, event) { - GridExportExcelPage(this.gridList); - }, + //onExportClick: function (button, event) { + // GridExportExcelPage(this.gridList); + //}, //#region 打印 Print: function () { @@ -1341,6 +1350,55 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, { { this.onRefreshClick(); } + + , onExportClick: function (button, event) { + if (this.storeBodyList.getCount() == 0) { + return; + } + var sortstr = ''; + + if (this.sortfield != '' && this.sortdire != '') { + + sortstr = this.sortfield + ' ' + this.sortdire; + } + + var sql = this.getCondition(); + + Ext.Msg.wait('正在组织数据, 请稍侯..'); + Ext.Ajax.request({ + waitMsg: '正在组织数据...', + url: '/MvcShipping/OP_SERVICEBILL/GetDataListStr', + scope: this, + params: { + condition: sql, + sort: sortstr + }, + callback: function (options, success, response) { + if (success) { + Ext.MessageBox.hide(); + var jsonresult = Ext.JSON.decode(response.responseText); + if (jsonresult.Success) { + var returnstr = jsonresult.Data; + var sql1 = returnstr; + sql1 = sql1.replace(/\+/g, "@@@") + if (sql1 != '') { + GridExportBySql(sql1, _this.formname + 'bill', '委托结算服务.xls'); + + } + + } else { + Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); + } + } else { + Ext.Msg.show({ + title: '请重试', + msg: '服务器响应出错', + icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK + }); + } + } + }); + }, }); From 2ad6db59df62dca2e6a00877474037f4d34ec47e Mon Sep 17 00:00:00 2001 From: ddlucky Date: Tue, 16 Apr 2024 18:00:57 +0800 Subject: [PATCH 3/3] 3 --- DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs index 2b4ead6b..b89e31bd 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs @@ -64,14 +64,10 @@ using sun.swing; using DSWeb.MvcShipping.Models.MsSysThirdPartyAccount; using Microsoft.Practices.EnterpriseLibrary.Data; using ICSharpCode.SharpZipLib.Zip; -<<<<<<< HEAD using DSWeb.SoftMng.Filter; -======= using DSWeb.Areas.MvcShipping.Models.Message.VGM; using DSWeb.MvcShipping.DAL.MsSysThirdPartyAccount; ->>>>>>> 559d9f9c4994ad9bd5160e9291e8a0f558c6c1b1 -//using Discuz.Common; namespace DSWeb.MvcShipping.Controllers {