From 6dc0ba931520275a17bccd10139e83c81805f46e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 06 七月 2023 14:22:56 +0800
Subject: [PATCH] 采购入库扫码模块整理、优化

---
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html     | 1748 +++++++++++++++++++++++++++++++------------------
 WebTM/views/领料发货/销售出库/Kf_SellOutBill_FastList.html   |    2 
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_FastList.html |  264 ++++---
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html     |   29 
 WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html       |    5 
 WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html       |    2 
 6 files changed, 1,269 insertions(+), 781 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/Kf_MoveStockBill_Fast.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/Kf_MoveStockBill_Fast.html"
index a64a4fa..5258173 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/Kf_MoveStockBill_Fast.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/Kf_MoveStockBill_Fast.html"
@@ -29,7 +29,7 @@
                                 <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
                             </div>
                             <div class="layui-col-xs8">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;" autocomplete="off" class="layui-input" onfocus="this.select();">
                             </div>
                             <div class="layui-col-xs2">
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
@@ -1898,6 +1898,33 @@
                 }
             });
 
+            //鎵弿鍏堣繘鍏堝嚭浠撳簱
+            $('#HFIFOWHNAME').on('keydown', function (event) {
+                var HBarCode = $('#HFIFOWHNAME').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/LookingFor/getWHName_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HFIFOWHID").val(result.data[0].HItemID);
+                                $("#HFIFOWHNAME").val(result.data[0].HName);
+                                element.tabChange('tab-MateOutBill', '1');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
             //#region 鍒犻櫎鍔熻兘鎺т欢
             form.on('submit(cmdDelete)', function () {//鍒犻櫎
                 var checkStatus = table.checkStatus('wl-table')
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index b598f1d..0a94dba 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -30,7 +30,7 @@
                                 <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
                             </div>
                             <div class="layui-col-xs8">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;" autocomplete="off" class="layui-input" onfocus="this.select();">
                             </div>
                             <div class="layui-col-xs2">
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
@@ -1071,7 +1071,8 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HFIFOWHID&HOrgID=' + sessionStorage["OrganizationID"] + '', 'yes']
+                    //, content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
                     , resize: false
                     , cancel: function () {
                         //$(".layui-btn").removeClass("layui-btn-disabled");
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
index 1b7abee..9b5831c 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
@@ -34,7 +34,7 @@
                             </div>
                             </div>
                     </div>-->
-                    <div class="layui-tab" lay-filter="tab-POStockInBillList">
+                    <div class="layui-tab" lay-filter="tab-SellOutBillList">
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1">缂撳瓨鍒楄〃</li>
                             <li lay-id="2">宸蹭笂浼犲垪琛�</li>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 501bb2d..dbb442f 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -29,7 +29,7 @@
                                 <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
                             </div>
                             <div class="layui-col-xs8">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;" autocomplete="off" class="layui-input" onfocus="this.select();">
                             </div>
                             <div class="layui-col-xs2">
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
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 309cbad..9703bb5 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"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>澶栬喘鍏ュ簱</title>
+    <title>閲囪喘鍏ュ簱</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -24,7 +24,7 @@
             <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>
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>閲囪喘鍏ュ簱鍗�</span>
                     </div>
                     <div class="layui-form-item" style="padding:15px;margin:0px">
                         <div class="layui-row" style="display:none;">
@@ -42,7 +42,7 @@
                                 <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
                             </div>
                             <div class="layui-col-xs8">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;" autocomplete="off" class="layui-input" onfocus="this.select();">
                             </div>
                             <div class="layui-col-xs2">
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
@@ -53,20 +53,20 @@
                                 <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">
+                                <input type="text" name="HQty" id="HQty" lay-verify="HQty" 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>
                     </div>
                     <div class="layui-tab layui-col-xs12" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1" style="padding:1px;">婧愬崟淇℃伅</li>
-                            <li lay-id="2" style="padding:1px;"  class="layui-this">鍗曟嵁淇℃伅</li>
-                            <li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
-                            <li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>
+                            <li lay-id="1" style="padding:1px;">閫夋嫨婧愬崟</li>
+                            <li lay-id="2" style="padding:1px;" class="layui-this">琛ㄥご淇℃伅</li>
+                            <li lay-id="3" style="padding:1px;">鏄庣粏淇℃伅</li>
+                            <li lay-id="4" style="padding:1px;">鏉$爜淇℃伅</li>
                             <li lay-id="5" style="padding:1px;">鍚堣淇℃伅</li>
                         </ul>
                         <div class="layui-tab-content">
-                            <!--婧愬崟淇℃伅-->
+                            <!--閫夋嫨婧愬崟-->
                             <div class="layui-tab-item">
                                 <div class="layui-form-item">
                                     <div class="layui-row">
@@ -85,15 +85,25 @@
                                             <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
                                         </div>
                                         <div class="layui-col-xs8">
-                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                         </div>
                                         <div class="layui-col-xs2">
                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
                                         </div>
                                     </div>
+                                    <div class="layui-form-item">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+                                            </div>
+                                            <div class="layui-col-xs8">
+                                                <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                            <!--鍗曟嵁淇℃伅-->
+                            <!--琛ㄥご淇℃伅-->
                             <div class="layui-tab-item" layui-show>
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
@@ -101,7 +111,7 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                             <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs2">
@@ -115,11 +125,11 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                             <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
-                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" >...</button>
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
                                         </div>
                                     </div>
                                 </div>
@@ -129,7 +139,7 @@
                                             <label class="layui-form-label" style="width:45px;padding-left:0px;">渚涘簲鍟�</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input" disabled="disabled" onfocus="this.select();">
+                                            <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" disabled="disabled" onfocus="this.select();">
                                             <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
@@ -143,7 +153,7 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">淇濈</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                            <input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                             <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
@@ -157,7 +167,7 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">楠屾敹</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                            <input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                             <input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
@@ -184,7 +194,7 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">閮ㄩ棬</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                            <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                             <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
@@ -206,25 +216,17 @@
                                     </div>
                                 </div>
                             </div>
-                            <!--鐗╂枡娓呭崟-->
+                            <!--鏄庣粏淇℃伅-->
                             <div class="layui-tab-item">
                                 <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-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>
                                         <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                                     </div>
                                 </div>
                             </div>
-                            <!--鏄庣粏娓呭崟-->
+                            <!--鏉$爜淇℃伅-->
                             <div class="layui-tab-item">
                                 <!-- <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>-->
                                 <div class="layui-form-item" style="padding: 0px; margin: 0px">
@@ -391,17 +393,24 @@
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
+                , laydate = layui.laydate
                 , element = layui.element;
-            //娓呯┖鐣岄潰  new
-
+            var HInterID = $('#HInterID').val()
+            var HBillNo = $('#HBillNo').val()
+            var HBillType = '1201'
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]
+            var HSourceFlag = sessionStorage["SourceFlag"];
+            var OperationType = 0;//鎿嶄綔绫诲瀷
+            var option = [];
+            //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+            $("#HBarCode").focus();
 
             //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
             $("#HWHID").val(sessionStorage["HWHID"]);
             $("#HWHNAME").val(sessionStorage["HWHName"]);
             $("#HStockPlaceID").val(sessionStorage["HSPID"]);
             $("#HStockPlaceName").val(sessionStorage["HSPName"]);
-            //$("#HSupID").val(sessionStorage["HSupID"]);
-            //$("#HSupName").val(sessionStorage["HSupName"]);
             $("#HDeptID").val(sessionStorage["HDeptID"]);
             $("#HDeptName").val(sessionStorage["HDept"]);
             $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
@@ -413,11 +422,79 @@
             $("#HMakerID").hide();
             $("#HBillerID").val(sessionStorage["HBillerID"]);
             $("#HBillerID").hide();
+            $("#HDate").val(formatDate(sessionStorage["HDate"]));
             $("#HSTOCKORGID").val(sessionStorage["OrganizationID"]);
             $("#HSTOCKORGID").hide();
-            var HSourceFlag = sessionStorage["SourceFlag"];
-            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
 
+            // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝f柟寮�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+                });
+            }
+
+            //鏄庣粏淇℃伅
+            var listOption = {
+                elem: '#wl-table'
+                //, toolbar: '#toolbarDemo'
+                , totalRow: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HSNO', title: '搴忓彿', width: 60 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80, totalRow: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                    //, { field: 'HBatchNo', title: '鎵规', width: 150 }
+                    , { field: 'HPieceQty', title: '鏉$爜鏁伴噺', width: 150 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            }
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            //澶辫触鎻愮ず闊�
+            function playSound() {
+                console.log("playSound");
+                var audio = document.getElementById("cs");
+                audio.play();
+            }
+            //鎴愬姛鎻愮ず闊�
+            function playSound_OK() {
+                console.log("playSound_OK");
+                var audio = document.getElementById("cs2");
+                audio.play();
+            }
 
             //鑾峰彇鍙傛暟
             function getUrlVars() {
@@ -430,9 +507,111 @@
                 }
                 return vars;
             }
+            //var params = getUrlVars();
+            //var HInterID_Temp = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            //var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
             var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var OperationType = params[params[0]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷  1鏂板  2浠庣紦瀛樺垪琛ㄤ腑杩斿洖
+            var HInterID_Temp = params[params[1]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
+
+            //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
+            if (HInterID != 0) {
+                HSourceFlag = true;
+            }
+            //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+            else if (OperationType == 2) {
+                RoadBillMain(HInterID_Temp);
+                $("#HBarCode").select();
+                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                //$('#QueDin2').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                //document.getElementById("QueDin2").disabled = true;   //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
+                //鏄剧ず琛ㄤ綋鏄庣粏
+                DisBillEntryList();
+                HSourceFlag = true;
+                element.tabChange('tab-POStockInBill', '2');
+            }
+            else {
+                OperationType = 1;
+                //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBillType": HBillType },
+                    success: function (d) {
+                        if (d.count == 1) {
+                            $("#HInterID").val(d.data[0].HInterID);
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                            $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
+                            HInterID = $('#HInterID').val()
+                            HBillNo = $('#HBillNo').val()
+                        }
+                        else {
+                            layer.msg(d.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }
+                });
+                HSourceFlag = false;
+            }
+
+            function RoadBillMain(HInterID_Temp)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/WEBSController/GetSourceBill_Temp_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HInterID_Temp, "HBillType": HBillType },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HBillType").val(d.data[0].HSourceBillType == null ? "1103" : d.data[0].HSourceBillType);
+                        //鑾峰彇婧愬崟绫诲瀷
+                        if (d.data[0].HSourceBillType == "1103") {
+                            $("#HBillType").empty();
+                            $("#HBillType").val("1103");
+                            var optionHtml = '';
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鏀舵枡閫氱煡鍗�' + "</option>";
+                            $("#HBillType").append(optionHtml);
+                            layui.form.render('select');
+                            $("#HBillType").attr("readonly", "readonly");
+                        }
+                        else if (d.data[0].HSourceBillType == "1102") {
+                            $("#HBillType").empty();
+                            $("#HBillType").val("1102");
+                            var optionHtml = '';
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '閲囪喘璁㈠崟' + "</option>";
+                            $("#HBillType").append(optionHtml);
+                            layui.form.render('select');
+                            $("#HBillType").attr("readonly", "readonly");
+                        }
+                        else {
+                            $("#HBillType").empty();
+                            $("#HBillType").val("-1");
+                            var optionHtml = '';
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+                            $("#HBillType").append(optionHtml);
+                            layui.form.render('select');
+                            $("#HBillType").attr("readonly", "readonly");
+                        }
+
+                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+                        if (d.data[0].HMulSourceBill == 0) {
+                            $("#HSourceBillNo").attr("readonly", "readonly");
+                        }
+                        if (d.data[0].HDeptID != 0) {
+                            $("#HDeptID").val(d.data[0].HDeptID);
+                            $("#HDeptName").val(d.data[0].HDeptName);
+                        }
+                        $("#HSupID").val(d.data[0].HCusID);
+                        $("#HSupName").val(d.data[0].HSupName);
+                        $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
+                    }
+                })
+            }
+
+
+
+
 
             //clickSelect();
 
