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扫码模块/上料防错单/Sc_MaterToSourceBill_PDA.html |  260 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 226 insertions(+), 34 deletions(-)

diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
index cf78186..c5f63a6 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
@@ -80,6 +80,37 @@
                                     <div class="layui-form-item" style="padding:0px;margin:0px">
                                         <div class="layui-row">
                                             <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">娴佹按鍙�</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HProcNo" id="HProcNo" lay-verify="HProcNo" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HProcNo-BT" class="layui-btn" id="HProcNo-BT" style="padding:0 10px">纭畾</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">宸ュ簭</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HProcName" id="HProcName" lay-verify="HProcName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HProcID-BT" class="layui-btn" id="HProcID-BT">...</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇璁惧</label>
                                             </div>
                                             <div class="layui-col-xs10">
@@ -159,7 +190,7 @@
                                     <div class="layui-form-item" style="padding:0px;margin:0px">
                                         <div class="layui-row">
                                             <div class="layui-col-xs2">
-                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�<span style=" color :red">*</span></label>
                                             </div>
                                             <div class="layui-col-xs10">
                                                 <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
@@ -169,7 +200,7 @@
                                     <div class="layui-form-item" style="padding:0px;margin:0px">
                                         <div class="layui-row">
                                             <div class="layui-col-xs2">
-                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID<span style=" color :red">*</span></label>
                                             </div>
                                             <div class="layui-col-xs10">
                                                 <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
@@ -277,7 +308,7 @@
                         }
                         else {
                             layer.msg(d.Message, {
-                                icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                             }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
                         }
                     },
@@ -319,7 +350,7 @@
                 $("#HWorkerID").val(sessionStorage["HEmpID"]);
                 $("#HWorkerName").val(sessionStorage["HEmpName"]);
                 $("#HGroupID").val(sessionStorage["HGroupID"]);
-                $("#HGroupName").val(sessionStorage["HGroupName"]);
+                $("#HGroupName").val(sessionStorage["HGroup"]);
                 $("#HMaker").val(sessionStorage["HUserName"]);
                 $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                 $("#HStockOrgID").val(sessionStorage["OrganizationID"]);
