From dc6e93ac5007994d1d707d4b8661b956e9f6b342 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 13 六月 2025 10:35:59 +0800
Subject: [PATCH] 三升要料报表排产优化
---
WebTM/WebTM.csproj.user | 2 +-
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 25 +++++++++++++++----------
WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html | 4 ++--
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 2f7c57c..c2c4c7b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index fe9ea36..777b879 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -430,25 +430,29 @@
return layer.msg("鎷嗗崟鏁伴噺涓嶈兘涓�0!");
}
- if (SumHQty > (parseInt(obj.data["璁″垝鏁伴噺"]))) {
+ if (SumHQty > (parseInt(obj.data["璁″垝鏁伴噺"])) && obj.field == "鎷嗗崟鏁伴噺") {
obj.update({
- "鎷嗗崟鏁伴噺": "0"
+ "鎷嗗崟鏁伴噺": $(this).prev().text()
});
+
+ obj.tr.find('td[data-field=鎷嗗崟鏁伴噺] input').val($(this).prev().text()); // 杩欏彞浠ｇ爜鏄繀瑕佺殑鏇存柊鏄剧ず鍐呭
+
return layer.msg("鎷嗗崟鏁伴噺澶т簬璁㈠崟鏁伴噺!");
}
var NowDate = obj.field;
- if (dateHQty > (parseInt(obj.data["璁″垝鏁伴噺"]))) {
+ if (dateHQty > (parseInt(obj.data["鎷嗗崟鏁伴噺"]))) {
obj.update({
"鏃ヨ鍒掓暟閲忔�婚噺": dateHQty - obj.value,
[NowDate]: 0
});
- return layer.msg("鎺掍骇鏁伴噺澶т簬璁㈠崟鏁伴噺!")
+ obj.tr.find(`td[data-field=${NowDate}] input`).val(0); // 杩欏彞浠ｇ爜鏄繀瑕佺殑鏇存柊鏄剧ず鍐呭
+ return layer.msg("鎺掍骇鏁伴噺澶т簬鎷嗗崟鏁伴噺!")
}
- if (Date.parse(obj.field) > Date.parse(obj.data.璁″垝缁撴潫鏃ユ湡)) {
- return layer.msg("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
- }
+ //if (Date.parse(obj.field) > Date.parse(obj.data.璁″垝缁撴潫鏃ユ湡)) {
+ // return layer.msg("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
+ //}
//淇敼鏁版嵁
@@ -1756,10 +1760,11 @@
, toolbar: '#toolbarDemo'
, title: "璁″垝鎶ヨ〃"
, height: 'full-175'
- , page: false
+ , page: true
, cellMinWidth: 90
, cols: [columns]
- , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , limit: 100//榛樿鏄剧ず鍏ㄩ儴
+ , limits:[50,100,500,1000]
, contextmenu: {
// 琛ㄦ牸鍐呭鍙抽敭鑿滃崟閰嶇疆
body: [
@@ -3808,7 +3813,7 @@
if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) == 0) {
return layer.msg("绗�" + (i + 1) + "琛�,鎷嗕骇鏁伴噺鏈夎,璇烽噸鏂拌緭鍏�!");
}
- if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) - parseFloat(table.cache["mainTable"][i]["鎷嗗崟姹囨姤鏁伴噺"]) > parseFloat(table.cache["mainTable"][i]["璁″垝鏁伴噺"])) { // - 宸叉眹鎶ユ暟閲�
+ if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) > parseFloat(table.cache["mainTable"][i]["璁″垝鏁伴噺"])) { // - 宸叉眹鎶ユ暟閲�
return layer.msg("绗�" + (i + 1) + "琛�,鎺掍骇鏁伴噺瓒呭嚭璁㈠崟鏁伴噺!");
}
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
index 9683a4f..a71d8b4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
@@ -329,9 +329,9 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, title: "瑕佹枡璁″垝鎶ヨ〃"
- , page: false
+ , page: true
, cellMinWidth: 90
- , limit: 20000
+ , limit: 500
, totalRow: true
, limits: [50, 500, 5000, 20000]
, loading: false
--
Gitblit v1.9.1