From 12fb8792c9743187e0592d0b6a26e65e06d27fc7 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 13 十一月 2024 14:51:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 8e749f0..aa0ea91 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -707,6 +707,7 @@
a = 0;
return false;
}
+
var HProcExchBillNo = $("#HProcExchBillNo").val();
//鍒ゆ柇鏉＄爜涔嬪墠鐨勫伐搴忔槸鍚﹀嚭绔�
$.ajax({
@@ -728,6 +729,28 @@
a = 0;
return false;
}
+
+ //鍒ゆ柇鏉＄爜鐨勯厤浠舵槸鍚︾鍚堟ā鍏� 绌村彿瑕佹眰
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/h_p_CJ_SNBarCodeBillMouldBathSelect",
+ type: "GET",
+ async: false,
+ data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo, "HBillType": "BZ" },
+ success: function (result) {
+ if (result.count == 0) {
+ a = 1;
+ playSound();
+ layer.alert(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ return false;
+ }
+ }
+ })
+
+ if (a == 1) {
+ a = 0;
+ return false;
+ }
+
$.ajax({//鍒ゆ柇鎬荤殑鍖呰鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
url: GetWEBURL() + "/LEMS/h_p_Sc_ProductionLinePackaging_Checkqty",
@@ -1157,11 +1180,7 @@
//var ReportViewer = document.getElementById("ReportViewer");
window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
- if (LDM == "DU3" && BBM == "1099081-00-E") {
-
- } else {
- $("#Print2").click();
- }
+ $("#Print2").click();
});
//鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
--
Gitblit v1.9.1