Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan

DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs

@@ -17,6 +17,7 @@ using DSWeb.MvcShipping.DAL.MsSysBillNoSet;
 using DSWeb.MvcShipping.DAL.MsSysParamSet;
 using HcUtility.Core;
 using DSWeb.SoftMng.Model;
+using DSWeb.MvcShipping.Models.MsSysBillNoSet;
 
 namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
 {
@@ -1338,14 +1339,21 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
 
             var result = new DBResult();
             //20200121 此处为防止从编码规则当中的 单一窗口编码规则 中获得业务编号
-            var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='报关业务' and RULEBLNO='委托编号'", COMPANYID, dbname);
+
+            var billnoset = new SysBillNoSet(); 
+            if (headData.BSTYPE2 == "报关")
+                MsSysBillNoSetDAL.GetData("OPLBNAME='报关业务' and RULEBLNO='委托编号'", COMPANYID, dbname);
+            if (headData.BSTYPE2 == "报检")
+                MsSysBillNoSetDAL.GetData("OPLBNAME='报检业务' and RULEBLNO='委托编号'", COMPANYID, dbname);
+
+
             if (billnoset.BILLTYPE != "")
             {
                 
             }
             else
             {
-                result.SetErrorInfo("请检查命名规则 增加【报关业务 委托编号】！");
+                result.SetErrorInfo($"请检查命名规则 增加【{headData.BSTYPE2}业务 委托编号】！");
                 return result;
             }
             //if (isuse)

DSWeb/Areas/MvcShipping/Views/MsOpApply/InspectionEdit.aspx

@@ -48,7 +48,7 @@
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyModel.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCodeOpService/MsCodeOpServiceModel.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Edit.js"></script>
-<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpApply/Inspection.js"></script>
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpApply/InspectionEdit.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpApply/ApplyFee.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>

DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/ApplyAmendFee.js

@@ -38,6 +38,11 @@ Ext.extend(Shipping.ApplyAmendFee, Ext.Panel, {
 
         //按钮Toolbar
         var mainform = Ext.getCmp('OpApplyEdit');
+        if (!mainform) {
+            Ext.getCmp('InspectionEdit');
+        }
+        
+
         EditRecord = mainform.editRecord;
         this.bsno = EditRecord.get('BSNO');
         this.formHead = Ext.widget('form', {

DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Edit.js

@@ -1,12 +1,12 @@
 Ext.namespace('Shipping');
 
-Shipping.MsOpApplyEdit = function (config) {
+Shipping.InspectionEdit = function (config) {
     Ext.applyIf(this, config);
     this.initUIComponents();
-    window.Shipping.MsOpApplyEdit.superclass.constructor.call(this);
+    window.Shipping.InspectionEdit.superclass.constructor.call(this);
 };
 
-Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
+Ext.extend(Shipping.InspectionEdit, Ext.Panel, {
 
     ParentWin: null,
     OpStatus: 'add',
@@ -14,7 +14,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
     editRecord: null,
     Editdata: null,
     stroplb: '报关业务',
-    BSTYPE2: '报关',
+    BSTYPE2: '报检',
 
     initUIComponents: function () {
         this.serialNo = 0;
@@ -660,7 +660,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
 
         this.comboxISDY = Ext.create('DsExt.ux.RefTableCombox', {
             store: this.storeISDY,
-            labelWidth: 85,
+            labelWidth: 85,hidden:true,
             fieldLabel: '单一窗口读取',
             valueField: 'FType',
             ReadOnly: true,
@@ -686,7 +686,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
             store: this.store_etps_category,
             fieldLabel: '报关企业类别',
             forceSelection: true,
-            flex: 1,
+            flex: 1,hidden:true,
             name: 'ETPS_CATEGORY'
         });
 
@@ -706,7 +706,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
             store: this.storeCdnType,
             fieldLabel: '单据类型',
             queryMode: 'local',
-            width: 110,
+            width: 110, hidden: true,
             id: 'cdnType',
             name: 'CDNTYPE',
             forceSelection: true,
@@ -794,7 +794,10 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
                     items: [this.comboxOp, this.comboxSalesCode, this.comboxBsType, {
                         fieldLabel: '报关单号',
                         name: 'CUSTOMNO'
-                    }, this.comboxWmsNo, this.comboxISDY 
+                    }, this.comboxWmsNo, this.comboxISDY, {
+                            flex: 1,
+                            xtype: 'hiddenfield'
+                        }
                            ]
                     }, {
                         xtype: 'container',
@@ -803,11 +806,13 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
                         defaultType: 'textfield',
                         items: [
                             this.combox_etps_category,
-                            this.comboxcdnType, this.comboxCustservice, this.comboxInfoClientContact,
+                            this.comboxcdnType,
+
+                            this.comboxCustservice, this.comboxInfoClientContact,
 
                             this.comboxCUSTOMERNAME2,
                             {
-                                flex: 1,
+                                flex: 3,
                                 xtype: 'hiddenfield'
                             }
                         ]
@@ -2072,7 +2077,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
 
         this.tabtree = new Ext.tree.Panel({
             region: 'west',
-            title: '报关业务操作',
+            title: '报检业务操作',
             split: true,
             width: 180,
             collapsible: true,

DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Index.js

@@ -1541,31 +1541,8 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, {
 
                     scope: this
                 }
+
                 , '-', {
-                        text: "EDI报文",
-                        menu: [{
-                            text: "导出易航线",
-                            handler: function (menu, event) {
-                                _this.onCreateELineEDIClick(menu, event);
-                            }
-                        },'-', {
-                                text: "导入博世报文",
-                                handler: function (menu, event) {
-                                    _this.ImortBsXml(menu, event);
-                                }
-                            }, {
-                                text: "导出博世报文",
-                                handler: function (menu, event) {
-                                    _this.onCreateBsXml(menu, event);
-                                }
-                            }, {
-                                text: "上传博世报文",
-                                handler: function (menu, event) {
-                                    _this.onUpdateBsXml(menu, event);
-                                }
-                            }],
-                        scope: this
-                    }, '-', {
                     text: '导出EXCEL', //"EXCEL模板导出",
                     iconCls: "btnexportexcel",
                     handler: function (button, event) {
@@ -1578,11 +1555,7 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, {
                 , {
                     text: "其他操作",
                     menu: [
-                         { text: "批量状态更新",
+                          {
-                             handler: function (menu, event) {
-                                 _this.onUpOpStatusClick(menu, event, 1);
-                             }
-                        }, {
                             text: "业务批量修改", //"业务批量修改",
                             handler: function (menu, event) {
                                 _this.winModifyShow.show();
@@ -1604,33 +1577,10 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, {
                              handler: function (menu, event) {
                                  _this.onPiLiangServiceFeeClick(menu, event);
                              }
-                         }, { text: "刷新舱单状态",
-                             handler: function (menu, event) {
-                                 _this.onCustomRefreshStatusClick(menu, event);
-                             }
-                         }, { text: "烟台码头状态",
-                             handler: function (menu, event) {
-                                 _this.onYanTaiYardStatusClick(menu, event);
-                             }
-                         }, { text: "QQCT|QQCTU海关放行",
-                             handler: function (menu, event) {
-                                 _this.onQQCTQQCTUBILLClick(menu, event);
-                             }
                          }],
                     scope: this
                 }
-                , '-', {
+                
-                    text: "批量读取单一窗口信息",
-                    id: "btnGetSingle",
-                    hidden: true,
-                    handler: function (button, event) {
-                        _this.GetDecHead_Port_Time();
-                    },
-                    scope: this
-                }, this.comboxcdnType
-                ,this.comboxisSecondApply
-                , this.comboxIES
-                , this.comboxisdownload
             ]
         });
 
@@ -2196,31 +2146,6 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, {
 
         //#endregion
 
-        Ext.Ajax.request({
-            waitMsg: '',
-            url: '/MvcShipping/MsBaseInfo/GetUserModuleEnable',
-            params: {
-                modulename: "modGetSingle"
-            },
-            callback: function (options, success, response) {
-                if (success) {
-                    var result = Ext.JSON.decode(response.responseText);
-                    if (result.Success != true) {
-
-                    } else {
-
-                        var btnEdit = Ext.getCmp('btnGetSingle');
-                        btnEdit.setVisible(true);
-                    }
-                } else {
-
-                }
-            },
-            scope: this
-        });
-
-
-
     }, //end initUIComponents
 
     InitGrid: function () {
@@ -3455,7 +3380,7 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, {
                 var jsonresult = Ext.JSON.decode(response.responseText);
                 if (jsonresult.Success) {
                     var returnstr = jsonresult.data;
-                    var printType = 'MSOPAPPLYLIST';
+                    var printType = 'INSPECTIONLIST';
                     var sql1 = returnstr;
                     var sql2 = "select * from op_apply where BSNO='" + bsno + "'";
                     var sql3 = "";
@@ -3519,7 +3444,7 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, {
             bsno = record.data.BSNO;
         }
 
-        var printType = 'MSOPAPPLYLISTSELECT';
+        var printType = 'INSPECTIONSELECT';
         var sql1 = "select *,(SELECT TOP 1 STATUS FROM OP_STATUS WHERE BSNO=op_apply.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS from op_apply WHERE BSNO IN (" + feeGidSql + ") order by " + sortstr;
         var sql2 = "select *,(SELECT TOP 1 STATUS FROM OP_STATUS WHERE BSNO=op_apply.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS from op_apply where BSNO='" + bsno + "'";
         var sql3 = "";