From 68fcb32bf7599f5387b77e2168c8fd692c0ecbfd Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 25 四月 2023 13:56:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html |  109 +++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 82 insertions(+), 27 deletions(-)

diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 1c30243..af89da4 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -21,7 +21,7 @@
 <body>
     <div class="layui-fluid" style="padding:0">
         <div class="layui-card" style="padding: 1px">
-            <div class="layui-card-body" style="padding: 5px; height:800px;">
+            <div class="layui-card-body" style="padding: 0px; height:800px;">
                 <form class="layui-form" action="" lay-filter="component-form-group">
                     <div style="background-color:#0085E8;">
                         <span style="color: white;"><i class="layui-icon layui-icon-form"></i>澶栬喘鍏ュ簱鍗�</span>
@@ -41,11 +41,19 @@
                             <div class="layui-col-xs3">
                                 <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
                             </div>
-                            <div class="layui-col-xs5">
+                            <div class="layui-col-xs8">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                             </div>
                             <div class="layui-col-xs2">
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+                            </div>
+                        </div>                       
+                        <div class="layui-row">
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+                            </div>
+                            <div class="layui-col-xs8">
+                                <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                     </div>
@@ -203,14 +211,14 @@
                                 <div class="layui-row">
                                     <div class="layui-col-xs12">
                                         <div class="layui-form-item" style="padding:0px;margin:0px">
-                                            <div class="layui-row">
+                                            <!--<div class="layui-row">
                                                 <div class="layui-col-xs3">
                                                     <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
                                                 </div>
                                                 <div class="layui-col-xs8">
                                                     <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                                                 </div>
-                                            </div>
+                                            </div>-->
                                         </div>
                                         <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                                     </div>
@@ -230,7 +238,7 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
-                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鏁伴噺</label>
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
                                         </div>
                                         <div class="layui-col-xs8">
                                             <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
