diff --git a/BookingJieFeng/BookingJieFeng.csproj.user b/BookingJieFeng/BookingJieFeng.csproj.user index 28be9c4c..a48b3371 100644 --- a/BookingJieFeng/BookingJieFeng.csproj.user +++ b/BookingJieFeng/BookingJieFeng.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true diff --git a/BookingWeb/BookingWeb.csproj.user b/BookingWeb/BookingWeb.csproj.user index 4edb5e0f..6bc24ada 100644 --- a/BookingWeb/BookingWeb.csproj.user +++ b/BookingWeb/BookingWeb.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true diff --git a/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs index a2ffc223..551fcfbe 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs @@ -5782,14 +5782,14 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL if (string.IsNullOrEmpty(head.PROFITSTATUS)) { result.Success = false; result.Message = "无需发送邮件！"; - + return result; } var mailaddr = MsSysParamSetDAL.GetData("PARAMNAME='RptLrMail'").PARAMVALUE; if (string.IsNullOrEmpty(mailaddr)) { result.Success = false; result.Message = "无需发送邮件！"; - + return result; } var htmlfile = HttpContext.Current.Server.MapPath("../../EDIFiles/报表利润情况说明.html"); diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs index 93221bdb..34d0db96 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs @@ -9116,14 +9116,14 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL headData.ISSUEPLACE= strtmp; } - aaa = mySheet.Cells.get_Range("E23").Value2; - v11new = aaa; - if (v11new != null) - { - strtmp = v11new.ToString(); - if (strtmp != "") - headData.PREPARDAT = strtmp; - } + //aaa = mySheet.Cells.get_Range("E23").Value2; + //v11new = aaa; + //if (v11new != null) + //{ + // strtmp = v11new.ToString(); + // if (strtmp != "") + // headData.PREPARDAT = strtmp; + //} aaa = mySheet.Cells.get_Range("B24").Value2; v11new = aaa; if (v11new != null) @@ -9132,24 +9132,26 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL if (strtmp != "") headData.CONTRACTNO = strtmp; } - aaa = mySheet.Cells.get_Range("E24").Value2; - v11new = aaa; - var cntr = ""; - if (v11new != null) - { - strtmp = v11new.ToString(); - if (strtmp != "") - { - headData.CNTRTOTAL = strtmp; - if (strtmp.IndexOf("X") > 0) { - var cntrlist = strtmp.Split('X'); - if (cntrlist != null && cntrlist.Length >= 2) - cntr = cntrlist[1]; + //aaa = mySheet.Cells.get_Range("E24").Value2; + //v11new = aaa; + //var cntr = ""; + //if (v11new != null) + //{ + // strtmp = v11new.ToString(); + // if (strtmp != "") + // { + // headData.CNTRTOTAL = strtmp; + // if (strtmp.IndexOf("X") > 0) { + // var cntrlist = strtmp.Split('X'); + // if (cntrlist != null && cntrlist.Length >= 2) + // cntr = cntrlist[1]; + // cntr = cntr.Replace("'",""); + // if (cntr.Length > 4) cntr = cntr.Substring(4); - } + // } - } - } + // } + //} for (var i = 0; i < 22; i++) @@ -9294,15 +9296,17 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL { MsOpSeaeDetail data = new MsOpSeaeDetail(); data.BSNO = bsno; - //data.CTNALL = GetExcelValue(mySheet, "C" + j.ToString()); - data.CTNALL = cntr; + //var cntrstr = GetExcelValue(mySheet, "H" + j.ToString()); + //if (!string.IsNullOrEmpty(cntrstr)) data.CTNALL = cntrstr; + //else + // data.CTNALL = cntr; data.CNTRNO = GetExcelValue(mySheet, "I" + j.ToString()); - data.SEALNO = GetExcelValue(mySheet, "G" + j.ToString()); + data.SEALNO = GetExcelValue(mySheet, "J" + j.ToString()); try { - data.PKGS = Convert.ToInt32(GetExcelValue(mySheet, "L" + j.ToString())); - data.KGS = Convert.ToDecimal(GetExcelValue(mySheet, "M" + j.ToString())); - data.CBM = Convert.ToDecimal(GetExcelValue(mySheet, "N" + j.ToString())); + data.PKGS = Convert.ToInt32(GeNumValue(GetExcelValue(mySheet, "L" + j.ToString()))); + data.KGS = Convert.ToDecimal(GeNumValue(GetExcelValue(mySheet, "M" + j.ToString()))); + data.CBM = Convert.ToDecimal(GeNumValue(GetExcelValue(mySheet, "N" + j.ToString()))); } catch (Exception exception) { @@ -9353,6 +9357,36 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL return result; } + public static string GeNumValue(string Local) + { + var str = Local.Trim(); + var result = "0"; + if (str == null || str == "") return result; + if (str.Length == 0) return result; + + var if_find = false; + var str_num = ""; + for (var i = 0; i < str.Length; i += 1) + { + var member = str.Substring(i, 1); + if ((member == "0") || (member == "1") || (member == "2") || (member == "3") + || (member == "4") || (member == "5") || (member == "6") || (member == "7") + || (member == "8") || (member == "9") || (member == ".")) + { + if (!if_find) + { + str_num = str_num + member; + } + } + else + { + if_find = true; + } + } + result = str_num; + return result; + } + #endregion // diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index 0a8c6571..48d55645 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -25242,13 +25242,13 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL tempstr = "11";//1//RECORD-ID//M//9(2)//1//2//11// tempstr += GetSpaceStr("", 1);//2//Filler//M//X(1)//3//3//Spaces// - if (bill.VOYNO.ToString().Trim().Length < 4) + if (bill.VESSELID.ToString().Trim().Length < 4) { - tempstr += GetSpaceStr(bill.VOYNO.ToString().Trim(), 10);//3//Vessel Code//M//X(10)//4//13//和vessel有关的，即field 4和 field 3 都必填 + tempstr += GetSpaceStr(bill.VESSELID.ToString().Trim(), 10);//3//Vessel Code//M//X(10)//4//13//和vessel有关的，即field 4和 field 3 都必填 } else { - tempstr += GetSpaceStr(bill.VOYNO.ToString().Trim().Substring(0, 4), 10);//3//Vessel Code//M//X(10)//4//13//和vessel有关的，即field 4和 field 3 都必填 + tempstr += GetSpaceStr(bill.VESSELID.ToString().Trim().Substring(0, 4), 10);//3//Vessel Code//M//X(10)//4//13//和vessel有关的，即field 4和 field 3 都必填 } tempstr += GetSpaceStr(bill.VESSEL, 20);//4//Vessel Name//M//X(20)//14//33//和vessel有关的，即field 4和 field 3 都必填 tempstr += GetSpaceStr("", 8);//5//Voyage No.//M//X(8)//34//41//Alternate Voyage Reference (Commercial voyage)//但是和voyage有关的，即field 5和field 8不用填//不用填 @@ -25717,7 +25717,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL tempstr += GetSpaceStr(ctn.CTNNUM.ToString(), 6, "0");//6 //No of packages/Containers//M//9(6)//19 //24 //Number of Containers for the cargo line tempstr += GetSpaceStr(ctn.TEU.ToString(), 4, "0");//7 //TEU Utilisation//C//9(4)//25 //28 //Actual TEU utilised, eg. OOG's slot kill or Flatrack bundled units tempstr += GetSpaceStr((ctn.KGS * 1000).ToString(), 11, "0");//8 //Cargo Gross Weight//C//9(8)v999//29 //39 //Mandatory, except for Empties - tempstr += GetSpaceStr((ctn.KGS * 1000).ToString(), 11, "0");//9 //Cargo Nett Weight//C//9(8)v999//40 //50 //Mandatory, except for Empties + tempstr += GetSpaceStr("0", 11, "0");//9 //Cargo Nett Weight//C//9(8)v999//40 //50 //Mandatory, except for Empties tempstr += GetSpaceStr((ctn.CBM * 1000).ToString(), 10, "0");//10 //Cargo Gross Measurement//C//9(7)v999//51 //60 //Mandatory, except for Empties tempstr += GetSpaceStr("", 10, "0");//11 //Cargo Nett Measurement//C//9(7)v999//61 //70 //Mandatory, except for Empties tempstr += GetSpaceStr(bill.GOODSNAME, 48);//12 //Commodity Name//O//X(48)//71 //118 // @@ -26019,7 +26019,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL tempstr += GetSpaceStr(ctn.CTNNUM.ToString(), 6, "0");//6 //No of packages/Containers//M//9(6)//19 //24 //Number of Containers for the cargo line tempstr += GetSpaceStr(ctn.TEU.ToString(), 4, "0");//7 //TEU Utilisation//C//9(4)//25 //28 //Actual TEU utilised, eg. OOG's slot kill or Flatrack bundled units tempstr += GetSpaceStr((ctn.KGS * 1000).ToString(), 11, "0");//8 //Cargo Gross Weight//C//9(8)v999//29 //39 //Mandatory, except for Empties - tempstr += GetSpaceStr((ctn.KGS * 1000).ToString(), 11, "0");//9 //Cargo Nett Weight//C//9(8)v999//40 //50 //Mandatory, except for Empties + tempstr += GetSpaceStr("0", 11, "0");//9 //Cargo Nett Weight//C//9(8)v999//40 //50 //Mandatory, except for Empties tempstr += GetSpaceStr((ctn.CBM * 1000).ToString(), 10, "0");//10 //Cargo Gross Measurement//C//9(7)v999//51 //60 //Mandatory, except for Empties tempstr += GetSpaceStr((ctn.CBM * 1000).ToString(), 10, "0");//11 //Cargo Nett Measurement//C//9(7)v999//61 //70 //Mandatory, except for Empties tempstr += GetSpaceStr(bill.GOODSNAME, 48);//12 //Commodity Name//O//X(48)//71 //118 // diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js index 1d855839..b73fc843 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js @@ -14051,9 +14051,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { this.gridListCellEditing.startEditByPosition({ row: n - 1, column: 4 }); this.setAllTotal(); var KGS = this.formEdit.getForm().findField('KGS').getValue(); - this.formEdit.getForm().findField('GROSSWEIGHT').setValue(KGS + 'KGS'); + //this.formEdit.getForm().findField('GROSSWEIGHT').setValue(KGS + 'KGS'); var CBM = this.formEdit.getForm().findField('CBM').getValue(); - this.formEdit.getForm().findField('MEASUREMENT').setValue(CBM + 'CBM'); + //this.formEdit.getForm().findField('MEASUREMENT').setValue(CBM + 'CBM'); var PKGS = this.formEdit.getForm().findField('PKGS').getValue(); var sKINDPKGS = this.formEdit.getForm().findField('KINDPKGS').getValue(); this.formEdit.getForm().findField('NOPKGS').setValue(PKGS + sKINDPKGS); @@ -14465,9 +14465,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { }; this.setAllTotal(); var KGS = this.formEdit.getForm().findField('KGS').getValue(); - this.formEdit.getForm().findField('GROSSWEIGHT').setValue(KGS + 'KGS'); + //this.formEdit.getForm().findField('GROSSWEIGHT').setValue(KGS + 'KGS'); var CBM = this.formEdit.getForm().findField('CBM').getValue(); - this.formEdit.getForm().findField('MEASUREMENT').setValue(CBM + 'CBM'); + //this.formEdit.getForm().findField('MEASUREMENT').setValue(CBM + 'CBM'); var PKGS = this.formEdit.getForm().findField('PKGS').getValue(); var sKINDPKGS = this.formEdit.getForm().findField('KINDPKGS').getValue(); this.formEdit.getForm().findField('NOPKGS').setValue(PKGS + sKINDPKGS); @@ -14765,7 +14765,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { } } - me.formEdit.getForm().findField('NOPKGS').setValue(PKGS + sKINDPKGS); + //me.formEdit.getForm().findField('NOPKGS').setValue(PKGS + sKINDPKGS); me.formEdit.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(PKGS).toUpperCase() + ' ' + sKINDPKGS + ' ONLY.'); } }); @@ -14972,7 +14972,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, { } } - me.formEdit.getForm().findField('NOPKGS').setValue(PKGS + sKINDPKGS); + //me.formEdit.getForm().findField('NOPKGS').setValue(PKGS + sKINDPKGS); me.formEdit.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(PKGS).toUpperCase() + ' ' + sKINDPKGS + ' ONLY.'); } }); diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user index 9a8510e8..bce68685 100644 --- a/DSWeb/DSWeb.csproj.user +++ b/DSWeb/DSWeb.csproj.user @@ -4,7 +4,7 @@ ShowAllFiles FolderProfile true - Release|Any CPU + Debug|Any CPU diff --git a/DispatchWeb/DispatchWeb.csproj.user b/DispatchWeb/DispatchWeb.csproj.user index af17a67a..e6a8406a 100644 --- a/DispatchWeb/DispatchWeb.csproj.user +++ b/DispatchWeb/DispatchWeb.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true