Merge branch 'QDHHYT' of http://60.209.125.238:20010/dengyu/DS7 into QDHHYT

DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs

@@ -26,6 +26,7 @@ using DSWeb.Areas.Dispatch.Helper;
 using DSWeb.MvcShipping.Models.MsOpSeaeDjy;
 using FluentFTP;
 using DSWeb.Areas.Account.Models.BSNOLB;
+using DSWeb.Common.DB;
 
 namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
 {
@@ -1786,7 +1787,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                 result = CreateEdiGLJYARD(headData, usercode, path, mblno, filetype, filerole, ftpset, type, isbill);
                 //List<MsOpSeae> headData, string usercode, string path, string mblno, string filetype, string filerole, CodeFtpSet ftpset, string type, int isbill
             }
-            else if (type == "GLXYARD")
+            else if (type == "GLXYARD")//港联欣场站
             {
                 result = CreateEdiGLXYARD(headData, usercode, path, mblno, filetype, filerole, ftpset, type, isbill);
                 //List<MsOpSeae> headData, string usercode, string path, string mblno, string filetype, string filerole, CodeFtpSet ftpset, string type, int isbill
@@ -22251,7 +22252,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
         }
 
         /// <summary>
-        /// 港联欣下货纸
+        /// 港联欣下货纸 港联欣场站EDI
         /// </summary>
         /// <param name="headData"></param>
         /// <param name="usercode"></param>
@@ -22312,6 +22313,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                 回车换行	  2			ASC码			ASC码“0D”“0A”
              */
 
+            var cdc = new CommonDataContext();
+
+            var cargoinfo = cdc.tSysEnumValue.Where(x => x.EnumTypeID == 96012).ToList();
 
             string filename = path + "\\" + mblno + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".txt";
             if (System.IO.File.Exists(filename))
@@ -22384,8 +22388,16 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                 回车换行	  2			ASC码			ASC码“0D”“0A”
                 */
 
-                r.WriteLine("22:" + bill.GOODSNAME + ":" + bill.PKGS.ToString() + ":" + bill.KINDPKGS + ":" + bill.KGS.ToString() + ":" + bill.CBM + ":" + isdg + ":" + bill.DCLASS
+                //r.WriteLine("22:" + bill.GOODSNAME + ":" + bill.PKGS.ToString() + ":" + bill.KINDPKGS + ":" + bill.KGS.ToString() + ":" + bill.CBM + ":" + isdg + ":" + bill.DCLASS + ":" + bill.DUNNO + ":::" + bill.TEMPSET + ":" + bill.REEFERF + ":" + bill.HUMIDITY + "");
-                    + ":" + bill.DUNNO + ":::" + bill.TEMPSET + ":" + bill.REEFERF + ":" + bill.HUMIDITY + "");//bill.HSCODE
+                //20241101 湿度之后增加货物类型
+                var cargostr = bill.CARGOID;
+
+                if (cargoinfo.Exists(x => x.EnumValueID == cargostr)) { 
+                    var _cargoinfo= cargoinfo.FirstOrDefault(x => x.EnumValueID == cargostr);
+                    cargostr= _cargoinfo.EnumValueName;
+                }
+
+                r.WriteLine("22:" + bill.GOODSNAME + ":" + bill.PKGS.ToString() + ":" + bill.KINDPKGS + ":" + bill.KGS.ToString() + ":" + bill.CBM + ":" + isdg + ":" + bill.DCLASS + ":" + bill.DUNNO + ":::" + bill.TEMPSET + ":" + bill.REEFERF + ":" + bill.HUMIDITY + ":"+ cargostr);
                 icount++;
 
 

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js

@@ -4930,7 +4930,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7	isVehiclesDispatcher	是否派车调度人
                             _this.onCreateEDIClick(menu, event, 'GLJYARD');
                         }
                     }, {
-                        text: Zi.LAN.GLXYARD,
+                        text: Zi.LAN.GLXYARD,//港联欣场站EDI
                         id: 'EDI-GLXYARD',
                         //hidden: true,
                         handler: function (menu, event) {