From dbdf6f746e11d74517efd72cb015dc0f1d0b7f9c Mon Sep 17 00:00:00 2001
From: hanxuntao <641739520@qq.com>
Date: Thu, 30 Mar 2023 09:09:51 +0800
Subject: [PATCH] 12

---
 .../Controllers/Chfee_AuditController.cs      |  6 ++++
 .../CommMng/Viewsjs/Comm/BasicDataRefModel.js | 29 ++++++++++------
 .../MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs |  6 ++--
 .../TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx  |  4 ++-
 .../TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js   | 34 ++++++++++++-------
 5 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs b/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs
index 33e8a009..a10a3587 100644
--- a/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs
+++ b/DSWeb/Areas/Account/Controllers/Chfee_AuditController.cs
@@ -758,6 +758,12 @@ namespace DSWeb.Areas.Account.Controllers
 
                 if ((head.DetiNation == null || head.DetiNation == ""))
                 { error = error + "<br />提单号：" + head.MblNoSe + "目的地不能为空"; }
+                if ((head.DetiNation == null || head.DetiNation == ""))
+                { error = error + "<br />提单号：" + head.MblNoSe + "目的地不能为空"; }
+                if ((head.BsType == null || head.BsType == ""))
+                { error = error + "<br />提单号：" + head.MblNoSe + "业务来源不能为空"; }
+                if ((head.EtDate == null || head.EtDate == ""))
+                { error = error + "<br />提单号：" + head.MblNoSe + "发车日期不能为空"; }
 
             }
             if (optype == "op_supervision_truck")
diff --git a/DSWeb/Areas/CommMng/Viewsjs/Comm/BasicDataRefModel.js b/DSWeb/Areas/CommMng/Viewsjs/Comm/BasicDataRefModel.js
index cec9b29a..2587172e 100644
--- a/DSWeb/Areas/CommMng/Viewsjs/Comm/BasicDataRefModel.js
+++ b/DSWeb/Areas/CommMng/Viewsjs/Comm/BasicDataRefModel.js
@@ -20,19 +20,26 @@ Ext.define('DsTruckMng.ux.VoyRefModel', {
 });
 
 //客户资料参照Model(95004-vMsTruckClient)
