20240507

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

@@ -9288,6 +9288,14 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
 
                 var 装货港大简云code = OpseaeHead.PORTLOADID;
 
+                var 卸货港大简云code = OpseaeHead.PORTDISCHARGEID;
+
+                //20240507 如果两港均为空 不进行判断 直接返回true
+                if (string.IsNullOrWhiteSpace(装货港大简云code) && string.IsNullOrWhiteSpace(卸货港大简云code)) 
+                {
+                    return result.OK();
+                }
+
                 var 装货港中远code = "";
                 var 卸货港中远code = "";
 
@@ -9298,7 +9306,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
 
                 }
 
-                var 卸货港大简云code = OpseaeHead.PORTDISCHARGEID;
+                
 
                 var 卸货港中远codeItem = cdc.code_disport_edi.FirstOrDefault(x => x.EDINAME == 中远港口代码EDINAME && x.PORTID == OpseaeDjyOrderHead.PORTDISCHARGEID);
                 if (卸货港中远codeItem != null)
@@ -9332,6 +9340,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
                     return result.SetErrorInfo($"{卸货港大简云EDICODEItem.PORTID} 没有在大简云设置其中远港口代码");
                 }
                 //3:从吴广的中远接口依据启运港目的港 当前日期+1 五周 查询船名航次
+                //20240507 日期改为 ETD-3
                 var _r1 = GetCoscoVoyno(装货港中远code, 卸货港中远code);
 
                 if (!_r1.Success) {
@@ -9468,10 +9477,12 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
             sendParam.webAccount = CarrierUserKey;
             sendParam.webPassword = CarrierUserSecret;
 
-            DateTime today = DateTime.Today; // 获取当前日期（不包含时间）
-            DateTime tomorrow = today.AddDays(1); // 当前日期加一天
+            //DateTime today = DateTime.Today; // 获取当前日期（不包含时间）
+            //DateTime tomorrow = today.AddDays(1); // 当前日期加一天
+
+            var ETD前3天 = ((DateTime)OpseaeDjyOrderHead.ETD).AddDays(-3);
 
-            sendParam.searchConditionDate = tomorrow.ToString("yyyy-MM-dd");
+            sendParam.searchConditionDate = ETD前3天.ToString("yyyy-MM-dd");
 
             sendParam.originName = 装货港中远code;
             sendParam.destinationName = 卸货港中远code;

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

@@ -12644,7 +12644,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
         this.comboxLANE2 = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: Zi.LAN.LANE, //'航线',
             store: this.storeLANE,
-            forceSelection: true,
+            forceSelection: false,
+            id:"DJYORDER_LANE",
             name: 'LANE',
             valueField: 'LANE',
             displayField: 'LANE',
@@ -13145,6 +13146,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                             format: 'Y-m-d',
                             allowBlank:false,
                             fieldLabel: 'ETD',
+                            id: "DJYORDER_ETD",
                             //emptyText: '品名',
                             blankText: 'ETD',
                             name: 'ETD'
@@ -13389,6 +13391,11 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                 Ext.getCmp("DJYORDER_VESSEL").setValue(record.data.vesselName);
                 Ext.getCmp("DJYORDER_VOYNO").setValue(record.data.voyageNumber);
 
+
+
+                Ext.getCmp("DJYORDER_ETD").setValue(record.data.YJLG);
+                Ext.getCmp("DJYORDER_LANE").setValue(record.data.serviceCode);
+
                 this.win_VesselVoyno_Cosco.close();
             }
 
@@ -13414,7 +13421,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                 text: Zi.LAN.GuanBi, //"关闭",
                 minWidth: 70,
                 handler: function () {
-                    me.winCheckRuleListShow.close();
+                    me.win_VesselVoyno_Cosco.close();
                 }
             }]
         });
@@ -24297,15 +24304,27 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                             var TJGK = "";
                             var vesselName = "";
                             var voyageNumber = "";
+                            var serviceCode = "";
+
+                            var 直达 = false;
+                            var 中转 = false;
+
+
+                            if (rec.oceanLegLength == 1) {
+                                直达 = true;
+                            } else {
+                                中转 = true;
+                            }
 
                             if (rec.oceanLegs && rec.oceanLegs.length > 0) {
                                 var _startinfo = rec.oceanLegs[0];
                                 CMHCHX = _startinfo.vesselName + "/" + _startinfo.voyageNumber + "/" + _startinfo.serviceCode;
 
-                                YJLG = _startinfo.polETDOrder;
+                                YJLG = _this.strtodatastr( _startinfo.polETDOrder);
 
                                 vesselName = _startinfo.vesselName;
                                 voyageNumber = _startinfo.voyageNumber;
+                                serviceCode = _startinfo.serviceCode;
 
                                 for (var j = 0; j < rec.oceanLegs.length; j += 1) {
                                     if (TJGK != "") TJGK += "/";
@@ -24314,8 +24333,12 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                 }
 
                             }
-
-                            
+                            if (直达) {
+                                TJGK = "(直达)" + TJGK;
+                            }
+                            if (中转) {
+                                TJGK = "(中转)" + TJGK;
+                            }
 
                             var CFDFW = "";
                             if (rec.originHaulageIndicator == "C") {
@@ -24339,6 +24362,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                 DDDFW = "CY/Door"
                             }
 
+                            var podETAOrder = _this.strtodatastr(rec.eatAtFNDOrder);
+
                             var record = Ext.create('VesselVoyno_Cosco_md', {
                                 allowBooking: allowBooking,
                                 cargoNatureList: cnl,
@@ -24347,8 +24372,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                 CMHCHX: CMHCHX,
                                 vesselName: vesselName,
                                 voyageNumber: voyageNumber,
+                                serviceCode: serviceCode,
                                 TJGK: TJGK,
-                                podETAOrder: rec.eatAtFNDOrder,
+                                podETAOrder: podETAOrder,
                                 originHaulageIndicator: CFDFW,
                                 fndHaulageIndicator: DDDFW
                             });
@@ -24404,5 +24430,22 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
             }
         });
     }
+
+    , strtodatastr(str) {
+
+        if (str && str.length >= 8) {
+
+            var a = str.substr(0, 4);
+            var b = str.substr(4, 2);
+            var c = str.substr(6, 2);
+
+            var newstr = a + '-' + b + '-' + c;
+
+            return newstr;
+
+        } else
+            return str;
+        
+    }
 });
 

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

@@ -546,7 +546,7 @@ Ext.define('VesselVoyno_Cosco_md', {
 		{ name: 'CMHCHX', type: 'string' }, //船名/航次/航线
 		{ name: 'vesselName', type: 'string' }, //船名
 		{ name: 'voyageNumber', type: 'string' }, //航次
-		{ name: 'serviceCode', type: 'string' }, //serviceCode
+		{ name: 'serviceCode', type: 'string' }, //serviceCode 航线
 		{ name: 'TJGK', type: 'string' }, //途径港口
 		{ name: 'podETAOrder', type: 'string' }, //预计到达
 		{ name: 'originHaulageIndicator', type: 'string' }, //出发地服务