@@ -449,115 +628,115 @@
                 }
             }
 
-            //鍔犺浇琛ㄥご
-            function RoadBillMain(linterid) {
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetPonderationBill",
-                    type: "GET",
-                    data: { "HInterID": linterid },
-                    success: function (d) {
-                        // console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HBillType").val(d.data[0].HSourceBillType);
-                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
-                        //$("#HWHID").val(d.data[0].HWhID);
-                        //$("#HKeeperID").val(d.data[0].HKeeperID);
-                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
-                        //$("#HDeptID").val(d.data[0].HDeptID);
-                        //$("#HBarCode").val(d.data[0].HBarCode);
-                        //$("#HQty").val(d.data[0].HQty);
-                        HSourceFlag = true;
-                        RoadSup();
-                    }
-                })
-            }
-            //鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇渚涘簲鍟�
-            function RoadSup() {
-                //var sInterID = $("#HInterID").val()
-                var HSourceBillNo = $('#HSourceBillNo').val()
-                var sInterID = $("#HInterID").val()
-                var sBillNo = $("#HBillNo").val()
-                var HSourceBillType = $("#HBillType").val()
-                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                if (HSourceBillNo == "" || sInterID <= 0) {
-                    layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                else {
-                    $.ajax({
-                        url: GetWEBURL() + "/POStockInBill/get_GetCg_POOrderBillList",
-                        type: "GET",
-                        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
-                        success: function (result) {
-                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                $("#HSupID").val(result.data[0].HSupID);
-                                $("#HSupName").val(result.data[0].HSupName);
-                                $("#HDeptID").val(result.data[0].HDeptID);
-                                $("#HDeptName").val(result.data[0].HDeptName);
-                                sessionStorage["SourceFlag"] = true;
-                                element.tabChange('tab-POStockInBill', '2');
-                                layer.load(3);
-                            }
-                            else {
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                            layer.closeAll("loading");
-                        }
-                    });
-                }
-            }
-            //鍔犺浇琛ㄤ綋
-            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: [[
-                        { type: 'radio' }
-                        , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100 }
-                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100 }
-                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', sort: true, width: 200 }
-                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
-                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
-                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
-                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
-                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
-                        , { field: 'HBatchNo', title: '鎵规', sort: true, width: 200 }
-                    ]]
-                    , height: 500
-                    , done: function () {
-                        layer.closeAll("loading");
-                    }
-                });
-            }
+            ////鍔犺浇琛ㄥご
+            //function RoadBillMain(HInterID_Temp) {
+            //    $.ajax({
+            //        url: GetWEBURL() + "/Web/GetPonderationBill",
+            //        type: "GET",
+            //        data: { "HInterID": HInterID_Temp },
+            //        success: function (d) {
+            //            // console.log(d.data);
+            //            $("#HInterID").val(d.data[0].HInterID);
+            //            $("#HBillNo").val(d.data[0].HBillNo);
+            //            $("#HBillType").val(d.data[0].HSourceBillType);
+            //            $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+            //            //$("#HWHID").val(d.data[0].HWhID);
+            //            //$("#HKeeperID").val(d.data[0].HKeeperID);
+            //            //$("#HSecManagerID").val(d.data[0].HSecManagerID);
+            //            //$("#HDeptID").val(d.data[0].HDeptID);
+            //            //$("#HBarCode").val(d.data[0].HBarCode);
+            //            //$("#HQty").val(d.data[0].HQty);
+            //            HSourceFlag = true;
+            //            RoadSup();
+            //        }
+            //    })
+            //}
+            ////鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇渚涘簲鍟�
+            //function RoadSup() {
+            //    //var sInterID = $("#HInterID").val()
+            //    var HSourceBillNo = $('#HSourceBillNo').val()
+            //    var sInterID = $("#HInterID").val()
+            //    var sBillNo = $("#HBillNo").val()
+            //    var HSourceBillType = $("#HBillType").val()
+            //    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+            //    if (HSourceBillNo == "" || sInterID <= 0) {
+            //        layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //        return;
+            //    }
+            //    else {
+            //        $.ajax({
+            //            url: GetWEBURL() + "/POStockInBill/get_GetCg_POOrderBillList",
+            //            type: "GET",
+            //            data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+            //            success: function (result) {
+            //                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+            //                    $("#HSupID").val(result.data[0].HSupID);
+            //                    $("#HSupName").val(result.data[0].HSupName);
+            //                    $("#HDeptID").val(result.data[0].HDeptID);
+            //                    $("#HDeptName").val(result.data[0].HDeptName);
+            //                    sessionStorage["SourceFlag"] = true;
+            //                    element.tabChange('tab-POStockInBill', '2');
+            //                    layer.load(3);
+            //                }
+            //                else {
+            //                    layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //                }
+            //                layer.closeAll("loading");
+            //            }
+            //        });
+            //    }
+            //}
+            ////鍔犺浇琛ㄤ綋
+            //function RoadBillSub(HInterID_Temp) {
+            //    table.render({
+            //        elem: '#wl-table'
+            //        , page: true
+            //        , limit: 100
+            //        , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+            //        , where: { HBillID: HInterID_Temp, HBillType: '1201', sWhere: '' }
+            //        , cols: [[
+            //            { type: 'radio' }
+            //            , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100 }
+            //            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100 }
+            //            , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', sort: true, width: 200 }
+            //            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
+            //            , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
+            //            , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+            //            , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+            //            , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
+            //            , { field: 'HBatchNo', title: '鎵规', sort: true, width: 200 }
+            //        ]]
+            //        , height: 500
+            //        , done: function () {
+            //            layer.closeAll("loading");
+            //        }
+            //    });
+            //}
 
             //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
 