@@ -333,7 +364,8 @@
 
                 var data = [];
                 listOption.cols = [[
-                    { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 100 }
+                    { field: '鍘熸潗鏂欐壒娆″彿', title: '鍘熸潗鏂欐壒娆″彿', width: 100 }
+                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 100 }
                     , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
                     , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
                     , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
@@ -406,7 +438,7 @@
                             HBillNo = $('#HBillNo').val()
                         }
                         else {
-                            layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -437,6 +469,8 @@
                                 $("#HMainSourceBillType").append(optionHtml);
                                 layui.form.render('select');
                                 $("#HMainSourceBillType").attr("disabled", "disabled");
+                                $("#HProcName").attr("disabled", "disabled");
+                                $('#HProcID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                             }
                             else {
                                 $("#HMainSourceBillType").empty();
@@ -452,13 +486,18 @@
                             $("#HICMOInterID").val(d.data[0].HICMOInterID);
                             $("#HICMOEntryID").val(d.data[0].HICMOEntryID);
                             $("#HICMOBillNo").val(d.data[0].HICMOBillNo);
+                            $("#HProcID").val(d.data[0].HProcID);
+                            $("#HProcName").val(d.data[0].HProcName);
                             $("#HSourceBillNo").val(d.data[0].HMainSourceBillNo);
                             $("#HSourceBillNo").attr("disabled", "disabled");
                             $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            $("#HProcNo").val(d.data[0].HProcNo);
+                            $("#HProcNo").attr("disabled", "disabled");
+                            $('#HProcNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                             $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                         }
                         else {
-                            layer.msg(d.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(d.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -468,6 +507,76 @@
             //#endregion
 
             //#region 鍩虹璧勬枡閫夋嫨
+
+            //#region 宸ュ簭
+            //鎵弿宸ュ簭鏉$爜
+            $('#HProcName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HProcName = $('#HProcName').val()
+                    if (HProcName == '') {
+                        playSound();
+                        $("#HProcID").val("0");
+                        $("#HProcName").val("");
+                        layer.msg("宸ュ簭鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HProcName").select();
+                            $("#HProcName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetProcess_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HProcName, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HProcID").val(result.data[0].HInterID);
+                                $("#HProcName").val(result.data[0].HName);
+                                element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HProcID").val("0");
+                                $("#HProcName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HProcName").select();
+                                    $("#HProcName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //宸ュ簭鎸夐挳
+            form.on('submit(HProcID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '宸ュ簭鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcessList.html?HStockOrgID=' + HStockOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
 
             //#region 鐢熶骇璁惧
             //鎵弿鐢熶骇璁惧鏉$爜
@@ -479,7 +588,7 @@
                         $("#HEquipID").val("0");
                         $("#HEquipName").val("");
                         layer.msg("鐢熶骇璁惧鏉$爜涓虹┖锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HEquipName").select();
                             $("#HEquipName").focus();
@@ -509,7 +618,7 @@
                                 $("#HEquipName").val("");
                                 $("#HSourceID").val("0");
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HEquipName").select();
                                     $("#HEquipName").focus();
@@ -551,7 +660,7 @@
                         $("#HWorkerID").val("0");
                         $("#HWorkerName").val("");
                         layer.msg("鎿嶄綔宸ユ潯鐮佷负绌猴紒", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HWorkerName").select();
                             $("#HWorkerName").focus();
@@ -579,7 +688,7 @@
                                 $("#HWorkerID").val("0");
                                 $("#HWorkerName").val("");
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HWorkerName").select();
                                     $("#HWorkerName").focus();
@@ -621,7 +730,7 @@
                         $("#HGroupID").val("0");
                         $("#HGroupName").val("");
                         layer.msg("鐝粍鏉$爜涓虹┖锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HGroupName").select();
                             $("#HGroupName").focus();
@@ -649,7 +758,7 @@
                                 $("#HGroupID").val("0");
                                 $("#HGroupName").val("");
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HGroupName").select();
                                     $("#HGroupName").focus();
@@ -703,6 +812,10 @@
                     $("#HGroupID").val("0");
                     data.field.HGroupID = $('#HGroupID').val()
                 }
+                if ($("#HProcName").val() == '') {
+                    $("#HProcID").val("0");
+                    data.field.HProcID = $('#HProcID').val()
+                }
 
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = table.cache['wl-table'];
@@ -734,12 +847,12 @@
                                         });//鏂板
                                 }
                                 else {
-                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                 }
                             },
                             complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
                             error: function (err) {
-                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
                         });
                     layer.closeAll("loading");
@@ -775,12 +888,12 @@
                                     }
                                     else {
                                         playSound();
-                                        layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                        layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                     }
                                 },
                                 complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
                                 error: function (err) {
-                                    layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                 }
                             });
                         layer.closeAll("loading");
@@ -852,16 +965,26 @@
                             $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                             $("#HMainSourceBillType").attr("disabled", "disabled");
                             form.render('select');
-                            element.tabChange('tab-Sc_MaterToSourceBill_PDA', '2');
-                            $("#HBarCode").select();
-                            $("#HBarCode").focus();
-                            //鏄剧ず琛ㄤ綋鏄庣粏
-                            DisBillEntryList();
+                            //婧愬崟锛氬伐搴忔祦杞崱
+                            if (HSourceBillType == "3772") {
+                                element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
+                                $("#HProcNo").select();
+                                $("#HProcNo").focus();
+                            }
+                            else {
+                                element.tabChange('tab-Sc_MaterToSourceBill_PDA', '2');
+                                $("#HProcNo").attr("disabled", "disabled");
+                                $('#HProcNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                DisBillEntryList();
+                            }
                         }
                         else {
                             playSound();
                             layer.msg(result.Message, {
-                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                             }, function () {
                                 element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
                                 $("#HSourceBillNo").select();
@@ -876,6 +999,66 @@
 
             //#endregion
 
+            //#region 娴佹按鍙峰洖杞�
+
+            //娴佹按鍙峰洖杞�
+            $('#HProcNo').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByProcNo();
+                }
+            });
+
+            //娴佹按鍙锋寜閽�
+            form.on('submit(HProcNo-BT)', function (data) {
+                GetMeesageByProcNo();
+            });
+
+            //娴佹按鍙峰洖杞﹁繑鍥炰俊鎭�
+            function GetMeesageByProcNo(obj) {
+                var HProcExchBillNo = $("#HProcExchBillNo").val()
+                var HProcNo = $("#HProcNo").val()
+                if ($("#HProcNo").val() == '') {
+                    HProcNo = 0
+                }
+                layer.load(3)
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/get_ProcNo_MaterToSource_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HProcExchBillNo": HProcExchBillNo, "HProcNo": HProcNo, "HMaker": HMaker },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            playSound_OK();
+                            $("#HProcExchEntryID").val(result.data[0].HProcExchEntryID);
+                            $("#HProcID").val(result.data[0].HProcID);
+                            $("#HProcName").val(result.data[0].HProcName);
+                            $("#HProcName").attr("disabled", "disabled");
+                            $('#HProcID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            $("#HProcNo").attr("disabled", "disabled");
+                            $('#HProcNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            element.tabChange('tab-Sc_MaterToSourceBill_PDA', '2');
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                            //鏄剧ず琛ㄤ綋鏄庣粏
+                            DisBillEntryList();
+                        }
+                        else {
+                            playSound();
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
+                                $("#HProcNo").select();
+                                $("#HProcNo").focus();
+                            });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+                layer.closeAll("loading");
+            }
+
+            //#endregion
 
             //#region 鎵弿鐗╂枡鏉$爜
 
@@ -905,7 +1088,7 @@
                     if (sBarCode == "") {
                         playSound();
                         layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HBarCode").select();
                             $("#HBarCode").focus();
@@ -932,7 +1115,7 @@
                                 else {
                                     playSound();
                                     layer.msg(data.Message, {
-                                        icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                        icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                     }, function () {
                                         $("#HBarCode").select();
                                         $("#HBarCode").focus();
@@ -943,7 +1126,7 @@
                             error: function (err) {
                                 playSound();
                                 layer.msg('閿欒' + err, {
-                                    icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HBarCode").select();
                                     $("#HBarCode").focus();
@@ -957,7 +1140,7 @@
                     if (sBarCode == '') {
                         playSound();
                         layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HBarCode").select();
                             $("#HBarCode").focus();
@@ -983,7 +1166,7 @@
                             else {
                                 playSound();
                                 layer.msg(result.Message, {
-                                    icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HBarCode").select();
                                     $("#HBarCode").focus();
@@ -994,7 +1177,7 @@
                         error: function (err) {
                             playSound();
                             layer.msg("閿欒锛�" + err, {
-                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                             }, function () {
                                 $("#HBarCode").select();
                                 $("#HBarCode").focus();
@@ -1062,10 +1245,12 @@
                         }
                         else {
                             listOption.cols = [[
-                                { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 100 }
+                                { field: '鍘熸潗鏂欐壒娆″彿', title: '鍘熸潗鏂欐壒娆″彿', width: 100 }
+                                ,{ field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 100 }
                                 , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
                                 , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
                                 , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                , { field: '鏉$爜鏁伴噺', title: '鏉$爜鏁伴噺', width: 100 }
                                 , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 100 }
                             ]];
                             listOption.data = data;
@@ -1084,6 +1269,13 @@
         //浠ヤ笂涓簂ayui妯″潡
         //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
 
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖宸ュ簭淇℃伅
+        function GetHProcValue(obj) {
+            if (obj.length > 0) {
+                $("#HProcName").val(obj[0].HName);
+                $("#HProcID").val(obj[0].HInterID);
+            }
+        }
         //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖鐢熶骇璁惧淇℃伅
         function GetHEquipNameValue(obj) {
             if (obj.length > 0) {
@@ -1110,15 +1302,15 @@
         //鍗曟嵁涓婁紶鍓嶅垽鏂�
         function AllowLoadData(sSubStr) {
             if (HInterID == 0) {
-                layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
             if (HBillNo == '') {
-                layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
             if (sSubStr.length == 0) {
-                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
             //鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -1130,7 +1322,7 @@
                     }
                 }
                 if (s == 0) {
-                    layer.msg("娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
             }

--
Gitblit v1.9.1