20240509中远订舱，双击选择船时增加记录网页的初始港和末尾港。订舱时增加这两个参数

DSWeb.Common/DB/Comm.cs

@@ -3674,6 +3674,15 @@ namespace DSWeb.Common.DB
         public bool? SENDSUCCESS { get; set; }
         public string SENDRESULTINFO { get; set; }
 
+        //中远的起始港目的港 纯文本200
+        public string PolPortName { get; set; }
+        public string PodPortName { get; set; }
+
+        /// <summary>
+        /// 大简云的运输条款
+        /// </summary>
+        [NotMapped]
+        public string SERVICE_DJYCODE { get; set; }
         public string GetShipperInfo() {
 
             var result = new StringBuilder();

DSWeb/Areas/Account/Controllers/Chfee_invoice_HangXinController.cs

@@ -755,7 +755,7 @@ namespace DSWeb.Areas.Account.Controllers
             if (StrGid != "")
             {
                 StrGid = "(" + StrGid + ")";
-                var dataList = ChinvoiceapplicationDAL.GetDataInvList(" BILLSTATUS=0 and GID IN " + StrGid, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"]));
+                var dataList = ChinvoiceapplicationDAL.GetDataInvList(" BILLSTATUS=0 and cm.GID IN " + StrGid, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"]));
                 if (dataList != null && dataList.Count != 0)
                 {
                     var modb = new ModelObjectDB();
@@ -1888,6 +1888,7 @@ namespace DSWeb.Areas.Account.Controllers
 
             //被冲红的蓝票信息
             var BlueInvoice = ChinvoiceDAL.GetData(" cm.billno='" + bill + "'");
+            BlueInvoice.billUuid = BlueInvoice.GID.Replace("-", "");
 
             if (BlueInvoice.ISNEEDFEE == "1")
             {
@@ -2173,6 +2174,10 @@ namespace DSWeb.Areas.Account.Controllers
                                     //head.billUuid = "";
                                     //modb.Save(head);
                                 }
+                                else
+                                {
+                                    modb.Save(head);
+                                }
 
                                 return BasicDataRefDAL.GetContentResult(_r);
                             }
@@ -2247,7 +2252,11 @@ namespace DSWeb.Areas.Account.Controllers
                             //获取红票信息并发出
                             redhead.BILLNO = PubSysDAL.GetBillNo("0308");
 
-                            head.billUuid = redhead.GID.Replace("-", "");
+                            head.billUuid = head.GID.Replace("-", "");
+                            redhead.GID = head.billUuid;
+                            //T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
+                            //var blUpSQL = $"  update ch_fee_invoice set billUuid='{head.billUuid}' where GID='{redhead.GID}'";
+                            //bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL);
 
 
                             result = hx.PostRedConfirm(redhead, ref head, detailList, Session);
@@ -2255,6 +2264,10 @@ namespace DSWeb.Areas.Account.Controllers
                             {
 
                             }
+                            else
+                            {
+                                returndate = (ChInvoice_HangXin)result.Data;
+                            }
                         }
                         //诺诺全电票根据红字申请单的结果读取确认单
                     }

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

@@ -8386,7 +8386,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
             {
                 canmake.SetErrorInfo($"没有设置运输方式[{result.OpseaeDjyOrderHead.SERVICE}]的代码对应。");
             }
-            result.OpseaeDjyOrderHead.SERVICE = 运输方式映射;
+            result.OpseaeDjyOrderHead.SERVICE_DJYCODE = 运输方式映射;
             //6
             var 大简云付费方式映射List = PubSysDAL.GetEnumValueList(81011, "");
             if (大简云付费方式映射List.Exists(x => x.EnumValueName == result.OpseaeDjyOrderHead.BLFRT))
@@ -8424,7 +8424,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
             BasicDataRefDAL.CheckWebconfig("BookingAuto_secret", ref canmake);
 
 
-            var 运输条款 = result.OpseaeDjyOrderHead.SERVICE;
+            var 运输条款 = result.OpseaeDjyOrderHead.SERVICE_DJYCODE;
             var 条款Array = 运输条款.Split('-').ToArray();
 
             if (条款Array==null|| 条款Array.Length!=2) {
@@ -8805,7 +8805,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
                 { "PORTDISCHARGECODE", OpseaeHead.PORTDISCHARGEID },
                 //{ "PORTDISCHARGE", OpseaeHead.PORTDISCHARGE },
 
-                { "SERVICECODE", OpseaeDjyOrderHead.SERVICE },//运输条款
+                { "SERVICECODE", OpseaeDjyOrderHead.SERVICE_DJYCODE },//运输条款
                 //{ "BLFRT", OpseaeHead.BLFRT },
                 { "FRTCODE", OpseaeHead.BLFRT },//付费方式
                 { "HSCODE", OpseaeHead.HSCODE },
@@ -8850,6 +8850,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
                 { "LANECODE", OpseaeDjyOrderHead.LANE }//航线
 
                 ,{ "OPMAIL", SendUser.EMAIL1 }//操作邮箱 发送人的邮箱
+
+                ,{ "PolPortName", OpseaeDjyOrderHead.PolPortName }//
+                ,{ "PodPortName", OpseaeDjyOrderHead.PodPortName }//
             };
 
 
@@ -9371,6 +9374,14 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
                             item.oceanLegs[0].vesselName == OpseaeDjyOrderHead.VESSEL &&
                             item.oceanLegs[0].voyageNumber == OpseaeDjyOrderHead.VOYNO ) 
                         {
+                            var _PolPortName = item.oceanLegs[0].polPortName;
+                            var _PodPortName = item.oceanLegs[item.oceanLegLength-1].podPortName;
+
+                            if (OpseaeDjyOrderHead.PolPortName != _PolPortName || OpseaeDjyOrderHead.PodPortName != _PodPortName) 
+                            {
+                                continue;
+                            }
+
                             result.OK();
                             break;
                         }
@@ -9495,7 +9506,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
             sendParam.originName = 装货港中远code;
             sendParam.destinationName = 卸货港中远code;
 
-            var 运输条款 = OpseaeDjyOrderHead.SERVICE;
+            var 运输条款 = OpseaeDjyOrderHead.SERVICE_DJYCODE;
             var 条款Array = 运输条款.Split('-').ToArray();
 
             sendParam.outboundHaulage = 条款Array[0];

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

@@ -13150,6 +13150,20 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                             //emptyText: '品名',
                             blankText: 'ETD',
                             name: 'ETD'
+                        },
+                        {
+                            labelWidth: 50,hidden:true,
+                            fieldLabel: 'PolPortName',
+                            id: "DJYORDER_PolPortName",
+                            blankText: 'PolPortName',
+                            name: 'PolPortName'
+                        },
+                        {
+                            labelWidth: 50, hidden: true,
+                            fieldLabel: 'PodPortName',
+                            id: "DJYORDER_PodPortName",
+                            blankText: 'PodPortName',
+                            name: 'PodPortName'
                         }
                     ]
                 }
