From 335fa42937fd6d274ebee76c5a76bbc73610da9c Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 17 十一月 2025 11:39:27 +0800
Subject: [PATCH] 添康排产页面直接修改排产数量；小卫单品过站组织ID大小写调整；
---
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batch.html | 2
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateCaseCode.html | 2
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindEdit.html | 4 +-
WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK2.html | 72 +++++++++++++++++++++++-------------
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement.html | 2
5 files changed, 51 insertions(+), 31 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
index f4736e4..09f1d20 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
@@ -33,7 +33,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">缁勮鎺掍骇</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙ｉ攣宸ュ崟</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnPublishDate" id="btnPublishDate">浜ゆ湡鍙戝竷</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnPublishDate" id="btnPublishDate">浜ゆ湡鍙戝竷</button>-->
</div>
<div class="layui-collapse resizable-container">
<div class="layui-colla-item">
@@ -481,14 +481,21 @@
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("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
+ //}
//淇敼鏁版嵁
obj.update({
"鏃ヨ鍒掓暟閲忔�婚噺": dateHQty,
});
+
+ //鏍￠獙淇敼鍗曞厓鏍兼爣棰樻槸鍚︿负鏃ユ湡鏍煎紡
+ if (isNaN(new Date(obj.field).getTime()) == false) {
+ //鏁版嵁搴撶洿鎺ユ洿鏂颁慨鏀规棩鏈熺殑鎺掍骇鏁伴噺
+ UpdateDayPlanQty(obj.data.hmainid, obj.field, obj.value, obj.data.浜х嚎鎬讳骇鑳�);
+ }
+
})
//#endregion
@@ -569,7 +576,7 @@
obj.update(data);
}
});
- }
+ }
//#endregion
});
@@ -674,7 +681,7 @@
} else {
layer.alert("褰撳墠涓嶄负澶氳溅闂存帓浜фā寮�");
}
-
+
})
//鐢熶骇璁㈠崟閫夊崟
@@ -856,11 +863,11 @@
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺', filter: true });
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID", filter: true });
- columns.push({ field: '瑕佽揣鏃ユ湡', title: '瑕佽揣鏃ユ湡', width: 150, templet: "<div>{{d.瑕佽揣鏃ユ湡 == '' ? '1900-01-01':layui.util.toDateString(d.瑕佽揣鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HDeliveryDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '寮�宸ユ棩鏈�', title: '寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '瀹屽伐鏃ユ湡', title: '瀹屽伐鏃ユ湡', width: 150, templet: "<div>{{d.瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '瑕佽揣鏃ユ湡', title: '瑕佽揣鏃ユ湡', width: 150, templet: "<div>{{d.瑕佽揣鏃ユ湡 ==null ?'':layui.util.toDateString(d.瑕佽揣鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HDeliveryDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '寮�宸ユ棩鏈�', title: '寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
+ columns.push({ field: '瀹屽伐鏃ユ湡', title: '瀹屽伐鏃ユ湡', width: 150, templet: "<div>{{d.瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
-
+
columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150, sort: true, hide: true });
columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150, sort: true, hide: true });
columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150, sort: true, hide: true });
@@ -884,7 +891,7 @@
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
-
+
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150, sort: true });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150, sort: true });
columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150, sort: true });
@@ -1128,6 +1135,26 @@
}
//#endregion
+ //#region 鐩戝惉鍗曞厓鏍兼暟鎹慨鏀规煇涓�澶╃殑鎺掍骇鏁伴噺
+ function UpdateDayPlanQty(HInterID, HMasterDate, HValue, HSumWorkQty) {
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/UpdateDayPlanQty',
+ type: "GET",
+ data: { "HWorkBillSortInterID": HInterID, "HMasterDate": HMasterDate, "HQty": HValue, "HSumWorkQty": HSumWorkQty },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 娣诲姞鐢熶骇璁㈠崟
function get_btnAddICMO() {
var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();
@@ -1173,7 +1200,7 @@
}
//#endregion
-
+
//#region 娣诲姞鎶ょ悊搴�-妞呮灦鐢熶骇璁㈠崟
function get_btnAddICMO_Batch() {
var HDeptID = "102357,102359" //102357=鎶ょ悊搴� 102359=妞呮灦
@@ -1289,13 +1316,6 @@
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);
- }
-
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1318,8 +1338,8 @@
var lastDay = new Date(year, month, 0).getDate(); //褰撴湀鏈�鍚庝竴澶�
var thisDay = new Date().getDay(); //褰撳ぉ鏄湰鏈堢鍑犲ぉ
- var valueList = [7, 21, 28 , 30, 35];
- var titleList = ["7澶�","21澶�","28澶�", "30澶�", "35澶�"];
+ var valueList = [7, 21, 28 , 30, 35,50];
+ var titleList = ["7澶�","21澶�","28澶�", "30澶�", "35澶�", "50澶�"];
var HArrangeProductDayQty_ArrayList = '';
for (var i = 0; i < valueList.length; i++) {
@@ -1330,7 +1350,7 @@
$("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
- $("#HArrangeProductDayQty").val("21");
+ $("#HArrangeProductDayQty").val("50");
form.render('select');
}
//#endregion
@@ -1393,7 +1413,7 @@
} else {
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
- }
+ }
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
@@ -2352,15 +2372,15 @@
//鏍规嵁閿�鍞鍗曡璐ф棩鏈燂紝閿�鍞鍗曞鏍告棩鏈熸帓搴忔暟缁�
data.sort(function (a, b) {
- // 榛樿鏍规嵁瑕佽揣鏃ユ湡鎺掑簭锛岃璐ф棩鏈熺浉鍚屽垯鎸夌収閿�鍞鍗曞鏍告棩鏈熸帓搴�
+ // 榛樿鏍规嵁鏈�鏃╁紑宸ユ棩鏈熸帓搴忥紝鏈�鏃╁紑宸ユ棩鏈熺浉鍚屽垯鎸夌収閿�鍞鍗曞鏍告棩鏈熸帓搴�
if (new Date(a.瑕佽揣鏃ユ湡) == new Date(b.瑕佽揣鏃ユ湡)) {
return new Date(a.閿�鍞鍗曞鏍告棩鏈�) - new Date(b.閿�鍞鍗曞鏍告棩鏈�)
}
return new Date(a.瑕佽揣鏃ユ湡) - new Date(b.瑕佽揣鏃ユ湡)
});
- for (var i = 0; i < data.length; i++) {
- if ($("#HAutoYX").val == "鏄�") {
+ for (var i = 0; i < data.length; i++) {
+ if ($("#HAutoYX").val() == "鏄�") {
data[i]["浼樺厛绾�"] = ((i + 1) * 5);
} else {
if (data[i]["浼樺厛绾�"] == 0 || data[i]["浼樺厛绾�"] == "") {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
index f37eea9..87ec336 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
@@ -746,7 +746,7 @@
"field": {
"HProcID": $("#HProcID").val(), "HBatchNo": "",
"HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
- "HProdOrgID": sessionStorage["OrganizationID"],
+ "HPRDOrgID": sessionStorage["OrganizationID"],
"HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
}
};
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindEdit.html"
index 6549a73..2e2dc48 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindEdit.html"
@@ -52,8 +52,8 @@
<div class="layui-input-block" style="display: inline-block; margin-left:0px;">
<label class="layui-form-label" style="padding-left:0px" id="">鐢熶骇璁㈠崟鍙�:</label>
<input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HICMOBillNo" style="width: 500px;">
- <input type="text" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" style="display:none;">
- <input type="text" class="layui-input" name="HICMOEntryID" lay-verify="HICMOEntryID" style="display:none;">
+ <input type="text" class="layui-input" id="HICMOInterID" name="HICMOInterID" lay-verify="HICMOInterID" style="display:none;">
+ <input type="text" class="layui-input" id="HICMOEntryID" name="HICMOEntryID" lay-verify="HICMOEntryID" style="display:none;">
</div>
<div class="layui-inline-block" style="margin-top:10px;">
<label class="layui-form-label">涓嬩竴宸ュ簭:</label>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
index 4290378..592e0af 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
@@ -492,7 +492,7 @@
"field": {
"HProcID": $("#HProcID").val(), "HBatchNo": $("#HBarCode_Batch").val(),
"HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
- "HProdOrgID": sessionStorage["OrganizationID"],
+ "HPRDOrgID": sessionStorage["OrganizationID"],
"HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
}
};
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateCaseCode.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateCaseCode.html"
index 1386009..a1dec96 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateCaseCode.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateCaseCode.html"
@@ -465,7 +465,7 @@
"field": {
"HProcID": $("#HProcID").val(), "HBatchNo": "", "HWeight": $("#HWeight").val(),
"HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
- "HProdOrgID": sessionStorage["OrganizationID"],
+ "HPRDOrgID": sessionStorage["OrganizationID"],
"HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
}
};
--
Gitblit v1.9.1