From a03addb5fbf4da382275f3c9dff8dbc916c4e021 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 九月 2025 09:52:01 +0800
Subject: [PATCH] 其他出库、其他入库:子表件数可以输入为0 乔一客户物料即时库存报表:把米数和件数的合计加上去 (按生产订单)客户订单:过滤条件改为模糊查询

---
 WebTM/views/WMS扫码模块/客户条码扫描/Gy_getCusBarCodeBill_PDA.html |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\256\242\346\210\267\346\235\241\347\240\201\346\211\253\346\217\217/Gy_getCusBarCodeBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\256\242\346\210\267\346\235\241\347\240\201\346\211\253\346\217\217/Gy_getCusBarCodeBill_PDA.html"
index fe0667b..b660c1d 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\256\242\346\210\267\346\235\241\347\240\201\346\211\253\346\217\217/Gy_getCusBarCodeBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\256\242\346\210\267\346\235\241\347\240\201\346\211\253\346\217\217/Gy_getCusBarCodeBill_PDA.html"
@@ -158,6 +158,8 @@
             var HStockOrgID = sessionStorage["OrganizationID"]
             var option = [];
 
+            var HLength_BarCode = 0;        //鏉$爜闀垮害楠岃瘉锛屽彇鎵爜鐨勭涓�涓潯鐮佺殑闀垮害浣滀负鏉$爜闀垮害
+
             //鏉$爜缁熶竴鍓嶇紑璁剧疆鏍囪
             var HBarCode_Pre_Flag = 0;      //缁熶竴鍓嶇紑璁剧疆鏍囪[0:鏈缃�,1宸茶缃甝
 
@@ -256,15 +258,25 @@
                     layer.msg("鏉$爜涓嶈兘涓虹┖锛岃鎵弿鏉$爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
+
+                if (HLength_BarCode != 0 && HLength_BarCode != sBarCode.length) {
+                    playSound();
+                    layer.msg("鏉$爜闀垮害涓嶄竴鑷达紝璇烽噸鏂版壂鎻忔潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    $('#HBarCode').val("");
+                    return false;
+                }
+
                 if (HBarCode_Pre == "" || HBarCode_Pre_Flag != 1) {
                     playSound();
                     layer.msg("缁熶竴鍓嶇紑涓嶈兘涓虹┖锛岃璁剧疆缁熶竴鍓嶇紑骞剁‘璁わ紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    $('#HBarCode').val("");
                     return false;
                 }
 
                 if (sBarCode.indexOf(HBarCode_Pre) != 0) {
                     playSound();
                     layer.msg("鏉$爜鍓嶇紑涓嶄负缁熶竴鍓嶇紑锛岃妫�鏌ユ潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    $('#HBarCode').val("");
                     return false;
                 }
 
@@ -368,6 +380,12 @@
                             option.data = data_Temp;
                             table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
                             ins = table.render(option);
+
+                            //鑾峰彇褰撳墠鍗曟嵁绗竴涓壂鐮佹垚鍔熺殑鏉$爜鐨勯暱搴�
+                            if (data1.data.length > 0) {
+                                HLength_BarCode = data1.data[0]["HBarCode"].length;
+                            }
+
                             layer.close(ajaxLoad);
                         } else {
                             layer.close(ajaxLoad);
@@ -439,15 +457,19 @@
                     data: { "HInterID": HInterID, "HBillType": HBillType, "HBillNo": value, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
                     success: function (result) {
                         if (result.count == 1) {
-                            var data = result.data;
-                            $("#HBarCode_Pre").val(data[0]["HBarCode_Pre"]);
+                            if (result.data == null) {
 
-                            HBarCode_Pre_Flag = 1;
+                            } else {
+                                var data = result.data;
+                                $("#HBarCode_Pre").val(data[0]["HBarCode_Pre"]);
 
-                            //绂佺敤纭鎸夐挳
-                            $('#cmdHBarCode_Pre').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
-                            //绂佺敤 缁熶竴鍓嶇紑 鏂囨湰妗�
-                            $('#HBarCode_Pre').prop('disabled', true);                     //缁熶竴鍓嶇紑 鏂囨湰妗嗕笉鍙紪杈�
+                                HBarCode_Pre_Flag = 1;
+
+                                //绂佺敤纭鎸夐挳
+                                $('#cmdHBarCode_Pre').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
+                                //绂佺敤 缁熶竴鍓嶇紑 鏂囨湰妗�
+                                $('#HBarCode_Pre').prop('disabled', true);                     //缁熶竴鍓嶇紑 鏂囨湰妗嗕笉鍙紪杈�  
+                            }
 
                             judgeFlag = true;
                         }

--
Gitblit v1.9.1