From 3425237a2b54ca28fc3e3c5f7c35a7fbef4e15fa Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 29 十二月 2025 09:19:29 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement.html | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
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 c2da2ff..0f2108a 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"
@@ -91,7 +91,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;" id="BT_HProcExchBillNo">宸ュ簭娴佽浆鍗�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;" autocomplete="off">
<input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
<input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
</div>
@@ -252,7 +252,8 @@
</script>-->
<script type="text/html" id="toolbarDemo2">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -323,6 +324,9 @@
//鍒楄缃�
case 'set_HideColumn2': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_Display);
break;
+ //鍒锋柊
+ case 'refresh': get_Display();
+ break;
};
});
//闀洉鐮佸洖杞︽柟娉�
@@ -342,11 +346,6 @@
var HBarCode_Key = $('#HBarCode_Key').val();
if (event.keyCode == 13) {
- if ($("#HBarCode_SN").val() == "" || $("#HBarCode_SN").val() == null) {
- layer.msg("鏈壂SN鐮佽鍏堟壂鐮�");
- $("#HBarCode_SN").focus();
- return
- }
if (HBarCode_Key) {
txtHBarCodeKey_KeyDown(HBarCode_Key);
}
@@ -615,7 +614,7 @@
var HBillNo = $("#HBillNo").val();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomMatch_XW",
+ url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomBind_XW",
async: false,
data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HBarCode_P": $('#HBarCode_SN').val(), "HProcID": $('#HProcID').val(), "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
@@ -646,7 +645,13 @@
//鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
$("#HBarCode_Key").focus();
$("#HBarCode_Key").val("");
-
+ //濡傛灉閰嶄欢閰嶅畬鑷甫鎻愪氦
+ if (areQuantitiesEqual(option.data)) {
+ //淇濆瓨鍏抽敭浠�
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
+ }
layer.close(indexs);
}
else {
@@ -741,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()
}
};
@@ -1062,7 +1067,23 @@
//}
return true;
}
+ //鍒ゆ柇鏄惁缁戝畾瀹�
+ function areQuantitiesEqual(arr) {
+ if (arr.length === 0) {
+ return false; // 绌烘暟缁勯粯璁よ涓烘弧瓒虫潯浠�
+ }
+ const firstHPartsQty = arr[0].HPartsQty;
+ const firstHBindingQty = arr[0].HBindingQty;
+
+ for (let i = 1; i < arr.length; i++) {
+ if (arr[i].HPartsQty !== firstHPartsQty || arr[i].HBindingQty !== firstHBindingQty) {
+ return false;
+ }
+ }
+
+ return true;
+ }
//#endregion
});
--
Gitblit v1.9.1