From b07aac63eb3692a3fdd86c0df0625d3b83ae5029 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 06 八月 2025 09:10:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill_JiaNan.html | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html"
index 2d1cad9..cf3f225 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html"
@@ -241,7 +241,12 @@
var HSourceInterID = params[params[2]]; //婧愬崟涓籭d
var HSourceEntryID = params[params[3]]; //婧愬崟瀛恑d
var HSourceBillType = params[params[4]]; //婧愬崟绫诲瀷
- var HSourceBillNo = params[params[5]]; ``//婧愬崟鍗曞彿
+ var HSourceBillNo = params[params[5]];
+
+ var HZZRQ = ""; //鍒堕�犳棩鏈�
+
+ var HQty_waitProduce = 0; //鍙敓鎴愭潯鐮佹暟閲�
+ //婧愬崟鍗曞彿
//#endregion
//#endregion
@@ -260,6 +265,14 @@
}
else if (OperationType == "4") { //涓嬫帹
+ var temp = getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
+ var dataArray = [];
+ dataArray.push(temp);
+ if (dataArray[0].鏉＄爜鍚屾鏍囪.trim() != "") {
+ layer.alert("璇ュ崟鎹槑缁嗚褰曟潯鐮佸凡缁忓悓姝ワ紝涓嶅厑璁哥敓鎴愭潯鐮侊紝璇锋挙閿�鍚屾鍚庡啀杩涜鐢熸垚锛侊紒", { icon: 5 });
+ return;
+ }
+
setInit_PushBill();
}
else {
@@ -284,6 +297,16 @@
var sMainData_temp = [];
if (sMainData.HBarCodeType == "BarCode") {
+ //鍒ゆ柇鐢熸垚鏉＄爜鏁伴噺鏄惁瓒呰繃鍙敓鎴愭潯鐮佹暟閲�
+ var temp = getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
+ var dataArray = [];
+ dataArray.push(temp);
+ var HQty_SourceBill = $("#HQty_SourceBill").val() * 1;
+ if (HQty_SourceBill > ((dataArray[0].鏁伴噺 * 1) - (dataArray[0].宸茬敓鎴愭潯鐮佹暟閲� * 1))) {
+ layer.msg("鏉＄爜鐢熸垚鏁伴噺澶т簬鏈�澶у彲鐢熸垚鏁伴噺銆�" + ((dataArray[0].鏁伴噺 * 1) - (dataArray[0].宸茬敓鎴愭潯鐮佹暟閲� * 1)) + "銆�!!");
+ return false;
+ }
+
sMainData_temp = [
{
"HMainID": sMainData.HMainSourceInterID
@@ -335,6 +358,7 @@
, "HSupNumber": sMainData.HSupNumber
, "HSupName": sMainData.HSupName
, "HInnerBillNo": sMainData.HPOOrderBillNo
+ , "HZZRQ": HZZRQ
}
]
} else if(sMainData.HBarCodeType == "BarCode_Box") {
@@ -389,6 +413,7 @@
, "HSupNumber": sMainData.HSupNumber
, "HSupName": sMainData.HSupName
, "HInnerBillNo": sMainData.HPOOrderBillNo
+ , "HZZRQ": HZZRQ
}
]
}else if (sMainData.HBarCodeType == "BarCode_Pack") {
@@ -443,6 +468,7 @@
, "HSupNumber": sMainData.HSupNumber
, "HSupName": sMainData.HSupName
, "HInnerBillNo": sMainData.HPOOrderBillNo
+ , "HZZRQ": HZZRQ
}
]
} else {
@@ -691,6 +717,12 @@
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
if (!ref.test(newHQty_SourceBill)) {
layer.msg("婧愬崟鏁伴噺璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ $("#HQty_SourceBill").val(oldHQty_SourceBill);
+ return false;
+ }
+
+ if (newHQty_SourceBill > HQty_waitProduce) {
+ layer.msg("鏉＄爜鐢熸垚鏁伴噺澶т簬鏈�澶у彲鐢熸垚鏁伴噺銆�" + HQty_waitProduce + "銆�!!");
$("#HQty_SourceBill").val(oldHQty_SourceBill);
return false;
}
@@ -991,12 +1023,15 @@
, "HMaterModel": dataArray[0].瑙勬牸鍨嬪彿
, "HUnitID": dataArray[0].HUnitID
, "HUnitName": dataArray[0].璁￠噺鍗曚綅
- , "HQty_SourceBill": dataArray[0].鏁伴噺
+ , "HQty_SourceBill": (dataArray[0].鏁伴噺 * 1) - (dataArray[0].宸茬敓鎴愭潯鐮佹暟閲� * 1)
, "HBatchNo": dataArray[0].鎵瑰彿
, "HAuxPropID": dataArray[0].HAuxPropID
, "HAuxPropNumber": dataArray[0].杈呭姪灞炴�т唬鐮�
, "HAuxPropName": dataArray[0].杈呭姪灞炴��
});
+ HZZRQ = dataArray[0].鍒堕�犳棩鏈�;
+
+ HQty_waitProduce = (dataArray[0].鏁伴噺 * 1) - (dataArray[0].宸茬敓鎴愭潯鐮佹暟閲� * 1);
}
else if (HBarCodeType == "BarCode_Box") {
var HQty_SourceElement = document.getElementById("HQty_SourceElement");
@@ -1032,6 +1067,7 @@
, "HAuxPropNumber": dataArray[0].杈呭姪灞炴�т唬鐮�
, "HAuxPropName": dataArray[0].杈呭姪灞炴��
});
+ HZZRQ = dataArray[0].鍒堕�犳棩鏈�;
}
else if (HBarCodeType == "BarCode_Pack") {
var HQty_SourceElement = document.getElementById("HQty_SourceElement");
@@ -1067,6 +1103,7 @@
, "HAuxPropNumber": dataArray[0].杈呭姪灞炴�т唬鐮�
, "HAuxPropName": dataArray[0].杈呭姪灞炴��
});
+ HZZRQ = dataArray[0].鍒堕�犳棩鏈�;
}
else {
return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟涓嬫帹锛侊紒');
--
Gitblit v1.9.1