From e0fa6f63fc5c4148895c6d035e2e3275aaed166a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 19 十一月 2023 12:46:46 +0800
Subject: [PATCH] 优化单品过站

---
 WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html |   66 +++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 19 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/Cj_CollectionOfSingleProductDefects.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_CollectionOfSingleProductDefects.html"
index 5ff26ad..351b414 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_CollectionOfSingleProductDefects.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_CollectionOfSingleProductDefects.html"
@@ -168,6 +168,7 @@
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" value="" style="background-color:#efefef4d;">
                                                 <input type="hidden" class="layui-input" name="HMaterID" lay-verify="HMaterID" id="HMaterID" value="0">
+                                                <input type="hidden" class="layui-input" name="HProdOrgID" lay-verify="HProdOrgID" id="HProdOrgID" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -315,10 +316,12 @@
         var params = getUrlVars();
         var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
         var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+        var HProcExchBillNo = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
 
         //鍒跺崟浜�
         $("#HMaker").val(sessionStorage["HUserName"]);
         $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
+        $("#HProdOrgID").val(sessionStorage["OrganizationID"]);
      
         //鍒ゆ柇鏄惁鏂板
         if (OperationType == 1) {
@@ -455,40 +458,65 @@
         //鏉$爜鍥炶溅鏌ヨ
         function txtHBarCode_KeyDown(HBarCode) {
 
-            var index = layer.load();
+            var indexs = layer.load();
             $.ajax({
                 type: "GET",
-                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
-                async: true,
-                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
+                url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
+                async: false,
+                data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                 dataType: "json",
                 success: function (data1) {
                     if (data1.count == 1) {
-                        layer.close(index);
-                        $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
-                        $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
-                        $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
-                        $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
-                        $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
-                        $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
-                        $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]);
-                        $("#HMaterID").val(data1.data[0]["HMaterID"]);
-                        $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
-                        $("#HModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]);
-                        $("#HBarCode").val(data1.data[0]["鏉$爜"]);
-                      
+                        layer.close(indexs);
+                        var index = layer.load();
+
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
+                            async: false,
+                            data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+                            dataType: "json",
+                            success: function (data1) {
+                                if (data1.count == 1) {
+                                    layer.close(index);
+                                    $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟"]);
+                                    $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
+                                    $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
+                                    $("#HProcExchBillNo").val(data1.data[0]["宸ュ簭娴佽浆鍗�"]);
+                                    $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
+                                    $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
+                                    $("#HMaterNumber").val(data1.data[0]["鐗╂枡缂栫爜"]);
+                                    $("#HMaterID").val(data1.data[0]["HMaterID"]);
+                                    $("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
+                                    $("#HModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]);
+                                    $("#HBarCode").val(data1.data[0]["鏉$爜"]);
+
+                                }
+                                else {
+                                    layer.close(index);
+                                    layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                $("#HBarCodeSN").val("");
+                            },
+                            error: function (err) {
+                                layer.close(index);
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
                     }
                     else {
-                        layer.close(index);
+                        layer.close(indexs);
                         layer.msg(data1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                     $("#HBarCodeSN").val("");
                 },
                 error: function (err) {
-                    layer.close(index);
+                    layer.close(indexs);
                     layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 }
             });
+
+          
         }
 
          //涓嶈壇鍘熷洜閫夋嫨椤甸潰

--
Gitblit v1.9.1