From 31d956f64c2f3837017ab8adeb30bf74cd7bec88 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 03 一月 2024 14:03:47 +0800
Subject: [PATCH] 排产时减去已汇报数量
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 22 ++++++++++++++--------
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 7 +++++--
2 files changed, 19 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\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 9829060..3053c4b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -344,7 +344,7 @@
var NewRow = {
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
- "HICMOBillNo": "", "HICMOInterID": "0","HICMOEntryID":"0","HRemark": ""
+ "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
};
switch (obj.event) {
@@ -675,7 +675,7 @@
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- });
+ });
}
//#endregion
@@ -872,8 +872,13 @@
, { field: 'HQty', title: '鐢熶骇鏁伴噺', edit: 'text', width: 100 }
, { field: 'HBadQty', title: '涓嶈壇鏁伴噺', edit: 'text', width: 100 }
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', edit: 'text', width: 100 }
- , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', edit: 'text', width: 100, hide: true}
- , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true}
+ , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', edit: 'text', width: 100, hide: true }
+ , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
+
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', width: 100 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
+ , { field: 'HSourceBillNo', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
+ , { field: 'HSourceBillType', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
@@ -915,7 +920,7 @@
, elem: '#mainTable_prodReport'
, page: true
, limit: 1000
- , limits: [500,1000,1500,2000,3000]
+ , limits: [500, 1000, 1500, 2000, 3000]
, cellMinWidth: 120
, height: 500
, cols: [columns_prodReport]
@@ -1019,7 +1024,7 @@
});
option.data = arr;
- console.log(option.data );
+ console.log(option.data);
table.render(option);
option_prodReport.data = arr_detail;
@@ -1027,7 +1032,7 @@
} else {
option.data = [{
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
- "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
+ "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
}];
table.render(option);
@@ -1042,7 +1047,7 @@
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
option.data = [{
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
- "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
+ "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
}];
table.render(option);
@@ -1067,6 +1072,7 @@
$("#HInnerBillNo").val(data.鍐呴儴鍗曟嵁鍙�);
$("#HDeptID").val(data.HDeptID);
$("#HDeptName").val(data.閮ㄩ棬);
+ $("#HDeptNumber").val(data.閮ㄩ棬浠ｇ爜);
$("#HGroupID").val(data.HGroupID);
$("#HGroupName").val(data.鐝粍);
$("#HEmpID").val(data.HEmpID);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 874c79d..f80a2df 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -1580,6 +1580,7 @@
var HDelData = 0;
JDTLen = (100 / option.data.length).toFixed(2);
var HJDLen = 0;
+ var HReportQty = 0;
//濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
//鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
@@ -1662,11 +1663,13 @@
sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
sWorkQty = option.data[i]["灏忔椂浜ц兘"];
sYX = option.data[i]["浼樺厛绾�"];
+ HReportQty = option.data[i]["鎷嗗崟姹囨姤鏁伴噺"];
+
if (SDSum > 0) {
- sPlanQty = sPlanQty - SDSum;
+ sPlanQty = sPlanQty - SDSum - HReportQty;
}
//鍓╀綑闇�姹傚伐鏃�
- iLeftQty = sPlanQty;
+ iLeftQty = sPlanQty - HReportQty;
if (sWorkQty <= 0) {
sLeftProdTimes = 0;
}
--
Gitblit v1.9.1