From 6754eb5d4f45ef750576840fd486aeeb4e0df0aa Mon Sep 17 00:00:00 2001 From: ddlucky Date: Tue, 7 Mar 2023 10:51:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ESL=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=82=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=8C=E5=85=88=E5=81=9A?= =?UTF-8?q?=E5=AF=B9=E7=91=9E=E4=BA=AC=E5=86=85=E8=B4=B8=E7=A9=BA=E8=BF=90?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MsOpSeaeController.cs | 16 ++++ .../MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs | 48 ++++++++++++ .../Viewsjs/MsOpSeae/MsOpSeaeIndex.js | 76 ++++++++++++++++++- .../MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js | 6 +- .../MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js | 4 + 5 files changed, 148 insertions(+), 2 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs index 5d168e94..b4651657 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs @@ -14552,6 +14552,22 @@ namespace DSWeb.MvcShipping.Controllers } #endregion + + #region ESL相关业务调用 + public ContentResult ESLWork(string WORKTYPE, string BSNO) + { + + var result = new DBResult(); + + result = MsOpSeaeDAL.ESLWork(WORKTYPE,BSNO, CookieConfig.GetCookie_UserId(Request), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"])); + + + var _result = BasicDataRefDAL.GetContentResult(result); + return _result; + } + + + #endregion public ContentResult PiLiangZhengPiaoTiJiao(string bsno, int statusvalue) { string message = ""; diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs index b4aa4401..a62620cb 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs @@ -42,6 +42,7 @@ using DSWeb.Areas.MvcShipping.Comm; using DSWeb.Areas.MvcShipping.DB; using Org.BouncyCastle.Bcpg; using DSWeb.MvcShipping.DAL.MsCodeCtnEdi; +using DSWeb.MvcShipping.DAL.MsOpExpressDAL; namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL { @@ -7968,6 +7969,53 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL return result; } + + static public DBResult ESLWork(string WORKTYPE, string BSNO, string userid, string username, string copmpanyid) + { + var result = new DBResult(); + + //var accCfg = MsSysThirdPartyAccount.MsSysThirdPartyAccountDAL.GetData($" CUSTOMERNAME='{order.CARRIER}' and THIRDPARTY='船公司账号' and USERID='" + userid + "' "); + //if (accCfg == null || string.IsNullOrWhiteSpace(accCfg.ACCOUNT) || string.IsNullOrWhiteSpace(accCfg.ACCOUNTPSW)) + //{ + // result.SetErrorInfo($"未在第三方账号信息中配置船公司【{order.CARRIER}】的网站账号、密码（第三方账号每人维护各自信息，客户名称需选择船公司，第三方软件为【船公司账号】）"); + //} + + try + { + if (WORKTYPE == "ETA") + { + + } + + //舱位分配查询 + if (WORKTYPE == "CWFPCX") + { + + } + + //格式单批量接收 + if (WORKTYPE == "ETA") + { + + } + } + catch (Exception e) + { + result.SetErrorInfo(e.Message); + } + + return result; + } + + private static DBResult ESL_CANDO(string WORKTYPE, string BSNO, string userid, string username, string copmpanyid) + { + var result = new DBResult(); + + //看 + + return result; + } + } public class GLSFEEHead diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js index 076df043..a4fa563d 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js @@ -2927,7 +2927,28 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { _this.onSendToDJY('del'); } } - + //, { + // text: Zi.LAN.ESL, //"ESL业务执行", + // menu: [ + // { + // text: Zi.LAN.ESL_ETA, //"ESL到港时间更新", + // handler: function (menu, event) { + // _this.ESLWork("ETA"); + // } + // }, + // { + // text: Zi.LAN.ESL_CWFPCX, //"ESL舱位分配查询", + // handler: function (menu, event) { + // _this.ESLWork("CWFPCX"); + // } + // }, { + // text: Zi.LAN.ESL_GSDXZ, //"ESL格式单批量接收", + // handler: function (menu, event) { + // _this.ESLWork("GSDXZ"); + // } + // } + // ] + //} , { text: '推送港联顺费用', handler: function (menu, event) { @@ -15989,6 +16010,59 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, { }); } } + + , ESLWork: function (WORKTYPE) { + var selections = this.GridCheckBoxModel.selected.items; + if (selections.length == 0) { + Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要更新的业务! + return; + } + var BSNOStr = ''; + for (var i = 0; i < selections.length; i++) { + var rec = selections[i]; + var BSNO = "'" + rec.data.BSNO + "'"; + if (BSNOStr == '') + BSNOStr = BSNO; + else { + + BSNOStr = BSNOStr + ',' + BSNO; + } + } + + if (BSNOStr == '') { + Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; + + } + else { + Ext.Ajax.request({ + waitMsg: '', + url: '/MvcShipping/MsOpSeae/ESLWork', + params: { + WORKTYPE: WORKTYPE, + BSNO: BSNOStr + }, + callback: function (options, success, response) { + if (success) { + var result = Ext.JSON.decode(response.responseText); + if (result.Success != true) { + + Ext.Msg.show({ title: Zi.LAN.TiShi, msg: result.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + + } else { + + MsgTip("提示", result.Message, 2500); + + } + } else { + Ext.Msg.show({ title: Zi.LAN.ChuoWu, msg: result.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); + } + }, + scope: this + }); + + + } }); function fnSearch() { diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js index 22656317..ddfdc55b 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js @@ -683,4 +683,8 @@ Zi.LAN.rRECEIVERSALE = "接受方销售"; Zi.LAN.rRECEIVERDEPT = "接受方部门"; Zi.LAN.EDIRUSSIA = "俄罗斯(交通部)"; Zi.LAN.RememberQuery = "Save Query"; -Zi.LAN.IRCODE = "CSR/IR号"; \ No newline at end of file +Zi.LAN.IRCODE = "CSR/IR号"; +Zi.LAN.ESL = "ESL业务执行"; +Zi.LAN.ESL_ETA = "ESL到港时间更新"; +Zi.LAN.ESL_CWFPCX = "ESL舱位分配查询"; +Zi.LAN.ESL_GSDXZ = "ESL格式单批量接收"; \ No newline at end of file diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js index 1c1bbf3d..415c7699 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js @@ -711,6 +711,10 @@ Zi.LAN.rRECEIVERDEPT = "接受方部门"; Zi.LAN.EDIRUSSIA = "俄罗斯(交通部)"; Zi.LAN.RememberQuery = "记忆查询"; Zi.LAN.IRCODE = "CSR/IR号"; +Zi.LAN.ESL = "ESL业务执行"; +Zi.LAN.ESL_ETA = "ESL到港时间更新"; +Zi.LAN.ESL_CWFPCX = "ESL舱位分配查询"; +Zi.LAN.ESL_GSDXZ = "ESL格式单批量接收"; //Zi.LAN. = ""; From af4b56571f0a4363dd1bf21a8339631ad9ac094e Mon Sep 17 00:00:00 2001 From: ddlucky Date: Tue, 7 Mar 2023 11:20:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?20230307=E7=91=9E=E4=BA=AC=E5=86=85?= =?UTF-8?q?=E8=B4=B8=E7=A9=BA=E8=BF=90=EF=BC=9A1=E4=B8=BB=E5=8D=95?= =?UTF-8?q?=E5=86=85=E7=9A=84=E5=88=86=E5=8D=95=E5=8F=B7=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9=EF=BC=9B2?= =?UTF-8?q?=E4=B8=8D=E8=AE=BA=E4=B8=BB=E5=8D=95=E8=BF=98=E6=98=AF=E5=88=86?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E8=B4=B9=E7=94=A8=E9=94=81=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E6=89=A7=E8=A1=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MvcShipping/Controllers/MsOpAirnController.cs | 13 +++++++++---- .../Viewsjs/MsOpAirn/MsOpAirnMainEdit.js | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs index 6266014d..efd5ba50 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs @@ -210,7 +210,7 @@ namespace DSWeb.MvcShipping.Controllers { var headData = JsonConvert.Deserialize(data); - + DBResult result=new DBResult(); var CargobodyList = JsonConvert.Deserialize>(CargoBody); var CargodelbodyList = JsonConvert.Deserialize>(CargoDelBody); @@ -220,6 +220,12 @@ namespace DSWeb.MvcShipping.Controllers //headData.CREATETIME = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); } + var oldheadData = MsOpAirnDAL.GetData(" B.BSNO='" + headData.BSNO + "' "); + + if (oldheadData.FEESTATUS == true) { + result.SetErrorInfo("费用锁定的业务不允许修改"); + } + var isPost = true; var errorstr = ""; //var isuse = false; @@ -263,7 +269,7 @@ namespace DSWeb.MvcShipping.Controllers var feecount = BasicDataRefDAL.GetExist("ch_fee", " BSNO='" + headData.BSNO + "' "); if (feecount > 0) { - var oldheadData = MsOpAirnDAL.GetData(" B.BSNO='" + headData.BSNO + "' "); + headData.BLFRT = oldheadData.BLFRT; headData.PFREIGHT = oldheadData.PFREIGHT; @@ -348,7 +354,7 @@ namespace DSWeb.MvcShipping.Controllers BasicDataRefDAL.SaveLog("opstatus="+ opstatus+":"+JsonConvert.Serialize(headData)+"//"+ JsonConvert.Serialize(CargobodyList), Convert.ToString(Session["SHOWNAME"]),"内贸空运","主单保存"); var modb = new ModelObjectRepository(); - DBResult result = modb.Save(headData, + result = modb.Save(headData, ModelObjectConvert.ToModelObjectList(CargobodyList), ModelObjectConvert.ToModelObjectList(CargodelbodyList) ); @@ -506,7 +512,6 @@ namespace DSWeb.MvcShipping.Controllers if (iscreatecustno == true) MsSysBillNoSetDAL.DeleteBsNo(headData.CUSTNO); - var result = new DBResult(); result.Success = false; result.Message = errorstr + "重复,不允许保存！"; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAirn/MsOpAirnMainEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAirn/MsOpAirnMainEdit.js index 47d20bfd..bf1e0cd1 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAirn/MsOpAirnMainEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAirn/MsOpAirnMainEdit.js @@ -799,6 +799,7 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, { }] }, { fieldLabel: '分单号', + readOnly: true, name: 'HBLNO' }, this.comboxStlName, { fieldLabel: '结算日期', From 025bd2fd3aaba4c955d4ac2e4feb19529bdd89ca Mon Sep 17 00:00:00 2001 From: ddlucky Date: Tue, 7 Mar 2023 11:36:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8A=E8=BF=B0=E9=97=AE=E9=A2=982?= =?UTF-8?q?=E5=85=88=E5=8F=96=E6=B6=88=E4=B8=8D=E5=81=9A=E9=99=90=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E5=8F=AA=E5=9C=A8=E4=B8=BB=E5=8D=95?= =?UTF-8?q?=E6=9C=89chfee=E6=97=B6=E9=99=90=E5=88=B6=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=92=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs index efd5ba50..d5bb979b 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs @@ -222,9 +222,9 @@ namespace DSWeb.MvcShipping.Controllers var oldheadData = MsOpAirnDAL.GetData(" B.BSNO='" + headData.BSNO + "' "); - if (oldheadData.FEESTATUS == true) { - result.SetErrorInfo("费用锁定的业务不允许修改"); - } + //if (oldheadData.FEESTATUS == true) { + // result.SetErrorInfo("费用锁定的业务不允许修改"); + //} var isPost = true; var errorstr = "";