-            //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
-                    //url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    type: "GET",
-                    data: { "HBillType": '1201' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                    }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(linterid);
-                RoadBillSub(linterid);
-                RoadSup();
-            }
+            ////鍒ゆ柇鏄惁鏂板
+            //if (HInterID_Temp == null || HInterID_Temp == 0) {
+            //    //鑾峰彇鏈�澶у崟鎹彿 new
+            //    $("#HInterID").val("");
+            //    $("#HBillNo").val("");
+            //    $.ajax({
+            //        url: GetWEBURL() + "/Web/GetMAXNumPDA",
+            //        //url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+            //        type: "GET",
+            //        data: { "HBillType": '1201' },
+            //        success: function (d) {
+            //            //console.log(d.data);
+            //            $("#HInterID").val(d.data[0].HInterID);
+            //            $("#HBillNo").val(d.data[0].HBillNo);
+            //        }
+            //    });
+            //}
+            //else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            //    RoadBillMain(HInterID_Temp);
+            //    RoadBillSub(HInterID_Temp);
+            //    RoadSup();
+            //}
             //濡傛灉淇敼鍒欒蛋涓嬮潰 new
 
 
@@ -579,379 +758,28 @@
                 pFocus.select();
             }
             //
-            ////閫夋嫨璋冨叆浠撳簱
-            form.on('submit(HWHID-BT)', function () {
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '浠撳簱鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-            //閫夋嫨璋冨叆浠撲綅
-            form.on('submit(HSpID-BT)', function () {
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '浠撲綅鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
 
 
          
 
 
 
-            //閫夋嫨渚涘簲鍟�
-            form.on('submit(HSupID-BT)', function () {
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '渚涘簲鍟嗗垪琛�'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-            //閫夋嫨淇濈
-            form.on('submit(HKeeperID-BT)', function () {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鑱屽憳鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/UserInformation.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HKeeper").val(checkStatus.data[0].HName);
-                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            });
-            //閫夋嫨鍙戣揣
-            form.on('submit(HSecManagerID-BT)', function (data) {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鑱屽憳鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/UserInformation.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HSecManager").val(checkStatus.data[0].HName);
-                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            });
-            //閫夋嫨閮ㄩ棬
-            form.on('submit(HDeptID-BT)', function () {
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '閮ㄩ棬鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
 
-            //閫�鍑�
-            form.on('submit(Cancel)', function () {
-
-
-
-                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../../views/index_Mobile.html";
-                });
-            })
-            //缂栬緫
-            form.on('submit(cmdModify)', function () {
-                var sSubStr = table.cache['wl-table'];
-                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '鏄庣粏鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-                // }
-            });
-            //鍒犻櫎
-            form.on('submit(cmdDelete)', function () {
-                var checkStatus = table.checkStatus('wl-table')
-                    , data = checkStatus.data;
-                // console.log(data);
-                var sInterID = $('#HInterID').val()
-                var sMaterID = data[0].HMaterID
-                var sBillType = '1201'
-                var sAuxPropID = data[0].HAuxPropID
-                //var sMTONo = data[0].HMTONo
-                var sMTONo = ''
-                var sSourceInterID = data[0].HSourceInterID
-                var sSourceEntryID = data[0].HSourceEntryID
-                var sMouldManagerCtl = 'N'
-                var sFIFOCtl = 'N'
-                $.ajax(
-                    {
-                        type: "Get",
-                        //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        url: GetWEBURL() + "/ProductIn/Delete_Json_AN",
-                        async: true,
-                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) {
-                                $.ajax({
-                                    url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
-                                    type: "GET",
-                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
-                                    success: function (result) {
-                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                            listOption.data = result.data.list;
-                                            table.render(listOption);
-                                            var count = 0;
-                                            var count1 = 0;
-                                            for (var i = 0; i < result.data.list.length; i++) {
-                                                count += result.data.list[i].HQty;
-                                                count1 += result.data.list[i].HPieceQty;
-                                            }
-                                            $("#HSumQtys").val(count);
-                                            $("#HBarCodeQtys").val(count1);
-                                            //return;
-                                        }
-                                        else {
-                                            layer.msg(result.Message);
-                                        }
-                                        layer.closeAll("loading");
-                                    }
-                                });
-                            }
-                            else {
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
-            });
-
-            //鎻愪氦
-            form.on('submit(Saver)', function (data) {//鎻愪氦
-                if ($("#HExplanation").val() == "") {
-                    if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
-                        $("#HWHNAME").val("");
-                        $("#HWHID").val("");
-                        layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return;
-                    }
-                }
-                var sMainStr = JSON.stringify(data.field);
-                var sSubStr = table.cache['wl-table'];
-                var sSourceType = $("#HBillType").val();
-                if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
-                {
-                    layer.load(3);
-                    $.ajax(
-                        {
-                            type: "POST",
-                            //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePOStockInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            url: GetWEBURL() + "/POStockInBill/set_SavePOStockInBill_Json",
-                            async: true,
-                            data: { "oMain": sMainStr },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                                    sessionStorage["SourceFlag"] = false;
-                                    layer.confirm(data.Message, {
-                                    //layer.confirm("鏀舵枡" + data.Message + $("#HBillNo").val(), {
-                                        icon: 1,
-                                        skin: 'layui-layer-lan',
-                                        closeBtn: 0,
-                                        btn: ['纭'],
-                                        btn2: function () {
-                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                            //window.location.reload();//鏂板
-                                            parent.location.href = "../../../views/index.html"
-                                        }//鍏抽棴
-                                    }
-                                        , function () { parent.location.href = "../../../views/index.html"; }//鏂板
-                                    );
-                                }
-                                else {
-                                    //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
-                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                }
-                                layer.closeAll("loading");
-                                layui.form.render();
-                            },
-                            error: function (err) {
-                                //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
-                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        });
-                    return false;
-                }
-            });
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
-                }
-            });
 
             
-            //鏉″舰鐮佸洖杞︽柟娉�
-            $('#HBarCode').on('keydown', function (event) {
-                var sQty = $("#HQty").val();
-                if (sQty == "") {
-                    sQty = 0;
-                }
-                if (event.keyCode == 13) {
-                    GetMeesageByBarCode();
-                }
-            });
-            //纭畾
-            form.on('submit(QueDin)', function (data) {
-                GetMeesageByBarCode();
-            });
-
-
-            //鎵簮鍗�
-            $('#HSourceBillNo').on('keydown', function (event) {      
-                if (event.keyCode == 13) {
-                    GetMeesageBySourceBillNo();
-                }
-            });
-            //纭畾
-            form.on('submit(QueDin2)', function (data) {
-                GetMeesageBySourceBillNo();
-            });
 
 
 
-            //鎵粨浣�
-            $('#HStockPlaceName').on('keydown', function (event) {
-                var HBarCode = $('#HStockPlaceName').val()
-                if (event.keyCode == 13) {
-                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                    $.ajax({
-                        url: GetWEBURL() + "/LookingFor/getSpName_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);
-                                $("#HWHID").val(result.data[0].HWHID);
-                                $("#HWHNAME").val(result.data[0].HWhName);
-                                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 });
-                }
-            });
 
-            //鎵粨搴�
-            $('#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'
                 // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
                 //, toolbar: '#toolbarDemo'
-                // , where: { sMsg: linterid, sMsg2: lentryid }
+                // , where: { sMsg: HInterID_Temp, sMsg2: lentryid }
                 , cols: [[
                     , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
                 ]]
@@ -1002,31 +830,671 @@
                 }
             });
 
