From 7ae052d141e69fe9e19392172fc2960134a03232 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 十二月 2025 15:54:52 +0800
Subject: [PATCH] 1.采购入库单列表、直接调拨单列表、其他出库单列表、生产入库列表、销售出库单列表:layui中开发 查看包装明细

---
 WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html |  505 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 363 insertions(+), 142 deletions(-)

diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
index 87094d4..cd1e349 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
@@ -15,6 +15,7 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/qrcode/qrcode.min.js"></script>
     <style>
         .layui-col-xs8 {
             width: 55.666667%;
@@ -31,21 +32,49 @@
                     </div>
                     <div class="layui-form-item" style="padding:15px;margin:0px">
                         <div class="layui-row">
-                            <div class="layui-col-xs3">
-                                <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉$爜</label>
-                            </div>
-                            <div class="layui-col-xs7">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" 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="" lay-filter="HBarCode-BT" class="layui-btn layui_btn_sm" id="HBarCode-BT">纭畾</button>
-                            </div>
-                            <div class="layui-row">
+                            <div class="layui-col-xs6">
                                 <div class="layui-col-xs3">
-                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">鏁伴噺</label>
+                                    <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉$爜</label>
                                 </div>
-                                <div class="layui-col-xs7">
+                                <div class="layui-col-xs9">
+                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">鏁伴噺</label>
+                                </div>
+                                <div class="layui-col-xs5">
                                     <input type="number" 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 class="layui-col-xs4">
+                                    <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+                                </div>
+                                <div class="layui-col-xs6">
+                                    <input type="text" name="HSCWHName" id="HSCWHName" lay-verify="HSCWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                    <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" lay-filter="HSCWHID-BT" class="layui-btn" id="HSCWHID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                </div>
+                                <div class="layui-col-xs6">
+                                    <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                    <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" lay-filter="HSCSpID-BT" class="layui-btn" id="HSCSpID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
                                 </div>
                             </div>
                         </div>
@@ -82,11 +111,18 @@
                                             <div class="layui-col-xs3">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
                                             </div>
-                                            <div class="layui-col-xs7">
-                                                <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="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT">纭畾</button>
+                                            <div class="layui-col-xs9">
+                                                <div class="layui-col-xs8">
+                                                    <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="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+                                                    </button>
+                                                </div>
+                                                <div class="layui-col-xs2" style="float: right;">
+                                                    <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
+                                                </div>
                                             </div>
                                         </div>
                                         <div class="layui-row">
@@ -103,12 +139,14 @@
                                             <div class="layui-col-xs3">
                                                 <label class="layui-form-label" style="width: 70px; padding-left: 0px;">鍏堣繘鍏堝嚭浠�</label>
                                             </div>
-                                            <div class="layui-col-xs7">
-                                                <input type="text" name="HFIFOWHName" id="HFIFOWHName" lay-verify="HFIFOWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
-                                                <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
-                                            </div>
-                                            <div class="layui-col-xs2">
-                                                <button type="button" lay-submit="" lay-filter="HFIFOWHID-BT" class="layui-btn" id="HFIFOWHID-BT" style="padding:0 26.5px">...</button>
+                                            <div class="layui-col-xs9">
+                                                <div class="layui-col-xs10" style="padding-right: 15px;">
+                                                    <input type="text" name="HFIFOWHName" id="HFIFOWHName" lay-verify="HFIFOWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
+                                                </div>
+                                                <div class="layui-col-xs2">
+                                                    <button type="button" lay-submit="" lay-filter="HFIFOWHID-BT" class="layui-btn" id="HFIFOWHID-BT" style="width: 45px; margin-left: -5px; padding-left: 12px">...</button>
+                                                </div>
                                             </div>
                                         </div>
                                         <div class="layui-row">
@@ -116,7 +154,7 @@
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧绫诲瀷</label>
                                             </div>
                                             <div class="layui-col-xs9">
-                                                <select name=" HStockStyle" id="HStockStyle"disabled>
+                                                <select lay-filter="HStockStyle" name=" HStockStyle" id="HStockStyle">
                                                     <option value="缁勭粐鍐呰皟鎷�">缁勭粐鍐呰皟鎷�</option>
                                                     <option value="璺ㄧ粍缁囪皟鎷�">璺ㄧ粍缁囪皟鎷�</option>
                                                 </select>
@@ -162,8 +200,13 @@
                                             <div class="layui-col-xs3">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
                                             </div>
-                                            <div class="layui-col-xs9">
+                                            <div class="layui-col-xs8">
                                                 <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                            <div class="layui-col-xs2">
+                                                <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+                                                </button>
                                             </div>
                                         </div>
                                         <div class="layui-row">
@@ -180,10 +223,10 @@
                                 <div class="layui-tab-item">
                                     <div class="layui-form-item" style="padding:0px;margin:0px">
                                         <div class="layui-row">
-                                            <div class="layui-col-xs2">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
                                             </div>
-                                            <div class="layui-col-xs10">
+                                            <div class="layui-col-xs10" style="margin-left:10px">
                                                 <div class="layui-col-xs10">
                                                     <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">
@@ -196,48 +239,16 @@
                                     </div>
                                     <div class="layui-form-item" style="padding:0px;margin:0px">
                                         <div class="layui-row">
-                                            <div class="layui-col-xs2">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
                                             </div>
-                                            <div class="layui-col-xs10">
+                                            <div class="layui-col-xs10" style="margin-left:10px">
                                                 <div class="layui-col-xs10">
                                                     <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-xs2">
                                                     <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item" style="padding:0px;margin:0px">
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs2">
-                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
-                                            </div>
-                                            <div class="layui-col-xs10">
-                                                <div class="layui-col-xs10">
-                                                    <input type="text" name="HSCWHName" id="HSCWHName" lay-verify="HSCWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
-                                                    <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <button type="button" lay-submit="" lay-filter="HSCWHID-BT" class="layui-btn" id="HSCWHID-BT">...</button>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item" style="padding:0px;margin:0px">
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs2">
-                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
-                                            </div>
-                                            <div class="layui-col-xs10">
-                                                <div class="layui-col-xs10">
-                                                    <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
-                                                    <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <button type="button" lay-submit="" lay-filter="HSCSpID-BT" class="layui-btn" id="HSCSpID-BT">...</button>
                                                 </div>
                                             </div>
                                         </div>
@@ -308,11 +319,11 @@
                                     </div>
                                     <div class="layui-form-item" style="padding:0px;margin:0px">
                                         <div class="layui-row">
-                                            <div class="layui-col-xs2">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭缁勭粐</label>
                                             </div>
-                                            <div class="layui-col-xs10">
-                                                <select name=" HStockOutOrgID" id="HStockOutOrgID"disabled>
+                                            <div class="layui-col-xs10" style="margin-left:10px">
+                                                <select lay-filter="HStockOutOrgID" name=" HStockOutOrgID" id="HStockOutOrgID" disabled>
                                                     <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                                 </select>
                                             </div>
@@ -320,11 +331,11 @@
                                     </div>
                                     <div class="layui-form-item" style="padding:0px;margin:0px">
                                         <div class="layui-row">
-                                            <div class="layui-col-xs2">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆缁勭粐</label>
                                             </div>
-                                            <div class="layui-col-xs10">
-                                                <select name=" HStockInOrgID" id="HStockInOrgID"disabled>
+                                            <div class="layui-col-xs10" style="margin-left:10px">
+                                                <select lay-filter="HStockInOrgID" name=" HStockInOrgID" id="HStockInOrgID" disabled>
                                                     <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                                 </select>
                                             </div>
@@ -414,40 +425,40 @@
                                     </div>
                                     <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                         <div class="layui-row">
-                                            <div class="layui-col-xs2">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
                                             </div>
-                                            <div class="layui-col-xs10">
+                                            <div class="layui-col-xs10" style="margin-left:10px">
                                                 <input type="text" name="HWHName_B" id="HWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-form-item" style="padding:0px;margin:0px">
                                         <div class="layui-row">
-                                            <div class="layui-col-xs2">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
                                             </div>
-                                            <div class="layui-col-xs10">
+                                            <div class="layui-col-xs10" style="margin-left:10px">
                                                 <input type="text" name="HSPName_B" id="HSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                         <div class="layui-row">
-                                            <div class="layui-col-xs2">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
                                             </div>
-                                            <div class="layui-col-xs10">
+                                            <div class="layui-col-xs10" style="margin-left:10px">
                                                 <input type="text" name="HSCWHName_B" id="HSCWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-form-item" style="padding:0px;margin:0px">
                                         <div class="layui-row">
-                                            <div class="layui-col-xs2">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
                                                 <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
                                             </div>
-                                            <div class="layui-col-xs10">
+                                            <div class="layui-col-xs10" style="margin-left:10px">
                                                 <input type="text" name="HSCSPName_B" id="HSCSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                             </div>
                                         </div>
@@ -476,6 +487,7 @@
                     <input type="hidden" name="HBillType" id="HBillType">
                     <input type="hidden" name="HBillerID" id="HBillerID">
                     <input type="hidden" name="HRedBlueFlag" id="HRedBlueFlag">
+                    <input type="hidden" name="HSourceBillListCtl" id="HSourceBillListCtl">
                     <!--澶辫触鎻愮ず闊�-->
                     <div id="" style="display:none;">
                         <audio id="cs" hidden controls>
@@ -554,7 +566,7 @@
                         }
                         else {
                             layer.msg(d.Message, {
-                                icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                             }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
                         }
                     },
