diff --git a/DSWeb.Common/DB/Comm.cs b/DSWeb.Common/DB/Comm.cs index 7c8e81f4..d330dc3a 100644 --- a/DSWeb.Common/DB/Comm.cs +++ b/DSWeb.Common/DB/Comm.cs @@ -3792,6 +3792,12 @@ namespace DSWeb.Common.DB } + [Table("VW_OP_SEAE_DJYORDER")] + public class VW_OP_SEAE_DJYORDER_md:OP_SEAE_DJYORDER_md + { + public string CARRIER { get; set; } + } + [Table("DJYORDER_CONTRACTNO")] public class DJYORDER_CONTRACTNO_md { diff --git a/DSWeb.Common/DB/CommonDataContext.cs b/DSWeb.Common/DB/CommonDataContext.cs index dbe45208..9b9b64b3 100644 --- a/DSWeb.Common/DB/CommonDataContext.cs +++ b/DSWeb.Common/DB/CommonDataContext.cs @@ -131,6 +131,8 @@ namespace DSWeb.Common.DB public DbSet sys_log { get; set; } public DbSet OP_SEAE_DJYORDER { get; set; } + public DbSet VW_OP_SEAE_DJYORDER { get; set; } + public DbSet DJYORDER_CONTRACTNO { get; set; } public DbSet DJYORDER_ACCOUNTINFO { get; set; } diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs index 128ba4ba..daebcb21 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs @@ -13782,7 +13782,6 @@ namespace DSWeb.MvcShipping.Controllers if (CARRIER == "") CARRIER = "COSCO"; - var carrierList = new List { "COSCO", @@ -13797,14 +13796,12 @@ namespace DSWeb.MvcShipping.Controllers return new ContentResult() { Content = json1 }; } - var USERID = Session["USERID"].ToString(); var condition = $" B.BSNO='{BSNO}'"; var head = 大简云订舱邮件Helper.GetDjyOrderData(BSNO, USERID, CARRIER);// - var json = JsonConvert.Serialize( new { Success = true, Message = "查询成功", data = head }); return new ContentResult() { Content = json }; diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs index b34199fa..a434e163 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs @@ -9068,60 +9068,67 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperName, "发货人", ref canmake); MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperAddress, "发货人地址", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperCountry, "发货人国家", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperProvince, "发货人省份", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperCity, "发货人城市", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperCounty, "发货人县/区", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperPostCode, "发货人邮编", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperFirstName, "发货人名", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperLastName, "发货人姓", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperPhoneCountryCode, "发货人国家区号", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperPhoneCode, "发货人省市区号", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperPhone, "发货人电话", ref canmake); - //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperPhoneExtension, "唛头", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperCountry, "发货人国家", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperProvince, "发货人省份", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperCity, "发货人城市", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperCounty, "发货人县/区", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperPostCode, "发货人邮编", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperFirstName, "发货人名", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperLastName, "发货人姓", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperPhoneCountryCode, "发货人国家区号", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperPhoneCode, "发货人省市区号", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperPhone, "发货人电话", ref canmake); + ////MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ShipperPhoneExtension, "唛头", ref canmake); MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingName, "订舱方", ref canmake); MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingAddress, "订舱方地址", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingCountry, "订舱方国家", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingProvince, "订舱方省份", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingCity, "订舱方城市", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingCounty, "订舱方县/区", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingPostCode, "订舱方邮编", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingFirstName, "订舱方名", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingLastName, "订舱方姓", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingPhoneCountryCode, "订舱方国家区号", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingPhoneCode, "订舱方省市区号", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingPhone, "订舱方电话", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingCountry, "订舱方国家", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingProvince, "订舱方省份", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingCity, "订舱方城市", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingCounty, "订舱方县/区", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingPostCode, "订舱方邮编", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingFirstName, "订舱方名", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingLastName, "订舱方姓", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingPhoneCountryCode, "订舱方国家区号", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingPhoneCode, "订舱方省市区号", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.BookingPhone, "订舱方电话", ref canmake); MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeName, "收货人", ref canmake); MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeAddress, "收货人地址", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeCountry, "收货人国家", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeProvince, "收货人省份", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeCity, "收货人城市", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeCounty, "收货人县/区", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneePostCode, "收货人邮编", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeFirstName, "收货人名", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeLastName, "收货人姓", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneePhoneCountryCode, "收货人国家区号", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneePhoneCode, "收货人省市区号", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneePhone, "收货人电话", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeCountry, "收货人国家", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeProvince, "收货人省份", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeCity, "收货人城市", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeCounty, "收货人县/区", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneePostCode, "收货人邮编", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeFirstName, "收货人名", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneeLastName, "收货人姓", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneePhoneCountryCode, "收货人国家区号", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneePhoneCode, "收货人省市区号", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.ConsigneePhone, "收货人电话", ref canmake); MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartName, "通知人", ref canmake); MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartAddress, "通知人地址", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartCountry, "通知人国家", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartProvince, "通知人省份", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartCity, "通知人城市", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartCounty, "通知人县/区", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartPostCode, "通知人邮编", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartFirstName, "通知人名", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartLastName, "通知人姓", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartPhoneCountryCode, "通知人国家区号", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartPhoneCode, "通知人省市区号", ref canmake); - MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartPhone, "通知人电话", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartCountry, "通知人国家", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartProvince, "通知人省份", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartCity, "通知人城市", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartCounty, "通知人县/区", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartPostCode, "通知人邮编", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartFirstName, "通知人名", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartLastName, "通知人姓", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartPhoneCountryCode, "通知人国家区号", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartPhoneCode, "通知人省市区号", ref canmake); + //MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.StringIsChinese_Dr(result.OpseaeDjyOrderHead.NotifypartPhone, "通知人电话", ref canmake); return result; } + /// + /// 一个海运出口根据其BSNO初次产生 大简云订舱信息op_seae_djyorder + /// + /// + /// + /// + /// public static 大简云订舱邮件Helper GetDjyOrderHead(string BSNO, string USERID, string _CARRIER)// { @@ -9495,6 +9502,74 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL } } + // + if (CARRIER == "ONE") + { + + + //20241106 对于one的订舱信息而言 + //每次新增 如果vw_op_seae_djyorder当中存在 islast=true 且 船公司=ONE的记录，取其中时间最晚的 + //如果 品名(为空) 和上述四组名称/地址 + + //20241106 四个名称和地址 都默认带出上一票的值 + var cdc = new CommonDataContext(); + var lastrecList = cdc.VW_OP_SEAE_DJYORDER.Where(x => + x.CreateID == SendUser.USERID + && x.CARRIER=="ONE" + && x.ISLAST == true + && ( + (x.BookingName != null && x.BookingName != "") + || (x.ShipperName != null && x.ShipperName != "") + || (x.NotifypartName != null && x.NotifypartName != "") + || (x.ConsigneeName != null && x.ConsigneeName != "") + )).ToList(); + + if (lastrecList != null && lastrecList.Count > 0) + { + + var lastrec = lastrecList.OrderByDescending(o => o.CreateTime).FirstOrDefault(); + + if (!string.IsNullOrWhiteSpace(lastrec.bookingAddr)) + OpseaeDjyOrderHead.bookingAddr = lastrec.bookingAddr; + + if (!string.IsNullOrWhiteSpace(lastrec.DESCRIPTION)) + OpseaeDjyOrderHead.DESCRIPTION = lastrec.DESCRIPTION; + + if (!string.IsNullOrWhiteSpace(lastrec.ShipperName)) + OpseaeDjyOrderHead.ShipperName = lastrec.ShipperName; + if (!string.IsNullOrWhiteSpace(lastrec.ShipperAddress)) + OpseaeDjyOrderHead.ShipperAddress = lastrec.ShipperAddress; + + if (!string.IsNullOrWhiteSpace(lastrec.BookingName)) + OpseaeDjyOrderHead.BookingName = lastrec.BookingName; + if (!string.IsNullOrWhiteSpace(lastrec.BookingAddress)) + OpseaeDjyOrderHead.BookingAddress = lastrec.BookingAddress; + + if (!string.IsNullOrWhiteSpace(lastrec.NotifypartName)) + OpseaeDjyOrderHead.NotifypartName = lastrec.NotifypartName; + if (!string.IsNullOrWhiteSpace(lastrec.NotifypartAddress)) + OpseaeDjyOrderHead.NotifypartAddress = lastrec.NotifypartAddress; + + if (!string.IsNullOrWhiteSpace(lastrec.ConsigneeName)) + OpseaeDjyOrderHead.ConsigneeName = lastrec.ConsigneeName; + if (!string.IsNullOrWhiteSpace(lastrec.ConsigneeAddress)) + OpseaeDjyOrderHead.ConsigneeAddress = lastrec.ConsigneeAddress; + } + + //20240705 根据枚举类型 81018 enumvalueid=opseae.service运输条款 + //来填充 servicetype 和 servicemode + var 运输条款对应 = PubSysDAL.GetEnumValueList(81018); + + if (运输条款对应.Exists(x => x.EnumValueId == OpseaeHead.SERVICE)) + { + var 对应条款 = 运输条款对应.First(x => x.EnumValueId == OpseaeHead.SERVICE); + + OpseaeDjyOrderHead.serviceType = 对应条款.EnumValueName; + OpseaeDjyOrderHead.serviceMode = 对应条款.EnumValueName_2; + + } + } + } private MsOpSeae OpseaeHead { get; set; } @@ -9648,7 +9723,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL { "BOOKINGPASSWORD", 第三方密码 }, { "LANECODE", OpseaeDjyOrderHead.LANE }//航线 - ,{ "OPMAIL", SendUser.EMAIL1 }//操作邮箱 发送人的邮箱 + //,{ "OPMAIL", SendUser.EMAIL1 }//操作邮箱 发送人的邮箱 + ,{ "OpMail", SendUser.EMAIL1 }//操作邮箱 发送人的邮箱 ,{ "PolPortName", OpseaeDjyOrderHead.PolPortName }// ,{ "PodPortName", OpseaeDjyOrderHead.PodPortName }// @@ -9684,7 +9760,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL if (OpseaeHead.CARRIER == "ONE") { + _result.Add("PLACERECEIPTCODE", OpseaeDjyOrderHead.PLACERECEIPTID); _result.Add("ShipInfoJson", OpseaeDjyOrderHead.ShipInfoJson); + _result.Add("bookingAddr", OpseaeDjyOrderHead.bookingAddr); } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/formDjyOrder_ONE.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/formDjyOrder_ONE.js index 70118b3f..0059edae 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/formDjyOrder_ONE.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/formDjyOrder_ONE.js @@ -382,11 +382,11 @@ Ext.extend(Shipping.formDjyOrder_ONE, Ext.Panel, { //Ext.MessageBox.confirm(Zi.LAN.TiShi, "是否要用选定账号的联系信息覆盖托运人信息？", function (btn) { // if (btn == 'yes') { - // var rec = records[0].data; + var rec = records[0].data; // //_this.formDjyOrder.getForm().findField('ShipperName').setValue(rec.ShipperName); // //_this.formDjyOrder.getForm().findField('ShipperAddress').setValue(rec.ShipperAddress); - // //_this.formDjyOrder.getForm().findField('NamedAccount').setValue(rec.NamedAccount); + _this.formDjyOrder.getForm().findField('NamedAccount').setValue(rec.NamedAccount); // } @@ -784,7 +784,7 @@ Ext.extend(Shipping.formDjyOrder_ONE, Ext.Panel, { model: 'DsExtEnumModel', proxy: { url: '/CommMng/PubSys/GetEnumValueList' } }); - this.storeBillAddr.load({ params: { enumTypeId: 81015 } }); + this.storeBillAddr.load({ params: { enumTypeId: 81021 } }); this.comboxbookingAddr = Ext.create('DsExt.ux.RefTableCombox', { flex: 1, @@ -1227,13 +1227,25 @@ Ext.extend(Shipping.formDjyOrder_ONE, Ext.Panel, { if (memberyf.data.EnumValueName != "") { + checked = false if (memberyf.data.EnumValueName_2 != "") { checked = true } - var checkboxSingleItem = "{boxLabel:'" + memberyf.data.EnumValueName + "',inputValue:true,checked:" + checked + ",name:'" + memberyf.data.EnumValueId + "',id:'" + memberyf.data.EnumValueId + "'"; + var checkboxSingleItem = ""; + + //20241105 只保留第3个 订舱 + + if (memberyf.data.EnumValueName == "订舱") { + + checkboxSingleItem= "{boxLabel:'" + memberyf.data.EnumValueName + "',inputValue:true,checked:" + checked + ",name:'" + memberyf.data.EnumValueId + "',id:'" + memberyf.data.EnumValueId + "'"; + } else { + checkboxSingleItem = "{boxLabel:'" + memberyf.data.EnumValueName + "',inputValue:true,checked:false,name:'" + memberyf.data.EnumValueId + "',id:'" + memberyf.data.EnumValueId + "'"; + checkboxSingleItem += ",hidden:true"; + } + checkboxSingleItem += "}"; if (checkboxitems2 != "[") { @@ -1248,8 +1260,10 @@ Ext.extend(Shipping.formDjyOrder_ONE, Ext.Panel, { id: 'DjyServiceGroup', xtype: 'checkboxgroup', //fieldLabel: Zi.LAN.myService, //'大简云服务项目', - flex: 3, - columns: 8, + //flex: 2, + //columns: 8, + flex: 1, + columns:1, items: eval(checkboxitems2) }); //this.formDjyOrder.add(this.DjyServiceCheckboxGroup); @@ -1388,19 +1402,41 @@ Ext.extend(Shipping.formDjyOrder_ONE, Ext.Panel, { grid_VesselVoyno.addListener('itemdblclick', function (dataview, record, item, index, e, b) { + me = this; + + Ext.MessageBox.confirm("您已选择如下船期订舱,确定发送订舱请选择“是”", + "船名:" + record.data.vesselName + ",航次:" + record.data.voyageNumber + ",ETD:" + record.data.departureDate + ",航线:" + record.data.serviceCode + ",航程:" + record.data.days, function (btn) { + if (btn == 'yes') { + + + Ext.getCmp("DJYORDER_VESSEL").setValue(record.data.vesselName); + Ext.getCmp("DJYORDER_VOYNO").setValue(record.data.voyageNumber); + + Ext.getCmp("DJYORDER_ETD").setValue(record.data.departureDate); + Ext.getCmp("DJYORDER_LANE").setValue(record.data.serviceCode); + + Ext.getCmp("DJYORDER_PolPortName").setValue(record.data.originName); + Ext.getCmp("DJYORDER_PodPortName").setValue(record.data.destinationName); + + me.win_VesselVoyno.close(); + } + + }); + + - //双击时 将船名航次写入 并关闭win_VesselVoyno - Ext.getCmp("DJYORDER_VESSEL").setValue(record.data.vesselName); - Ext.getCmp("DJYORDER_VOYNO").setValue(record.data.voyageNumber); + ////双击时 将船名航次写入 并关闭win_VesselVoyno + //Ext.getCmp("DJYORDER_VESSEL").setValue(record.data.vesselName); + //Ext.getCmp("DJYORDER_VOYNO").setValue(record.data.voyageNumber); - Ext.getCmp("DJYORDER_ETD").setValue(record.data.departureDate); - Ext.getCmp("DJYORDER_LANE").setValue(record.data.serviceCode); + //Ext.getCmp("DJYORDER_ETD").setValue(record.data.departureDate); + //Ext.getCmp("DJYORDER_LANE").setValue(record.data.serviceCode); - Ext.getCmp("DJYORDER_PolPortName").setValue(record.data.originName); - Ext.getCmp("DJYORDER_PodPortName").setValue(record.data.destinationName); + //Ext.getCmp("DJYORDER_PolPortName").setValue(record.data.originName); + //Ext.getCmp("DJYORDER_PodPortName").setValue(record.data.destinationName); - this.win_VesselVoyno.close(); + //this.win_VesselVoyno.close(); }, this); @@ -1833,8 +1869,8 @@ Ext.extend(Shipping.formDjyOrder_ONE, Ext.Panel, { data.acceptNotify = false; } - data.ShipperAddress = ""; - data.BookingAddress = ""; + //data.ShipperAddress = ""; + //data.BookingAddress = ""; data.ShipperCountry = ""; data.ShipperProvince = ""; data.ShipperCity = ""; @@ -1845,8 +1881,8 @@ Ext.extend(Shipping.formDjyOrder_ONE, Ext.Panel, { data.BookingCity = ""; data.BookingCounty = ""; data.BookingPostCode = ""; - data.ConsigneeAddress = ""; - data.NotifypartAddress = ""; + //data.ConsigneeAddress = ""; + //data.NotifypartAddress = ""; data.ConsigneeProvince = ""; data.ConsigneeCity = ""; data.ConsigneeCounty = ""; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotalMonth/MsRptNoTotalMonthIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotalMonth/MsRptNoTotalMonthIndex.js index a2bd2920..02349409 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotalMonth/MsRptNoTotalMonthIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotalMonth/MsRptNoTotalMonthIndex.js @@ -858,7 +858,7 @@ Ext.extend(Shipping.MsRptNoTotalMonthIndex, Ext.Panel, { this.panelSearch = new Ext.Panel({ layout: "border", region: "north", - height: 80, + height: 100, items: [this.formSearch] });