-            //鎵潯鐮�
-            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+
+            //#region 鍩虹璧勬枡閫夋嫨
+
+            //#region 浠撳簱
+            //鎵粨搴�
+            $('#HWHNAME').on('keydown', function (event) {
+                var HBarCode = $('#HWHNAME').val()
+                if (event.keyCode == 13) {
+                    if (!HBarCode) {
+                        layer.msg('鏃犱粨搴撴潯鐮佷俊鎭紒');
+                        return;
+                    }
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/LookingFor/getWHName_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //$("#HStockPlaceName").val(result.data[0].HName);
+                                //$("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHID").val(result.data[0].HItemID);
+                                $("#HWHNAME").val(result.data[0].HName);
+                                element.tabChange('tab-POStockInBill', '2');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").focus();
+                            }
+                            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 });
+                }
+            });
+
+            //浠撳簱
+            form.on('submit(HWHID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"] + '', 'yes']
+                    //, content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 浠撲綅
+            //鎵粨浣�
+            $('#HStockPlaceName').on('keydown', function (event) {
+                var HBarCode = $('#HStockPlaceName').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                $("#HWHNAME").val(result.data[0].HWhName);
+                                element.tabChange('tab-POStockInBill', '2');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").focus();
+                            }
+                            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");
+                        }
+                    });
+                }
+            });
+
+            //閫夋嫨浠撲綅
+            form.on('submit(HSpID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 渚涘簲鍟�
+            //閫夋嫨渚涘簲鍟�
+            form.on('submit(HSupID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '渚涘簲鍟嗗垪琛�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 淇濈
+            //閫夋嫨淇濈
+            form.on('submit(HKeeperID-BT)', function () {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeper").val(checkStatus.data[0].HName);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+
+            //#endregion
+
+            //#region 楠屾敹
+            //閫夋嫨楠屾敹
+            form.on('submit(HSecManagerID-BT)', function (data) {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManager").val(checkStatus.data[0].HName);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            //#endregion
+
+            //#region 鍔熻兘鎺т欢
+            //閫夋嫨閮ㄩ棬
+            form.on('submit(HDeptID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                if ($("#HExplanation").val() == "") {
+                    if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
+                        $("#HWHNAME").val("");
+                        $("#HWHID").val("");
+                        layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                }
+                var sMainStr = JSON.stringify(data.field);
                 var sSubStr = table.cache['wl-table'];
-                var sBarCode = $('#HBarCode').val()
+                var sSourceType = $("#HBillType").val();
+                if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePOStockInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            url: GetWEBURL() + "/POStockInBill/set_SavePOStockInBill_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm(data.Message, {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                                        //layer.confirm("鏀舵枡" + data.Message + $("#HBillNo").val(), {
+                                        //icon: 1,
+                                        //skin: 'layui-layer-lan',
+                                        //closeBtn: 0,
+                                        //btn: ['纭'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            //window.location.reload();//鏂板
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }
+                                        , function () {
+                                            //parent.location.href = "../../../views/index.html";
+                                            location.replace('Kf_POStockInBill_Fast.html?OperationType=1&HInterID=0');
+                                        });//鏂板
+                                }
+                                else {
+                                    //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                //layui.form.render();
+                            },
+                            error: function (err) {
+                                //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                    return false;
+                }
+            });
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //#endregion
+
+            //#region 缂栬緫
+
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏄庣粏鍒楄〃'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + data[0].HInterID + '&HMaterID =' + data[0].HMaterID + '&HBillType =' + data[0].HBillType, 'yes']
+                        , resize: false
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                        , end: function () {
+                            //鏄剧ず琛ㄤ綋鏄庣粏
+                            DisBillEntryList();
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇峰厛閫夋嫨涓�琛岃褰曪紝杩涜缂栬緫锛�');
+                }
+                // }
+            });
+
+            //form.on('submit(cmdModify)', function () {
+            //    var sSubStr = table.cache['wl-table'];
+            //    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '鏄庣粏鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //    // }
+            //});
+
+            //#endregion
+
+            //#region 鍒犻櫎
+
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
+                        var sInterID = $("#HInterID").val()
+                        var sBillNo = $("#HBillNo").val()
+                        var sMaterID = data[0].HMaterID
+                        var sAuxPropID = data[0].HAuxPropID
+                        var sMTONo = ''
+                        var sSourceInterID = data[0].HSourceInterID
+                        var sSourceEntryID = data[0].HSourceEntryID
+                        var HBillType = '1201';
+                        var sHStockOrgID = sessionStorage["OrganizationID"]
+                        layer.load(3)
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+                                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        //鏄剧ず琛ㄤ綋鏄庣粏
+                                        DisBillEntryList();
+                                    }
+                                    else {
+                                        layer.msg(data.Message, { icon: 2 });
+                                    }
+                                },
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, {
+                                        icon: 5,
+                                        time: 20000
+                                    }, function () {
+                                    });
+                                }
+                            });
+                        layer.close(index)
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+                }
+            });
+
+
+            ////鍒犻櫎
+            //form.on('submit(cmdDelete)', function () {
+            //    var checkStatus = table.checkStatus('wl-table')
+            //        , data = checkStatus.data;
+            //    // console.log(data);
+            //    var sInterID = $('#HInterID').val()
+            //    var sMaterID = data[0].HMaterID
+            //    var sBillType = '1201'
+            //    var sAuxPropID = data[0].HAuxPropID
+            //    //var sMTONo = data[0].HMTONo
+            //    var sMTONo = ''
+            //    var sSourceInterID = data[0].HSourceInterID
+            //    var sSourceEntryID = data[0].HSourceEntryID
+            //    var sMouldManagerCtl = 'N'
+            //    var sFIFOCtl = 'N'
+            //    $.ajax(
+            //        {
+            //            type: "Get",
+            //            //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+            //            url: GetWEBURL() + "/ProductIn/Delete_Json_AN",
+            //            async: true,
+            //            data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+            //            dataType: "json",
+            //            success: function (data) {
+            //                if (data.count == 1) {
+            //                    $.ajax({
+            //                        url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
+            //                        type: "GET",
+            //                        data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+            //                        success: function (result) {
+            //                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+            //                                listOption.data = result.data.list;
+            //                                table.render(listOption);
+            //                                var count = 0;
+            //                                var count1 = 0;
+            //                                for (var i = 0; i < result.data.list.length; i++) {
+            //                                    count += result.data.list[i].HQty;
+            //                                    count1 += result.data.list[i].HPieceQty;
+            //                                }
+            //                                $("#HSumQtys").val(count);
+            //                                $("#HBarCodeQtys").val(count1);
+            //                                //return;
+            //                            }
+            //                            else {
+            //                                layer.msg(result.Message);
+            //                            }
+            //                            layer.closeAll("loading");
+            //                        }
+            //                    });
+            //                }
+            //                else {
+            //                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //                }
+            //            },
+            //            error: function (err) {
+            //                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            }
+            //        });
+            //});
+
+            //#endregion
+
+            //#region 鍔熻兘鎺т欢
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    parent.location.href = "../../../views/index_Mobile.html";
+                });
+            })
+
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鎵弿婧愬崟鏉$爜
+
+            //鎵簮鍗�
+            $('#HSourceBillNo').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    layer.load(3)
+                    GetMeesageBySourceBillNo();
+                    layer.closeAll("loading");
+                }
+            });
+
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                layer.load(3)
+                GetMeesageBySourceBillNo();
+                layer.closeAll("loading");
+            });
+
+            //鎵弿婧愬崟鏉$爜
+            function GetMeesageBySourceBillNo(obj) {
                 var sInterID = $("#HInterID").val()
                 var sBillNo = $("#HBillNo").val()
-                var sQty = $("#HQty").val()
-                var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷
+                var HBillType = '1201'
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var HSourceBillType = $("#HBillType").val()
+                var HMaker = sessionStorage["HUserName"]
+                var sHStockOrgID = sessionStorage["OrganizationID"];
+
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_POStockIn_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HStockOrgID": sHStockOrgID },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            playSound_OK();
+                            HSourceFlag = true;
+                            $("#HSupName").val(result.data.hSupNameField);
+                            $("#HSupID").val(result.data.hSupIDField);
+                            if (result.data.hDeptIDField != 0) {
+                                $("#HDeptID").val(result.data.hDeptIDField);
+                                $("#HDeptName").val(result.data.hDeptNameField);
+                            }
+
+                            $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+                            $("#HBillType").attr("disabled", "disabled");
+                            form.render('select');
+                            if (result.data.hMulSourceFlagField == 0) {
+                                $("#HSourceBillNo").attr("readonly", "readonly");
+                            }
+                            element.tabChange('tab-POStockInBill', '2');
+                            //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌浠撳簱涓�
+                            $("#HBarCode").focus();
+                            //鏄剧ず琛ㄤ綋鏄庣粏
+                            DisBillEntryList();
+                        }
+                        else {
+                            playSound();
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    }
+                });
+            }
+
+
+            //鍘熻皟鐢ㄦ柟娉�
+            ////鎵簮鍗�
+            //function GetMeesageBySourceBillNo(obj) {
+            //    var HSourceBillNo = $('#HSourceBillNo').val()
+            //    var sInterID = $("#HInterID").val()
+            //    var sBillNo = $("#HBillNo").val()
+            //    var HSourceBillType = $("#HBillType").val()
+            //    if (HSourceBillNo == "" || sInterID <= 0) {
+            //        layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //        return;
+            //    }
+            //    //
+            //    $.ajax({
+            //        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+            //        url: GetWEBURL() + "/POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+            //        type: "GET",
+            //        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+            //        success: function (result) {
+            //            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+            //                $("#HSupID").val(result.data[0].HSupID);
+            //                $("#HSupName").val(result.data[0].HSupName);
+            //                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'
+            //                    , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
+            //                    , cols: [[
+            //                        { type: 'radio' }
+            //                        , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100, totalRow: true }
+            //                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100, totalRow: true }
+            //                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', sort: true, width: 200 }
+            //                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
+            //                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
+            //                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+            //                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+            //                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
+            //                        , { field: 'HBatchNo', title: '鎵规' }
+            //                        , { field: 'HPieceQty', title: '鏉$爜浠舵暟', width: 100 }
+            //                    ]]
+            //                    // , data: [HInterID_Temp]
+            //                    , height: 500
+            //                    , done: function () {
+            //                        layer.closeAll("loading");
+            //                    }
+            //                });
+            //            }
+            //            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");
+            //        }
+            //    });
+            //}
+
+            //#endregion
+
+
+            //#region 鎵弿鐗╂枡鏉$爜
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    layer.load(3)
+                    GetMeesageByBarCode();
+                    layer.closeAll("loading");
+                }
+            });
+
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                layer.load(3)
+                GetMeesageByBarCode();
+                layer.closeAll("loading");
+            });
+
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+                var sInterID = $("#HInterID").val()
                 var sBillType = '1201'
