From bce487d7ba324c0f623f0c605f4686f382dbdcec Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 22 二月 2021 12:04:47 +0800
Subject: [PATCH] 上架归还增加重复扫码校验

---
 WebTM/views/仓存管理/仓库调拨/Cc_LookingForReturnBill.html |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)

diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
index a9866ea..c0f31ca 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
@@ -436,24 +436,33 @@
                         data: { "HBarCode": HBarCode },
                         success: function (result) {
                             if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                var data = result.data;
-                                option2.data = data;
-                                table.render(option2);
-                                var sSubStr = table.cache['bzd-table2'];
-                                sSubStr[0].HSourceID = $("#HSourceID").val();
-                                sSubStr[0].HSource = $("#HSource").val();
-                                sSubStr[0].HGroupID = $("#HGroupID").val();
-                                sSubStr[0].HGroup = $("#HGroup").val();
-                                sSubStr[0].HInterID = $("#HInterID").val();
-                                sSubStr[0].HBillNo = $("#HBillNo").val();
-                                sSubStr[0].HMakerID = $("#HMakerID").val();
-                                sSubStr[0].HMaker = $("#HMaker").val();
-                                option2.data = table.cache["bzd-table2"];
-                                table.render(option2);
-                                layer.close(index);
-                                $('#HBarCode').val("");
-                                layer.close(index);
-                                layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
+                                if (sSubStr[i].HIsStatus == "鏄�") {
+                                    layer.close(index);
+                                    $('#HBarCode').val("");
+                                    layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                } else if (sSubStr[i].HStatus != null && sSubStr[i].HStatus == "" && sSubStr[i].HStatus == "鍦ㄥ簱") {
+                                    layer.close(index);
+                                    layer.msg("璇ュ疄鐗╁湪搴擄紝涓嶅厑璁告壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                } else {
+                                    var data = result.data;
+                                    option2.data = data;
+                                    table.render(option2);
+                                    var sSubStr = table.cache['bzd-table2'];
+                                    sSubStr[0].HSourceID = $("#HSourceID").val();
+                                    sSubStr[0].HSource = $("#HSource").val();
+                                    sSubStr[0].HGroupID = $("#HGroupID").val();
+                                    sSubStr[0].HGroup = $("#HGroup").val();
+                                    sSubStr[0].HInterID = $("#HInterID").val();
+                                    sSubStr[0].HBillNo = $("#HBillNo").val();
+                                    sSubStr[0].HMakerID = $("#HMakerID").val();
+                                    sSubStr[0].HMaker = $("#HMaker").val();
+                                    option2.data = table.cache["bzd-table2"];
+                                    table.render(option2);
+                                    layer.close(index);
+                                    $('#HBarCode').val("");
+                                    layer.close(index);
+                                    layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
+                                }
                             }
                             else {
                                 option2.data = [];

--
Gitblit v1.9.1