@@ -488,6 +496,8 @@
             function RoadBillSub(linterid) {
                 table.render({
                     elem: '#wl-table'
+                    , page: true
+                    , limit: 100
                     , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
                     , where: { HBillID: linterid, HBillType: '1201', sWhere: '' }
                     , cols: [[
@@ -548,8 +558,8 @@
             else {
                 //榛樿杩涘叆鍗曟嵁淇℃伅椤电
                 element.tabChange('tab-POStockInBill', '2');
-                //榛樿鍏夋爣鏄剧ず鍦ㄦ潯鐮侀噷闈�
-                var pFocus = $("#HBarCode");
+                //榛樿鍏夋爣鏄剧ず鍦ㄤ粨搴撻噷闈�
+                var pFocus = $("#HWHNAME");
                 pFocus.focus();
                 pFocus.select();
             }
@@ -885,6 +895,41 @@
                     // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
                 }
             });
+
+            //鎵粨搴�
+            $('#HWHNAME').on('keydown', function (event) {
+                var HBarCode = $('#HWHNAME').val()
+                if (event.keyCode == 13) {
+                    if (!HBarCode) {
+                        layer.msg('鏃犱粨搴撴潯鐮佷俊鎭紒');
+                        return;
+                    }
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getWHName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //$("#HStockPlaceName").val(result.data[0].HName);
+                                //$("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HBarCode").focus();
+                                $("#HWHID").val(result.data[0].HItemID);
+                                $("#HWHNAME").val(result.data[0].HName);
+                                element.tabChange('tab-POStockInBill', '2');
+                            }
+                            else {
+                                // $("#verifycode").click();
+                                //layer.msg(result.Message, { icon: 5 });
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+                }
+            });
+
             //鍒锋柊鏄庣粏椤电
             table.render({
                 elem: '#mx-table'
@@ -895,6 +940,7 @@
                     , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
                 ]]
                 , page: true
+                , limit: 100
                 , height: 500
                 , done: function () {
                 }
@@ -991,41 +1037,44 @@
                         success: function (result) {
                             if (result.count == 1) {
                                 playSound1();
-                                if (result.data.HBarType == '浠撳簱鏉$爜') {
-                                    $("#HWHNAME").val(result.data.HWhName);
-                                    $("#HWHID").val(result.data.HWhID);
+                                if (result.data.hBarTypeField == '浠撳簱鏉$爜') {
+                                    $("#HWHNAME").val(result.data.hWhNameField);
+                                    $("#HWHID").val(result.data.hWhIDField);
                                     $("#HStockPlaceName").val("");
                                     $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
                                     element.tabChange('tab-POStockInBill', '2');  //璺宠浆椤电
+                                    return;//缁撴潫
                                 }
-                                else if (result.data.HBarType == '浠撲綅鏉$爜') {
-                                    $("#HStockPlaceName").val(result.data.HSPName);
-                                    $("#HStockPlaceID").val(result.data.HSPID);
-                                    $("#HWHNAME").val(result.data.HWhName);
-                                    $("#HWHID").val(result.data.HWhID);
+                                else if (result.data.hBarTypeField == '浠撲綅鏉$爜') {
+                                    $("#HStockPlaceName").val(result.data.hSPNameField);
+                                    $("#HStockPlaceID").val(result.data.hSPIDField);
+                                    $("#HWHNAME").val(result.data.hWhNameField);
+                                    $("#HWHID").val(result.data.hWhIDField);
                                     $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
                                     element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
+                                    return;//缁撴潫
                                 }
-                                else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
-                                    $("#HDeptName").val(result.data.HDeptName);
-                                    $("#HDeptID").val(result.data.HDeptID);
+                                else if (result.data.hBarTypeField == '閮ㄩ棬鏉$爜') {
+                                    $("#HDeptName").val(result.data.hDeptNameField);
+                                    $("#HDeptID").val(result.data.hDeptIDField);
                                     $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
                                     element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
+                                    return;//缁撴潫
                                 }
-                                else if (result.data.HBarType == '婧愬崟鏉$爜') {
-                                    $("#HSupName").val(result.data.HSupName);
-                                    $("#HSupID").val(result.data.HSupID);
-                                    $("#HDeptName").val(result.data.HDeptName);
-                                    $("#HDeptID").val(result.data.HDeptID);
+                                else if (result.data.hBarTypeField == '婧愬崟鏉$爜') {
+                                    $("#HSupName").val(result.data.hSupName);
+                                    $("#HSupID").val(result.data.hSupID);
+                                    $("#HDeptName").val(result.data.hDeptName);
+                                    $("#HDeptID").val(result.data.hDeptID);
                                     $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                     $("#HBillType").val(result.data.hSourceBillTypeField)
                                     sessionStorage["SourceFlag"] = true;
                                     //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                    if (result.data.HSourceBillType == "1102") {
+                                    if (result.data.hSourceBillTypeField == "1102") {
                                         $("#HBillType").val("1102");
 
                                     }
-                                    else if (result.data.HSourceBillType == "1103") {
+                                    else if (result.data.hSourceBillTypeField == "1103") {
                                         $("#HBillType").val("1103");
                                     }
                                     else {
@@ -1108,6 +1157,9 @@
                                         layer.closeAll("loading");
                                     }
                                 });
+
+                                //娓呯┖鏁伴噺
+                                $("#HQty").val("");
                             }
                             else {
                                 playSound();
@@ -1119,7 +1171,7 @@
             }
             var listOption = {
                 elem: '#wl-table'
-                , toolbar: '#toolbarDemo'
+                //, toolbar: '#toolbarDemo'
                 , totalRow: true
                 , cellMinWidth: 90
                 , cols: [[
@@ -1172,11 +1224,15 @@
                             sessionStorage["SourceFlag"] = true;
                             layer.load(3);
                             element.tabChange('tab-POStockInBill', '2');
+                            var pFocus = $("#HBarCode");
+                            pFocus.focus();
 
                             table.render({
                                 elem: '#wl-table'
                                 , cellMinWidth: 80
                                 , totalRow: true
+                                , page: true
+                                , limit: 100
                                 //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
                                 , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
                                 //, toolbar: '#toolbarDemo'
@@ -1195,7 +1251,6 @@
                                     , { field: 'HPieceQty', title:'鏉$爜浠舵暟', width: 100 }
                                 ]]
                                 // , data: [linterid]
-                                // , page: true
                                 , height: 500
                                 , done: function () {
                                     layer.closeAll("loading");

--
Gitblit v1.9.1