+                var sBillNo = $("#HBillNo").val()
+                var sMaker = sessionStorage["HUserName"];
+                var sHStockOrgID = sessionStorage["OrganizationID"];
                 var sHWHID = $("#HWHID").val()
                 var sHSPID = $("#HStockPlaceID").val()
+                var sQty = $("#HQty").val()
                 var sSourceBillNo = $("#HSourceBillNo").val()
-                var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠$悊
-                var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊
+                var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷
 
-                var HDeleteFlag = sBarCode.substring(0, 1);
-                var sBarCodeNew = sBarCode.slice(1);
-
-               
-
-                    if (sQty == "") {
-                        sQty = 0;
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
                     }
+                    else {
+                        $('#HBarCode').val("");
+                    }
+                    $.ajax(
+                        {
+                            type: "GET",
+                            url: GetWEBURL() + "/ProductIn/Delete_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    playSound_OK();
+                                    //娓呯┖鏁伴噺
+                                    $("#HQty").val("");
+                                    //鏄剧ず琛ㄤ綋鏄庣粏
+                                    DisBillEntryList();
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
 
-                    //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
+                                }
+                            },
+                            error: function (err) {
+                                playSound();
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+                            }
+                        });
+                }
+                else {
+                    var sBarCode = $('#HBarCode').val()
                     if (sBarCode == '') {
                         playSound();
                         layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1035,24 +1503,17 @@
                     if (sBarCode != "") {
                         $('#HBarCode').val("");
                     }
-                    if (sQty != "") {
-                        $('#HQty').val("");
+                    if (sQty == "") {
+                        sQty = 0;
                     }
-                    //if (sHWHID == "184154") {
-                    //    if (sHSPID == "0") {
-                    //        playSound();
-                    //        layer.msg("浠撲綅涓虹┖锛岃閫夋嫨浠撲綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    //        return false;
-                    //    }
-                    //}
                     $.ajax({
-                        url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
                         type: "GET",
-                        async: false,
-                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
+                        url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sHStockOrgID, "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
                         success: function (result) {
                             if (result.count == 1) {
-                                playSound1();
+                                playSound_OK();
                                 if (result.data.hBarTypeField == '浠撳簱鏉$爜') {
                                     $("#HWHNAME").val(result.data.hWhNameField);
                                     $("#HWHID").val(result.data.hWhIDField);
@@ -1125,10 +1586,10 @@
                                     else {
                                         $("#HSupName").val(result.data.hSupNameField);
                                         $("#HSupID").val(result.data.hSupIDField);
-                                        //$("#HDeptName").val(result.data.HDept);
-                                        //$("#HDeptID").val(result.data.HDeptID);
-                                        //$("#HSourceBillNo").val(result.data.hSourceBillNoField);
-                                        //$("#HBillType").val(result.data.hSourceBillTypeField)
+                                        if (result.data.hDeptIDField != 0) {
+                                            $("#HDeptID").val(result.data.hDeptIDField);
+                                            $("#HDeptName").val(result.data.hDeptNameField);
+                                        }
                                         $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                         HSourceFlag = true;
                                         //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
@@ -1164,150 +1625,115 @@
                                         element.tabChange('tab-POStockInBill', '3');
                                     }
                                 }
-
-                                layer.load(3)
-                                $.ajax({
-                                    url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
-                                    type: "GET",
-                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
-                                    success: function (result) {
-                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                            listOption.data = result.data.list;
-                                            table.render(listOption);
-                                            //$("#HBarCode_B").val(result.data.list2[0].HBarCode);
-                                            //$("#HMaterName_B").val(result.data.list2[0].HMaterName);
-                                            //$("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
-                                            //$("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
-                                            //$("#HUnitName_B").val(result.data.list2[0].HUnitName);
-                                            //$("#HQty_B").val(result.data.list2[0].HQty);
-                                            //$("#HTMQty_B").val(result.data.list2[0].HTMQty);
-                                            //$("#HWHName_B").val(result.data.list2[0].HWHName);
-                                            //$("#HSPName_B").val(result.data.list2[0].HSPName);
-
-                                            var count = 0;
-                                            var count1 = 0;
-                                            for (var i = 0; i < result.data.list.length; i++) {
-                                                count += result.data.list[i].HQty;
-                                                count1 += result.data.list[i].HPieceQty;
-                                            }
-                                            $("#HSumQtys").val(count);
-                                            $("#HBarCodeQtys").val(count1);
-                                        }
-                                        else {
-                                            layer.msg(result.Message);
-                                        }
-                                        layer.closeAll("loading");
-                                    }
-                                });
-
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                DisBillEntryList();
                                 //娓呯┖鏁伴噺
                                 $("#HQty").val("");
+
+                                //layer.load(3)
+                                //$.ajax({
+                                //    url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
+                                //    type: "GET",
+                                //    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+                                //    success: function (result) {
+                                //        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //            listOption.data = result.data.list;
+                                //            table.render(listOption);
+                                //            //$("#HBarCode_B").val(result.data.list2[0].HBarCode);
+                                //            //$("#HMaterName_B").val(result.data.list2[0].HMaterName);
+                                //            //$("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
+                                //            //$("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
+                                //            //$("#HUnitName_B").val(result.data.list2[0].HUnitName);
+                                //            //$("#HQty_B").val(result.data.list2[0].HQty);
+                                //            //$("#HTMQty_B").val(result.data.list2[0].HTMQty);
+                                //            //$("#HWHName_B").val(result.data.list2[0].HWHName);
+                                //            //$("#HSPName_B").val(result.data.list2[0].HSPName);
+
+                                //            var count = 0;
+                                //            var count1 = 0;
+                                //            for (var i = 0; i < result.data.list.length; i++) {
+                                //                count += result.data.list[i].HQty;
+                                //                count1 += result.data.list[i].HPieceQty;
+                                //            }
+                                //            $("#HSumQtys").val(count);
+                                //            $("#HBarCodeQtys").val(count1);
+                                //        }
+                                //        else {
+                                //            layer.msg(result.Message);
+                                //        }
+                                //        layer.closeAll("loading");
+                                //    }
+                                //});
+
+                                ////娓呯┖鏁伴噺
+                                //$("#HQty").val("");
                             }
                             else {
                                 playSound();
                                 layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
-                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            playSound();
+                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
-            }
-            var listOption = {
-                elem: '#wl-table'
-                //, toolbar: '#toolbarDemo'
-                , totalRow: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'radio' }
-                    , { field: 'HSNO', title: '搴忓彿', width: 60 }
-                    , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
-                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80, totalRow: true}
-                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
-                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                    //, { field: 'HBatchNo', title: '鎵规', width: 150 }
-                    , { field: 'HPieceQty', title: '鏉$爜鏁伴噺', width: 150 }
-                ]]
-                , height: 500
-                , done: function () {
-                    layer.closeAll("loading");
                 }
             }
-            function playSound() {
-                var audio = document.getElementById("cs");
-                audio.play();
-            }
-            function playSound1() {
-                var audio = document.getElementById("cs2");
-                audio.play();
-            }
-            //鎵簮鍗�
-            function GetMeesageBySourceBillNo(obj) {
-                var HSourceBillNo = $('#HSourceBillNo').val()
+
+            //#endregion
+
+
+            //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+            function DisBillEntryList() {
                 var sInterID = $("#HInterID").val()
                 var sBillNo = $("#HBillNo").val()
-                var HSourceBillType = $("#HBillType").val()
-                if (HSourceBillNo == "" || sInterID <= 0) {
-                    layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                //
+                var HBillType = '1201'
+                var sHStockOrgID = sessionStorage["OrganizationID"];
+
+                //鍒锋柊鍒楄〃淇℃伅
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
-                    url: GetWEBURL() + "/POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                     type: "GET",
-                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": sHStockOrgID },
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            $("#HSupID").val(result.data[0].HSupID);
-                            $("#HSupName").val(result.data[0].HSupName);
-                            sessionStorage["SourceFlag"] = true;
-                            layer.load(3);
-                            element.tabChange('tab-POStockInBill', '2');
-                            var pFocus = $("#HBarCode");
-                            pFocus.focus();
+                            listOption.data = result.data.Materlist;
+                            table.render(listOption);
 
-                            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'
-                                , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
-                                , cols: [[
-                                    { type: 'radio' }
-                                    , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100, totalRow: true}
-                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100, totalRow: true}
-                                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', sort: true, width: 200 }
-                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
-                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
-                                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
-                                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
-                                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
-                                    , { field: 'HBatchNo', title: '鎵规' }
-                                    , { field: 'HPieceQty', title:'鏉$爜浠舵暟', width: 100 }
-                                ]]
-                                // , data: [linterid]
-                                , height: 500
-                                , done: function () {
-                                    layer.closeAll("loading");
-                                }
-                            });
+                            $("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
+                            $("#HMaterName_B").val(result.data.BarCodeDetailslist[0].HMaterName);
+                            $("#HMaterModel_B").val(result.data.BarCodeDetailslist[0].HMaterModel);
+                            $("#HBatchNo_B").val(result.data.BarCodeDetailslist[0].HBatchNo);
+                            $("#HUnitName_B").val(result.data.BarCodeDetailslist[0].HUnitName);
+                            $("#HQty_B").val(result.data.BarCodeDetailslist[0].HQty);
+                            $("#HTMQty_B").val(result.data.BarCodeDetailslist[0].HTMQty);
+                            $("#HWHName_B").val(result.data.BarCodeDetailslist[0].HWHName);
+                            $("#HSPName_B").val(result.data.BarCodeDetailslist[0].HSPName);
+
+                            //console.log(result.data.list2);
+                            var count = 0;
+                            var count1 = 0;
+                            for (var i = 0; i < result.data.Materlist.length; i++) {
+                                count += result.data.Materlist[i].HQty;
+                                count1 += result.data.Materlist[i].HPieceQty;
+                            }
+                            $("#HSumQtys").val(count);
+                            $("#HBarcodeQtys").val(count1);
+                            //return;
                         }
                         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.msg(result.Message);
                         }
