From a03addb5fbf4da382275f3c9dff8dbc916c4e021 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 九月 2025 09:52:01 +0800
Subject: [PATCH] 其他出库、其他入库：子表件数可以输入为0 乔一客户物料即时库存报表：把米数和件数的合计加上去 （按生产订单）客户订单：过滤条件改为模糊查询
---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 107 insertions(+), 7 deletions(-)
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 3bec200..85ded7c 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"
@@ -121,20 +121,25 @@
contentType: 'application/json',
exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
before: function (data) {
- loadIndex = layer.load(2);
+ layer.load();
},
done: function (data1) {
+ layer.closeAll('loading');
if (data1.count == 1) {
+ var HVersion_Import_Temp = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
+ for (var i = 0; i < data1.data.length; i++) {
+ data1.data[i].HVersion_Import = HVersion_Import_Temp;
+ }
+
option.data = data1.data;
table.render(option);
- layer.close(loadIndex);
} else {
- layer.close(loadIndex);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
},
error: function (err) {
debugger
+ layer.closeAll('loading');
layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
}
});
@@ -212,6 +217,7 @@
columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true});
columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
+ columns.push({ field: 'HVersion_Import', title: '瀵煎叆搴忓垪鍙�'});
var k = 0;//鏀堕泦寰幆娆℃暟
var Days = 45;
@@ -260,6 +266,7 @@
//瀵煎叆(淇濆瓨)
function set_AddNew(data) {
+ var msgError = "";
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -286,6 +293,18 @@
}
}
+ //鍒ゆ柇鏄惁鏈夊鍏ユ潈闄愶紝濡傛灉鏈夊垯灏嗘�昏杞﹂棿涔嬪墠鐨勬棩璁″垝宸ュ崟浣滃簾
+ if (!set_ModCheck("Sc_WorkBillSortBill_Edit")) {
+ layer.msg("瀵煎叆澶辫触锛佹棤瀵煎叆鏉冮檺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ } else {
+ if (!setWorkBillSortBillForDelete()) {
+ layer.msg("瀵煎叆澶辫触锛佸線鏈熸棩璁″垝浣滃簾澶辫触锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
+
+
var HDataSub = [];
//JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
@@ -307,19 +326,27 @@
success: function (data) {
if (data.count == 1) {
layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
+ /* layer.msg("鎻愪氦鎴愬姛");*/
}
else {
layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ msgError += data.Message + "锛�";
+ //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
error: function (err) {
layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ msgError += err + "锛�";
+ //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- }
+ }
+
+ if (msgError.length == 0) {
+ layer.msg("鎻愪氦鎴愬姛");
+ } else {
+ layer.msg(msgError, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
}
//琛屽唴鍒犻櫎
@@ -388,6 +415,79 @@
return vars;
}
+ //#region 鏉冮檺鍒ゅ畾
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ //layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
+ //#endregion
+
+ //#region 浣滃簾瀵瑰簲鐢熶骇杞﹂棿鐨勬棩璁″垝宸ュ崟
+ function setWorkBillSortBillForDelete() {
+ //鎷兼帴鐢熶骇杞﹂棿鐨処D
+ var HWorkShopIDArrayList = [];
+ for (var i = 0; i < option.data.length; i++) {
+ option.data[i]["鍗曟嵁鍙�"] = "";
+ option.data[i]["hmainid"] = "";
+
+
+ if ($.inArray(option.data[i]["HWorkShopID"], HWorkShopIDArrayList) == -1) {
+ HWorkShopIDArrayList.push(option.data[i]["HWorkShopID"]);
+ }
+ }
+ var HWorkShopIDListStr = "";
+ for (var i = 0; i < HWorkShopIDArrayList.length; i++) {
+ if (i == HWorkShopIDArrayList.length - 1) {
+ HWorkShopIDListStr = HWorkShopIDArrayList[i];
+ } else {
+ HWorkShopIDListStr = HWorkShopIDArrayList[i] + ",";
+ }
+ }
+
+ //浣滃簾瀵瑰簲鐢熶骇杞﹂棿ID鐨勬棩璁″垝宸ュ崟
+ var resultBool = false;
+ var sql = "";
+ if (HWorkShopIDListStr != "") {
+ sql = "update Sc_WorkBillSortBillMain set HDeleteMan = '" + sessionStorage["HUserName"] + "',HDeleteDate = getdate(),HBillStatus = 4 where HWorkShopID in (" + HWorkShopIDListStr + ")";
+ } else {
+ return resultBool;
+ }
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/commonMethod',
+ type: "GET",
+ async: false,
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
+ success: function (data1) {
+ if (data1.count == 1) {
+ resultBool = true;
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ return resultBool;
+ }
+ //#endregion
+
//#endregion
});
--
Gitblit v1.9.1