From 2a59d3495aecb1ae4622aa48c0ad58a7f5edc2c1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 13 八月 2024 11:35:14 +0800
Subject: [PATCH] 单品过站优化

---
 WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html |   10 ++++++++--
 WebTM/WebTM.csproj                                       |    1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index be7f460..65e5d06 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -456,7 +456,6 @@
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_RegistrationForTestingReport.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
-    <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\SB_TechnologyParameterList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\QC_ProcessPerformanceFirstPass.html" />
     <Content Include="views\璐ㄩ噺绠$悊\璐ㄩ噺鎶ヨ〃\Sc_StationOutBil_HProc.html" />
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/Cj_ProcessItemStationPlatform.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/Cj_ProcessItemStationPlatform.html"
index 1b4ae15..6146859 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/Cj_ProcessItemStationPlatform.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/Cj_ProcessItemStationPlatform.html"
@@ -950,7 +950,8 @@
                 success: function (data1) {
                     if (data1.count == 1) {
                         layer.close(index);
-                        
+
+                        var MaterNum = 0;
                         for (var i = 0; i < option.data.length; i++) {
                             if (data1.data[0]["HMaterNumber"] == option.data[i]["閰嶄欢浠g爜"] && option.data[i]["HBatchNo"] == data1.data[0]["HBatchNo"] && option.data[i]["HBatchNo"] != "") {
                                 return layer.msg("褰撳墠鎵规宸叉壂鍏�,璇蜂笉瑕侀噸澶嶆壂鍏�!");
@@ -972,10 +973,15 @@
                                 option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
                                 option.data[i]["閰嶄欢鏁伴噺"] = data1.data[0]["HQty"];
                                 option.data[i]["HBarCode"] = HBarCode;
-                                
+
                                 table.render(option);
                                 PD_HBatchNo();
                                 break;
+                            } else {
+                                MaterNum++;
+                                if (MaterNum == option.data.length) {
+                                    layer.msg("鐗╂枡浠g爜涓嶅尮閰�,璇风‘璁ゆ潯鐮侀厤浠剁墿鏂欐槸鍚︿笌缁戝畾鐗╂枡涓�鑷�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
                             }
                            
                         }

--
Gitblit v1.9.1