-Ext.define('DsTruckMng.ux.CustomRefModel', {
+Ext.define('DsShipping.ux.CustomRefModel', {
     extend: 'Ext.data.Model',
     fields: [
-                { name: 'GId', type: 'string' },
-                { name: 'CustCode', type: 'string' },
-                { name: 'CustName', type: 'string' },
-                { name: 'CodeAndName', type: 'string' },
-                { name: 'CodeAndFull', type: 'string' },
-                { name: 'UNITPRICE', type: 'string' },
-                //{ name: 'DESCRIPTION', type: 'string' },
-                { name: 'KFCodename', type: 'string' },
-                { name: 'ISSTOP', type: 'string' }
-            ]
+        { name: 'GId', type: 'string' },
+        { name: 'CustCode', type: 'string' },
+        { name: 'CustName', type: 'string' },
+        { name: 'CodeAndName', type: 'string' },
+        { name: 'CodeAndFull', type: 'string' },
+        { name: 'DESCRIPTION', type: 'string' },
+        { name: 'SALE', type: 'string' },
+        { name: 'OP', type: 'string' },
+        { name: 'DOC', type: 'string' },
+        { name: 'CUSTSERVICE', type: 'string' },
+        { name: 'SALECORPID', type: 'string' },
+        { name: 'BSSOURCE', type: 'string' },
+        { name: 'CONTRACTNO', type: 'string' },
+        { name: 'FEEFRT', type: 'string' },
+        { name: 'EMAIL', type: 'string' },
+        { name: 'TEL', type: 'string' }
+    ]
 });
 
 Ext.define('DsTruckMng.ux.CustomContactRefModel', {
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs
index 7da0b3e1..667d87fd 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs
@@ -3084,16 +3084,16 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
             if (bill.BSTYPE2 == "报检")
             {
                 if ((bill.INSPECTIONNO == null || bill.INSPECTIONNO == ""))
-                { error = error + "<br />提单号：" + bill.MBLNO + "报检单号不能为空"; }
+                { error = error + "<br />提单号：" + bill.MBLNO + "商检单号不能为空"; }
                 if ((bill.INSPECTIONDATE == null || bill.INSPECTIONDATE == ""))
-                { error = error + "<br />提单号：" + bill.MBLNO + "报检日期不能为空"; }
+                { error = error + "<br />提单号：" + bill.MBLNO + "商检日期不能为空"; }
                 if ((bill.BYCUSTOM == null || bill.BYCUSTOM == ""))
                 { error = error + "<br />提单号：" + bill.MBLNO + "商检地点不能为空"; }
                 
             }
 
             if ((bill.CUSTOMDATE == null || bill.CUSTOMDATE == ""))
-            { error = error + "<br />提单号：" + bill.MBLNO + "申报日期不能为空"; }
+            { error = error + "<br />提单号：" + bill.MBLNO + "报关日期不能为空"; }
 
             if ((bill.ETD == null || bill.ETD == ""))
             { error = error + "<br />提单号：" + bill.MBLNO + "开船日期不能为空"; }
diff --git a/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx b/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx
index 07ebf28b..de7f0d0a 100644
--- a/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx
+++ b/DSWeb/Areas/TruckMng/Views/PcHeadEdit_WFSD/Edit.aspx
@@ -67,13 +67,15 @@
   <script type="text/javascript" src="../../../../Areas/Import/Viewsjs/Comm/SaveGridPanel.js"></script>
   <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
   <script type="text/javascript" src="../../../../Areas/Import/Viewsjs/Comm/UnitDEF.js"></script>
-
+    <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridView2.js"></script> 
    <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCompanys/MsCompanysModel.js"></script>
     <script type="text/javascript" src="../../../../Areas/TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js"></script> 
     <script type="text/javascript" src="../../../../Areas/TruckMng/Viewsjs/MsWlBs/PcAmendFee.js"></script>
 
     <script type="text/javascript">
+
+
         var pnl = null;
         Ext.onReady(function () {
             Ext.QuickTips.init();
diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js
index dd85123c..26bdf059 100644
--- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js
+++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js
@@ -219,14 +219,22 @@ Ext.extend(DsTruck.MsPcWFSDEdit, Ext.Panel, {
             name: 'TruckSpec'
         });
 
-        this.storeBsType = Ext.create('DsExt.ux.RefEnumStore', {});
-        this.storeBsType.load({ params: { enumTypeId: 96004 } });
+        //this.storeBsType = Ext.create('DsExt.ux.RefEnumStore', {});
+        //this.storeBsType.load({ params: { enumTypeId: 96004 } });
+
+        this.storeSource = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsShipping.ux.SourceModel',
+            proxy: { url: '/CommMng/BasicDataRef/GetSource' }
+        });
+        this.storeSource.load();
 
         this.comboxBsType = Ext.create('DsExt.ux.RefEnumCombox', {
-            fieldLabel: '业务类型',
-            store: this.storeBsType,
+            fieldLabel: '业务来源',
+            store: this.storeSource,
             labelWidth: 60,
             flex: 0.5,
+            valueField: 'SourceName',
+            displayField: 'SourceName',
             forceSelection: true,
             name: 'BsType'
         });
@@ -546,10 +554,11 @@ Ext.extend(DsTruck.MsPcWFSDEdit, Ext.Panel, {
                         fieldLabel: '派车时间',
                         xtype: 'datetimefield',
                         format: 'Y-m-d', name: 'ExpDate'
-                    }, this.comboxPcBillType, {
-                        fieldLabel: '派车申请人',
-                        name: 'UserName'
-                    }, this.comboxTRUCKER, this.comboxTruckNo
+                    }, {
+                            fieldLabel: '发车日期',
+                            xtype: 'datefield',
+                            format: 'Y-m-d', name: 'EtDate'
+                        }, this.comboxPcBillType, this.comboxTRUCKER, this.comboxTruckNo
                            ]
                 }, {
                     xtype: 'container',
@@ -618,10 +627,6 @@ Ext.extend(DsTruck.MsPcWFSDEdit, Ext.Panel, {
                     }, {
                         fieldLabel: '船名航次',
                         name: 'VoyVeg'
-                    }, {
-                        fieldLabel: '开船日期',
-                        xtype: 'datefield',
-                        format: 'Y-m-d', name: 'EtDate'
                     }, {
                         fieldLabel: '截港日期',
                             xtype: 'datefield',
@@ -630,7 +635,10 @@ Ext.extend(DsTruck.MsPcWFSDEdit, Ext.Panel, {
                         fieldLabel: '注意事项',
                         flex: 1,
                         name: 'ChangedReson'
-                    }
+                        }, {
+                            fieldLabel: '派车申请人',
+                            name: 'UserName'
+                        }
                            ]
                 }, {
                     xtype: 'container',