From 7e57544235ff368d30802f3cfe2ee7d7103ea688 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 12 六月 2025 16:22:35 +0800
Subject: [PATCH] 三升排产发货计划平台，要料报表日计划生成
---
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 7 +++++--
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 2 +-
WebTM/views/生产管理/发货计划平台（三升）/Xs_SendGoodsPlanForm.html | 4 ++--
WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html | 35 +++++++++++++++++++++++++++++++++++
4 files changed, 43 insertions(+), 5 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 3d70e60..c475eb3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -1229,7 +1229,7 @@
let addSWhere = "";
- if (openType != "undefined") {
+ if (typeof(openType) != "undefined") {
if (openType == 1 && HOrgName != "undefined") {
/*addSWhere = " and 绂佺敤鏍囪 = '' 瀹℃牳浜� !='' and 杞﹂棿鏍囪 = 'Y' " ;*/
addSWhere = " and 绂佺敤鏍囪 = ' ' and 杞﹂棿鏍囪 = 'Y' ";
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 975afdb..fe9ea36 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"
@@ -1107,9 +1107,10 @@
$("#HArrangeProductDayQty").empty();
$("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
- form.render('select');
+
$("#HArrangeProductDayQty").val("40");
+ form.render('select');
}
//#endregion
@@ -1842,6 +1843,8 @@
//})
}
}
+
+ table.render(option);
}
//缂烘枡鍒嗘瀽琛ㄦ牸鏁版嵁
@@ -3805,7 +3808,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]["鎷嗗崟姹囨姤鏁伴噺"]) > 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/\345\217\221\350\264\247\350\256\241\345\210\222\345\271\263\345\217\260\357\274\210\344\270\211\345\215\207\357\274\211/Xs_SendGoodsPlanForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\217\221\350\264\247\350\256\241\345\210\222\345\271\263\345\217\260\357\274\210\344\270\211\345\215\207\357\274\211/Xs_SendGoodsPlanForm.html"
index 4f32d16..9261f90 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\217\221\350\264\247\350\256\241\345\210\222\345\271\263\345\217\260\357\274\210\344\270\211\345\215\207\357\274\211/Xs_SendGoodsPlanForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\217\221\350\264\247\350\256\241\345\210\222\345\271\263\345\217\260\357\274\210\344\270\211\345\215\207\357\274\211/Xs_SendGoodsPlanForm.html"
@@ -505,7 +505,7 @@
//蹇�熻繃婊�
function get_FastQuery() {
- sWhere = "select * from h_v_Xs_SendGoodsPlanBillList where 1=1 and (閲囪喘璁㈠崟鍏抽棴鐘舵��='A' or 閲囪喘璁㈠崟鍏抽棴鐘舵�� is null) and 閿�鍞鍗曞叧闂姸鎬�='A'"
+ sWhere = "select * from h_v_Xs_SendGoodsPlanBillList where 1=1 and 閿�鍞鍗曞叧闂姸鎬�='A'"
get_Display(sWhere);
sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -528,7 +528,7 @@
success: function (data1) {
if (data1.count == 1) {
get_FastQuery(2);
- layer.msg(data1.data[0]["Column1"]);
+ layer.msg(data1.data[0]["HRemark"]);
layer.close(ajaxLoad);
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
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 cea12aa..9683a4f 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"
@@ -49,6 +49,7 @@
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGetWorkBill" id="btnGetWorkBill">鐢熸垚鎺掍骇璁″垝</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin: 10px 0 10px;">
<div class="layui-inline">
@@ -235,6 +236,13 @@
btnHDeptID();
});
//#endregion
+
+ //#region 鐢熶骇杞﹂棿
+ form.on('submit(btnGetWorkBill)', function (data) {
+ btnGetWorkBill();
+ });
+ //#endregion
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -529,6 +537,33 @@
}
//#endregion
+ //#region 瑕佹枡璁″垝鐢熸垚鎺掍骇璁″垝
+ function btnGetWorkBill() {
+ var ajaxLoad = layer.load();
+ var sql = "exec h_p_JIT_WorkBillSortBill_WorkDemandPlan_sansheng " + $("#HDeptID").val()+",'" +sessionStorage["HUserName"] + "','" + sessionStorage["OrganizationID"] + "'";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/searchMethod',
+ type: "GET",
+ async: false,
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ get_FastQuery(2);
+ layer.msg(data1.data[0]["Column1"]);
+ layer.close(ajaxLoad);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ });
+ }
+ //#endregion
+
+
//鐗╂枡鍒楄〃
function btnHMATERIALID() {
layer.open({
--
Gitblit v1.9.1