-                        layer.closeAll("loading");
                     }
                 });
             }
+
+            //#endregion
+
+
             
         });
 
@@ -1357,18 +1783,18 @@
             //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
             //    return false;
             //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
+            //if ($("#HDeptName").val() == '') {
+            //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            //if ($("#HSecManager").val() == '') {
+            //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            //if ($("#HKeeper").val() == '') {
+            //    layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
             //if ($("#HSupName").val() == '') {
             //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
             //    return false;
@@ -1406,7 +1832,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: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return false;
                     }
                 }
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_FastList.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_FastList.html"
index 9c72435..f8dbf15 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_FastList.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_FastList.html"
@@ -135,7 +135,7 @@
             //閫�鍑�
             form.on('submit(cmdCancel)', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../../views/index.html";
+                    parent.location.href = "../../../views/index_Mobile.html"
                 });
                 //parent.location.href = "../../../views/index.html"
                 //window.close();//鍏抽棴褰撳墠椤�
@@ -144,27 +144,61 @@
             form.on('submit(cmdModify)', function () {
                 var checkStatus = table.checkStatus('dj-table')
                     , data = checkStatus.data;
-                //ajaxLabelData = data;
-                //layer.alert(rows);
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '澶栬喘鍏ュ簱鍗�'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        $(".layui-btn").removeClass("layui-btn-disabled");
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": data[0].HInterID, "HBillNo": data[0].HBillNo, "HBillType": sBillType },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '閲囪喘鍏ュ簱鍗�'
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: ['../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+                                , resize: false
+                                , cancel: function () {
+                                    $(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
-                })
+                });
             });