@@ -610,7 +622,7 @@
                 $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                 $("#HBillType").val("1207");
                 $("#HRedBlueFlag").val("false");
-                if (sessionStorage["HSCWHSPFlag"]) {
+                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
                     $("#HStockPlaceID").val("0");
                     $("#HStockPlaceName").val("");
                     $("#HStockPlaceName").attr("disabled", "disabled");
@@ -622,7 +634,7 @@
                     $("#HStockPlaceName").removeAttr("disabled");
                     $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
                 }
-                if (sessionStorage["HWhSPFlag"]) {
+                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                     $("#HOutStockPlaceID").val("0");
                     $("#HOutStockPlaceName").val("");
                     $("#HOutStockPlaceName").attr("disabled", "disabled");
@@ -768,7 +780,7 @@
                     , totalRow: true
                     , height: 'full-60'
                     , cellMinWidth: 90
-                    , limit: 50
+                    , limit: 200
                 };
 
                 //涓嬫灦淇℃伅
@@ -808,6 +820,32 @@
             })
             //#endregion
 
+            //#region  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(wl-table)', function (obj) {
+                var data = obj.data;
+
+                //鐗╂枡浠g爜瓒呴摼鎺�
+                if (obj.event == '鐗╂枡浠g爜') {                      //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鐗╂枡浠g爜'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var HMaterNumber = data.鐗╂枡浠g爜.toString();    //澹版槑鍙橀噺HMaterNumber 涓� data.鐗╂枡浠g爜
+                    layer.open({                                    //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞� 
+                        type: 2                                     //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '鍙婃椂搴撳瓨淇℃伅'                     //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1                               //鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6                                //閬僵閫忔槑搴�
+                        , maxmin: false                              //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0                                   //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventoryByCLD_PDA.html?OperationType=2&HMaterNumber=' + HMaterNumber  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , resize: false,                            //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                        }
+                    })
+                }
+            });
+             //#endregion
+
             //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
             if (HInterID != 0) {
                 HSourceFlag = true;
@@ -841,7 +879,7 @@
                 //鏄剧ず琛ㄤ綋鏄庣粏
                 DisBillEntryList();
                 HSourceFlag = true;
-                element.tabChange('tab-Kf_MoveStockBill_PDA', '2');
+                element.tabChange('tab-Kf_MoveStockBill_PDA', '3');
             }
             else {
                 //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
@@ -858,7 +896,7 @@
                             HBillNo = $('#HBillNo').val()
                         }
                         else {
-                            layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
@@ -986,6 +1024,7 @@
                         if (d.data[0].HMulSourceBill == 0) {
                             $("#HSourceBillNo").attr("disabled", "disabled");
                             $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                         }
                         if (d.data[0].HDeptID != 0) {
                             $("#HDeptID").val(d.data[0].HDeptID);
@@ -1022,7 +1061,7 @@
                         $("#HFIFOWHID").val("0");
                         $("#HFIFOWHName").val("");
                         layer.msg("鍏堣繘鍏堝嚭浠撳簱鏉$爜涓虹┖锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HFIFOWHName").select();
                             $("#HFIFOWHName").focus();
@@ -1050,7 +1089,7 @@
                                 $("#HFIFOWHID").val("0");
                                 $("#HFIFOWHName").val("");
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HFIFOWHName").select();
                                     $("#HFIFOWHName").focus();
@@ -1095,7 +1134,7 @@
                         $("#HOutStockPlaceName").removeAttr("disabled");
                         $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
                         layer.msg("璋冨嚭浠撳簱鏉$爜涓虹┖锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HSCWHName").select();
                             $("#HSCWHName").focus();
@@ -1113,8 +1152,8 @@
                             if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 $("#HSCWHID").val(result.data[0].HItemID);
                                 $("#HSCWHName").val(result.data[0].HName);
-                                $("#HOutStockPlaceID").val("0");
-                                $("#HOutStockPlaceName").val("");
+                                $("#HOutStockPlaceID").val(result.data[0].HSPID);
+                                $("#HOutStockPlaceName").val(result.data[0].HSPName);
                                 if (result.data[0].HSPFlag == 0) {
                                     $("#HOutStockPlaceName").attr("disabled", "disabled");
                                     $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
@@ -1123,7 +1162,6 @@
                                     $("#HOutStockPlaceName").removeAttr("disabled");
                                     $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
                                 }
-                                element.tabChange('tab-Kf_MoveStockBill_PDA', '2');
                                 //鍏夋爣鏄剧ず鍒版潯鐮佷笂
                                 $("#HBarCode").select();
                                 $("#HBarCode").focus();
@@ -1137,7 +1175,7 @@
                                 $("#HOutStockPlaceName").removeAttr("disabled");
                                 $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HSCWHName").select();
                                     $("#HSCWHName").focus();
@@ -1186,7 +1224,7 @@
                         $("#HOutStockPlaceID").val("0");
                         $("#HOutStockPlaceName").val("");
                         layer.msg("璋冨嚭浠撲綅鏉$爜涓虹┖锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HOutStockPlaceName").select();
                             $("#HOutStockPlaceName").focus();
@@ -1206,7 +1244,6 @@
                                 $("#HOutStockPlaceID").val(result.data[0].HItemID);
                                 $("#HSCWHName").val(result.data[0].HWhName);
                                 $("#HSCWHID").val(result.data[0].HWHID);
-                                element.tabChange('tab-Kf_MoveStockBill_PDA', '2');
                                 //鍏夋爣鏄剧ず鍒版潯鐮佷笂
                                 $("#HBarCode").select();
                                 $("#HBarCode").focus();
@@ -1218,7 +1255,7 @@
                                 $("#HOutStockPlaceID").val("0");
                                 $("#HOutStockPlaceName").val("");
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HOutStockPlaceName").select();
                                     $("#HOutStockPlaceName").focus();
@@ -1258,6 +1295,13 @@
             //鎵弿璋冨叆浠撳簱鏉$爜
             $('#HWHName').on('keydown', function (event) {
                 if (event.keyCode == 13) {
+                    if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+                        layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝g‘璋冨叆缁勭粐锛�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                        });
+                        return;
+                    }
                     var HWHName = $('#HWHName').val()
                     if (HWHName == '') {
                         playSound();
@@ -1268,7 +1312,7 @@
                         $("#HStockPlaceName").removeAttr("disabled");
                         $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
                         layer.msg("璋冨叆浠撳簱鏉$爜涓虹┖锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HWHName").select();
                             $("#HWHName").focus();
@@ -1286,8 +1330,8 @@
                             if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 $("#HWHID").val(result.data[0].HItemID);
                                 $("#HWHName").val(result.data[0].HName);
-                                $("#HStockPlaceID").val("0");
-                                $("#HStockPlaceName").val("");
+                                $("#HStockPlaceID").val(result.data[0].HSPID);
+                                $("#HStockPlaceName").val(result.data[0].HSPName);
                                 if (result.data[0].HSPFlag == 0) {
                                     $("#HStockPlaceName").attr("disabled", "disabled");
                                     $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
@@ -1310,7 +1354,7 @@
                                 $("#HStockPlaceName").removeAttr("disabled");
                                 $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HWHName").select();
                                     $("#HWHName").focus();
@@ -1325,6 +1369,13 @@
 
             //璋冨叆浠撳簱鎸夐挳
             form.on('submit(HWHID-BT)', function () {
+                if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+                    layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝g‘璋冨叆缁勭粐锛�", {
+                        icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                    });
+                    return;
+                }
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
@@ -1346,6 +1397,13 @@
             //鎵弿璋冨叆浠撲綅鏉$爜
             $('#HStockPlaceName').on('keydown', function (event) {
                 if (event.keyCode == 13) {
+                    if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+                        layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝g‘璋冨叆缁勭粐锛�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                        });
+                        return;
+                    }
                     //璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
                     if ($("#HWHName").val() == '') {
                         $("#HWHID").val("0");
@@ -1359,7 +1417,7 @@
                         $("#HStockPlaceID").val("0");
                         $("#HStockPlaceName").val("");
                         layer.msg("璋冨叆浠撲綅鏉$爜涓虹┖锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HStockPlaceName").select();
                             $("#HStockPlaceName").focus();
@@ -1391,7 +1449,7 @@
                                 $("#HStockPlaceID").val("0");
                                 $("#HStockPlaceName").val("");
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HStockPlaceName").select();
                                     $("#HStockPlaceName").focus();
@@ -1406,6 +1464,13 @@
 
             //璋冨叆浠撲綅鎸夐挳
             form.on('submit(HSpID-BT)', function () {
+                if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+                    layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝g‘璋冨叆缁勭粐锛�", {
+                        icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                    });
+                    return;
+                }
                 //璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
                 if ($("#HWHName").val() == '') {
                     $("#HWHID").val("0");
@@ -1437,7 +1502,7 @@
                         $("#HKeeperID").val("0");
                         $("#HKeeperName").val("");
                         layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HKeeperName").select();
                             $("#HKeeperName").focus();
@@ -1465,7 +1530,7 @@
                                 $("#HKeeperID").val("0");
                                 $("#HKeeperName").val("");
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HKeeperName").select();
                                     $("#HKeeperName").focus();
@@ -1507,7 +1572,7 @@
                         $("#HSecManagerID").val("0");
                         $("#HSecManagerName").val("");
                         layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HSecManagerName").select();
                             $("#HSecManagerName").focus();
@@ -1535,7 +1600,7 @@
                                 $("#HSecManagerID").val("0");
                                 $("#HSecManagerName").val("");
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HSecManagerName").select();
                                     $("#HSecManagerName").focus();
@@ -1577,7 +1642,7 @@
                         $("#HDeptID").val("0");
                         $("#HDeptName").val("");
                         layer.msg("閮ㄩ棬鏉$爜涓虹┖锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HDeptName").select();
                             $("#HDeptName").focus();
@@ -1605,7 +1670,7 @@
                                 $("#HDeptID").val("0");
                                 $("#HDeptName").val("");
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HDeptName").select();
                                     $("#HDeptName").focus();
@@ -1627,7 +1692,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                     , resize: false
                     , cancel: function () {
                         //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1647,7 +1712,7 @@
                         $("#HSupID").val("0");
                         $("#HSupName").val("");
                         layer.msg("瀹㈡埛鏉$爜涓虹┖锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HSupName").select();
                             $("#HSupName").focus();
@@ -1675,7 +1740,7 @@
                                 $("#HSupID").val("0");
                                 $("#HSupName").val("");
                                 layer.msg(result.Message, {
-                                    icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HSupName").select();
                                     $("#HSupName").focus();
@@ -1769,7 +1834,7 @@
                                                 parent.location.href = "../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA.html";
                                             }
                                             else {
-                                                parent.location.href = "../../../views/index_Mobile.html";
+                                               /* parent.location.href = "../../../views/index_Mobile.html";*/
                                             }
                                         }//鍏抽棴
                                     }
@@ -1778,12 +1843,12 @@
                                         });//鏂板
                                 }
                                 else {
-                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                 }
                             },
                             complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
                             error: function (err) {
-                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
                         });
                     layer.closeAll("loading");
