diff --git a/BookingJieFeng/BookingJieFeng.csproj.user b/BookingJieFeng/BookingJieFeng.csproj.user index a48b3371..28be9c4c 100644 --- a/BookingJieFeng/BookingJieFeng.csproj.user +++ b/BookingJieFeng/BookingJieFeng.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU FolderProfile true diff --git a/BookingWeb/BookingWeb.csproj.user b/BookingWeb/BookingWeb.csproj.user index 6bc24ada..4edb5e0f 100644 --- a/BookingWeb/BookingWeb.csproj.user +++ b/BookingWeb/BookingWeb.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs index e37b80e0..d626e0e3 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs @@ -29,6 +29,7 @@ using DSWeb.Areas.RptMng.Comm; using DSWeb.Areas.SysMng.DAL.SysUser; using DSWeb.Areas.Import.DAL.ReceiptDoc; using DSWeb.SoftMng.Filter; +using DSWeb.MvcShipping.Models.WMSNew; namespace DSWeb.MvcShipping.Controllers { @@ -690,10 +691,38 @@ namespace DSWeb.MvcShipping.Controllers var isuse = MsBaseInfoDAL.GetRuleUse("委托编号", "1"); var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='海运出口' AND RULEBLNO='委托编号'", Convert.ToString(Session["COMPANYID"])); - if (billnoset.BILLTYPE != "") - headData.CUSTNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD.ToString().Trim(), headData.ACCDATE.ToString().Trim(), "", headData.OP); - else - headData.CUSTNO = MsOpSeaeDAL.getCodeRule("委托编号", "CUSTNO", headData.BSDATE.ToString().Trim(), accdate, Convert.ToString(Session["USERID"]), Convert.ToString(Session["COMPANYID"])); + if (billnoset.BILLTYPE != "") + { + var CUSTOMHEAD = ""; + if (billnoset.CUSTOMHEAD != "") + { + var HBLCUSTOMHEAD = billnoset.CUSTOMHEAD; + if ((HBLCUSTOMHEAD.IndexOf("[SALE]") >= 0) && !string.IsNullOrEmpty(headData.SALE)) + { + var user = SysUserDAL.GetData("u.SHOWNAME='" + headData.SALE + "'"); + if (!string.IsNullOrEmpty(user.NOCODE)) + HBLCUSTOMHEAD = HBLCUSTOMHEAD.Replace("[SALE]", user.NOCODE); + + } + if ((HBLCUSTOMHEAD.IndexOf("[OP]") >= 0) && !string.IsNullOrEmpty(headData.OP)) + { + var user = SysUserDAL.GetData("u.SHOWNAME='" + headData.OP + "'"); + if (!string.IsNullOrEmpty(user.NOCODE)) + HBLCUSTOMHEAD = HBLCUSTOMHEAD.Replace("[OP]", user.NOCODE); + } + CUSTOMHEAD = HBLCUSTOMHEAD; + var CUST = MsInfoClientDAL.GetData("SHORTNAME='" + headData.CUSTOMERNAME + "'"); + CUSTOMHEAD = CUSTOMHEAD.Replace("[CUSTCODE]", CUST.CODENAME); + } + var corpid = headData.SALECORPID; + if (string.IsNullOrEmpty(corpid)) corpid = headData.CORPID; + + headData.CUSTNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD, headData.ACCDATE, "", headData.OP, corpid, CUSTOMHEAD); + + //headData.CUSTNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD.ToString().Trim(), headData.ACCDATE.ToString().Trim(), "", headData.OP); + } + else + headData.CUSTNO = MsOpSeaeDAL.getCodeRule("委托编号", "CUSTNO", headData.BSDATE.ToString().Trim(), accdate, Convert.ToString(Session["USERID"]), Convert.ToString(Session["COMPANYID"])); T_ALL_DA T_ALL_DA = new T_ALL_DA(); if (!string.IsNullOrEmpty(OrderData.SALECORPID)) { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index 34ec568e..b965228c 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -4808,15 +4808,17 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL r.WriteLine("DTM+137:" + DateTime.Now.ToString("yyyyMMddHHmm") + ":203'"); icount = icount + 2; - if (bill.SERVICE.ToUpper() == "DOOR-DOOR") + var service = GetSERVICEEDICode2(bill.SERVICE, "INTTR"); + + if (service.ToUpper() == "DOOR-DOOR") { r.WriteLine("TSR+27+2'"); } - else if (bill.SERVICE.ToUpper() == "DOOR-CY") + else if (service.ToUpper() == "DOOR-CY") { r.WriteLine("TSR+28+2'"); } - else if (bill.SERVICE.ToUpper() == "CY-DOOR") + else if (service.ToUpper() == "CY-DOOR") { r.WriteLine("TSR+29+2'"); } @@ -5684,16 +5686,16 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL r.WriteLine("BGM+340+" + OpBill.MBLNO + "+5'"); } - - if (bill.SERVICE.ToUpper() == "DOOR-DOOR") + var service = GetSERVICEEDICode2(bill.SERVICE, "INTTR"); + if (service.ToUpper() == "DOOR-DOOR") { r.WriteLine("TSR+27+2'"); } - else if (bill.SERVICE.ToUpper() == "DOOR-CY") + else if (service.ToUpper() == "DOOR-CY") { r.WriteLine("TSR+28+2'"); } - else if (bill.SERVICE.ToUpper() == "CY-DOOR") + else if (service.ToUpper() == "CY-DOOR") { r.WriteLine("TSR+29+2'"); } @@ -20383,6 +20385,16 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL { if (bill.HSCODE == null || bill.HSCODE == "") { error = error + "
HSCODE不能为空"; } + if (!string.IsNullOrEmpty(bill.MBLNO)) { + if (bill.MBLNO.Length > 10) { + + error = error + "
主提单号不允许超过10位"; + + + } + + } + } @@ -27942,6 +27954,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL { #region 54 冻柜 var tmpset = ""; + if (bill.TEMPSET.IndexOf("-") >= 0) { tmpset = "-"; @@ -27950,7 +27963,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL { tmpset = "0"; } - bill.TEMPSET = bill.TEMPSET.Replace("+", "").Replace("-", ""); + var billtempset = bill.TEMPSET.Replace("+", "").Replace("-", ""); tempstr = "54";//1 //RECORD-ID//M//9(2)//1 //2 //54 tempstr += GetSpaceStr("", 3);//2 //Filler//M//X(3)//3 //5 //Spaces @@ -27959,7 +27972,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL tempstr += "C";//5 //Reefer Temperature UOM冷藏温度计量单位//M//X(1)//12 //12 //C or F (C=Celsius, F=Fahrenheit) tempstr += GetSpaceStr("", 5);//6 //Reefer Min Temperature//C//9(3)v99//13 //17 //If MAX exists, MIN should exists tempstr += GetSpaceStr("", 5);//7 //Reefer Max Temperature//C//9(3)v99//18 //22 //If MIN exists, MAX should exists - tempstr += tmpset + GetSpaceStr((Convert.ToDecimal(bill.TEMPSET) * 100).ToString(), 4, "0");//8 //Reefer Preset Temperature冷藏温度设定//C//9(3)v99//23 //27 //Blank if no Preset required + tempstr += tmpset + GetSpaceStr((Convert.ToDecimal(billtempset) * 100).ToString(), 4, "0");//8 //Reefer Preset Temperature冷藏温度设定//C//9(3)v99//23 //27 //Blank if no Preset required tempstr += "N";//9 //Reefer Gensets Required冷藏机组的要求//M//X(1)//28 //28 //Y or N if (bill.REEFERF != "") { @@ -27970,7 +27983,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL tempstr += GetSpaceStr("", 5);//10 //Reefer Vent Open Value冷藏等开放价值//C//9(3)v99//29 //33 //Blank if Vent Status = 'Closed', else value in relation to Vent UOM如果等待空白状态=“闭合”，其他的值等计量单位 } tempstr += "Y";//11 //Pretrip Flag//M//X(1)//34 //34 //Y or N - tempstr += tmpset + GetSpaceStr((Convert.ToDecimal(bill.TEMPSET) * 100).ToString(), 4, "0");//12 //Carriage Temperature运输温度//C//9(3)v99//35 //39 //For operating reefers, at least one temperature field must not be blank + tempstr += tmpset + GetSpaceStr((Convert.ToDecimal(billtempset) * 100).ToString(), 4, "0");//12 //Carriage Temperature运输温度//C//9(3)v99//35 //39 //For operating reefers, at least one temperature field must not be blank if (bill.REEFERF != "") { tempstr += "H";//13 //Reefer Vent Status冷藏通风状况/UOM//C//X(1)//40 //40 //C:Closed, F:CFM, H:M3/H, P:Percentage, O:Open diff --git a/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs index ba0c50c9..a8c0ba72 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs @@ -22,6 +22,7 @@ using DSWeb.MvcShipping.Models.MsOpMailLog; using DSWeb.Areas.SysMng.DAL.SysUser; using DSWeb.Areas.Import.DAL.ReceiptDoc; using MimeKit.Text; +using DSWeb.MvcShipping.DAL.MsInfoClient; namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL { @@ -1177,7 +1178,36 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='海运出口' AND RULEBLNO='委托编号'",COMPANYID); if (billnoset.BILLTYPE != "") - headData.CUSTNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD.ToString().Trim(), headData.ACCDATE.ToString().Trim(), "", headData.OP); + { + var CUSTOMHEAD = ""; + if (billnoset.CUSTOMHEAD != "") + { + var HBLCUSTOMHEAD = billnoset.CUSTOMHEAD; + if ((HBLCUSTOMHEAD.IndexOf("[SALE]") >= 0) && !string.IsNullOrEmpty(headData.SALE)) + { + var user = SysUserDAL.GetData("u.SHOWNAME='" + headData.SALE + "'"); + if (!string.IsNullOrEmpty(user.NOCODE)) + HBLCUSTOMHEAD = HBLCUSTOMHEAD.Replace("[SALE]", user.NOCODE); + + } + if ((HBLCUSTOMHEAD.IndexOf("[OP]") >= 0) && !string.IsNullOrEmpty(headData.OP)) + { + var user = SysUserDAL.GetData("u.SHOWNAME='" + headData.OP + "'"); + if (!string.IsNullOrEmpty(user.NOCODE)) + HBLCUSTOMHEAD = HBLCUSTOMHEAD.Replace("[OP]", user.NOCODE); + } + CUSTOMHEAD = HBLCUSTOMHEAD; + var CUST = MsInfoClientDAL.GetData("SHORTNAME='" + headData.CUSTOMERNAME + "'"); + CUSTOMHEAD = CUSTOMHEAD.Replace("[CUSTCODE]", CUST.CODENAME); + } + var corpid = headData.SALECORPID; + if (string.IsNullOrEmpty(corpid)) corpid = headData.CORPID; + + headData.CUSTNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD, headData.ACCDATE, "", headData.OP, corpid, CUSTOMHEAD); + + + // headData.CUSTNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD.ToString().Trim(), headData.ACCDATE.ToString().Trim(), "", headData.OP); + } T_ALL_DA T_ALL_DA = new T_ALL_DA(); if (!string.IsNullOrEmpty(OrderData.SALECORPID)) { diff --git a/DispatchWeb/DispatchWeb.csproj.user b/DispatchWeb/DispatchWeb.csproj.user index e6a8406a..af17a67a 100644 --- a/DispatchWeb/DispatchWeb.csproj.user +++ b/DispatchWeb/DispatchWeb.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true