+            ////缂栬緫
+            //form.on('submit(cmdModify)', function () {
+            //    var checkStatus = table.checkStatus('dj-table')
+            //        , data = checkStatus.data;
+            //    //ajaxLabelData = data;
+            //    //layer.alert(rows);
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '澶栬喘鍏ュ簱鍗�'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            $(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
             //鍒锋柊
             form.on('submit(cmdRefresh)', function () {//
                 var sBillType = '1201'
-                //鍔ㄦ�佸垪-鍒锋柊缂撳瓨鍒楄〃
-                table.render(option);
+                ////鍔ㄦ�佸垪-鍒锋柊缂撳瓨鍒楄〃
+                //table.render(option);
                 table.render({
                     elem: '#yd-table'
                     , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
@@ -311,108 +345,108 @@
                 });
             });
 
-            ////缂撳瓨鍒楄〃
-            //table.render({
-            //    elem: '#dj-table'
-            //    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
-            //    , toolbar: '#toolbarDemo'
-            //    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
-            //    , cols: [[
-            //        { type: 'radio' }
-            //        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
-            //        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
-            //        , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
-            //        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
-            //        , { field: 'HQty', title: '鏁伴噺', width: 100 }
-            //        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-            //        , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
-            //        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
-            //    ]]
-            //    , height: 500
-            //    , done: function () {
-            //        layer.closeAll("loading");
-            //    }
-            //})
-
-
-
-            //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
-            $.ajax({
-                url: GetWEBURL() + "/Web/DisBillEntryList_Mate_Webs_Json",
-                type: "GET",
-                async: false,
-                data: { HBillType: sBillType, sWhere: '' },
-                //async: false,
-                success: function (data1) {
-
-                    if (data1.count == 1) {
-
-                        var data = [];
-                        var col = [];
-                        //缁欑┖鐨勬暟缁勮祴鍊�
-                        for (var key in data1.list) {
-                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
-                        }
-                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                        col.push({ type: 'radio', fixed: 'left' });
-                        for (var i = 0; i < data.length; i++) {
-                            if ($.inArray(data[i].name, "") > -1) {
-                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                            }
-                            else {
-                                switch (data[i].Type) {
-                                    //int
-                                    case 'DateTime':
-                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
-                                        break;
-                                    default:
-                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
-                                }
-                            }
-                        }
-
-                        option = {
-                            elem: '#dj-table'
-                            , toolbar: '#toolbarDemo'
-                            , height: 500
-                            , page: true //寮�鍚垎椤�
-                            , limit: 50
-                            , limits: [50, 500, 5000, 20000]
-                            , cols: [col]
-                            , data: data1.data
-                        };
-                        table.render(option);
-                    } else {
-                        option = {
-                            elem: '#dj-table'
-                            , toolbar: '#toolbarDemo'
-                            , height: 500
-                            , page: true //寮�鍚垎椤�
-                            , limit: 50
-                            , limits: [50, 500, 5000, 20000]
-                            , cols: [[
-                                { type: 'radio' }
-                                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
-                                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
-                                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                            ]]
-                            , data: []
-                        };
-                        table.render(option);
-                    }
-                },
-                error: function (err) {
-                    layer.msg('閿欒' + err, {
-                        icon: 5,
-                        time: 20000
-                    }, function () {
-                        //do something
-                    });
+            //缂撳瓨鍒楄〃
+            table.render({
+                elem: '#dj-table'
+                , url: GetWEBURL() + '/Web/chanpinruk'
+                , toolbar: '#toolbarDemo'
+                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: '鍗曟嵁鍐呯爜', title: '鍗曟嵁鍐呯爜', width: 120 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 120 }
+                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 150 }
+                    , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 150 }
+                    , { field: '绾㈣摑瀛�', title: '绾㈣摑瀛�', width: 120 }
+                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
                 }
             })
 
 
