'快递业务和舱单业务完成20221115'

DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherIndex.js

@@ -1248,7 +1248,7 @@ Ext.extend(Shipping.MsOpOtherIndex, Ext.Panel, {
         this.InitGrid(this.girdcolums);
         var myDate = new Date();
         var mydatestr = Ext.util.Format.date(myDate, 'Y-m');
-        this.sqlcontext = " op_other.ACCDATE='" + mydatestr + "'";
+        this.sqlcontext = " op_other.OPLBNAME <> '快递业务' and  op_other.OPLBNAME <> '舱单申报' and op_other.ACCDATE='" + mydatestr + "'";
 
         this.storeList.load({
             params: { start: 0, limit: this.PageSize, sort: '', condition: _this.sqlcontext },
@@ -1770,7 +1770,7 @@ Ext.extend(Shipping.MsOpOtherIndex, Ext.Panel, {
             return '';
         }
 
-        var sql = '';
+        var sql = " op_other.OPLBNAME <> '快递业务' and  op_other.OPLBNAME <> '舱单申报' ";
 
         var MBLNO = form.findField('MBLNO').getValue();
         sql = sql + getAndConSql(sql, MBLNO, "MBLNO like '%" + MBLNO + "%'");

DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanIndex.js

@@ -1248,7 +1248,7 @@ Ext.extend(Shipping.MsOpOtherIndex, Ext.Panel, {
         this.InitGrid(this.girdcolums);
         var myDate = new Date();
         var mydatestr = Ext.util.Format.date(myDate, 'Y-m');
-        this.sqlcontext = " op_other.ACCDATE='" + mydatestr + "'";
+        this.sqlcontext = " op_other.OPLBNAME='舱单申报' and op_other.ACCDATE='" + mydatestr + "' ";
 
         this.storeList.load({
             params: { start: 0, limit: this.PageSize, sort: '', condition: _this.sqlcontext },
@@ -1893,59 +1893,59 @@ Ext.extend(Shipping.MsOpOtherIndex, Ext.Panel, {
     },
     
     
-        PrintSelect: function () {
+    PrintSelect: function () {
 
-        _this = this;
+    _this = this;
-        if (this.storeList.getCount() == 0) {
+    if (this.storeList.getCount() == 0) {
-            return;
+        return;
-        }
+    }
-        var selectedRecords = [];
+    var selectedRecords = [];
-        var storeadd = null;
+    var storeadd = null;
-        selectedRecords = this.GridCheckBoxModel.selected.items;
+    selectedRecords = this.GridCheckBoxModel.selected.items;
 
 
-        if (selectedRecords.length == 0) {
+    if (selectedRecords.length == 0) {
-            Ext.Msg.show({ title: '提示', msg: '请先选择要打印的业务!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+        Ext.Msg.show({ title: '提示', msg: '请先选择要打印的业务!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
-            return;
+        return;
-        }
+    }
 
-        var sortstr = '';
+    var sortstr = '';
 
-        if (this.sortfield != '' && this.sortdire != '') {
+    if (this.sortfield != '' && this.sortdire != '') {
 
-            sortstr = this.sortfield + ' ' + this.sortdire;
+        sortstr = this.sortfield + ' ' + this.sortdire;
-        }
+    }
 
-        if (sortstr == "") sortstr = "BSDATE desc"
+    if (sortstr == "") sortstr = "BSDATE desc"
 
-        var feeGidSql = '';
+    var feeGidSql = '';
-        for (var i = 0; i < selectedRecords.length; i++) {
+    for (var i = 0; i < selectedRecords.length; i++) {
-            var record = selectedRecords[i];
+        var record = selectedRecords[i];
-            var feeGId = "'" + record.get('BSNO') + "'";
+        var feeGId = "'" + record.get('BSNO') + "'";
-            if (feeGidSql == '') {
+        if (feeGidSql == '') {
-                feeGidSql = feeGId;
+            feeGidSql = feeGId;
-            } else {
+        } else {
-                feeGidSql = feeGidSql + "," + feeGId;
+            feeGidSql = feeGidSql + "," + feeGId;
-            }
-        };
-
-        var bsno = '11111';
-        var selections = this.gridList.getSelectionModel().getSelection();
-        if (selections.length != 0) {
-            var record = selections[0];
-            bsno = record.data.BSNO;
         }
+    };
 
-        var printType = 'MSOPOTHERLISTSELECT';
+    var bsno = '11111';
-        var sql1 = "select *,(SELECT TOP 1 STATUS FROM OP_STATUS WHERE BSNO=op_other.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS from op_other WHERE BSNO IN (" + feeGidSql + ") order by " + sortstr;
+    var selections = this.gridList.getSelectionModel().getSelection();
-        var sql2 = "select *,(SELECT TOP 1 STATUS FROM OP_STATUS WHERE BSNO=op_other.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS from op_other where BSNO='" + bsno + "'";
+    if (selections.length != 0) {
-        var sql3 = "";
+        var record = selections[0];
-        var sql4 = "";
+        bsno = record.data.BSNO;
-        var sql5 = "";
+    }
-        var sql6 = "";
 
-        PrintComm(printType, sql1, sql2, sql3, sql4, sql5, sql6);
+    var printType = 'MSOPOTHERLISTSELECT';
-    },
+    var sql1 = "select *,(SELECT TOP 1 STATUS FROM OP_STATUS WHERE BSNO=op_other.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS from op_other WHERE BSNO IN (" + feeGidSql + ") order by " + sortstr;
+    var sql2 = "select *,(SELECT TOP 1 STATUS FROM OP_STATUS WHERE BSNO=op_other.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS from op_other where BSNO='" + bsno + "'";
+    var sql3 = "";
+    var sql4 = "";
+    var sql5 = "";
+    var sql6 = "";
+
+    PrintComm(printType, sql1, sql2, sql3, sql4, sql5, sql6);
+},
     //#region 2018年2月7日 李进举 鼎世 批量整票提交
     onPiLiangZhengPiaoTiJiaoClick: function (menu, event, type) {
 

DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_KuaiDiEdit.js

@@ -438,6 +438,10 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
                         fieldLabel: '业务编号',
                         name: 'BSNO', hidden: true
                     }, {
+                        fieldLabel: 'OPLBNAME',
+                    name: 'OPLBNAME', hidden: true
+                    },
+                        {
                         fieldLabel: '业务状态',
                         readOnly: true,
                         name: 'BSSTATUSREF',
@@ -1873,7 +1877,7 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
         });
         this.GetEditStatus();
 
-
+        this.formHead.getForm().findField("OPLBNAME").setValue("快递业务");
     },
 
     LoadMustBe: function () {

DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_KuaiDiIndex.js

@@ -1248,7 +1248,7 @@ Ext.extend(Shipping.MsOpOtherIndex, Ext.Panel, {
         this.InitGrid(this.girdcolums);
         var myDate = new Date();
         var mydatestr = Ext.util.Format.date(myDate, 'Y-m');
-        this.sqlcontext = " op_other.ACCDATE='" + mydatestr + "'";
+        this.sqlcontext = "  op_other.OPLBNAME='快递业务' and  op_other.ACCDATE='" + mydatestr + "'";
 
         this.storeList.load({
             params: { start: 0, limit: this.PageSize, sort: '', condition: _this.sqlcontext },
@@ -1770,7 +1770,7 @@ Ext.extend(Shipping.MsOpOtherIndex, Ext.Panel, {
             return '';
         }
 
-        var sql = '';
+        var sql = " op_other.OPLBNAME = '快递业务' ";
 
         var MBLNO = form.findField('MBLNO').getValue();
         sql = sql + getAndConSql(sql, MBLNO, "MBLNO like '%" + MBLNO + "%'");