From 85e7ae1c5451778043682c749ef60e39b1ca6b30 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 15 十月 2024 10:20:44 +0800
Subject: [PATCH] 出站汇报单/生产订单列表分页查询修改；流转卡添加字段
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 20 +++++++++++++-------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 24 +++++++++++++++++++++++-
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 4 ++--
3 files changed, 38 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index e15b989..f11f002 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -1139,8 +1139,8 @@
, data: data1.data
, height: 'full-120'
//, page: true
- //, limits: [50, 500, 5000, 50000]
- //, limit: 500
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
, cellMinWidth: 90
, done: function (res, curr, count) {
soulTable.render(this);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 25d940d..370eed7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -1717,7 +1717,7 @@
default:
}
}
- sWhere += " and HBillSubType<>'SUB'";
+ sWhere += " and HBillSubType<>''SUB''";
//sWhere = sWhere.replace(/'/g, "''");
@@ -1954,6 +1954,28 @@
soulTable.render(this);
}
}
+
+ //鍒ゆ柇鏄惁鏈夋煡鐪嬪伐浠锋潈闄�
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/CheckProcPrice",
+ async: false,
+ data: { "UserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ } else {
+ //鏃犳潈闄�
+ for (let i = 0; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].field == '宸ュ簭宸ヤ环') {
+ option.cols[0][i].hide = true; //闅愯棌宸ヤ环瀛楁
+ }
+ }
+ }
+ layer.closeAll("loading");
+ }
+ })
+
ins = table.render(option);
laypage.render(optionPage);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 40793d5..471dff8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -1055,7 +1055,8 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
}];
table.render(option);
}
@@ -1108,7 +1109,8 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
}];
table.render(option);
}
@@ -1188,7 +1190,8 @@
, { field: 'HSupFlag', title: '鏄惁濮斿', templet: '#HSupFlag' }
, { field: 'HQty', title: '娴佽浆鍗℃暟閲�', totalRow: true, edit: 'text', width:120 }
, { field: 'HSNCtrl', title: 'SN杩囩珯鎺у埗', templet: "#HSNCtrl", width: 120 }
-
+ , { field: 'HRoutingBillMainID', title: '宸ヨ壓璺嚎ID', hide: true }
+ , { field: 'HRoutingBillEntryID', title: '宸ヨ壓璺嚎瀛怚D', hide: true }
//, { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
//, { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
//, { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', edit: 'text', event: "HDeptCheck" }
@@ -1250,7 +1253,8 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
};
switch (obj.event) {
case 'btn-AddLine':
@@ -1915,7 +1919,7 @@
"HQty": HLZQty, "HSNCtrl": data[i].SN杩囩珯鎺у埗 == 0 ? "false" : "true", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�,
- "HRelationQty_OutBad": "0"
+ "HRelationQty_OutBad": "0", "HRoutingBillMainID": data[i].hmainid, "HRoutingBillEntryID": data[i].hsubid
});
}
option.data = Tablerow;
@@ -2253,7 +2257,8 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HSNCtrl": "false", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
}];
table.render(option);
}
@@ -2788,7 +2793,8 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
}];
table.render(option);
}
--
Gitblit v1.9.1