+
+            ////鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+            //$.ajax({
+            //    url: GetWEBURL() + "/Web/DisBillEntryList_Mate_Webs_Json",
+            //    type: "GET",
+            //    async: false,
+            //    data: { HBillType: sBillType, sWhere: '' },
+            //    //async: false,
+            //    success: function (data1) {
+
+            //        if (data1.count == 1) {
+
+            //            var data = [];
+            //            var col = [];
+            //            //缁欑┖鐨勬暟缁勮祴鍊�
+            //            for (var key in data1.list) {
+            //                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+            //            }
+            //            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+            //            col.push({ type: 'radio', fixed: 'left' });
+            //            for (var i = 0; i < data.length; i++) {
+            //                if ($.inArray(data[i].name, "") > -1) {
+            //                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+            //                }
+            //                else {
+            //                    switch (data[i].Type) {
+            //                        //int
+            //                        case 'DateTime':
+            //                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+            //                            break;
+            //                        default:
+            //                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+            //                    }
+            //                }
+            //            }
+
+            //            option = {
+            //                elem: '#dj-table'
+            //                , toolbar: '#toolbarDemo'
+            //                , height: 500
+            //                , page: true //寮�鍚垎椤�
+            //                , limit: 50
+            //                , limits: [50, 500, 5000, 20000]
+            //                , cols: [col]
+            //                , data: data1.data
+            //            };
+            //            table.render(option);
+            //        } else {
+            //            option = {
+            //                elem: '#dj-table'
+            //                , toolbar: '#toolbarDemo'
+            //                , height: 500
+            //                , page: true //寮�鍚垎椤�
+            //                , limit: 50
+            //                , limits: [50, 500, 5000, 20000]
+            //                , cols: [[
+            //                    { type: 'radio' }
+            //                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+            //                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+            //                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+            //                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+            //                ]]
+            //                , data: []
+            //            };
+            //            table.render(option);
+            //        }
+            //    },
+            //    error: function (err) {
+            //        layer.msg('閿欒' + err, {
+            //            icon: 5,
+            //            time: 20000
+            //        }, function () {
+            //            //do something
+            //        });
+            //    }
+            //})
+
+
             //宸蹭笂浼犲垪琛�
             table.render({
                 elem: '#yd-table'

--
Gitblit v1.9.1