@@ -1855,12 +1920,12 @@
                                     }
                                     else {
                                         playSound();
-                                        layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                        layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                     }
                                 },
                                 complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
                                 error: function (err) {
-                                    layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                 }
                             });
                         layer.closeAll("loading");
@@ -1880,9 +1945,9 @@
                     //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
                     $.ajax({
                         type: "Get",
-                        url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
+                        url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_New_Json",
                         async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-                        data: { "HInterID": HInterID, "HBillType": HBillType },
+                        data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
@@ -1896,12 +1961,12 @@
                                 }
                             }
                             else {
-                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
                         },
                         complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
                         error: function (err) {
-                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
                 });
@@ -1912,6 +1977,92 @@
             //#endregion
 
 
+            //#region 婧愬崟閫夋嫨
+
+            form.on('submit(cmdHSourceBillNo)', function () {
+                var HSourceTitle = "";
+                var HSourceBillType = $("#HMainSourceBillType").val()
+                if (HSourceBillType == '1402') {
+                    HSourceTitle = "鍙戣揣閫氱煡鍗�";
+                }
+                else if (HSourceBillType == '1243') {
+                    HSourceTitle = "璋冩嫧鐢宠鍗�";
+                }
+                else if (HSourceBillType == '3720') {
+                    HSourceTitle = "鐢熶骇鐢ㄦ枡娓呭崟";
+                }
+                else if (HSourceBillType == '1604') {
+                    HSourceTitle = "濮斿鐢ㄦ枡娓呭崟";
+                }
+                else if (HSourceBillType == '1214') {
+                    HSourceTitle = "鐢熶骇鍙戞枡閫氱煡鍗�";
+                }
+                else if (HSourceBillType == '3721') {
+                    HSourceTitle = "鐢熶骇澶囨枡鍗�";
+                }
+                else if (HSourceBillType == '1242') {
+                    HSourceTitle = "鍑哄簱鐢宠鍗�";
+                }
+
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: HSourceTitle + '鍒楄〃'//鏍囬
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_SourceBillEditDlg_PDA.html?HBillType =' + HBillType + '&HSourceBillType =' + HSourceBillType + '&HStockOrgID =' + HStockOrgID, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                    , end: function () {
+                        if ($("#HSourceBillListCtl").val() == '1') {
+                            GetMeesageBySourceBillNo();
+                            $("#HSourceBillListCtl").val("0");  //鐢ㄤ簬鍖哄垎婧愬崟鍒楄〃鐣岄潰鍏抽棴鐘舵�侊紙1涓鸿繑鍥烇紝0涓洪��鍑猴級
+                        }
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 浜岀淮鐮佺敓鎴�
+            form.on('submit(generateQRCodeBtn)', function () {
+                showQRCode($("#HBillNo").val(), "鍗曟嵁浜岀淮鐮�");
+            });
+            /**
+             * 鏄剧ず浜岀淮鐮佸脊绐�
+             * @param {string} content - 瑕佺敓鎴愪簩缁寸爜鐨勫唴瀹�
+             * @param {string} title - 寮圭獥鏍囬
+             */
+            function showQRCode(content, title) {
+                // 鏄剧ず寮圭獥
+                layer.open({
+                    type: 1,
+                    title: title || '浜岀淮鐮�',
+                    skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+                    area: ['300px', '360px'],
+                    closeBtn: 1,
+                    shadeClose: true,
+                    content: '<div style="text-align:center;padding:45px;">' +
+                        '<div id="qrcode" style="margin-left: auto;"></div>' +
+                        '<div style="">' + content + '</div></div>',
+                    success: function (layero, index) {
+                        // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+                        new QRCode(document.getElementById("qrcode"), {
+                            text: content,
+                            width: 200,
+                            height: 200,
+                            colorDark: "#000000",
+                            colorLight: "#ffffff",
+                            correctLevel: QRCode.CorrectLevel.H
+                        });
+                    }
+                });
+            }
+            //#endregion
+            
             //#region 鎵弿婧愬崟鏉$爜
 
             //鎵弿婧愬崟鏉$爜
