From fb8a9fbc15b917ff3d36eb30e28633a413ff0a42 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 04 八月 2025 10:17:38 +0800
Subject: [PATCH] 页面过滤条件:开始时间和结束时间(根据检验信息中的创建时间进行过滤)、站台(检验信息中的检验工序)、料号(PNL布局信息名称)、批次(lot号) 2.柱状图:x轴lot号,y轴良品率。根据开始时间和结束时间、站台、料号 过滤检验信息并去重(一个PNL里的PCS不能有重复记录),然后根据料号、批次分组合计得到该料号每个批次的不良PCS的数量合计。然后获取该料号每个批次中PNL条码的数量(PNL条码不能重复)并乘PNL布局信息中子表的记录数(该料号中的PCS数量)得到每个批次的PCS总数。对每个批次进行((PCS总数-不良PCS数量)/PCS总数 *100)得到每个批次的良品率。 3.饼状图:根据开始时间和结束时间、站台、料号 过滤检验信息并去重(一个PNL里的PCS不能有重复记录),然后根据检验信息中的不良原因分组统计各个原因的数量。在饼状图显示 4.表格:根据开始时间和结束时间、站台、料号 过滤检验信息,表头包含(站台、料号、PNL条码、PCS号、正反面、不良原因),并针对表头字段进行去重

---
 WebTM/views/WMS扫码模块/客户条码扫描/Gy_getCusBarCodeBill_PDA.html |   90 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 1 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 e5fb718..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"
@@ -92,6 +92,9 @@
                                     <div class="layui-col-xs8 layui-input-inline mobile">
                                         <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
                                     </div>
+                                    <div class="layui-col-xs2">
+                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBillNoChange">淇敼</button>
+                                    </div>
                                 </div>
                                 <div class="layui-row">
                                     <div class="layui-col-xs3">
@@ -154,6 +157,8 @@
             var HMaker = sessionStorage["HUserName"]
             var HStockOrgID = sessionStorage["OrganizationID"]
             var option = [];
+
+            var HLength_BarCode = 0;        //鏉$爜闀垮害楠岃瘉锛屽彇鎵爜鐨勭涓�涓潯鐮佺殑闀垮害浣滀负鏉$爜闀垮害
 
             //鏉$爜缁熶竴鍓嶇紑璁剧疆鏍囪
             var HBarCode_Pre_Flag = 0;      //缁熶竴鍓嶇紑璁剧疆鏍囪[0:鏈缃�,1宸茶缃甝
@@ -253,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;
                 }
 
@@ -348,7 +363,7 @@
                             $("#HQty_Total").val(data1.data.length);
 
                             var data_Temp = [];                     //瀛樻斁瀛愯〃闇�瑕佹樉绀虹殑鏁版嵁
-                            var data_temp_length = 20;              //閫氳繃缂撳瓨鍒楄〃鎴栨柊澧炶繘鍏ラ〉闈㈡椂锛屽瓙琛ㄦ樉绀虹殑鏈�澶ц褰曟暟
+                            var data_temp_length = 10;              //閫氳繃缂撳瓨鍒楄〃鎴栨柊澧炶繘鍏ラ〉闈㈡椂锛屽瓙琛ㄦ樉绀虹殑鏈�澶ц褰曟暟
                             if (data1.data.length < data_temp_length) {
                                 data_temp_length = data1.data.length;
                             }
@@ -365,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);
@@ -400,6 +421,73 @@
             //#endregion
             //#endregion
 
+            //#region 淇敼鍗曟嵁鍙�
+            //#region 淇敼鍗曟嵁鍙�
+            form.on('submit(cmdHBillNoChange)', function (data) {
+                layer.prompt({ formType: 2, title: "璇疯緭鍏ュ崟鎹彿锛�", value: HBillNo },
+                    function (value, index) {
+                        if (option.data!=null&& option.data.length > 0) {
+                            layer.msg("褰撳墠鍗曟嵁宸茬粡瀛樺湪鎵爜璁板綍锛屼笉鍙互淇敼鍗曟嵁鍙�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                            return;
+                        }
+
+                        if (value == "") {
+                            layer.msg("鍗曟嵁鍙蜂笉鍙互涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                            return;
+                        }
+
+                        if (judgeHBillNoIsInTempList(value)) {
+                            HBillNo = value;
+                            $("#HBillNo").val(HBillNo);
+                        }
+                        layer.close(index);
+                    });
+            });
+            //#endregion
+
+            //#region 鍒ゆ柇鍗曟嵁鍙锋槸鍚︿负缂撳瓨鍒楄〃涓殑鍗曟嵁鍙凤紝鏄垯淇敼鎴愬姛骞惰缃粺涓�鍓嶇紑锛屽惁鍒欎慨鏀瑰け璐ャ��
+            function judgeHBillNoIsInTempList(value) {
+                //鍒ゆ柇缁撴灉
+                var judgeFlag = false;
+
+                $.ajax({
+                    type: "GET",
+                    async: false,
+                    url: GetWEBURL() + "/WEBSController/Gy_getCusBarCodeBill_judgeHBillNoIsInTempList",
+                    data: { "HInterID": HInterID, "HBillType": HBillType, "HBillNo": value, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            if (result.data == null) {
+
+                            } else {
+                                var data = result.data;
+                                $("#HBarCode_Pre").val(data[0]["HBarCode_Pre"]);
+
+                                HBarCode_Pre_Flag = 1;
+
+                                //绂佺敤纭鎸夐挳
+                                $('#cmdHBarCode_Pre').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
+                                //绂佺敤 缁熶竴鍓嶇紑 鏂囨湰妗�
+                                $('#HBarCode_Pre').prop('disabled', true);                     //缁熶竴鍓嶇紑 鏂囨湰妗嗕笉鍙紪杈�  
+                            }
+
+                            judgeFlag = true;
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, time: 100000, offset: 't', btn: ['纭'] }, function () { $("#HBarCode").focus(); });
+
+                            judgeFlag = false;
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+
+                return judgeFlag;
+            }
+            //#endregion
+            //#endregion
+
             //#region 鍔熻兘鎺т欢
             //#region 鎻愪氦涓婁紶鍔熻兘鎺т欢
             form.on('submit(cmdLoadData)', function (data) {

--
Gitblit v1.9.1