From 1109f7bc37b250175103e249fab0446c07c72631 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 17 十二月 2024 15:40:22 +0800
Subject: [PATCH] 添康排产模块，计划导入模块
---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm_TK.html | 115 +++++++++++++++++++++-----------------
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 35 +++++++++--
WebTM/layuiadmin/Scripts/webConfig.js | 2
3 files changed, 93 insertions(+), 59 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 9bf7058..fc65bb4 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -9,7 +9,7 @@
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
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_DayPlanPlatFormImport.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_DayPlanPlatFormImport.html"
index f7e03ed..4213fbc 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_DayPlanPlatFormImport.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_DayPlanPlatFormImport.html"
@@ -182,6 +182,7 @@
var dd = myDate.getDate();
var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
var columns = [];
+ var HBEGINDATE = new Date(new Date($("#HDate").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
columns.push({ type: 'checkbox', fixed: 'left' });
columns.push({ field: 'hmainid', title: 'hmainid', width: 200, hide: true });
@@ -210,12 +211,34 @@
columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true});
columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
- for (var i = 0; i <= (SumMonth - dd); i++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:80 })
+
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ var Days = 45;
+ for (var j = 0; j <= (Days - k); j++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
}
- for (var i = 1; i <= dd; i++) {
- columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 80 })
- }
+
+ //for (var i = 0; i <= (SumMonth - dd); i++) {
+ // columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:80 })
+ //}
+ //for (var i = 1; i <= dd; i++) {
+ // columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 80 })
+ //}
columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
option = {
@@ -232,7 +255,7 @@
//娓叉煋椤甸潰
table.render(option);
- }
+ }
//瀵煎叆(淇濆瓨)
function set_AddNew(data) {
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_TK.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_TK.html"
index 382949e..5657fda 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_TK.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_TK.html"
@@ -26,9 +26,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">鎺掍骇</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">宸ヨ壓璺嚎</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">缁勮鎺掍骇</button>
@@ -645,17 +643,21 @@
}
}
if (HYxjQty > 0) {
- layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜鎺掍骇锛�', {
- title: "鎿嶄綔鎻愮ず",
- icon: 0,
- btn: ['纭', '鍙栨秷']
- }, function (index, layero) {
- //纭
- set_AddNew();
- }, function (index) {
- //鍙栨秷
- return
- });
+ //layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜鎺掍骇锛�', {
+ // title: "鎿嶄綔鎻愮ず",
+ // icon: 0,
+ // btn: ['纭', '鍙栨秷']
+ //}, function (index, layero) {
+ // //纭
+ // set_AddNew();
+ //}, function (index) {
+ // //鍙栨秷
+ // return
+ //});
+ //浼樺厛绾ф帓搴�
+ set_Priority();
+
+ set_AddNew();
} else {
set_AddNew();
}
@@ -835,7 +837,7 @@
get_FastQuery(1);
//闅愯棌鍕鹃�夊瓧娈�
DisPlay_HideColumn();
- get_Display2(sWhere_ICMO);
+ //get_Display2(sWhere_ICMO);
}
//#endregion
@@ -1097,8 +1099,8 @@
set_InitGrid1(field);
sWhere = {
HORGID: sessionStorage["OrganizationID"]
- , HBEGINDATE: field
- , HENDDATE: field
+ , HBEGINDATE: Format($("#HBeginDate").val(), 'yyyy/MM/dd')
+ , HENDDATE: Format($("#HEndDate").val(), 'yyyy/MM/dd')
}
get_Display_3(JSON.stringify(sWhere));
});
@@ -1119,9 +1121,18 @@
// }
//})
- for (var i = 0; i < HBackgroundColorIndex.length;i++) {
- $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["浼樺厛绾�"] != 0 && option.data[i]["浼樺厛绾�"] != "" && option.data[i]["HSourceID"] == 0 && (option.data[i]["鐢熶骇璧勬簮"] == "" || option.data[i]["鐢熶骇璧勬簮"] == null)) {
+ $("tr[data-index='" + i + "']").attr({ "style": "background:#F74848;color:black;" });
+ }
+ if (option.data[i]["浼樺厛绾�"] != 0 && option.data[i]["浼樺厛绾�"] != "" && option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "" && option.data[i]["灏忔椂浜ц兘"] == 0) {
+ $("tr[data-index='" + i + "']").attr({ "style": "background:#FCA78E;color:black;" });
+ }
}
+
+ //for (var i = 0; i < HBackgroundColorIndex.length;i++) {
+ // $("tr[data-index='" + i + "']").attr({ "style": "background:#F74848;color:black;" });
+ //}
}
}
}
@@ -1791,24 +1802,24 @@
table.render(option);
//鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
- var compareList = [];
- for (var i = 0; i < option.data.length; i++) {
- var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
- compareList.push(temp);
- }
+ //var compareList = [];
+ //for (var i = 0; i < option.data.length; i++) {
+ // var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
+ // compareList.push(temp);
+ //}
- //鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
- var tables = [];
- for (var i = 0; i < option2.data.length; i++) {
- var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
- if ($.inArray(temp, compareList) == -1) {
- tables.push(option2.data[i]);
- }
- }
- option2.data = tables;
+ ////鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
+ //var tables = [];
+ //for (var i = 0; i < option2.data.length; i++) {
+ // var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
+ // if ($.inArray(temp, compareList) == -1) {
+ // tables.push(option2.data[i]);
+ // }
+ //}
+ //option2.data = tables;
- //閲嶆柊娓叉煋瀛愯〃2
- table.render(option2);
+ ////閲嶆柊娓叉煋瀛愯〃2
+ //table.render(option2);
layer.close(ajaxLoad);
} else {
@@ -2940,25 +2951,25 @@
option.data = dataPush;
table.render(option);
- //鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
- var compareList = [];
- for (var i = 0; i < option.data.length; i++) {
- var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
- compareList.push(temp);
- }
+ ////鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
+ //var compareList = [];
+ //for (var i = 0; i < option.data.length; i++) {
+ // var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
+ // compareList.push(temp);
+ //}
- //鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
- var tables = [];
- for (var i = 0; i < option2.data.length; i++) {
- var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
- if ($.inArray(temp, compareList) == -1) {
- tables.push(option2.data[i]);
- }
- }
- option2.data = tables;
+ ////鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
+ //var tables = [];
+ //for (var i = 0; i < option2.data.length; i++) {
+ // var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
+ // if ($.inArray(temp, compareList) == -1) {
+ // tables.push(option2.data[i]);
+ // }
+ //}
+ //option2.data = tables;
- //閲嶆柊娓叉煋瀛愯〃2
- table.render(option2);
+ ////閲嶆柊娓叉煋瀛愯〃2
+ //table.render(option2);
layer.close(ajaxLoad);
} else {
--
Gitblit v1.9.1