@@ -1957,6 +2108,7 @@
                             if (result.data.hMulSourceFlagField == 0) {
                                 $("#HSourceBillNo").attr("disabled", "disabled");
                                 $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                             }
                             $("#HStockStyle").val(result.data.hStockStyleField);
                             $("#HStockStyle").attr("disabled", "disabled");
@@ -1972,7 +2124,7 @@
                             //瀹㈡埛涓嶅彲缂栬緫
                             $("#HSupName").attr("disabled", "disabled");
                             $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
-                            element.tabChange('tab-Kf_MoveStockBill_PDA', '2');
+                            element.tabChange('tab-Kf_MoveStockBill_PDA', '3');
                             $("#HBarCode").select();
                             $("#HBarCode").focus();
                             //璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
@@ -2002,7 +2154,7 @@
                         else {
                             playSound();
                             layer.msg(result.Message, {
-                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                             }, function () {
                                 element.tabChange('tab-Kf_MoveStockBill_PDA', '1');
                                 $("#HSourceBillNo").select();
@@ -2066,7 +2218,7 @@
                     if (sBarCode == "") {
                         playSound();
                         layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HBarCode").select();
                             $("#HBarCode").focus();
@@ -2095,7 +2247,7 @@
                                 else {
                                     playSound();
                                     layer.msg(data.Message, {
-                                        icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                        icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                     }, function () {
                                         $("#HBarCode").select();
                                         $("#HBarCode").focus();
@@ -2106,7 +2258,7 @@
                             error: function (err) {
                                 playSound();
                                 layer.msg('閿欒' + err, {
-                                    icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HBarCode").select();
                                     $("#HBarCode").focus();
@@ -2120,7 +2272,7 @@
                     if (sBarCode == '') {
                         playSound();
                         layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
-                            icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                         }, function () {
                             $("#HBarCode").select();
                             $("#HBarCode").focus();
@@ -2136,7 +2288,7 @@
                     layer.load(3)
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
+                        url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_New_Json",
                         async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
                         data: { "sBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": sHSCWHID, "HSCSPID": sHSCSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sSourceBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
                         success: function (result) {
@@ -2145,8 +2297,8 @@
                                 if (result.data.hBarTypeField == '浠撳簱鏉$爜') {
                                     $("#HSCWHName").val(result.data.hWhNameField);
                                     $("#HSCWHID").val(result.data.hWhIDField);
-                                    $("#HOutStockPlaceName").val("");
-                                    $("#HOutStockPlaceID").val("0");
+                                    $("#HOutStockPlaceName").val(result.data.hSPNameField);
+                                    $("#HOutStockPlaceID").val(result.data.hSPIDField);
                                     if (result.data.hSPFlagField == 0) {
                                         $("#HOutStockPlaceName").attr("disabled", "disabled");
                                         $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
@@ -2155,7 +2307,6 @@
                                         $("#HOutStockPlaceName").removeAttr("disabled");
                                         $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
                                     }
-                                    element.tabChange('tab-Kf_MoveStockBill_PDA', '2');  //璺宠浆椤电
                                     return;//缁撴潫
                                 }
                                 else if (result.data.hBarTypeField == '浠撲綅鏉$爜') {
@@ -2163,7 +2314,6 @@
                                     $("#HOutStockPlaceID").val(result.data.hSPIDField);
                                     $("#HSCWHName").val(result.data.hWhNameField);
                                     $("#HSCWHID").val(result.data.hWhIDField);
-                                    element.tabChange('tab-Kf_MoveStockBill_PDA', '2');//璺宠浆椤电
                                     return;//缁撴潫
                                 }
                                 else if (result.data.hBarTypeField == '閮ㄩ棬鏉$爜') {
@@ -2249,6 +2399,7 @@
                                     if (result.data.hMulSourceFlagField == 0) {
                                         $("#HSourceBillNo").attr("disabled", "disabled");
                                         $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                        $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                                     }
                                     $("#HStockStyle").val(result.data.hStockStyleField);
                                     $("#HStockStyle").attr("disabled", "disabled");
@@ -2299,13 +2450,15 @@
                                         var optionHtml = '';
                                         optionHtml += "<option value = '-1' >" + '鎵嬪伐褰曞叆' + "</option>";
                                         $("#HMainSourceBillType").append(optionHtml);
-                                        layui.form.render('select');
                                         $("#HMainSourceBillType").attr("disabled", "disabled");
                                         //婧愬崟鍗曞彿鏀逛负涓嶅彲缂栬緫妯″紡
                                         $("#HSourceBillNo").val("");
                                         $("#HSourceBillNo").attr("disabled", "disabled");
                                         $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                        $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                                         $("#HStockStyle").attr("disabled", "disabled");
+                                        $("#HStockInOrgID").attr("disabled", true);
+                                        layui.form.render('select');
                                         element.tabChange('tab-Kf_MoveStockBill_PDA', '3');
                                     }
                                 }
@@ -2317,7 +2470,7 @@
                             else {
                                 playSound();
                                 layer.msg(result.Message, {
-                                    icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                                 }, function () {
                                     $("#HBarCode").select();
                                     $("#HBarCode").focus();
@@ -2328,7 +2481,7 @@
                         error: function (err) {
                             playSound();
                             layer.msg("閿欒锛�" + err, {
-                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
                             }, function () {
                                 $("#HBarCode").select();
                                 $("#HBarCode").focus();
@@ -2370,19 +2523,26 @@
                             for (var i = 0; i < data.length; i++) {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                                }
-                                else {
+                                } else if (data[i].name == '鐗╂枡浠g爜') {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠g爜', event: '鐗╂枡浠g爜', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鐗╂枡浠g爜 + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                } 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')}}</div>", width: 200 });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                             break;
                                         default:
 
                                         if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉$爜涓暟') {
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+                                        } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
                                         } else {
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
                                         }
                                     }
                                 }
@@ -2463,6 +2623,60 @@
             //#endregion
 
 
+            //#region 閫夋嫨璋冩嫧绫诲瀷
+            form.on('select(HStockStyle)', function (data) {
+                if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�') {
+                    $("#HStockInOrgID").attr("disabled", false);
+                    form.render('select');
+                    //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+                    $("#HWHID").val("0");
+                    $("#HWHName").val("");
+                    $("#HStockPlaceID").val("0");
+                    $("#HStockPlaceName").val("");
+                    $("#HStockPlaceName").removeAttr("disabled");
+                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                    $("#HWHName").select();
+                    $("#HWHName").focus();
+                }
+                else {
+                    $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
+                    $("#HStockInOrgID").attr("disabled", true);
+                    form.render('select');
+                    if (HStockInOrgID != $('#HStockInOrgID').val()) {
+                        HStockInOrgID = $('#HStockInOrgID').val()
+                        //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        $("#HStockPlaceName").removeAttr("disabled");
+                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                        $("#HWHName").select();
+                        $("#HWHName").focus();
+                    }
+                }
+            });
+
+            //#endregion
+
+
+            //#region 閫夋嫨璋冨叆缁勭粐
+            form.on('select(HStockInOrgID)', function (data) {
+                HStockInOrgID = $('#HStockInOrgID').val()
+                //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+                $("#HWHID").val("0");
+                $("#HWHName").val("");
+                $("#HStockPlaceID").val("0");
+                $("#HStockPlaceName").val("");
+                $("#HStockPlaceName").removeAttr("disabled");
+                $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                $("#HWHName").select();
+                $("#HWHName").focus();
+            });
+
+            //#endregion
+
+
             
         });
 
@@ -2483,8 +2697,8 @@
             if (obj.length > 0) {
                 $("#HSCWHName").val(obj[0].HName);
                 $("#HSCWHID").val(obj[0].HItemID);
-                $("#HOutStockPlaceName").val("");
-                $("#HOutStockPlaceID").val("0");
+                $("#HOutStockPlaceName").val(obj[0].HSPName);
+                $("#HOutStockPlaceID").val(obj[0].HSPID);
                 if (obj[0].HSPFlag == 0) {
                     $("#HOutStockPlaceName").attr("disabled", "disabled");
                     $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
@@ -2509,8 +2723,8 @@
             if (obj.length > 0) {
                 $("#HWHName").val(obj[0].HName);
                 $("#HWHID").val(obj[0].HItemID);
-                $("#HStockPlaceName").val("");
-                $("#HStockPlaceID").val("0");
+                $("#HStockPlaceName").val(obj[0].HSPName);
+                $("#HStockPlaceID").val(obj[0].HSPID);
                 if (obj[0].HSPFlag == 0) {
                     $("#HStockPlaceName").attr("disabled", "disabled");
                     $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
@@ -2558,19 +2772,26 @@
                 $("#HSupID").val(obj[0].HItemID);
             }
         }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖婧愬崟鍗曞彿
+        function GetHSourceBillValue(obj) {
+            if (obj.length > 0) {
+                $("#HSourceBillNo").val(obj[0].鍗曟嵁鍙�);
+                $("#HSourceBillListCtl").val("1");
+            }
+        }
 
         //鍗曟嵁涓婁紶鍓嶅垽鏂�
         function AllowLoadData(sSubStr) {
             if (HInterID == 0) {
-                layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
             if (HBillNo == '') {
-                layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
             if (sSubStr.length == 0) {
-                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
             //鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
@@ -2582,7 +2803,7 @@
                     }
                 }
                 if (s == 0) {
-                    layer.msg("娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
             }

--
Gitblit v1.9.1