@@ -13396,6 +13410,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                 Ext.getCmp("DJYORDER_ETD").setValue(record.data.YJLG);
                 Ext.getCmp("DJYORDER_LANE").setValue(record.data.serviceCode);
 
+                Ext.getCmp("DJYORDER_PolPortName").setValue(record.data.PolPortName);
+                Ext.getCmp("DJYORDER_PodPortName").setValue(record.data.PodPortName);
+
                 this.win_VesselVoyno_Cosco.close();
             }
 
@@ -24309,6 +24326,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                             var 直达 = false;
                             var 中转 = false;
 
+                            var PolPortName = "";
+                            var PodPortName = "";
+
 
                             if (rec.oceanLegLength == 1) {
                                 直达 = true;
@@ -24318,6 +24338,11 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
 
                             if (rec.oceanLegs && rec.oceanLegs.length > 0) {
                                 var _startinfo = rec.oceanLegs[0];
+                                PolPortName = _startinfo.polPortName;
+
+                                var _lastinfo = rec.oceanLegs[rec.oceanLegs.length - 1];
+                                PodPortName = _startinfo.podPortName;
+
                                 CMHCHX = _startinfo.vesselName + "/" + _startinfo.voyageNumber + "/" + _startinfo.serviceCode;
 
                                 YJLG = _this.strtodatastr( _startinfo.polETDOrder);
@@ -24331,8 +24356,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                     var _gk = rec.oceanLegs[j];
                                     TJGK += _gk.podPortName;
                                 }
-
                             }
+
+
+
                             if (直达) {
                                 TJGK = "(直达)" + TJGK;
                             }
@@ -24376,7 +24403,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                 TJGK: TJGK,
                                 podETAOrder: podETAOrder,
                                 originHaulageIndicator: CFDFW,
-                                fndHaulageIndicator: DDDFW
+                                fndHaulageIndicator: DDDFW,
+                                PolPortName: PolPortName,
+                                PodPortName: PodPortName
                             });
                             _this.storeVesselVoyno_Cosco.add(record);
                         }

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

@@ -551,7 +551,8 @@ Ext.define('VesselVoyno_Cosco_md', {
 		{ name: 'podETAOrder', type: 'string' }, //预计到达
 		{ name: 'originHaulageIndicator', type: 'string' }, //出发地服务
 		{ name: 'fndHaulageIndicator', type: 'string' } //目的地服务
-		
+		, { name: 'PolPortName', type: 'string' }
+		, { name: 'PodPortName', type: 'string' }
 	]
 });