From da44d82e7f19e081f3c882c1e7934728e4ab534b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 18 八月 2025 11:13:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 1
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html | 24 ++++++
WebTM/views/WMS扫码模块/库存查询/KF_ICInventory_WorkShopByCLD_PDA.html | 4
WebTM/views/WMS扫码模块/小车锁定/Kf_TrolleyPositionBill_PDA.html | 63 ++++++++++-----
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 95 +++++++++++++++++++++++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 2
6 files changed, 165 insertions(+), 24 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\260\217\350\275\246\351\224\201\345\256\232/Kf_TrolleyPositionBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\260\217\350\275\246\351\224\201\345\256\232/Kf_TrolleyPositionBill_PDA.html"
index 87899af..533cc71 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\260\217\350\275\246\351\224\201\345\256\232/Kf_TrolleyPositionBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\260\217\350\275\246\351\224\201\345\256\232/Kf_TrolleyPositionBill_PDA.html"
@@ -667,7 +667,7 @@
}
});
- $("#HEquipBarCode").val("");
+ //$("#HEquipBarCode").val("");
}
});
@@ -916,7 +916,7 @@
});
if (sBarCode != "") {
- $('#HCarBarCode').val("");
+ //$('#HCarBarCode').val("");
}
//璋冭浆鍒扮浜屼釜椤电
element.tabChange('tab-Kf_TrolleyPositionBill_PDA', '2');
@@ -998,8 +998,46 @@
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
}
-
//#endregion
+
+ //鍗曟嵁涓婁紶鍓嶅垽鏂�
+ function AllowLoadData(sSubStr) {
+ if (HInterID == 0) {
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (HBillNo == '') {
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr.length == 0) {
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+
+ if (table.cache['wl-table'].length >= 1) {
+ var sSubStr = JSON.stringify(table.cache['wl-table']);
+
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HCarBarCode == "" || sSubStr[i].HCarBarCode == undefined || sSubStr[i].HCarBarCode == null) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,灏忚溅缂栧彿涓嶅厑璁镐负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ((sSubStr[i].HSPID == 0 || sSubStr[i].HSPID == undefined || sSubStr[i].HSPID == null) && (sSubStr[i].HEquipID == 0 || sSubStr[i].HEquipID == undefined || sSubStr[i].HEquipID == null)) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,闇�鎵爜缁戝畾浠撲綅鎴栨満鍙帮紝涓嶅厑璁镐粨浣嶅拰鏈哄彴淇℃伅閮戒负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ } else {
+ layer.msg("鏄庣粏璁板綍涓虹┖锛屼笉鍏佽鎻愪氦!璇锋壂灏忚溅鏉＄爜", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ return true;
+ }
});
@@ -1034,24 +1072,7 @@
HSPObj = obj;
}
- }
-
- //鍗曟嵁涓婁紶鍓嶅垽鏂�
- function AllowLoadData(sSubStr) {
- if (HInterID == 0) {
- layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (HBillNo == '') {
- layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (sSubStr.length == 0) {
- layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- return true;
- }
+ }
</script>
</body>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_WorkShopByCLD_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_WorkShopByCLD_PDA.html"
index 45c8a75..92ed167 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_WorkShopByCLD_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_WorkShopByCLD_PDA.html"
@@ -428,9 +428,9 @@
break;
default:
- if (data[i].name == '浠撳簱') {
+ if (data[i].name == '浠撳簱' || data[i].name == '鎵瑰彿') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120 });
- } else if (data[i].name == '鐗╂枡浠ｇ爜' || data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿' || data[i].name == '缁勭粐') {
+ } else if (data[i].name == '鐗╂枡浠ｇ爜' || data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿' || data[i].name == '缁勭粐' || data[i].name == '浠撲綅浠ｇ爜' ) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center' });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 9903a8b..a3177bc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -1620,6 +1620,7 @@
, "HSourceBillType": dataArray[i].鍗曟嵁绫诲瀷
, 'HICMOTempID': "0"
, 'HRemark': ""
+ , 'HPRODUCEDATE': dataArray[i].鐢熶骇鏃ユ湡
}
);
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index fa351a5..4c1a350 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -223,6 +223,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_WithdrawCheck_Flow" id="WithdrawCheck_Flow"><i class="layui-icon layui-icon-form"></i>鎾ゅ洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBillSetDate" id="set_CancelCloseBillSetDate"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�(璁剧疆鏃堕棿)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(瀹氶鐢宠鍗�)</button>
@@ -377,6 +378,9 @@
break;
//鍙嶅叧闂�
case 'set_CancelCloseBill': set_CloseBill(2);
+ break;
+ //鍙嶅叧闂缃椂闂�
+ case 'set_CancelCloseBillSetDate': set_CloseBillSetDate(2);
break;
//浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
case 'btn-Drop':set_DropBill(1);
@@ -1601,6 +1605,97 @@
}
}
+ //鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
+ function set_CloseBillSetDate(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var HInterID = data[0].hmainid;
+ if (data.length == 1) {
+ // 寮瑰嚭灞�
+ layer.open({
+ type: 1,
+ title: '璁剧疆鏃堕棿鑼冨洿',
+ area: ['500px', '300px'],
+ content: `
+ <div class="layui-form" style="padding: 20px;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="startTime" placeholder="璇烽�夋嫨寮�濮嬫椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="endTime" placeholder="璇烽�夋嫨缁撴潫鏃堕棿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-input-block" style="margin-left: 0; text-align: center;">
+ <button class="layui-btn" id="confirmTime">纭畾</button>
+ <button class="layui-btn layui-btn-primary" id="cancelTime">鍙栨秷</button>
+ </div>
+ </div>
+ </div> `,
+ success: function (layero, index) {
+ $("#startTime").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#endTime").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
+ // 纭畾鎸夐挳鐐瑰嚮浜嬩欢
+ $('#confirmTime').on('click', function () {
+ var startTime = $('#startTime').val();
+ var endTime = $('#endTime').val();
+
+ if (!startTime) {
+ layer.msg('璇烽�夋嫨寮�濮嬫椂闂�', { icon: 2 });
+ return;
+ }
+
+ if (!endTime) {
+ layer.msg('璇烽�夋嫨缁撴潫鏃堕棿', { icon: 2 });
+ return;
+ }
+
+ if (new Date(endTime) < new Date(startTime)) {
+ layer.msg('缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�', { icon: 2 });
+ return;
+ }
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseSetDate',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "", "HBeginDate": startTime, "HEndDate": endTime},
+ success: function (result) {
+ if (result.count == 1) {
+ // 杩欓噷鍙互澶勭悊鑾峰彇鍒扮殑鏃堕棿鑼冨洿
+ layer.msg('鏃堕棿鑼冨洿宸茶缃細' + startTime + ' 鑷� ' + endTime, { icon: 1 });
+ // 鍏抽棴寮瑰眰
+ layer.close(index);
+ $("#btnSearch").trigger('click');
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ // 鍏抽棴寮瑰眰
+ layer.close(index);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // 鍏抽棴寮瑰眰
+ layer.close(index);
+ }
+ });
+
+ });
+
+ // 鍙栨秷鎸夐挳鐐瑰嚮浜嬩欢
+ $('#cancelTime').on('click', function () {
+ layer.close(index);
+ });
+ },
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
//#region 鍙嶄綔搴�/浣滃簾鏁版嵁 [1 浣滃簾銆�2 鍙嶄綔搴焆
function set_DropBill(num) {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index b1ad371..56077f8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -2871,7 +2871,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
index 08c9d2e..6e7aa32 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
@@ -279,6 +279,30 @@
break;
};
});
+
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ });
+
+ table.on('sort(mainTable2)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable2', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option2.data = layui.table.cache["mainTable2"];
+ table.render(option);
+ });
//#endregion
//#region 閲嶇疆鎸夐挳
--
Gitblit v1.9.1