From 9fc747c8fe1b492e0e82da57a60f4ac17ef196d8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 22 二月 2021 22:28:09 +0800
Subject: [PATCH] 1、上架归还单:先扫条码再扫货架,如果不匹配不允许提交。2、下架找货单:已下架的条码允许再次下架。

---
 WebTM/views/工序汇报/MES_StationInBill.html |   64 +++++++++++++++----------------
 1 files changed, 31 insertions(+), 33 deletions(-)

diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill.html"
index e6f6570..abe81bf 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill.html"
@@ -35,9 +35,9 @@
                                     <legend>宸ュ簭杩涚珯鎺ユ敹鍗�</legend>
                                 </fieldset>
                             </div>
-                            <div class="layui-col-xs1 layui-inline">
+                            <!--<div class="layui-col-xs1 layui-inline">
                                 <img src="222.jpg" style="width:70%;height:50%;" />
-                            </div>
+                            </div>-->
                             <div class="layui-inline">
                                 <div class="">
                                     <label class="layui-inline" style="width:60px;">鏉″舰鐮�</label>
@@ -382,42 +382,40 @@
                     }
                     //
                     $.ajax({
-                        url: GetWEBURL() + "/LEMS/TxtHBarCode_KeyDown",
+                        url: GetWEBURL() + "TEST",
                         type: "GET",
                         data: {
                             "sBillBarCode": HFbarcode
                         },
                         success: function (result) {
-                            var data = result.data;
-                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "璁㈠崟璺熻釜鍙�": data[0].璁㈠崟璺熻釜鍙�
-                                    , "浜у搧浠g爜": data[0].浜у搧浠g爜
-                                    , "浜у搧鍚嶇О": data[0].浜у搧
-                                    , "瑙勬牸鍨嬪彿": data[0].瑙勬牸鍨嬪彿
-                                    , "娴佽浆鍗℃暟閲�": data[0].娴佽浆鍗℃暟閲�
-                                    , "鍒跺崟浜�": data[0].鍒跺崟浜�
-                                    , "鍒跺崟鏃ユ湡": data[0].鍒跺崟鏃ユ湡
-                                    , "淇敼浜�": data[0].淇敼浜�
-                                    , "淇敼鏃ユ湡": data[0].淇敼鏃ユ湡
-                                    , "瀹℃牳浜�": data[0].瀹℃牳浜�
-                                    , "瀹℃牳鏃ユ湡": data[0].瀹℃牳鏃ユ湡
-                                    , "鐢熶骇璁㈠崟鍙�": data[0].婧愬崟鍗曞彿
-                                    , "鐢熶骇璁㈠崟鏁伴噺": data[0].鐢熶骇鏁伴噺
-                                    , "HBillNo": $("#HFbarcode").val()
-                                });
-                                $("#HFbarcode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HFbarcode").css("background-color", "#efefef4d");
-                                $("#HFbarcode").css("box-shadow", "none");
-                                $("#Serial_number").removeAttr("readonly");//绉婚櫎娴佹按鍙峰彧璇�
-                                $("#Serial_number").css("background-color", "white");
-                                $("#Serial_number").focus();
-                                $("#Serial_number").css("box-shadow", "0 0 0 1px #00ff00");
-                            } else {
-                                // $("#verifycode").click();
-                                //layer.msg(result.Message, { icon: 5 });
-                                layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                            }
+                            //var data = result.data;
+                            //if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //    form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            //        "璁㈠崟璺熻釜鍙�": data[0].璁㈠崟璺熻釜鍙�
+                            //        , "浜у搧浠g爜": data[0].浜у搧浠g爜
+                            //        , "浜у搧鍚嶇О": data[0].浜у搧
+                            //        , "瑙勬牸鍨嬪彿": data[0].瑙勬牸鍨嬪彿
+                            //        , "娴佽浆鍗℃暟閲�": data[0].娴佽浆鍗℃暟閲�
+                            //        , "鍒跺崟浜�": data[0].鍒跺崟浜�
+                            //        , "鍒跺崟鏃ユ湡": data[0].鍒跺崟鏃ユ湡
+                            //        , "淇敼浜�": data[0].淇敼浜�
+                            //        , "淇敼鏃ユ湡": data[0].淇敼鏃ユ湡
+                            //        , "瀹℃牳浜�": data[0].瀹℃牳浜�
+                            //        , "瀹℃牳鏃ユ湡": data[0].瀹℃牳鏃ユ湡
+                            //        , "鐢熶骇璁㈠崟鍙�": data[0].婧愬崟鍗曞彿
+                            //        , "鐢熶骇璁㈠崟鏁伴噺": data[0].鐢熶骇鏁伴噺
+                            //        , "HBillNo": $("#HFbarcode").val()
+                            //    });
+                            //    $("#HFbarcode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                            //    $("#HFbarcode").css("background-color", "#efefef4d");
+                            //    $("#HFbarcode").css("box-shadow", "none");
+                            //    $("#Serial_number").removeAttr("readonly");//绉婚櫎娴佹按鍙峰彧璇�
+                            //    $("#Serial_number").css("background-color", "white");
+                            //    $("#Serial_number").focus();
+                            //    $("#Serial_number").css("box-shadow", "0 0 0 1px #00ff00");
+                            //} else {
+                            //    layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            //}
                         }, error: function () {
                             layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
                         }

--
Gitblit v1.9.1