From d4a4a6bbb6fc55e21ab6db1319edaf23541bdc2f Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 15 十月 2024 16:40:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
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