From ca1cfde35f518cfa9064643718b01bdb68e00529 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 21 二月 2022 10:13:10 +0800
Subject: [PATCH] nothing

---
 WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html                      |  115 
 WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html                     | 1316 ++--
 WebTM/views/模治具管理/模具报废入库单/Sc_MouldScrapInBill_PDA.html             |   84 
 WebTM/views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html               |  133 
 WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html                  |   97 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html                |    4 
 WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBill.html                   |    2 
 WebTM/views/index_Mobile.html                                      |   14 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html                  |  145 
 WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html                     | 1540 +++---
 WebTM/views/模治具管理/模具采购入库单/Sc_MouldProdInBill_PDA.html              |   87 
 WebTM/views/设备管理/Sb_EquipDotCheckBillList_PDA.html                 |  156 
 WebTM/views/领料发货/其他出库/Kf_OtherOutBill_FastList.html                |    4 
 WebTM/views/模治具管理/模具寿命调整单/Sc_MouldLifeChangeBill_PDA.html          |   81 
 WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill_Mul_PDA.html      |   44 
 WebTM/views/模治具管理/模具维修记录单/Sc_MouldRepairWorkBill_PDA.html          |   80 
 WebTM/views/车间管理/工序进站接收单/Sc_StationInBill_Mul_PDA.html             |   65 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html                          |   43 
 WebTM/views/生产工序管理/委外工序派工单/WW_AddEntrustProcSendWork.html          |   69 
 WebTM/views/模治具管理/模具生产退库单/Sc_MouldProdBackBill_PDA.html            |   84 
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html        |   24 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html                   |    9 
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html                   |  710 +-
 WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html                   | 1276 ++--
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html                   |  819 +-
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html             |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBill.html                |    2 
 WebTM/views/基础资料/基础资料/Gy_StockCheckItemEdit.html                   |    4 
 WebTM/views/生产工序管理/增加不良评审单/QC_Add_NoPassProdCheckBill.html         |   63 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html                 |    4 
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html        |  154 
 WebTM/views/模治具管理/设备点检记录单/Sb_EquipDotCheckBill_PDA.html            |   77 
 WebTM/views/设备管理/Sb_EquipMaintainBillList_PDA.html                 |   79 
 WebTM/views/生产工序管理/委外工序计划转出单/WW_Add_EntrustProcessSendOutBill.html |   42 
 WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html                      |  101 
 WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill_PDA.html         |  128 
 WebTM/views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html             |  123 
 WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html                          |    6 
 WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html                  | 1180 ++--
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill.html                 |    4 
 WebTM/WebTM.csproj                                                 |    1 
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html                    |    4 
 WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanEdit.html                   |   46 
 WebTM/views/模治具管理/模具其他入库单/Sc_MouldOtherInBill_PDA.html             |   84 
 WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html                    | 1203 ++--
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html        |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBill.html        |    2 
 WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillEdit.html      |   80 
 WebTM/views/模治具管理/模具处理出库单/Sc_MouldScrapOutBill_PDA.html            |   84 
 WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html                   |  722 +-
 WebTM/views/基础资料/销售基础资料/Gy_Customer.html                           |    2 
 WebTM/views/系统管理/会计期间/Xt_AccountPeriod_Edit.html                   |   20 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CheckItem.html                 |    2 
 WebTM/views/设备管理/设备维修派工单/Sb_EquipRepairSendWorkBillEdit.html       |   78 
 WebTM/views/质量管理/产品入库检验单/QC_LastPieceCheckBill.html                |   16 
 WebTM/views/生产工序管理/委外工序计划汇报单/WW_Add_EntrustProcessReport.html      |   50 
 WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html                     |  794 +-
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html                    |   20 
 WebTM/views/设备管理/Sb_EquipMaintainBillList_Mul.html                 |  151 
 WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html            |  102 
 WebTM/views/车间管理/工序出站汇报单/Sc_StationOutBill_Mul_PDA.html            |   75 
 WebTM/views/模治具管理/设备保养记录单/Sb_EquipMaintainBill_PDA.html            |   75 
 WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill_PDA.html          |  128 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html                    |    2 
 WebTM/views/生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html                  |   12 
 WebTM/views/系统管理/公告/GG_NoticeBillEdit.html                         |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html              |    4 
 WebTM/views/设备管理/Sb_EqpMaintenanceBillList_PDA.html                |   48 
 WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html               |    2 
 WebTM/views/模治具管理/模具生产领用单/Sc_MouldProdOutBill_PDA.html             |   86 
 WebTM/views/模治具管理/设备维修记录单/Sb_EquipRepairWorkBill_PDA.html          |   74 
 WebTM/views/生产管理/生产装箱单/Sc_PackUnionBill_Fast.html                  |  906 +++
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                          |   60 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html         |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillEdit.html        |    4 
 WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill_Mul_PDA.html     |   55 
 WebTM/views/工资管理/核算方式/Gy_ClassTimePrjBillEdit.html                 |    6 
 WebTM/views/模治具管理/模治具点检保养/Sc_MouldMaintainBill_PDA.html            |   78 
 WebTM/views/模治具管理/模具其他出库单/Sc_MouldOtherOutBill_PDA.html            |   78 
 WebTM/views/模治具管理/模具改制入库单/Sc_MouldRepairInBill_PDA.html            |   88 
 WebTM/views/模治具管理/模具改制出库单/Sc_MouldRepairOutBill_PDA.html           |   85 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html            |    2 
 WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html                   |   98 
 83 files changed, 7,774 insertions(+), 6,629 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index af0a381..1f61a32 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -805,6 +805,7 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鐗╂枡娓呭崟\sc_Gy_ICBomBillMainList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇瑁呯鍗昞Sc_PackUnionBill_Fast.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
     <Content Include="views\鐢熶骇绠$悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index d73fbd0..c69bb43 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -75,7 +75,7 @@
                 <img src="../layuiadmin/myicon/yidongduan.svg" alt="绉诲姩绔�" style="width:25px;height:25px;margin-right: 5px;"/>
                 <span>LMES绠$悊绯荤粺</span>
           </div>
-          <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu" style="width:260px;">
+          <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu" style="width:260p                                                                             x;">
               <!-- 杞﹂棿绠$悊 -->
               <li data-name="set" class="layui-nav-item">
                   <a style="padding-left:20px;">
@@ -380,6 +380,18 @@
                       <dd>
                           <a href="" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鐢熶骇瑁呯鍗�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a href="鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              鐢熶骇鎷嗙鍗�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a href="" target="main_self_frame" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鏉$爜鏌ヨn
                           </a>
                       </dd>
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 2d04920..83b88e3 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"
@@ -1,13 +1,18 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <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">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
 </head>
 
 <body>
@@ -25,6 +30,9 @@
                             </div>
                             <div class="layui-col-xs8">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -119,6 +127,9 @@
                                         </div>
                                         <div class="layui-col-xs8">
                                             <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -854,288 +865,34 @@
 
 
             //鎵潯鐮�
-            $('#HBarCode').on('keydown', function (event) {  //鎵潯鐮�
-                var sOldBarCode = $('#HBarCode').val()
-                var HDeleteFlag = sOldBarCode.substring(0, 1);
-                var sBarCode = sOldBarCode.slice(1);
-
-                var sSubStr = table.cache['wl-table'];
-                //var sBarCode = $('#HBarCode').val()
-                var sInterID = $("#HInterID").val()
-                var sBillNo = $("#HBillNo").val()
-                var sQty = $("#HQty").val()
-                var sHBillType = $("#HBillType").val()
-                var SCWhID = $("#HSCWHID").val()//璋冨嚭浠撳簱
-                var HSPID = $("#HStockPlaceID").val()//璋冨叆浠撲綅
-                var HWHID = $("#HWHID").val()//璋冨叆浠撳簱
-                var SCSPID = $("#HOutStockPlaceID").val()//璋冨嚭浠撲綅
-                var HMaker = $("#HMaker").val();//鍒跺崟浜�
-                var HOrgID = $("#HOrgID").val();//缁勭粐
-                var sBillType = '1207';
-                var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
-
+            $('#HBarCode').on('keydown', function (event) { 
                 if (sSourceBillNo == null)
                 {
                     sSourceBillNo = "";
                 }
-
                 if (sQty == "") {
                     sQty = 0;
                 }
                 if (event.keyCode == 13) {
-                    if (HDeleteFlag == "*") {
-                        if (sBarCode != "") {
-                            $('#HBarCode').val("");
-                        }
-                        $.ajax(
-                            {
-                                type: "Get",
-                                url: GetWEBURL() + "/ProductIn/Delete_Json",
-                                async: true,
-                                data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
-                                dataType: "json",
-                                success: function (data) {
-                                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                                        playSound1();
-                                        table.render({
-                                            elem: '#wl-table'
-                                            , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
-                                            , toolbar: '#toolbarDemo'
-                                            , defaultToolbar: []
-                                            , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
-                                            , cols: [[
-                                                { type: 'radio' }
-                                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                                , { 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 }
-                                                , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
-                                            ]]
-                                            // , data: [linterid]
-                                            // , page: true
-                                            , height: 500
-                                            , done: function () {
-                                                layer.closeAll("loading");
-                                            }
-                                        })
-                                    }
-                                    else {
-                                        playSound();
-                                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                    }
-                                },
-                                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 != "") {
-                            $('#HBarCode').val("");
-                        }
-                        if (sQty != "") {
-                            $('#HQty').val("");
-                        }
-                        if ($("#HWHNAME").val() == '') {
-                            playSound();
-                            layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
-                        }
-                        //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
-                        //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        //    return false;
-                        //}
-                        //if ($("#HSCWHNAME").val() == '') {
-                        //    layer.msg("璋冨嚭浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        //    return false;
-                        //}
-                        if ($("#HBillNo").val() == '') {
-                            playSound();
-                            layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
-                        }
-                        if ($("#HInterID").val() == '') {
-                            playSound();
-                            layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
-                        }
-                        $.ajax({
-                            url: GetWEBURL() + "/MoveStockBill/get_InfoByBarCode_Source_Json",
-                            type: "GET",
-                            data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sQty": sQty, "HWHID": HWHID, "HSPID": HSPID, "SCWhID": SCWhID, "SCSPID": SCSPID, "HMaker": HMaker, "HOrgID": HOrgID, "HSourceBillNo": sSourceBillNo, "HSourceBillType":  sHBillType },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    element.tabChange('tab-MoveStockBill', '3');
-                                    //$("#HWHNAME").attr("readOnly", "true");//璋冨叆浠撳簱涓嶅彲鍙�
-                                    //$("#HWHID-BT").attr("disabled", "true");
-                                    //$("#HStockPlaceName").attr("readOnly", "true");//璋冨叆浠撲綅涓嶅彲鍙�
-                                    //$("#HSpID-BT").attr("disabled", "true");
-                                    //$("#HSCWHNAME").attr("readOnly", "true");//璋冨嚭浠撳簱涓嶅彲鍙�
-                                    //$("#HSCWHID-BT").attr("disabled", "true");
-                                    //$("#HOutStockPlaceName").attr("readOnly", "true");//璋冨叆浠撲綅涓嶅彲鍙�
-                                    //$("#HOSpID-BT").attr("disabled", "true");
-                                    layer.load(3)
-                                    table.render({
-                                        elem: '#wl-table'
-                                        , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
-                                        , toolbar: '#toolbarDemo'
-                                        , defaultToolbar: []
-                                        , totalRow: true
-                                        , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
-                                        , cols: [[
-                                            { type: 'radio', totalRowText: '鍚堣' }
-                                            , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
-                                            , { field: '浠舵暟', title: '浠舵暟', width: 150, totalRow: true }
-                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                            , { 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: 'HMaterID', title: '鐗╂枡鍐呯爜', width: 150, hide: true }
-                                            , { field: 'HAuxPropID', title: '', width: 150, hide: true }
-                                            , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 150, hide: true }
-                                            , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
-                                        ]]
-                                        // , data: [linterid]
-                                        // , page: true
-                                        //, height: 500
-                                        , done: function () {
-                                            layer.closeAll("loading");
-                                        }
-                                    });
-                                    playSound1();
-                                    var sSubStr = table.cache['wl-table'];
-                                }
-                                else {
-                                    playSound();
-                                    layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                }
-                                layer.closeAll("loading");
-                            }
-                            //,
-                            //error: function (XMLHttpRequest, textStatus, errorThrown) {
-                            //    alert("璇锋眰瀵硅薄XMLHttpRequest: " + XMLHttpRequest);
-                            //    alert("閿欒绫诲瀷textStatus: " + textStatus);
-                            //    alert("寮傚父瀵硅薄errorThrown: " + errorThrown);
-                            //}
-                        });
-                    }
+                    GetMeesageByBarCode();
                 }
             });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
-
-            function playSound() {
-                console.log("playSound");
-                //var audio = document.getElementById("cs");
-                //$("appendAut").html("");
-                //if (audio == null)
-                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
-                //$("appendAut").attr("src","../../video/jingbao.wav")
-                var audio = document.getElementById("cs");
-                audio.play();
-            }
-
-            function playSound1() {
-                console.log("playSound1");
-                //var audio = document.getElementById("cs");
-                //$("appendAut").html("");
-                //if (audio == null)
-                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/success.wav" type = "audio/ogg"> </audio >');
-                //$("appendAut").attr("src", "../../video/success.wav")
-                var audio = document.getElementById("cs2");
-                audio.play();
-            }
+            
 
             //鎵簮鍗�
             $('#HSourceBillNo').on('keydown', function (event) {      //鎵簮鍗�
-                var HSourceBillNo = $('#HSourceBillNo').val()
-                var sInterID = $("#HInterID").val()
-                var sBillNo = $("#HBillNo").val()
-                var HSourceBillType = $("#HBillType").val()
-                if (HSourceBillType == '1243')
-                {
-                    
-                }
                 if (event.keyCode == 13) {
-                    $.ajax({
-                        url: GetWEBURL() + "/MoveStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
-                        type: "GET",
-                        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
-                        success: function (result) {
-                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                playSound1();
-                                if (result.data[0].HSourceBillType == '1243')
-                                {
-                                    $("#HStockStyle").val(result.data[0].HStockStyle);
-                                    $("#HStockInOrgID").val(result.data[0].HSTOCKINORGID);
-                                    $("#HStockInOrgName").val(result.data[0].HSTOCKINORGName);
-                                    $("#HStockOutOrgID").val(result.data[0].HSTOCKOUTORGID);
-                                    $("#HStockOutOrgName").val(result.data[0].HSTOCKOUTORGName);
-                                }
-
-                                $("#HDeptID").val(result.data[0].HDeptID);
-                                $("#HDeptName").val(result.data[0].HDeptName);
-                                
-
-                                $("#HWHID").val(result.data[0].HWhID);
-                                $("#HWHNAME").val(result.data[0].HWhName);
-
-                                //if (!DBUtility.ClsPub.ObjToBool(DS.Tables[0].Rows[0]["HIsStockMgr"])) {
-                                //    $("#HStockPlaceName").Enabled = false;
-                                //    $("#HStockPlaceID").Enabled = false;
-                                //}
-                                //else {
-                                //    $("#HStockPlaceName").Enabled = true;
-                                //    $("#HStockPlaceID").Enabled = true;
-                                //}
-                                layer.load(3);
-                                element.tabChange('tab-MoveStockBill', '2');
-                                table.render({
-                                    elem: '#wl-table'
-                                    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
-                                    , toolbar: '#toolbarDemo'
-                                    , defaultToolbar: []
-                                    , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
-                                    , cols: [[
-                                        { type: 'radio' }
-                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                        , { 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 }
-                                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
-                                    ]]
-                                    // , data: [linterid]
-                                    // , page: true
-                                    , height: 500
-                                    , done: function () {
-                                        layer.closeAll("loading");
-                                    }
-                                });
-                                $("#HSourceBillNo").attr("disabled", "true");
-                            }
-                            else {
-                                playSound();
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                            layer.closeAll("loading");
-                        }
-                    });
+                    GetMeesageBySourceBillNo();
                 }
+            });
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                GetMeesageBySourceBillNo();
             });
 
             $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
@@ -1221,173 +978,393 @@
                 }
             });
 
+            function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+            {
+                $("#HWHNAME").val(obj[0].HName);
+                //sessionStorage["HWHID"] = obj[0].HItemID;
+                $("#HWHID").val(obj[0].HItemID);
+            }
+            function GetHOrgNameValue(obj)  //杩斿洖璋冨叆缁勭粐
+            {
+                $("#HStockInOrgName").val(obj[0].HName);
+                $("#HStockInOrgID").val(obj[0].HItemID);
 
-            //浠ヤ笂涓簂ayui妯″潡
-        });
-        //娓呯┖琛ㄥご
-        //function f_ClearTitle() {
+            }
+            function GetHOutOrgNameValue(obj)  //杩斿洖璋冨嚭缁勭粐
+            {
+                $("#HStockOutOrgName").val(obj[0].HName);
+                $("#HStockOutOrgID").val(obj[0].HItemID);
 
-        //    $("#HBarCode").val("");
-        //    $("#HSpName").val("");
-        //    $("#HSpID").val("0");
-        //    $("#HQty").val("0");
-        //    $("#HSourceBillNo").val("");
-        //    $("#HWHNAME").val("");
-        //    $("#HWHID").val("0");
-        //    $("#HSCWHNAME").val("");
-        //    $("#HSCWHID").val("0");
-        //    $("#HSupName").val("");
-        //    $("#HSupID").val("0");
-        //    $("#HKeeper").val("");
-        //    $("#HKeeperID").val("0");
-        //    $("#HSecManager").val("0");
-        //    $("#HSecManagerID").val("");
-        //    $("#HDeptName").val("");
-        //    $("#HDeptID").val("0");
-        //    $("#HBillNo").val("");
-        //    $("#HInterID").val("0");
-        //}
-        function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
-        {
-            $("#HWHNAME").val(obj[0].HName);
-            //sessionStorage["HWHID"] = obj[0].HItemID;
-            $("#HWHID").val(obj[0].HItemID);
-        }
-
-        function GetHOrgNameValue(obj)  //杩斿洖璋冨叆缁勭粐
-        {
-            $("#HStockInOrgName").val(obj[0].HName);
-            $("#HStockInOrgID").val(obj[0].HItemID);
-
-        }
-        function GetHOutOrgNameValue(obj)  //杩斿洖璋冨嚭缁勭粐
-        {
-            $("#HStockOutOrgName").val(obj[0].HName);
-            $("#HStockOutOrgID").val(obj[0].HItemID);
-
-        }
-
-        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-            $("#HStockPlaceName").val(obj[0].HName);
-            $("#HStockPlaceID").val(obj[0].HItemID);
-        }
-        function GetHSCWHNAMEValue(obj)  //杩斿洖璋冨嚭浠撳簱
-        {
-            $("#HSCWHNAME").val(obj[0].HName);
-            $("#HSCWHID").val(obj[0].HItemID);
-        }
-        function GetHOutStockPlaceIDValue(obj) {  //杩斿洖璋冨嚭浠撲綅
-            $("#HOutStockPlaceName").val(obj[0].HName);
-            $("#HOutStockPlaceID").val(obj[0].HItemID);
-        }
-        function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
-            $("#HSupName").val(obj[0].HName);
-            $("#HSupID").val(obj[0].HItemID);
-        }
-        function GetHKeeperValue(obj) {  //杩斿洖淇濈
-            $("#HKeeper").val(obj[0].HName);
-            $("#HKeeperID").val(obj[0].HItemID);
-        }
-        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-            $("#HSecManager").val(obj[0].HName);
-            $("#HSecManagerID").val(obj[0].HItemID);
-        }
-        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-            $("#HDeptName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-        }
-
-        //杩斿洖鐝粍
-        function GetProductionTeamValue(obj) {   //杩斿洖鐝粍
-            if (obj.length == 0) {
-                layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
-            } else {
-                $("#HGroupName").val(obj[0].鐝粍);
-                $("#HGroupID").val(obj[0].HItemID);
-                layer.closeAll();
             }
-        }
-        //function Get_CheckWhAndSP(sInterID, sHBillType, sBarCode, sHWHID, sHSPID) {   //杩斿洖閮ㄩ棬
-        //    $.ajax({
-        //        type: "GET",
-        //        data: { "sHInterID": sInterID, "sHBillType": sHBillType, "sBarCode": sBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID },
-        //        success: function (result) {
-        //            if(result.count==1)
-        //            {
-        //               // layer.msg(result.Message, { icon: 1 });
-        //                return true;
-        //            }
-        //            else
-        //            {
-        //                layer.msg(result.Message, { icon: 5 });
-        //                return false;
-        //            }
-        //        }
-        //    })
-        //}
-        function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    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;
+            function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
             }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHSCWHNAMEValue(obj)  //杩斿洖璋冨嚭浠撳簱
+            {
+                $("#HSCWHNAME").val(obj[0].HName);
+                $("#HSCWHID").val(obj[0].HItemID);
             }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHOutStockPlaceIDValue(obj) {  //杩斿洖璋冨嚭浠撲綅
+                $("#HOutStockPlaceName").val(obj[0].HName);
+                $("#HOutStockPlaceID").val(obj[0].HItemID);
             }
-            //if ($("#HSupName").val() == '') {
-            //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            //    return false;
-            //}
-            if ($("#HWHNAME").val() == '') {
-                layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
             }
-            //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
-            //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            //    return false;
-            //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHKeeperValue(obj) {  //杩斿洖淇濈
+                $("#HKeeper").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
             }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
             }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
             }
-            if (bnt == 'Saver') {
-                if (!typeof (sSubStr) == "undefined") {
-                    for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                        if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                            if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
-                                layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                return false;
-                            }
-                        }
-                    }
-                    //for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    //    if (parseFloat(sSubStr[i].HQty) == 0) {
-                    //        layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
-                    //        return false;
-                    //    }
-                    //}
+            function GetProductionTeamValue(obj) {   //杩斿洖鐝粍
+                if (obj.length == 0) {
+                    layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
+                } else {
+                    $("#HGroupName").val(obj[0].鐝粍);
+                    $("#HGroupID").val(obj[0].HItemID);
+                    layer.closeAll();
                 }
             }
-            else {
-                return true;
+
+            function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
+                //if ($("#HSourceBillNo").val() == '') {
+                //    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 ($("#HSupName").val() == '') {
+                //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return false;
+                //}
+                if ($("#HWHNAME").val() == '') {
+                    layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
+                //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return false;
+                //}
+                if ($("#HBillNo").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HInterID").val() == '') {
+                    layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (typeof (sSubStr) == "undefined") {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (bnt == 'Saver') {
+                    if (!typeof (sSubStr) == "undefined") {
+                        for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                            if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                                if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                                    layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    return false;
+                                }
+                            }
+                        }
+                        //for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        //    if (parseFloat(sSubStr[i].HQty) == 0) {
+                        //        layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
+                        //        return false;
+                        //    }
+                        //}
+                    }
+                }
+                else {
+                    return true;
+                }
             }
-        }
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+
+                var sSubStr = table.cache['wl-table'];
+                //var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sQty = $("#HQty").val()
+                var sHBillType = $("#HBillType").val()
+                var SCWhID = $("#HSCWHID").val()//璋冨嚭浠撳簱
+                var HSPID = $("#HStockPlaceID").val()//璋冨叆浠撲綅
+                var HWHID = $("#HWHID").val()//璋冨叆浠撳簱
+                var SCSPID = $("#HOutStockPlaceID").val()//璋冨嚭浠撲綅
+                var HMaker = $("#HMaker").val();//鍒跺崟浜�
+                var HOrgID = $("#HOrgID").val();//缁勭粐
+                var sBillType = '1207';
+                var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
+
+                if (HDeleteFlag == "*") {
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/ProductIn/Delete_Json",
+                            async: true,
+                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    playSound1();
+                                    table.render({
+                                        elem: '#wl-table'
+                                        , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
+                                        , toolbar: '#toolbarDemo'
+                                        , defaultToolbar: []
+                                        , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
+                                        , cols: [[
+                                            { type: 'radio' }
+                                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                            , { 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 }
+                                            , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                                        ]]
+                                        // , data: [linterid]
+                                        // , page: true
+                                        , height: 500
+                                        , done: function () {
+                                            layer.closeAll("loading");
+                                        }
+                                    })
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            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 != "") {
+                        $('#HBarCode').val("");
+                    }
+                    if (sQty != "") {
+                        $('#HQty').val("");
+                    }
+                    if ($("#HWHNAME").val() == '') {
+                        playSound();
+                        layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
+                    //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    //    return false;
+                    //}
+                    //if ($("#HSCWHNAME").val() == '') {
+                    //    layer.msg("璋冨嚭浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    //    return false;
+                    //}
+                    if ($("#HBillNo").val() == '') {
+                        playSound();
+                        layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    if ($("#HInterID").val() == '') {
+                        playSound();
+                        layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    $.ajax({
+                        url: GetWEBURL() + "/MoveStockBill/get_InfoByBarCode_Source_Json",
+                        type: "GET",
+                        data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sQty": sQty, "HWHID": HWHID, "HSPID": HSPID, "SCWhID": SCWhID, "SCSPID": SCSPID, "HMaker": HMaker, "HOrgID": HOrgID, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                element.tabChange('tab-MoveStockBill', '3');
+                                //$("#HWHNAME").attr("readOnly", "true");//璋冨叆浠撳簱涓嶅彲鍙�
+                                //$("#HWHID-BT").attr("disabled", "true");
+                                //$("#HStockPlaceName").attr("readOnly", "true");//璋冨叆浠撲綅涓嶅彲鍙�
+                                //$("#HSpID-BT").attr("disabled", "true");
+                                //$("#HSCWHNAME").attr("readOnly", "true");//璋冨嚭浠撳簱涓嶅彲鍙�
+                                //$("#HSCWHID-BT").attr("disabled", "true");
+                                //$("#HOutStockPlaceName").attr("readOnly", "true");//璋冨叆浠撲綅涓嶅彲鍙�
+                                //$("#HOSpID-BT").attr("disabled", "true");
+                                layer.load(3)
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
+                                    , toolbar: '#toolbarDemo'
+                                    , defaultToolbar: []
+                                    , totalRow: true
+                                    , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio', totalRowText: '鍚堣' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+                                        , { field: '浠舵暟', title: '浠舵暟', width: 150, totalRow: true }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                        , { 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: 'HMaterID', title: '鐗╂枡鍐呯爜', width: 150, hide: true }
+                                        , { field: 'HAuxPropID', title: '', width: 150, hide: true }
+                                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 150, hide: true }
+                                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                                    ]]
+                                    // , data: [linterid]
+                                    // , page: true
+                                    //, height: 500
+                                    , done: function () {
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                                playSound1();
+                                var sSubStr = table.cache['wl-table'];
+                            }
+                            else {
+                                playSound();
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                        //,
+                        //error: function (XMLHttpRequest, textStatus, errorThrown) {
+                        //    alert("璇锋眰瀵硅薄XMLHttpRequest: " + XMLHttpRequest);
+                        //    alert("閿欒绫诲瀷textStatus: " + textStatus);
+                        //    alert("寮傚父瀵硅薄errorThrown: " + errorThrown);
+                        //}
+                    });
+                }
+            }
+            function playSound() {
+                console.log("playSound");
+                //var audio = document.getElementById("cs");
+                //$("appendAut").html("");
+                //if (audio == null)
+                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+                //$("appendAut").attr("src","../../video/jingbao.wav")
+                var audio = document.getElementById("cs");
+                audio.play();
+            }
+            function playSound1() {
+                console.log("playSound1");
+                //var audio = document.getElementById("cs");
+                //$("appendAut").html("");
+                //if (audio == null)
+                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/success.wav" type = "audio/ogg"> </audio >');
+                //$("appendAut").attr("src", "../../video/success.wav")
+                var audio = document.getElementById("cs2");
+                audio.play();
+            }
+            //鎵簮鐮�
+            function GetMeesageBySourceBillNo(obj) {  //杩斿洖宸ヤ綔涓績
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                $.ajax({
+                    url: GetWEBURL() + "/MoveStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    type: "GET",
+                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            playSound1();
+                            if (result.data[0].HSourceBillType == '1243') {
+                                $("#HStockStyle").val(result.data[0].HStockStyle);
+                                $("#HStockInOrgID").val(result.data[0].HSTOCKINORGID);
+                                $("#HStockInOrgName").val(result.data[0].HSTOCKINORGName);
+                                $("#HStockOutOrgID").val(result.data[0].HSTOCKOUTORGID);
+                                $("#HStockOutOrgName").val(result.data[0].HSTOCKOUTORGName);
+                            }
+
+                            $("#HDeptID").val(result.data[0].HDeptID);
+                            $("#HDeptName").val(result.data[0].HDeptName);
+
+
+                            $("#HWHID").val(result.data[0].HWhID);
+                            $("#HWHNAME").val(result.data[0].HWhName);
+
+                            //if (!DBUtility.ClsPub.ObjToBool(DS.Tables[0].Rows[0]["HIsStockMgr"])) {
+                            //    $("#HStockPlaceName").Enabled = false;
+                            //    $("#HStockPlaceID").Enabled = false;
+                            //}
+                            //else {
+                            //    $("#HStockPlaceName").Enabled = true;
+                            //    $("#HStockPlaceID").Enabled = true;
+                            //}
+                            layer.load(3);
+                            element.tabChange('tab-MoveStockBill', '2');
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
+                                , toolbar: '#toolbarDemo'
+                                , defaultToolbar: []
+                                , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { 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 }
+                                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                                ]]
+                                // , data: [linterid]
+                                // , page: true
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                            $("#HSourceBillNo").attr("disabled", "true");
+                        }
+                        else {
+                            playSound();
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+        
+        
     </script>
 
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
index f074b98..1759dad 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
@@ -62,7 +62,7 @@
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HQCCheckClassName" id="HQCCheckClassName" class="layui-input" value="0" style="float:left;width:150px;">
                                                     <input type="hidden" name="HQCCheckClassID" id="HQCCheckClassID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HQCCheckClassList" style="width:40px;">
+                                                    <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HQCCheckClassList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
                                                 </div>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 4a79856..2c66164 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -12,6 +12,15 @@
         .layui-form-label {
             width: 85px;
         }
+        .layui-form-item .layui-input-inline {
+            width: 50%;
+        }
+        .layui-inline {
+            width: 290px;
+        }
+        .layui-form-item .layui-inline {
+            margin-right: 0px;
+        }
     </style>
 </head>
 <body>
@@ -42,27 +51,27 @@
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鐗╂枡浠g爜锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                         <input id="HItemID" name="HItemID" type="hidden" />
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鐗╂枡鍚嶇О锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">瑙勬牸鍨嬪彿锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HModel" id="HModel" autocomplete="off">
 
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍔╄鐮侊細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
@@ -73,11 +82,11 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">涓昏閲忓崟浣�</label>
                                                         <div class="layui-input-inline">
-                                                            <input type="text" readonly name="HUnitName" id="HUnitName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="text" readonly name="HUnitName" id="HUnitName" class="layui-input" value="" style="float: left; width: 100px;">
                                                             <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="" style="float:left;width:150px;">
                                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitList" id="HUnitList" style="width:40px;">
                                                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -85,26 +94,26 @@
                                                         </div>
                                                     </div>
                                                     <!--<div class="layui-inline">
-                                                        <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
-                                                        <div class="layui-input-inline">
-                                                            <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
-                                                            <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
-                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
-                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                            </button>
-                                                        </div>
-                                                    </div>-->
+        <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
+            <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
+            <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+            </button>
+        </div>
+    </div>-->
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <!--<label class="layui-form-label"> 璁¢噺鍗曚綅缁勶細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
-                                                    </div>-->
+    <div class="layui-input-inline">
+        <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
+    </div>-->
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">璁¢噺鍗曚綅缁�</label>
                                                         <div class="layui-input-inline">
-                                                            <input type="text" readonly name="HUnitGroupName" id="HUnitGroupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="text" readonly name="HUnitGroupName" id="HUnitGroupName" class="layui-input" value="" style="float: left; width: 100px;">
                                                             <input type="hidden" name="HUnitGroupID" id="HUnitGroupID" class="layui-input" value="" style="float:left;width:150px;">
                                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitGroupList" id="HUnitGroupList" style="width:40px;">
                                                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -114,7 +123,7 @@
 
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 闄勫姞灞炴��1锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HSubjoin" lay-verify="HSubjoin" id="HSubjoin" autocomplete="off">
@@ -122,7 +131,7 @@
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 闄勫姞灞炴��2锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HSubjoin2" lay-verify="HSubjoin2" id="HSubjoin2" autocomplete="off">
@@ -134,21 +143,21 @@
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 棰滆壊锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HColor" lay-verify="HColor" id="HColor" autocomplete="off">
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 鐗╂枡鍒嗙被锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HMaterClsID" lay-verify="HMaterClsID" id="HMaterClsID" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 鐗╂枡灞炴�э細</label>
                                                     <div class="layui-input-inline">
                                                         <div class="layui-form">
@@ -163,15 +172,15 @@
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <!--<label class="layui-form-label"> 榛樿浠撳簱锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
-                                                    </div>-->
+    <div class="layui-input-inline">
+        <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
+    </div>-->
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">榛樿浠撳簱</label>
                                                         <div class="layui-input-inline">
-                                                            <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float: left; width: 100px;">
                                                             <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
                                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
                                                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -184,7 +193,7 @@
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 榛樿浠撲綅缁勶細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HSPGroupID" lay-verify="HSPGroupID" id="HSPGroupID" autocomplete="off" value="0">
@@ -192,21 +201,21 @@
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 榛樿浠撲綅锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HSPID" lay-verify="HSPID" id="HSPID" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 榛樿宸ヨ壓璺嚎锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HRoutingID" lay-verify="HRoutingID" id="HRoutingID" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 榛樿bom锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HBomID" lay-verify="HBomID" id="HBomID" autocomplete="off" value="0">
@@ -219,15 +228,15 @@
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <!--<label class="layui-form-label"> 杈呭姪璁¢噺鍗曚綅锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
-                                                    </div>-->
+    <div class="layui-input-inline">
+        <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+    </div>-->
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">杈呭姪璁¢噺鍗曚綅</label>
                                                         <div class="layui-input-inline">
-                                                            <input type="text" readonly name="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="text" readonly name="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float: left; width: 100px;">
                                                             <input type="hidden" name="HSecUnitID" id="HSecUnitID" class="layui-input" value="" style="float:left;width:150px;">
                                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecUnitList" id="HSecUnitList" style="width:40px;">
                                                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -236,25 +245,25 @@
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 鎹㈢畻鐜囷細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
                                                         <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>-->
+            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+        </button>-->
                                                         <!--<input id="HDormID" name="HDormID" type="hidden" />-->
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 鏈�楂樺簱瀛橈細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HHighStock" lay-verify="HHighStock" id="HHighStock" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 鏈�浣庡簱瀛橈細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HLowStock" lay-verify="HLowStock" id="HLowStock" autocomplete="off" value="0">
@@ -264,28 +273,28 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 瀹夊叏搴撳瓨锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HSafeStock" lay-verify="HSafeStock" id="HSafeStock" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 閲囪喘鍗曚环锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HOrderPrice" lay-verify="HOrderPrice" id="HOrderPrice" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 閿�鍞崟浠凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HSalePrice" lay-verify="HSalePrice" id="HSalePrice" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 璁″垝鍗曚环锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HPlanPrice" lay-verify="HPlanPrice" id="HPlanPrice" autocomplete="off" value="0">
@@ -295,26 +304,26 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 鏍囧噯鎴愭湰锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HstdPrice" lay-verify="HstdPrice" id="HstdPrice" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 淇濊川鏈燂細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HKeepDays" lay-verify="HKeepDays" id="HKeepDays" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 鏈�澶ц璐ч噺锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HQtyMax" lay-verify="HQtyMax" id="HQtyMax" autocomplete="off" value="0">
@@ -324,43 +333,43 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 鐗堟湰鍙凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HVersion" lay-verify="HVersion" id="HVersion" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 鑻辨枃鍚嶇О锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HEngName" lay-verify="HEngName" id="HEngName" autocomplete="off">
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label"> 鑻辨枃瑙勬牸锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
-                                                    </div>
-                                                </div>
+                                                 <div class="layui-inline">
+                                                     <label class="layui-form-label"> 鑻辨枃瑙勬牸锛�</label>
+                                                     <div class="layui-input-inline">
+                                                         <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
+                                                     </div>
+                                                 </div>
 
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label"> 杈呭姪灞炴�э細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
-                                                    </div>
-                                                </div>
+                                                 <div class="layui-inline">
+                                                     <label class="layui-form-label"> 杈呭姪灞炴�э細</label>
+                                                     <div class="layui-input-inline">
+                                                         <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
+                                                     </div>
+                                                 </div>
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 澶囨敞锛�</label>
                                                     <div class="layui-input-inline ">
                                                         <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">绂佺敤鏍囧織锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html"
index f15cf38..7b72638 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html"
@@ -32,7 +32,7 @@
                                         <input type="hidden" class="layui-input" name="user" id="user">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 120px">浠g爜锛�</label>
+                                                <label class="layui-form-label" style="width: 80px">浠g爜锛�</label>
                                                 <div class="layui-input-inline">
                                                     <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                     <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
@@ -46,7 +46,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                <label class="layui-form-label" style="width: 80px">鍔╄鐮侊細</label>
                                                 <div class="layui-input-inline">
                                                     <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                                 </div>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
index 907c0a9..9f56979 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
@@ -39,9 +39,9 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 10px;">
-                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
-                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
-                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 4283472..4dd76cc 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -108,8 +108,8 @@
                                     <div class="layui-input-inline">
                                         <input type="text" name="HProcMulName" id="HProcMulName" class="layui-input" value="" style="float:left;width:150px;">
                                         <input type="hidden" name="HProcMulID" id="HProcMulID" value="0">
-                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px; background-color: gainsboro;">
-                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px; color: black;"></i>
+                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px;"></i>
                                         </button>
                                     </div>
                                 </div>
@@ -136,8 +136,8 @@
                                     <div class="layui-input-inline">
                                         <input type="text" name="HProcessName_K3" id="HProcessName_K3" class="layui-input" value="" style="float:left;width:150px;">
                                         <input type="hidden" name="HProcessID_K3" id="HProcessID_K3" value="0">
-                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px; background-color: gainsboro;">
-                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px; color: black;"></i>
+                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px;"></i>
                                         </button>
                                     </div>
                                 </div>
@@ -192,6 +192,7 @@
                             </div>
                         </div>
                         <input type="hidden" value="0" name="HParentID" id="HParentID">
+                    </div>
                 </form>
             </div>
         </div>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index d217c3e..82b85a9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -8,7 +8,22 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-form-item .layui-input-inline {
+            width: 50%;
+        }
 
+        .layui-inline {
+            width: 290px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-right: 0px;
+        }
+        .layui-input, .layui-textarea {
+            width: 124%;
+        }
+    </style>
 
 </head>
 <body>
@@ -28,30 +43,34 @@
                     <h1 style="text-align:center;height:50px;line-height:50px"><b>渚涘簲鍟嗚缃�</b></h1>
                     <div class="layui-form-item" style="padding-top: 10px;">
                         <div class="layui-row" style="margin-bottom:5px">
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鍒涘缓缁勭粐</label>
-                                <div class="layui-input-inline" style="margin-right:0px">
-                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly">
-                                    <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
+                                <div class="layui-input-inline" style="margin-right: 0px;width: 100px;">
+                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly" style="width: 134%;">
+                                    <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input" >
                                 </div>
-                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">浣跨敤缁勭粐</label>
-                                <div class="layui-input-inline" style="margin-right:0px">
-                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly">
+                                <div class="layui-input-inline" style="margin-right: 0px; width: 100px;">
+                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly" style="width: 134%;">
                                     <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
                                 </div>
-                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">缂栫爜</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
                                     <input type="hidden" name="HInterID" id="HInterID">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鍚嶇О</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
@@ -59,25 +78,25 @@
                             </div>
                         </div>
                         <div class="layui-row" style="margin-bottom:5px">
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鍔╄鐮�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HHelpCode" id="HHelpCode" lay-verify="HHelpCode" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">绠�绉�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HShortName" id="HShortName" lay-verify="HShortName" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鍦板潃</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HAddress" id="HAddress" lay-verify="HAddress" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鑱旂郴浜�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HLinkMan" id="HLinkMan" lay-verify="HLinkMan" autocomplete="off" placeholder="" class="layui-input">
@@ -85,25 +104,25 @@
                             </div>
                         </div>
                         <div class="layui-row" style="margin-bottom:5px">
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HLinkPhone" id="HLinkPhone" lay-verify="HLinkPhone" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鎵嬫満</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HMobilePhone" id="HMobilePhone" lay-verify="HMobilePhone" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">浼犵湡</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HFax" id="HFax" lay-verify="HFax" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">閭紪</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HPostalCode" id="HPostalCode" lay-verify="HPostalCode" autocomplete="off" placeholder="" class="layui-input">
@@ -111,25 +130,25 @@
                             </div>
                         </div>
                         <div class="layui-row" style="margin-bottom:5px">
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鐢靛瓙閭</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HEmail" id="HEmail" lay-verify="HEmail" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">娉曚汉浠h〃</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HCorMan" id="HCorMan" lay-verify="HCorMan" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">寮�鎴烽摱琛�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HBank" id="HBank" lay-verify="HBank" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">绋庡姟鐧昏鍙�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HTaxNum" id="HTaxNum" lay-verify="HTaxNum" autocomplete="off" placeholder="" class="layui-input">
@@ -137,63 +156,63 @@
                             </div>
                         </div>
                         <div class="layui-row" style="margin-bottom:5px">
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鑻辨枃鍚嶇О</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HEnglishName" id="HEnglishName" lay-verify="HEnglishName" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鑻辨枃鍦板潃</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HEnglishAddress" id="HEnglishAddress" lay-verify="HEnglishAddress" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">鍥藉</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HCountry" id="HCountry" lay-verify="HCountry" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label" style="width: 85px;padding: 9px 13px;">鍦板尯</label>
                                 <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color:#efefef4d;width: 38%;display: inline-block;" readonly>
+                                    <input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color: #efefef4d; width: 64%; display: inline-block;" readonly>
                                     <input type="hidden" name="HAreaID" id="HAreaID" value="0">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnArea" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnArea" id="btnSearchProc" style="padding: 0 10px;float: right;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                     </button>
                                 </div>
                             </div>
                         </div>
                         <div class="layui-row" style="margin-bottom:5px">
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">澧炲�肩◣鐜�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HTaxRate" id="HTaxRate" lay-verify="HTaxRate" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label" style="width: 85px;padding: 9px 13px;">榛樿璐у竵</label>
                                 <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color:#efefef4d;width: 38%;display: inline-block;" readonly>
+                                    <input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color: #efefef4d; width: 64%; display: inline-block;" readonly>
                                     <input type="hidden" name="HCurID" id="HCurID" value="0">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCurrency" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCurrency" id="btnSearchProc" style="padding: 0 10px;float: right;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                     </button>
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label" style="width: 85px;padding: 9px 13px;">缁撶畻鏂瑰紡</label>
                                 <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HSSName" id="HSSName" style="background-color:#efefef4d;width: 38%;display: inline-block;" readonly>
+                                    <input type="text" class="layui-input" name="HSSName" id="HSSName" style="background-color: #efefef4d; width: 64%; display: inline-block;" readonly>
                                     <input type="hidden" name="HSSID" id="HSSID" value="0">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: right;">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                     </button>
                                 </div>
                             </div>
-                            <div class="layui-col-xs3">
+                            <div class="layui-inline">
                                 <label class="layui-form-label">閾惰璐﹀彿</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HBankAccount" id="HBankAccount" lay-verify="HBankAccount" autocomplete="off" placeholder="" class="layui-input">
@@ -227,26 +246,26 @@
                             <div class="layui-tab-item ">
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
-                                        <div class="layui-col-xs3">
+                                        <div class="layui-inline">
                                             <label class="layui-form-label">鍒涘缓浜�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
 
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3">
+                                        <div class="layui-inline">
                                             <label class="layui-form-label">鍒涘缓鏃ユ湡</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3">
+                                        <div class="layui-inline">
                                             <label class="layui-form-label">淇敼浜�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3">
+                                        <div class="layui-inline">
                                             <label class="layui-form-label">淇敼鏃ユ湡</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input">
@@ -254,25 +273,25 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-col-xs3">
+                                        <div class="layui-inline">
                                             <label class="layui-form-label">瀹℃牳浜�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3">
+                                        <div class="layui-inline">
                                             <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3">
+                                        <div class="layui-inline">
                                             <label class="layui-form-label">浣滃簾浜�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3">
+                                        <div class="layui-inline">
                                             <label class="layui-form-label">浣滃簾鏃ユ湡</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 577bce0..3c0681c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-
+   
 </head>
 <body>
     <div class="layui-fluid">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index 1211197..3383f1e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -9,7 +9,22 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
+    <style>
+        .layui-input, .layui-textarea {
+            width: 123%;
+        }
+        .layui-form-item .layui-input-inline {
+            width: 50%;
+        }
 
+        .layui-inline {
+            width: 290px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-right: 0px;
+        }
+    </style>
 </head>
 <body>
     <div class="layui-fluid">
@@ -32,23 +47,27 @@
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item" style="margin-bottom:5px">
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鍒涘缓缁勭粐</label>
-                                                <div class="layui-input-inline" style="margin-right:0px;">
+                                                <div class="layui-input-inline" style="margin-right: 0px; width: 100px;">
                                                     <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly">
                                                     <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
                                                 </div>
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT" id="HCreateOrgID-BT">...</button>
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT" id="HCreateOrgID-BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">浣跨敤缁勭粐</label>
-                                                <div class="layui-input-inline" style="margin-right:0px">
+                                                <div class="layui-input-inline" style="margin-right: 0px; width: 100px;">
                                                     <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly">
                                                     <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
                                                 </div>
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT" id="HUseOrgID-BT">...</button>
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT" id="HUseOrgID-BT" style="margin-left: 36px; width: 42px; padding: 0 10px; ">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HRemark" id="HRemark" lay-verify="" autocomplete="off" class="layui-input">
@@ -56,25 +75,25 @@
                                             </div>
                                         </div>
                                         <div class="layui-form-item" style="margin-bottom:5px">
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">瀹㈡埛浠g爜</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HNumber" id="HNumber" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HName" id="HName" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鍔╄鐮�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HHelpCode" id="HHelpCode" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">绠�绉�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HShortName" id="HShortName" lay-verify="" autocomplete="off" class="layui-input">
@@ -82,25 +101,25 @@
                                             </div>
                                         </div>
                                         <div class="layui-form-item" style="margin-bottom:5px">
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鑱旂郴浜�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HLinkMan" id="HLinkMan" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HLinkPhone" id="HLinkPhone" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鎵嬫満</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HMobilePhone" id="HMobilePhone" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">浼犵湡</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HFax" id="HFax" lay-verify="" autocomplete="off" class="layui-input">
@@ -108,25 +127,25 @@
                                             </div>
                                         </div>
                                         <div class="layui-form-item" style="margin-bottom:5px">
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鍦板潃</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HAddress" id="HAddress" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">閭紪</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HPostalCode" id="HPostalCode" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鐢靛瓙閭</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HEmail" id="HEmail" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">娉曚汉浠h〃</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HCorMan" id="HCorMan" lay-verify="" autocomplete="off" class="layui-input">
@@ -135,25 +154,25 @@
                                         </div>
 
                                         <div class="layui-form-item" style="margin-bottom:5px">
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">寮�鎴烽摱琛�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HBank" id="HBank" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">閾惰璐﹀彿</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HBankAccount" id="HBankAccount" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">绋庡姟鐧昏鍙�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HTaxNum" id="HTaxNum" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">澧炲�肩◣鐜�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HTaxRate" id="HTaxRate" lay-verify="" autocomplete="off" class="layui-input">
@@ -162,70 +181,70 @@
 
                                         </div>
                                         <div class="layui-form-item" style="margin-bottom:5px">
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鑻辨枃鍚嶇О</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HEnglishName" id="HEnglishName" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鑻辨枃鍦板潃</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HEnglishAddress" id="HEnglishAddress" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">鍥藉</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HCountry" id="HCountry" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">鍦板尯</label>
                                                 <div class="layui-input-block" style="margin-left: 77px;">
                                                     <input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HAreaID" id="HAreaID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnArea" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnArea" id="btnSearchProc" style="padding: 0 10px;float: right;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                     </button>
                                                 </div>
                                             </div>
 
                                         </div>
                                         <div class="layui-form-item" style="margin-bottom:5px">
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">榛樿璐у竵</label>
                                                 <div class="layui-input-block" style="margin-left: 77px;">
                                                     <input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HCurID" id="HCurID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCurrency" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCurrency" id="btnSearchProc" style="padding: 0 10px;float: right;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                     </button>
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label" style="width: 85px;">缁撶畻鏂瑰紡</label>
                                                 <div class="layui-input-block" style="margin-left: 77px;">
                                                     <input type="text" class="layui-input" name="HSSName" id="HSSName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HSSID" id="HSSID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: right;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                     </button>
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">瀹㈡埛鐘舵��</label>
-                                                <div class="layui-inline" style="width: 190px;">
+                                                <div class="layui-inline" style="width: 145px;">
                                                     <input name="HCusStatus" placeholder="鈥旇閫夋嫨鈥�" class="layui-input" id="HCusStatus">
                                                 </div>
                                             </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛鍒嗙被</label>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;padding: 9px 15px;">瀹㈡埛鍒嗙被</label>
                                                 <div class="layui-input-block" style="margin-left: 77px;">
                                                     <input type="text" class="layui-input" name="HCusTypeName" id="HCusTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HCusTypeID" id="HCusTypeID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCustomerType" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCustomerType" id="btnSearchProc" style="padding: 0 10px;float: right;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                     </button>
                                                 </div>
                                             </div>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
index e1c4569..e85d434 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
@@ -51,7 +51,7 @@
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="0" style="float:left;width:150px;">
                                                     <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HGroup-BT" style="width:40px;">
+                                                    <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HGroup-BT" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
                                                 </div>
@@ -61,7 +61,7 @@
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HParentName" id="HParentName" readonly class="layui-input" value="0" style="float:left;width:150px;">
                                                     <input type="hidden" name="HParentID" id="HParentID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="hparent-BT" style="width:40px;">
+                                                    <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="hparent-BT" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
                                                 </div>
@@ -71,7 +71,7 @@
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="0" style="float:left;width:150px;">
                                                     <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HDepart-BT" style="width:40px;">
+                                                    <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HDepart-BT" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
                                                 </div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
index c701740..61aefc0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
@@ -29,18 +29,10 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 10px;">
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
-                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
-                        </button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">棰勮</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -60,13 +52,13 @@
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 32px;">
+                                            <div class="layui-input-block" style="margin-left: 117px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 47px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍐呴儴鍗曟嵁鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <div class="layui-input-block" style="margin-left: 123px;">
                                                 <input type="text" class="layui-input" lay-verify="HInnerBillNo" name="HInnerBillNo" id="HInnerBillNo">
                                             </div>
                                         </div>
@@ -77,24 +69,24 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="MouldHNumber" name="MouldHNumber" id="MouldHNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HMouldID" id="HMouldID" lay-verify="HMouldID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">缁翠慨椤圭洰</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                            <div class="layui-input-block" style="margin-left: 73px;">
                                                 <input type="text" class="layui-input" name="HRepairIDName" lay-verify="HRepairIDName" id="HRepairIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HRepairID" lay-verify="HRepairID" id="HRepairID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRepairID" id="btnHRepairID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRepairID" id="btnHRepairID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鏃堕棿鍗曚綅</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;width: 182px;">
+                                            <div class="layui-input-block" style="margin-left: 119px;width: 185px;">
                                                 <select name="HCycleUnit" lay-verify="HCycleUnit" id="HCycleUnit">
                                                     <option value="灏忔椂">灏忔椂</option>
                                                     <option value="澶�">澶�</option>
@@ -111,17 +103,17 @@
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿瑙勬牸</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <div class="layui-input-block" style="margin-left: 117px;">
                                                 <input type="text" class="layui-input" lay-verify="MouldHModel" name="MouldHModel" id="MouldHModel" value="" style="background-color:#efefef4d;display: inline-block;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">缁翠慨閮ㄩ棬</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HDeptIDName" lay-verify="HDeptIDName" id="HDeptIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <div class="layui-input-block" style="margin-left: 67px;">
+                                                <input type="text" class="layui-input" name="HDeptIDName" lay-verify="HDeptIDName" id="HDeptIDName" style="background-color:#efefef4d;width: 55%;margin-left:7px;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -132,25 +124,25 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HManagerIDName" name="HManagerIDName" id="HManagerIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HManagerID" id="HManagerID" lay-verify="HManagerID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHManagerID" id="btnHManagerID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHManagerID" id="btnHManagerID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">缁翠慨浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                            <label class="layui-form-label" style="width: 85px;">缁翠慨浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 73px;">
                                                 <input type="text" class="layui-input" lay-verify="HEmpIDName" name="HEmpIDName" id="HEmpIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HEmpID" lay-verify="HEmpID" id="HEmpID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                 </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">缁翠慨寮�濮嬫棩鏈�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" lay-verify="HRepairBeginDate" name="HRepairBeginDate" id="HRepairBeginDate" style="padding-left: 32px;">
+                                                <input type="date" class="layui-input" lay-verify="HRepairBeginDate" name="HRepairBeginDate" id="HRepairBeginDate" style="padding-left: 42px;">
                                             </div>
                                         </div>
                                     </div>
@@ -163,14 +155,14 @@
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">瀹為檯缁翠慨宸ユ椂</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <div class="layui-input-block" style="margin-left: 117px;">
                                                 <input type="text" class="layui-input" name="HTimes" lay-verify="HTimes" id="HTimes" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">缁翠慨缁撴潫鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" lay-verify="HRepairEndDate" name="HRepairEndDate" id="HRepairEndDate" style="padding-left: 32px;">
+                                                <input type="date" class="layui-input" lay-verify="HRepairEndDate" name="HRepairEndDate" id="HRepairEndDate" style="padding-left: 39px;margin-left:3px;">
                                             </div>
                                         </div>
                                     </div>
@@ -180,14 +172,14 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HSupIDName" name="HSupIDName" id="HSupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HSupID" lay-verify="HSupID" id="HSupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupID" id="btnHSupID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupID" id="btnHSupID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                 </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">缁翠慨绫诲瀷</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;width: 182px;">
+                                            <div class="layui-input-block" style="margin-left: 115px;width: 185px;">
                                                 <select name="HRepairType" lay-verify="HRepairType" id="HRepairType">
                                                     <option value="鍐呴儴缁翠慨">鍐呴儴缁翠慨</option>
                                                     <option value="濮斿缁翠慨">濮斿缁翠慨</option>
@@ -196,8 +188,8 @@
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">缁翠慨鍚庢柊瑙勬牸</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HNewModel" name="HNewModel" id="HNewModel" value="0">
+                                            <div class="layui-input-block" style="margin-left: 125px;">
+                                                <input type="text" class="layui-input" lay-verify="HNewModel" name="HNewModel" id="HNewModel" value="0" style="width:97%;">
                                             </div>
                                         </div>
                                     </div>
@@ -209,12 +201,12 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                            <label class="layui-form-label" style="width: 85px;">璁惧</label>
+                                            <div class="layui-input-block" style="margin-left: 73px;">
                                                 <input type="text" class="layui-input" lay-verify="HEquipIDName" name="HEquipIDName" id="HEquipIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HEquipID" lay-verify="HEquipID" id="HEquipID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquipID" id="btnHEquipID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquipID" id="btnHEquipID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225/Sc_MouldOtherInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225/Sc_MouldOtherInBill_PDA.html"
index cd6e6b5..9b8b915 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225/Sc_MouldOtherInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225/Sc_MouldOtherInBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -325,50 +326,13 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
-                var HInterID = $('#HInterID').val();
-                var HWHID = $('#HWHID').val();
-                var HSPID = $('#HSPID').val();
-                if (HSPID == "") {
-                    HSPID = 0;
-                }
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode},
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMaterID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HLeaveLife": data.HLeaveLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
             });
          
 
@@ -531,7 +495,43 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225/Sc_MouldOtherOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225/Sc_MouldOtherOutBill_PDA.html"
index 0efbb3a..c18f4d6 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225/Sc_MouldOtherOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225/Sc_MouldOtherOutBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -325,44 +326,13 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMaterID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HLeaveLife": data.HLeaveLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
             });
          
 
@@ -517,7 +487,43 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html"
index 5069e90..065f947 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -321,51 +322,19 @@
                     $("#HBillNo").val(d.data[0].HBillNo);
                 }
             });
-           
+
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMaterID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HDesignLife": data.HDesignLife,
-                                    "HLeaveLife": data.HLeaveLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-         
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -527,7 +496,44 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HDesignLife").val(data.HDesignLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\257\277\345\221\275\350\260\203\346\225\264\345\215\225/Sc_MouldLifeChangeBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\257\277\345\221\275\350\260\203\346\225\264\345\215\225/Sc_MouldLifeChangeBill_PDA.html"
index 72da1f1..60fac4b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\257\277\345\221\275\350\260\203\346\225\264\345\215\225/Sc_MouldLifeChangeBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\257\277\345\221\275\350\260\203\346\225\264\345\215\225/Sc_MouldLifeChangeBill_PDA.html"
@@ -337,51 +337,17 @@
                     $("#HBillNo").val(d.data[0].HBillNo);
                 }
             });
-           
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMouldID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HLeaveLife": data.HLeaveLife,
-                                    "HDesignLife": data.HDesignLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-         
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -585,7 +551,44 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HDesignLife").val(data.HDesignLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225/Sc_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225/Sc_MouldScrapInBill_PDA.html"
index 267c793..4fcf7ab 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225/Sc_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225/Sc_MouldScrapInBill_PDA.html"
@@ -85,6 +85,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -339,52 +340,18 @@
                     $("#HBillNo").val(d.data[0].HBillNo);
                 }
             });
-
-
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMaterID": data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HQty": 1,
-                                    "HLeaveLife": data.HLeaveLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
-
+           
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -584,7 +551,44 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HQty").val(1);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225/Sc_MouldRepairInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225/Sc_MouldRepairInBill_PDA.html"
index 6e1a1c0..6f56e52 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225/Sc_MouldRepairInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225/Sc_MouldRepairInBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -321,56 +322,17 @@
                     $("#HBillNo").val(d.data[0].HBillNo);
                 }
             });
-           
-
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
-                var HInterID = $('#HInterID').val();
-                var HWHID = $('#HWHID').val();
-                var HSPID = $('#HSPID').val();
-                if (HSPID == "") {
-                    HSPID = 0;
-                }
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode},
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMaterID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HLeaveLife": data.HLeaveLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-         
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -531,7 +493,43 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225/Sc_MouldRepairOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225/Sc_MouldRepairOutBill_PDA.html"
index 478c4f4..2ffea48 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225/Sc_MouldRepairOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225/Sc_MouldRepairOutBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -325,52 +326,14 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
-                var HInterID = $('#HInterID').val();
-                var HWHID = $('#HWHID').val();
-                var HSPID = $('#HSPID').val();
-                if (HSPID == "") {
-                    HSPID = 0;
-                }
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode},
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMaterID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HLeaveLife": data.HLeaveLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-         
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -531,7 +494,43 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
index 2a985cc..a06fc3a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -321,53 +322,16 @@
                     $("#HBillNo").val(d.data[0].HBillNo);
                 }
             });
-           
-
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
-                var HInterID = $('#HInterID').val();
-                var HWHID = $('#HWHID').val();
-                var HSPID = $('#HSPID').val();  
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode},
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMaterID": data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HLeaveLife": data.HLeaveLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-         
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -523,7 +487,43 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
index 04ef312..8784302 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -315,55 +316,18 @@
                     $("#HBillNo").val(d.data[0].HBillNo);
                 }
             });
-           
-
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
-                var HInterID = $('#HInterID').val();
-                var HWHID = $('#HWHID').val();  
-                var HSPID = $('#HSPID').val();  
-                    
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMaterID": data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HLeaveLife": data.HLeaveLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-         
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
+           
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -516,7 +480,43 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sc_MouldRepairWorkBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sc_MouldRepairWorkBill_PDA.html"
index abeee31..6aa5df2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sc_MouldRepairWorkBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sc_MouldRepairWorkBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>妯℃不鍏锋潯鐮�</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -348,49 +349,16 @@
                 }
             });
            
-
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMouldID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HLeaveLife": data.HLeaveLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-         
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -598,7 +566,43 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225/Sc_MouldProdInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225/Sc_MouldProdInBill_PDA.html"
index ab6f1e3..cf32508 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225/Sc_MouldProdInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225/Sc_MouldProdInBill_PDA.html"
@@ -85,6 +85,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -335,56 +336,16 @@
                     $("#HBillNo").val(d.data[0].HBillNo);
                 }
             });
-           
-
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
-                var HInterID = $('#HInterID').val();
-                var HWHID = $('#HWHID').val();
-                var HSPID = $('#HSPID').val();
-                if (HSPID == "") {
-                    HSPID = 0;
-                }
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode},
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMaterID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HLeaveLife": data.HLeaveLife
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-         
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -568,7 +529,43 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HLeaveLife").val(data.HLeaveLife);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index 62b14b3..1e5fe8e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -134,7 +134,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
index 61f1795..efeb4df 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
@@ -143,7 +143,7 @@
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">閫夊崟鍙�</label>
                                                     <div class="layui-input-inline">
-                                                        <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                        <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
index 89c2952..94fc8d3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
@@ -127,7 +127,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
index bd5e847..13680ab 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
@@ -119,7 +119,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index c25f78d..d0b7d95 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -116,7 +116,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">婧愬崟绫诲瀷</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                         </div>
@@ -147,7 +147,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
index beade7a..75b1d01 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
@@ -127,7 +127,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index 024bd50..6d9bec8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -138,7 +138,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html"
index 4bda711..4e43f53 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html"
@@ -146,7 +146,7 @@
                                                 </select>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="width:300px;">
                                             <label class="layui-form-label">鏀瑰瀷妯″紡</label>
                                             <div class="layui-input-block">
                                                 <select name="HChangeType" lay-filter="HChangeType" id="HChangeType">
@@ -175,7 +175,7 @@
                                                 <input class="layui-input" name="HChangeNum" id="HChangeNum" value="0">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="width:300px;">
                                             <label class="layui-form-label">鏀瑰埗绫诲瀷</label>
                                             <div class="layui-input-block">
                                                 <select name="HRepairType" lay-filter="aihao" id="HRepairType">
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
index 3555337..20afce2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
@@ -142,13 +142,13 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">婧愬崟绫诲瀷</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index 637b829..ebee0eb 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -130,13 +130,13 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">婧愬崟绫诲瀷</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
index 2c4fdf7..a07128d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
@@ -77,10 +77,11 @@
                 <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
                     <div class="maintitle">鍣ㄥ叿鐐规璁板綍鍗�</div>
                     <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-row">
+                        <div  class="layui-inline">
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -275,7 +276,7 @@
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
-                ,laydate = layui.laydate
+                , laydate = layui.laydate
                 , element = layui.element;
 
             //鏃ユ湡鏃堕棿閫夋嫨鍣�
@@ -340,42 +341,8 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMouldID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
          
@@ -387,6 +354,11 @@
                 });
             })
 
+
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
             //鎻愪氦
             form.on('submit(Saver)', function (data) {//鎻愪氦
                 //var tableData = data.field;
@@ -511,22 +483,6 @@
                 });
             });
 
-            //form.on('submit(HManager)', function () {
-            //    //椤甸潰灞�-鑷畾涔�
-            //    layer.open({
-            //        type: 2,
-            //        skin: 'layui-layer-rim', //鍔犱笂杈规
-            //        title: '璐熻矗浜哄垪琛�',
-            //        closeBtn: 1,
-            //        shift: 2,
-            //        area: ['80%', '80%'],
-            //        maxmin: true,
-            //        content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes'],
-            //        cancel: function (index, layero) {
-            //        }
-            //    });
-            //});
-
             //鐐规椤圭洰寮圭獥
             form.on('submit(HDotCheckItemList)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -553,17 +509,47 @@
             $("#HDeptName").val(obj[0].HName);
             $("#HDeptID").val(obj[0].HItemID);
         }
-        //杩斿洖璐熻矗浜�
-        //function GetHWorkerValue(obj) {
-        //    $("#HManagerName").val(obj[0].HName);
-        //    $("#HManagerID").val(obj[0].HItemID);
-        //}
         //杩斿洖鐐规椤圭洰
         function GetHCheckNameValue(obj) {
             $("#HDotCheckItem").val(obj[0].HName);
             $("#HDotCheckItemID").val(obj[0].HItemID);
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
index 36e8dc3..ac13048 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
@@ -85,6 +85,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" id="QueDin" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -352,43 +353,8 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HMouldID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HQty":"1"
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
 
@@ -400,6 +366,10 @@
                 });
             })
 
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
             //鎻愪氦
             form.on('submit(Saver)', function (data) {//鎻愪氦
                 //var tableData = data.field;
@@ -540,7 +510,43 @@
             $("#HMaintainItem").val(obj[0].HName);
             $("#HMaintainItemID").val(obj[0].HItemID);
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode() {
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HMouldID").val(data.hinterid);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HQty").val(1);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 9306423..376700b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -19,6 +19,9 @@
         .btn-title {
             font-size: 16px;
         }
+        .layui-form-select .layui-input {
+             padding-right: 0px; 
+        }
         /*.table-select {
             margin-top: -10px;
             margin-left: -15px;
@@ -32,8 +35,8 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 10px;">
-                        <button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
-                        <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                        <button type="button" id="btnSave" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="margin-left: 0px" lay-filter="Exit">閫�鍑�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <!--<ul class="layui-tab-title" lay-filter="tab-all">
@@ -55,10 +58,10 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px;">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 47px;">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="margin-left:10px;">
                                             <label class="layui-form-label">璐т富绫诲瀷</label>
                                             <div class="layui-input-block">
                                                 <select name="HMouldOWNER" lay-filter="HMouldOWNER" id="HMouldOWNER">
@@ -134,8 +137,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -144,8 +147,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -154,8 +157,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -178,8 +181,8 @@
                                             <div class="layui-input-block" style="margin-left: 80px;">
                                                 <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -190,8 +193,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -214,8 +217,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -230,8 +233,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -316,8 +319,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HMouldMaintainRuleInterName" id="HMouldMaintainRuleInterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMouldMaintainRuleInterList" id="HMouldMaintainRuleInterList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMouldMaintainRuleInterList" id="HMouldMaintainRuleInterList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                 </button>
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
index 1e5abab..234baca 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
@@ -118,7 +118,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
index dddba79..f1c7914 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -313,44 +314,14 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID":data.hmainid,
-                                    "HBarName": data.璁惧鍚嶇О,
-                                    "HBarModel": data.璁惧鍨嬪彿
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-         
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -558,7 +529,41 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HEquipID").val(data.hmainid);
+                        $("#HBarName").val(data.璁惧鍚嶇О);
+                        $("#HBarModel").val(data.璁惧鍨嬪彿);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
index ab21465..99c2ac8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -310,48 +311,18 @@
                 }
             });
            
-
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID": data.hmainid,
-                                    "HBarName": data.璁惧鍚嶇О,
-                                    "HBarModel": data.璁惧鍨嬪彿
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-         
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
+            
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -558,7 +529,41 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HEquipID").val(data.hmainid);
+                        $("#HBarName").val(data.璁惧鍚嶇О);
+                        $("#HBarModel").val(data.璁惧鍨嬪彿);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
index 9a8c1f2..f751ad7 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
@@ -81,6 +81,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -345,42 +346,13 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID": data.hmainid,
-                                    "HBarName": data.璁惧鍚嶇О,
-                                    "HBarModel": data.璁惧鍨嬪彿
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                    
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
             });
          
 
@@ -590,7 +562,41 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.data.length == 1) {
+                        var data = result.data[0];
+                        $("#HEquipID").val(data.hmainid);
+                        $("#HBarName").val(data.璁惧鍚嶇О);
+                        $("#HBarModel").val(data.璁惧鍨嬪彿);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
index 53753a6..f25d22d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
@@ -37,91 +37,94 @@
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs2">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">璁㈠崟璺熻釜鍙凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="" id="" autocomplete="off" disabled>
                                                         <input id="" name="" type="hidden" />
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
+                                                <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">浜у搧锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input type="text" name="HMater" id="HMater" lay-verify="HMater" readonly="readonly" autocomplete="off" class="layui-input">
                                                         <input id="HMaterID" name="HMaterID" type="hidden" />
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">浜у搧浠g爜锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input type="text" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" readonly="readonly" autocomplete="off" class="layui-input">
                                                     </div>
                                                 </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭璁″垝鍗曞彿锛�</label>
+                                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                                        <input type="text" class="layui-input" lay-verify="HMainSourceBillNo" name="HMainSourceBillNo" id="HMainSourceBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HMainSourceInterID" name="HMainSourceInterID" type="hidden" />
+                                                        <input id="HMainSourceEntryID" name="HMainSourceEntryID" type="hidden" />
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HPlanID-BT" id="HPlanID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
                                             </div>
-                                            <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">宸ュ簭璁″垝鍗曞彿锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="" autocomplete="off" class="layui-input">
-
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanID-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HMainSourceInterID" name="HMainSourceInterID" type="hidden" />
-                                                        <input id="HMainSourceEntryID" name="HMainSourceEntryID" type="hidden" />
-
-                                                    </div>
-                                                </div>
-
-                                                <div class="layui-col-xs2">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 宸ヤ綔涓績锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HWorkCenterName" lay-verify="" id="HWorkCenterName" readonly="readonly" autocomplete="off">
                                                         <input id="HCenterID" name="HCenterID" type="hidden" />
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 璁″垝鏁伴噺锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" onkeyup="this.value=this.value.replace(/\D/g,'')" name="HPlanQty" id="HPlanQty" readonly="readonly" autocomplete="off">
 
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HModel" lay-verify="" id="HModel" readonly="readonly" autocomplete="off">
                                                         <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HMateriaID-BT">
-                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                       </button>-->
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                       </button>-->
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 涓嶈壇鏁伴噺锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" onkeyup="this.value=this.value.replace(/\D/g,'')" name="HBadQty" id="HBadQty" autocomplete="off">
 
                                                     </div>
                                                 </div>
-
                                             </div>
                                         </div>
-
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
@@ -135,8 +138,8 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                            </div>
+                                        </div>
+                                    </div>
                         </div>
 
                         <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_AddEntrustProcSendWork.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_AddEntrustProcSendWork.html"
index 10b0831..4c9b791 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_AddEntrustProcSendWork.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_AddEntrustProcSendWork.html"
@@ -8,6 +8,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-form-item .layui-input-inline {
+             margin-right: 0px; 
+        }
+    </style>
 </head>
 <body>
 
@@ -36,80 +41,76 @@
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                         <input type="hidden" name="HInterID" id="HInterID" autocomplete="off" class="layui-input">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">浠诲姟鍗曞彿锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HManagerName" id="HManagerName" autocomplete="off" disabled>
                                                         <input id="HManagerID" name="HManagerID" type="hidden" />
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">渚涘簲鍟嗕唬鐮侊細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HSupNumber" id="HSupNumber" lay-verify="HSupNumber" readonly="readonly" autocomplete="off" class="layui-input">
-                                                    </div>
-                                                </div>
+
                                             </div>
                                             <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">渚涘簲鍟嗭細</label>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">渚涘簲鍟嗕唬鐮侊細</label>
                                                     <div class="layui-input-inline">
-                                                        <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
-
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupID-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HSupID" name="HSupID" type="hidden" />
-
+                                                        <input type="text" name="HSupNumber" id="HSupNumber" lay-verify="HSupNumber" readonly="readonly" autocomplete="off" class="layui-input">
                                                     </div>
                                                 </div>
-
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 80px;">渚涘簲鍟嗭細</label>
+                                                    <div class="layui-input-block" style="margin-left: 70px;">
+                                                        <input type="text" class="layui-input" name="HSupName" id="HSupName" lay-verify="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HSupID" name="HSupID" type="hidden" />
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSupID-BT" id="HSupID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
                                                     </div>
                                                 </div>
-
-                                                <div class="layui-col-xs3">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 璁″垝寮�宸ユ棩鏈燂細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HPlanBeginDate" lay-verify="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off">
-
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 璁″垝瀹屽伐鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HPlanEndDate" lay-verify="HPlanEndDate" id="HPlanEndDate" autocomplete="off">
-
                                                     </div>
                                                 </div>
-
                                             </div>
                                         </div>
 
-
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-
                                                 <div class="layui-col-xs6">
                                                     <label class="layui-form-label"> 澶�    娉細</label>
                                                     <div class="layui-input-block">
@@ -122,19 +123,19 @@
                                     <div class="layui-tab-item">
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍒� 鍗� 浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HMaker" id="HMaker" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">瀹� 鏍� 浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HChecker" id="HChecker" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍙� 鏇� 浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HUpDater" id="HUpDater" readonly="readonly" autocomplete="off">
@@ -144,19 +145,19 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍒跺崟鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HMakeDate" id="HMakeDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">瀹℃牳鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HCheckDate" id="HCheckDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍙樻洿鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HUpDateDate" id="HUpDateDate" readonly="readonly" autocomplete="off">
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_Add_EntrustProcessReport.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_Add_EntrustProcessReport.html"
index 0c9fe57..77d476d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_Add_EntrustProcessReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_Add_EntrustProcessReport.html"
@@ -8,6 +8,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-form-item .layui-inline {
+             margin-right: 0px; 
+        }
+    </style>
 </head>
 <body>
 
@@ -36,27 +41,27 @@
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                         <input type="hidden" name="HInterID" id="HInterID" autocomplete="off" class="layui-input">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">浠诲姟鍗曞彿锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HManagerName" id="HManagerName" autocomplete="off" disabled>
                                                         <input id="HManagerID" name="HManagerID" type="hidden" />
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">渚涘簲鍟嗕唬鐮侊細</label>
                                                     <div class="layui-input-inline">
                                                         <input type="text" name="HSupNumber" id="HSupNumber" lay-verify="HSupNumber" readonly="readonly" autocomplete="off" class="layui-input">
@@ -67,35 +72,26 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">渚涘簲鍟嗭細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
-
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupID-BT">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 80px;">渚涘簲鍟嗭細</label>
+                                                    <div class="layui-input-block" style="margin-left: 72px;">
+                                                        <input type="text" class="layui-input" name="HSupName" id="HSupName" lay-verify="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HSupID" name="HSupID" type="hidden" />
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSupID-BT" id="HSupID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                         </button>
-                                                        <input id="HSupID" name="HSupID" type="hidden" />
-
                                                     </div>
                                                 </div>
-
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="margin-left:5px;"> 瑙勬牸鍨嬪彿锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
                                                     </div>
                                                 </div>
-
-                                               
-
                                             </div>
                                         </div>
-
-
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-
                                                 <div class="layui-col-xs6">
                                                     <label class="layui-form-label"> 澶�    娉細</label>
                                                     <div class="layui-input-block">
@@ -108,19 +104,19 @@
                                     <div class="layui-tab-item">
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍒� 鍗� 浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HMaker" id="HMaker" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">瀹� 鏍� 浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HChecker" id="HChecker" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍙� 鏇� 浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HUpDater" id="HUpDater" readonly="readonly" autocomplete="off">
@@ -130,19 +126,19 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍒跺崟鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HMakeDate" id="HMakeDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">瀹℃牳鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HCheckDate" id="HCheckDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍙樻洿鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HUpDateDate" id="HUpDateDate" readonly="readonly" autocomplete="off">
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_Add_EntrustProcessSendOutBill.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_Add_EntrustProcessSendOutBill.html"
index c14e506..3447daf 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_Add_EntrustProcessSendOutBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_Add_EntrustProcessSendOutBill.html"
@@ -8,6 +8,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-form-pane .layui-form-label {
+            border-style: none;
+        }
+    </style>
 </head>
 <body>
 
@@ -41,36 +46,33 @@
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                         <input type="hidden" name="HInterID" id="HInterID" autocomplete="off" class="layui-input">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">渚涘簲鍟嗕唬鐮侊細</label>
                                                     <div class="layui-input-inline">
                                                         <input type="text" name="HSupNumber" id="HSupNumber" lay-verify="HSupNumber" readonly="readonly" autocomplete="off" class="layui-input">
                                                     </div>
                                                 </div>
-
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">渚涘簲鍟嗭細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
-
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupID-BT">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 110px;padding: 9px 18px;">渚涘簲鍟嗭細</label>
+                                                    <div class="layui-input-block" style="margin-left: 72px;">
+                                                        <input type="text" class="layui-input" name="HSupName" id="HSupName" lay-verify="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HSupID" name="HSupID" type="hidden" />
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSupID-BT" id="HSupID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                         </button>
-                                                        <input id="HSupID" name="HSupID" type="hidden" />
-
                                                     </div>
                                                 </div>
                                             </div>
@@ -93,7 +95,7 @@
                                     <div class="layui-tab-item">
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍒� 鍗� 浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HMaker" id="HMaker" readonly="readonly" autocomplete="off">
@@ -101,19 +103,19 @@
 
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">瀹� 鏍� 浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HChecker" id="HChecker" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">淇敼浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HUpDater" id="HUpDater" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍏抽棴浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HCloseMan" id="HCloseMan" readonly="readonly" autocomplete="off">
@@ -123,25 +125,25 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍒跺崟鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HMakeDate" id="HMakeDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">瀹℃牳鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HCheckDate" id="HCheckDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">淇敼鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HUpDateDate" id="HUpDateDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍏抽棴鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HCloseDate" id="HCloseDate" readonly="readonly" autocomplete="off">
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
index 83ac388..c02e293 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
@@ -8,6 +8,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-form-pane .layui-form-label {
+             border-style: none; 
+        }
+        .layui-form-item .layui-inline {
+             margin-right: 0px; 
+        }
+    </style>
 </head>
 <body>
 
@@ -18,7 +26,6 @@
                     <form id="form0" class="layui-form layui-form-pane" action="">
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
-
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                                 <button type="button" id="Closeing" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Closeing">鍏抽棴</button>
@@ -26,9 +33,7 @@
                                 <button type="button" id="Auditing" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Auditing">瀹℃牳</button>
                                 <button type="button" id="BackAudit" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="BackAudit">鍙嶅鏍�</button>
                                 <button type="button" id="Printing" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Printing">鎵撳嵃</button>
-
                             </div>
-
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -37,88 +42,79 @@
                                     <li>鍏朵粬淇℃伅</li>
                                 </ul>
                                 <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
                                     <div class="layui-tab-item layui-show">
-
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">浠诲姟鍗曞彿锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HICMOBillNo" id="HICMOBillNo" autocomplete="off" disabled>
                                                         <!--<input id="HICMOInterID" name="HICMOInterID" type="hidden" />-->
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">杞﹂棿浠g爜锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="HDeptID" readonly="readonly" autocomplete="off" class="layui-input">
                                                     </div>
                                                 </div>
-                                            </div>
-                                            <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">杞﹂棿锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
-
-                                                        <button type="button" id="HDeptID-BT" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 110px;padding: 9px 18px;">杞﹂棿锛�</label>
+                                                    <div class="layui-input-block" style="margin-left: 72px;">
+                                                        <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HDeptID" name="HDeptID" type="hidden" />
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HDeptID-BT" id="HDeptID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                         </button>
-                                                        <input id="HDeptID" name="HDeptID" type="hidden" />
-
                                                     </div>
                                                 </div>
 
                                                 <!--<div class="layui-col-xs3">
-                                <label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
-                                </div>
-                            </div>-->
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label"> 璁″垝寮�宸ユ棩鏈燂細</label>
+        <label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
+        <div class="layui-input-inline">
+            <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
+        </div>
+    </div>-->
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="margin-left:5px;"> 璁″垝寮�宸ユ棩鏈燂細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HPlanBeginDate" lay-verify="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off">
 
                                                     </div>
                                                 </div>
-
-                                                <div class="layui-col-xs3">
+                                            </div>
+                                            <div class="layui-row" style="height:43px">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 璁″垝瀹屽伐鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HPlanEndDate" lay-verify="HPlanEndDate" id="HPlanEndDate" autocomplete="off">
 
                                                     </div>
                                                 </div>
-
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 姹囨姤鏁伴噺锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
                                                     </div>
                                                 </div>
-
                                             </div>
-                                        </div>
-
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-
+                                            <div class="layui-row" style="height:43px">
                                                 <div class="layui-col-xs8">
                                                     <label class="layui-form-label"> 澶�    娉細</label>
                                                     <div class="layui-input-block">
@@ -126,12 +122,8 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-tab-item">
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                            <div class="layui-row" style="height:43px">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍒� 鍗� 浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HMaker" id="HMaker" readonly="readonly" autocomplete="off">
@@ -139,75 +131,72 @@
 
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">瀹� 鏍� 浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HChecker" id="HChecker" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">淇敼浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HUpDater" id="HUpDater" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍏抽棴浜猴細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HCloseMan" id="HCloseMan" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                            <div class="layui-row" style="height:43px">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍒跺崟鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HMakeDate" id="HMakeDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">瀹℃牳鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HCheckDate" id="HCheckDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">淇敼鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HUpDateDate" id="HUpDateDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍏抽棴鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HCloseDate" id="HCloseDate" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
                                             </div>
+                                            <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
                                         </div>
                                     </div>
-
                                 </div>
                             </div>
+
+                            <blockquote class="layui-elem-quote">宸ュ簭娲惧伐鍗�</blockquote>
+                            <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            <script type="text/html" id="toolbarDemo">
+                                <div class="layui-btn-container">
+                                    <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-add"><i class="layui-icon layui-icon-addition"></i>鎷嗗垎</button>
+                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>鍒犺</button>-->
+                                </div>
+                            </script>
                         </div>
-                        <blockquote class="layui-elem-quote">宸ュ簭娲惧伐鍗�</blockquote>
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
-                        <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-add"><i class="layui-icon layui-icon-addition"></i>鎷嗗垎</button>
-            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>鍒犺</button>-->
-                            </div>
-                        </script>
-
-
                     </form>
                 </div>
-                        </div>
+            </div>
         </div>
     </div>
-     <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
index 73d6313..87fa513 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
@@ -36,57 +36,58 @@
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">浠诲姟鍗曞彿锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HManagerName" id="HManagerName" autocomplete="off" disabled>
                                                         <input id="HManagerID" name="HManagerID" type="hidden" />
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">杞﹂棿浠g爜锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="HDeptNumber" readonly="readonly" autocomplete="off" class="layui-input">
-                                                    </div>
-                                                </div>
+
                                             </div>
                                             <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">杞﹂棿锛�</label>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">杞﹂棿浠g爜锛�</label>
                                                     <div class="layui-input-inline">
-                                                        <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
-
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HDeptID" name="HDeptID" type="hidden" />
-
+                                                        <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="HDeptNumber" readonly="readonly" autocomplete="off" class="layui-input">
                                                     </div>
                                                 </div>
-
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">杞﹂棿锛�</label>
+                                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                                        <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HDeptID" name="HDeptID" type="hidden" />
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HDeptID-BT" id="HDeptID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
                                                     </div>
                                                 </div>
-
-                                                <div class="layui-col-xs3">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 璁″垝寮�宸ユ棩鏈燂細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HPlanBeginDate" lay-verify="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off">
@@ -94,17 +95,15 @@
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label"> 璁″垝瀹屽伐鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HPlanEndDate" lay-verify="HPlanEndDate" id="HPlanEndDate" autocomplete="off">
 
                                                     </div>
                                                 </div>
-
                                             </div>
                                         </div>
-
                                         <div class="layui-form-item">
                                             <div class="layui-row">
 
@@ -117,55 +116,55 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-tab-item">
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">鍒� 鍗� 浜猴細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HMaker" id="HMaker" readonly="readonly" autocomplete="off">
+                                            <div class="layui-tab-item">
+                                                <div class="layui-form-item">
+                                                    <div class="layui-row">
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍒� 鍗� 浜猴細</label>
+                                                            <div class="layui-input-inline">
+                                                                <input class="layui-input" name="HMaker" id="HMaker" readonly="readonly" autocomplete="off">
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">瀹� 鏍� 浜猴細</label>
+                                                            <div class="layui-input-inline">
+                                                                <input class="layui-input" name="HChecker" id="HChecker" readonly="readonly" autocomplete="off">
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍙� 鏇� 浜猴細</label>
+                                                            <div class="layui-input-inline">
+                                                                <input class="layui-input" name="HUpDater" id="HUpDater" readonly="readonly" autocomplete="off">
+                                                            </div>
+                                                        </div>
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">瀹� 鏍� 浜猴細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HChecker" id="HChecker" readonly="readonly" autocomplete="off">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">鍙� 鏇� 浜猴細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HUpDater" id="HUpDater" readonly="readonly" autocomplete="off">
+                                                <div class="layui-form-item">
+                                                    <div class="layui-row">
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍒跺崟鏃ユ湡锛�</label>
+                                                            <div class="layui-input-inline">
+                                                                <input class="layui-input" name="HMakeDate" id="HMakeDate" readonly="readonly" autocomplete="off">
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">瀹℃牳鏃ユ湡锛�</label>
+                                                            <div class="layui-input-inline">
+                                                                <input class="layui-input" name="HCheckDate" id="HCheckDate" readonly="readonly" autocomplete="off">
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍙樻洿鏃ユ湡锛�</label>
+                                                            <div class="layui-input-inline">
+                                                                <input class="layui-input" name="HUpDateDate" id="HUpDateDate" readonly="readonly" autocomplete="off">
+                                                            </div>
+                                                        </div>
                                                     </div>
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">鍒跺崟鏃ユ湡锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HMakeDate" id="HMakeDate" readonly="readonly" autocomplete="off">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">瀹℃牳鏃ユ湡锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HCheckDate" id="HCheckDate" readonly="readonly" autocomplete="off">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label">鍙樻洿鏃ユ湡锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HUpDateDate" id="HUpDateDate" readonly="readonly" autocomplete="off">
-                                                    </div>
-                                                </div>
-                                            </div>
+
                                         </div>
                                     </div>
-
-                                </div>
-                            </div>
                         </div>
                         <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html"
index 0e111a7..f5171ce 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html"
@@ -30,18 +30,10 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 10px;">
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
-                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
-                        </button>
+                        <button class="layui-btn layui-btn-normal"  style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">棰勮</button>
+                        <button class="layui-btn layui-btn-normal"  style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
+                        <button class="layui-btn layui-btn-normal"  style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>
+                        <button class="layui-btn layui-btn-normal"  style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -61,17 +53,17 @@
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 32px;">
+                                            <div class="layui-input-block" style="margin-left: 115px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 32px;width:190px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                            <label class="layui-form-label" style="width: 72px;">浠诲姟鍗曞彿</label>
+                                            <div class="layui-input-block" style="margin-left: 62px;">
                                                 <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" style="width: 60%;display: inline-block;">
                                                 <!--<input type="hidden" class="layui-input" name="HRepairID" lay-verify="HRepairID" id="HRepairID" value="0">-->
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -88,8 +80,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HMaterIDName" lay-verify="HMaterIDName" id="HMaterIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMaterID" lay-verify="HMaterID" id="HMaterID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -112,8 +104,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HUnitIDName" lay-verify="HUnitIDName" id="HUnitIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HUnitID" lay-verify="HUnitID" id="HUnitID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitID" id="btnHUnitID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitID" id="btnHUnitID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -128,18 +120,18 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">璁″垝寮�宸ユ棩鏈�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
+                                                <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;width:188px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">璁″垝瀹屽伐鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 130px;">
-                                                <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
+                                            <div class="layui-input-block" style="margin-left: 115px;">
+                                                <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px; width: 190px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇鏁伴噺</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <label class="layui-form-label" style="width: 72px;">鐢熶骇鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 105px;">
                                                 <input type="text" class="layui-input" lay-verify="HPlanQty" name="HPlanQty" id="HPlanQty">
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
index 38af96d..2f6e13f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
@@ -225,12 +225,12 @@
                 return vars;
             }
 
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            if (sessionStorage.login != "login") {
-                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../user/login.html"; });
-            }
+            ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
 
             var params = getUrlVars();
             var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/Sc_PackUnionBill_Fast.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/Sc_PackUnionBill_Fast.html"
new file mode 100644
index 0000000..7e74cdd
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/Sc_PackUnionBill_Fast.html"
@@ -0,0 +1,906 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <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">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+
+<body>
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card">
+            <div class="layui-card-body" style="padding: 5px; 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>
+                    </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:60px;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">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab layui-col-xs12" lay-filter="tab-ProductlnBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鎷栨潯鐮佷俊鎭�</li>
+                            <li lay-id="2" style="padding:1px;">瀛愭潯鐮佷俊鎭�</li>
+                            <li lay-id="3" style="padding:1px;">鍚堣淇℃伅</li>
+                            <!--<li lay-id="5">鏃ュ織</li>-->
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item">
+                                <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:60px;padding-left:0px;">鎷栨潯鐮�</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HTBarCode" id="HTBarCode" lay-verify="HTBarCode" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <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:45px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <!--<div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4">
+                                            <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">
+                                        </div>
+                                    </div>
+                                </div>-->
+                                <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" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
+                            </div>
+                        </div>
+                        <!--<div class="layui-form-item" style="margin-bottom: 20px;">
+                            <div class="layui-row">
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                                </div>
+                            </div>
+                        </div>-->
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                        <!-- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>-->
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                    </div>
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+
+
+            var option = [];
+
+
+            //娓呯┖鐣岄潰  new
+
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 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"]);
+            $("#HSecManager").val(sessionStorage["HSecManager"]);
+            $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+            $("#HKeeper").val(sessionStorage["HKeeper"]);
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMaker").hide();
+            $("#HMakerID").hide();
+            $("#HBillerID").val(sessionStorage["HBillerID"]);
+            $("#HBillerID").hide();
+            var HSourceFlag = sessionStorage["SourceFlag"];
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+            $("#HBarCode").focus();
+
+
+
+            //鍒濆鍖栨槑缁嗚〃鏍�
+            function set_InitGrid() {
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                    , { 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: 'HInterID', title: '鍗曟嵁ID', width: 150, hide: true }
+                    , { field: 'HBilltype', title: '鍗曟嵁绫诲瀷', width: 150, hide: true }
+                    , { field: 'Hbarcode', title: '鏉$爜缂栧彿', width: 150, hide: true }
+                    , { field: 'HSCWHID', title: '璋冨嚭浠撳簱ID', width: 150, hide: true }
+                    , { field: 'HSCSPID', title: '璋冨嚭浠撲綅ID', width: 150, hide: true }
+                    , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 150, hide: true }
+                    , { field: 'HMTONo', title: 'MTO鍙�', width: 150, hide: true }
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
+                ];
+                option = {
+                    id: 'wl-table'
+                    , elem: '#wl-table'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+            ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = getUrlVars();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            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);
+                        //$("#HStockPlaceID").val(d.data[0].HSPID);
+                        //$("#HKeeperID").val(d.data[0].HKeeperID);
+                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
+                        HSourceFlag = true;
+                    }
+                })
+            }
+
+
+            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                var sInterID = $("#HInterID").val();
+                table.render({
+                    elem: '#wl-table'
+                    //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+                    , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+                    , toolbar: '#toolbarDemo'
+                    , defaultToolbar: []
+                    , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+                    , cols: [[
+                          { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                        , { 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 }
+                    ]]
+                    // , data: [linterid]
+                    // , page: true
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+
+
+
+
+
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3783' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        set_InitGrid();
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+                RoadBillSub(linterid);
+            }
+
+
+        //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣   new
+        //if (1 == 2)
+        //{
+        //    element.tabChange('tab-ProductlnBill', '3');
+        //    var pFocus = $("#HBarCode");
+        //    pFocus.focus();
+        //    pFocus.select();
+        //}
+        //else
+        //{
+        //    element.tabChange('tab-ProductlnBill', '1');
+        //    var pFocus = $("#HSourceBillNo");
+        //    pFocus.focus();
+        //    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_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                , resize: false
+                , cancel: function () {
+                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                }
+            })
+        });
+
+        //閫夋嫨淇濈
+        //form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+        //    layer.open({
+        //        type: 2
+        //        , area: ['100%', '100%']
+        //        , title: '淇濈鍒楄〃'
+        //        , shade: 0.6 //閬僵閫忔槑搴�
+        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', '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) {//閫夋嫨楠屾敹
+        //    var sMainStr = JSON.stringify(data.field);
+        //    layer.open({
+        //        type: 2
+        //        , area: ['100%', '100%']
+        //        , title: '楠屾敹鍒楄〃'
+        //        , shade: 0.6 //閬僵閫忔槑搴�
+        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+        //        , resize: false
+        //        , cancel: function () {
+        //            //$(".layui-btn").removeClass("layui-btn-disabled");
+        //        }
+        //    })
+        //});
+
+            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(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(Cancel)', function () {
+            //sessionStorage["SourceFlag"] = false;
+            parent.location.href = "../../../views/index.html"
+            //window.close();//鍏抽棴褰撳墠椤�
+        })
+
+        //鍒犻櫎
+        form.on('submit(cmdDelete)', function () {//鍒犻櫎
+            var checkStatus = table.checkStatus('wl-table')
+            , data = checkStatus.data;
+            var sInterID = $('#HInterID').val()
+            var HBarCode = data[0].HBarCode
+            $.ajax(
+               {
+                   type: "Get",
+                    url: GetWEBURL() + "/PackSplit/Delete",
+                   async: true,
+                    data: { "HInterID": sInterID, "HBarCode": HBarCode, "HBillType": '3784'},
+                   dataType: "json",
+                   success: function (data) {
+                       if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                           layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                               // 寰楀埌frame绱㈠紩
+                               var index = layer.getFrameIndex(window.name);
+                               //鍏抽棴褰撳墠frame
+                               layer.close(index);
+                               //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                               window.location.reload();
+                           });
+                       }
+                       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) {//鎻愪氦
+            var sInterID = $('#HInterID').val()
+            var sBillNo = $("#HBillNo").val()
+            var HTBarCode = $('#HTBarCode').val()
+            var HOrgID = sessionStorage["OrganizationID"]
+            var sMaker = sessionStorage["HUserName"]
+                layer.load(3);
+                $.ajax(
+                {
+                    type: "GET",
+                        url: GetWEBURL() + "/PackSplit/set_SavePackSplitBill_Json",
+                    async: true,
+                        data: { "sInterID": sInterID, "HBillType": '3784', "sBillNo": sBillNo, "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
+                    //dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                            layer.confirm("鐢熸垚鎷嗙鍗�" + data.Message + $("#HBillNo").val(), {
+                                icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                                btn2: function () {
+                                    //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                    //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                    parent.location.href = "../../../views/index.html"
+                                }//鍏抽棴
+                            }, function () { window.location.reload(); });//鏂板
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+        });
+
+        //鐩戝惉鎻愪氦
+        form.verify({
+            numberOrEmpty: function (value, item) {
+                // if (value != '') {
+                if (!/^\d+$/.test(value)) {
+                    return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                }
+                //}
+            }
+        });
+
+        //鎵弿瑁呯鏉$爜
+            $('#HBarCode').on('keydown', function (event) {  //鎵弿瑁呯鏉$爜
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HBarCode = $('#HBarCode').val()
+                var HTBarCode = $('#HTBarCode').val()
+                if (event.keyCode == 13) {
+                    var sBarCode = $('#HBarCode').val()
+                    //var Flag = sessionStorage["SourceFlag"];
+                    //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
+                    if (HBarCode == '') {
+                            playSound();
+                            layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                        if (HBarCode != "") {
+                            $('#HBarCode').val("");
+                        }
+                        $.ajax({
+                            url: GetWEBURL() + "/PackUnionBill/get_CheckTypeByBarCode_Json1",
+                            type: "GET",
+                            data: { "HBarCode": HBarCode, "sInterID": sInterID, "HBillType": '3784', "sBillNo": sBillNo, "HTBarCode": HTBarCode, "sMaker": sessionStorage["HUserName"], "HOWNERID": sessionStorage["OrganizationID"] },
+                            success: function (result) {
+                                //debugger;
+                                playSound1();
+                                if (result.count == 1) {
+                                        $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+                                        element.tabChange('tab-ProductlnBill', '3');
+                                    }
+                                    else {
+                                            $("#HNote").val(";鐗╂枡鏉$爜");
+                                            element.tabChange('tab-ProductlnBill', '3');
+                                        //}
+                                    }
+                                    layer.load(3)
+                                    table.render({
+                                        elem: '#wl-table'
+                                        , url: GetWEBURL() + '/PackUnionBill/GetBillEntry_TmpList_Pack'
+                                        , toolbar: '#toolbarDemo'
+                                        , defaultToolbar: []
+                                        , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '3783', sWhere: '' }
+                                        , cols: [[
+                                            { type: 'radio' }
+                                            , { field: 'HPieceQty', title: '浠舵暟', width: 150 }
+                                            , { field: 'HBarCode', title: '瀛愭潯鐮佺紪鍙�', width: 150 }
+                                            , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                                            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                            , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                            , { field: 'HMaterID', title: '鐗╂枡ID', width: 150 }
+                                            , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                                            //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                                            //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                                            //, { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                        ]]
+                                        // , data: [linterid]
+                                        // , page: true
+                                        , height: 500
+                                        , done: function () {
+                                            layer.closeAll("loading");
+                                        }
+                                    });
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                playSound();
+                                layer.msg("鎺ュ彛璇锋眰寮傚父:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                console.log(err);
+                            }
+                        });
+                }
+            });
+
+
+            function playSound() {
+                console.log("playSound");
+                //var audio = document.getElementById("cs");
+                //$("appendAut").html("");
+                //if (audio == null)
+                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+                //$("appendAut").attr("src","../../video/jingbao.wav")
+                var audio = document.getElementById("cs");
+                audio.play();
+            }
+
+            function playSound1() {
+                console.log("playSound1");
+                //var audio = document.getElementById("cs");
+                //$("appendAut").html("");
+                //if (audio == null)
+                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/success.wav" type = "audio/ogg"> </audio >');
+                //$("appendAut").attr("src", "../../video/success.wav")
+                var audio = document.getElementById("cs2");
+                audio.play();
+            }
+
+        //鎵嫋鏉$爜
+            $('#HTBarCode').on('keydown', function (event) {
+            var HTBarCode = $('#HTBarCode').val()
+            var sInterID = $("#HInterID").val()
+            var sBillNo = $("#HBillNo").val()
+            var HOrgID = sessionStorage["OrganizationID"]
+            var sMaker = sessionStorage["HUserName"]
+            if (event.keyCode == 13) {
+                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                if (HTBarCode == '') {
+                    playSound();
+                    layer.msg("鎷栨潯鐮佷负绌猴紝涓嶈兘鎵弿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                $.ajax({
+                    url: GetWEBURL() + "/PackUnionBill/SetPackBarCode_Webs1",
+                    type: "GET",
+                    data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": '3783', "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //$('#HTBarCode').val(result.data.HSourceBillNo);
+                            $("#HTBarCode").attr("disabled", "true");
+                            layer.load(3)
+                            element.tabChange('tab-ProductlnBill', '2');
+                            table.render({
+                                elem: '#wl-table'
+                                //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+                                , url: GetWEBURL() + '/PackUnionBill/GetBillEntry_TmpList_Pack1'
+                                , toolbar: '#toolbarDemo'
+                                , defaultToolbar: []
+                                , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '3783', sWhere: '' }
+                              , cols: [[
+                                  { type: 'radio' }
+                                , { field: 'HPieceQty', title: '浠舵暟', width: 150 }
+                                , { field: 'HBarCode', title: '瀛愭潯鐮佺紪鍙�', width: 150 }
+                                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                , { field: 'HMaterID', title: '鐗╂枡ID', width: 150 }
+                                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                                , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                                , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                              ]]
+                              , height: 500
+                              , done: function () {
+                                  layer.closeAll("loading");
+                              }
+                            });
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+        });
+
+        //鎵粨浣�
+        $('#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-ProductlnBill', '2');
+                        }
+                        else {
+                            // $("#verifycode").click();
+                            //layer.msg(result.Message, { icon: 5 });
+                            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+        });
+
+        //鎵玀ES浠撲綅
+        $('#HMESSPName').on('keydown', function (event) {      //鎵粨浣�
+            var HBarCode = $('#HMESSPName').val();
+            if (event.keyCode == 13) {
+                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                $.ajax({
+                    url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                    type: "GET",
+                    data: { "HBarCode": HBarCode },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            $("#HMESSPID").val(result.data[0].HWHID);
+                            $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+                            $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+                            $.ajax({
+                                url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+                                type: "GET",
+                                data: { "HERPWHID": result.data[0].HWHID },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        $("#HWHID").val(result.data[0].HMESWHID);
+                                        $("#HWHNAME").val(result.data[0].HMESWHNAME);
+                                        $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+                                        $("#HMESSPName").css("background-color", "#efefef4d");
+                                    }
+                                    else {
+                                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    }
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+        });
+
+        //鍒锋柊鏄庣粏椤电
+        table.render({
+            elem: '#mx-table'
+            // , url: 'http://61.130.49.162:9090/WMSAPI///Web/GetHBarCodeShowBillSub'
+            //, toolbar: '#toolbarDemo'
+            // , where: { sMsg: linterid, sMsg2: lentryid }
+         , cols: [[
+           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+         ]]
+         , page: true
+         , height: 500
+         , done: function () {
+         }
+        });
+    });
+    function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+    {
+        $("#HWHNAME").val(obj[0].HName);
+        //sessionStorage["HWHID"] = obj[0].HItemID;
+        $("#HWHID").val(obj[0].HItemID);
+    }
+    function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+        $("#HStockPlaceName").val(obj[0].HName);
+        $("#HStockPlaceID").val(obj[0].HItemID);
+    }
+    function GetHKeeperValue(obj) {  //杩斿洖淇濈
+        $("#HKeeper").val(obj[0].HName);
+        $("#HKeeperID").val(obj[0].HItemID);
+    }
+    function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+        $("#HSecManager").val(obj[0].HName);
+        $("#HSecManagerID").val(obj[0].HItemID);
+    }
+    function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+        $("#HDeptName").val(obj[0].HName);
+        $("#HDeptID").val(obj[0].HItemID);
+    }
+    function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+        //if ($("#HSourceBillNo").val() == '') {
+        //    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 ($("#HWHNAME").val() == '') {
+        //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+        //    return false;
+        //}
+        if ($("#HBillNo").val() == '') {
+            layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            return false;
+        }
+        if ($("#HInterID").val() == '') {
+            layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            return false;
+        }
+        //if (typeof (sSubStr) == "undefined")
+        //{
+        //    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        //    return false;
+        //}
+        //if (!typeof (sSubStr) == "undefined") {
+        //    //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+        //    //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+        //    //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
+        //    //        {
+        //    //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+        //    //            return false;
+        //    //        }
+        //    //    }
+        //    //}
+        //    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+        //        if (parseFloat(sSubStr[i].HQty) > 0) {
+        //            s = 1;
+        //        }
+        //    }
+        //    if (s == 0) {
+        //        layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        //        return false;
+        //    }
+        //}
+        else
+        {
+            return true;
+        }
+    }
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriod_Edit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriod_Edit.html"
index fb40b27..f867a96 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriod_Edit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriod_Edit.html"
@@ -23,12 +23,12 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 10px;">
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">鏂板</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">瀹℃牳</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">鎵撳嵃</button>
+                         <button type="button" lay-submit="" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-filter="Saver">淇濆瓨</button>
+                         <button type="button" lay-submit="" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-filter="Add">鏂板</button>
+                         <button type="button" lay-submit="" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-filter="Check">瀹℃牳</button>
+                         <button type="button" lay-submit="" class="layui-btn layui-btn-normal" style="margin-left: 0px"" lay-filter="FCheck">鍙嶅鏍�</button>
+                         <button type="button" lay-submit="" class="layui-btn layui-btn-normal" style="margin-left: 0px"" lay-filter="Cancel">閫�鍑�</button>
+                         <button type="button" lay-submit="" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-filter="print">鎵撳嵃</button>
                     </div>
                     <div class="layui-form-item" style="padding-top: 10px;">
                         <div class="layui-row">
@@ -47,15 +47,15 @@
                         </div>
                         <div class="layui-row">
                             <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate" style="padding-left: 32px;">
+                                <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                <div class="layui-input-block" style="margin-left: 110px;">
+                                    <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate" style="padding-left: 52px;">
                                 </div>
                             </div>
                             <div class="layui-inline">
                                 <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
                                 <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="date" class="layui-input" name="HEndDate" id="HEndDate" style="padding-left: 32px;">
+                                    <input type="date" class="layui-input" name="HEndDate" id="HEndDate" style="padding-left: 52px;">
                                 </div>
                             </div>
                             <div class="layui-inline">
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html"
index 1f47b50..1b2ae60 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html"
@@ -68,7 +68,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鍙戦�佷汉<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="HSendMan" id="HSendMan" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="HSendMan" id="HSendMan" readonly class="layui-input" value="" style="float:left;">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index c1152ad..c375c23 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -52,19 +52,11 @@
         <div class="layui-card" style="padding: 2px;background-color: #efefef;">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
-                    <div style="padding: 10px;">
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
-                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
-                        </button>
+                    <div style="padding: 10px; ">
+                        <button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal"  lay-submit="" lay-filter="btnSearch" >棰勮</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -87,7 +79,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 32px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 48px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -108,21 +100,21 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠g爜</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 75px;">浜у搧鍚嶇О</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;width:90%" readonly>
+                                                <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 65px;">瑙勬牸鍨嬪彿</label>
-                                            <div class="layui-input-block" style="margin-left: 105px;">
+                                            <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" readonly>
                                             </div>
                                         </div>
@@ -139,8 +131,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -149,14 +141,14 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="text" class="layui-input" lay-verify="HRoutingGroupIDName" name="HRoutingGroupIDName" id="HRoutingGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                 </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鏃堕棿鍗曚綅</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;width: 172px;">
+                                            <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
                                                 <select name="HMainTimeUnit" lay-verify="HMainTimeUnit" id="HMainTimeUnit">
                                                     <option value="灏忔椂">灏忔椂</option>
                                                     <option value="澶�">澶�</option>
@@ -176,8 +168,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -186,8 +178,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -196,14 +188,14 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 65px;">鎴愬搧缂栧彿</label>
-                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                            <label class="layui-form-label" style="width: 85px;">鎴愬搧缂栧彿</label>
+                                            <div class="layui-input-block" style="margin-left: 115px;">
                                                 <input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
                                             </div>
                                         </div>
@@ -229,8 +221,8 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 65px;">鐗堟湰</label>
-                                            <div class="layui-input-block" style="margin-left: 105px;">
+                                            <label class="layui-form-label" style="width: 85px;">鐗堟湰</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
index 3ae5aab..9a48003 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
@@ -93,6 +93,7 @@
                                         <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
                                         <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                             <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                            <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -404,6 +405,16 @@
 
             
 
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
@@ -850,7 +861,42 @@
                     }
                 }
             }
-            
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+                if (!HBarCode) {
+                    layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                    return;
+                }
+                $.ajax({
+                    url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
+                    type: "GET",
+                    data: { "HBarCode": HBarCode },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+                            $("#HEquipID").val(data.HItemID);
+                            $("#HBarName").val(data.HName);
+                            $("#HBarSpec").val(data.HModel);
+                            $("#HBarModel").val(data.HModel2);
+                            $("#HQty").val(1);
+                            $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                            $("#HBarCode").css("background-color", "#efefef4d");
+
+                            HProcExchBillNoFlag = true;
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
             //浠ヤ笂涓簂ayui妯″潡
         });
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
index 52de7ca..08a289d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
@@ -94,6 +94,7 @@
                                         <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
                                         <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                             <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                            <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -362,86 +363,16 @@
             //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
             var HProcExchBillNoFlag = false;
 
-
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID": data.HItemID,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HQty": "1"
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                                HProcExchBillNoFlag = true;
-                                get_DocCheckItem();
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-            function get_DocCheckItem() {
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetDotCheckRuleItemByEquipProjectID",
-                    type: "GET",
-                    data: { "EquipProjectID": $("#HEquipID").val() },
-                    success: function (result) {
-                        if (result != null) {
-                            if (result.count == 1) {
-                                var BYData = result;//
-                                var rowdate1 = layui.table.cache["mainTable"];
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": ""}];
-                                table.render(option);
-
-                                if (BYData.data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
-                                {
-                                    buttonArr = [];//娓呯┖鏁扮粍
-                                    for (var i = 0; i < BYData.data.length; i++) {
-                                        var checkrow = {
-                                            "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
-                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
-                                            "HManagerName": BYData.data[i].HManagerName
-                                        };
-                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
-                                    }
-                                    table.reload("mainTable", {
-                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                    })
-                                }
-                            }
-                            else {
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": ""}];
-                                table.render(option);
-                                layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
-                            }
-                        }
-                    }
-                })
-            }
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -777,6 +708,81 @@
                     return true;
                 }
             }
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+                if (!HBarCode) {
+                    layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                    return;
+                }
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown",
+                    type: "GET",
+                    data: { "HBarCode": HBarCode },
+                    success: function (result) {
+                        if (result.data.length == 1) {
+                            var data = result.data[0];
+                            $("#HEquipID").val(data.HItemID);
+                            $("#HBarName").val(data.HName);
+                            $("#HBarSpec").val(data.HModel);
+                            $("#HBarModel").val(data.HModel2);
+                            $("#HQty").val(1);
+                            $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                            $("#HBarCode").css("background-color", "#efefef4d");
+                            HProcExchBillNoFlag = true;
+                            get_DocCheckItem();
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg("鏈煡鎵惧埌鏁版嵁", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            function get_DocCheckItem() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetDotCheckRuleItemByEquipProjectID",
+                    type: "GET",
+                    data: { "EquipProjectID": $("#HEquipID").val() },
+                    success: function (result) {
+                        if (result != null) {
+                            if (result.count == 1) {
+                                var BYData = result;//
+                                var rowdate1 = layui.table.cache["mainTable"];
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
+                                table.render(option);
+
+                                if (BYData.data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                                {
+                                    buttonArr = [];//娓呯┖鏁扮粍
+                                    for (var i = 0; i < BYData.data.length; i++) {
+                                        var checkrow = {
+                                            "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
+                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
+                                            "HManagerName": BYData.data[i].HManagerName
+                                        };
+                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                    }
+                                    table.reload("mainTable", {
+                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    })
+                                }
+                            }
+                            else {
+                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
+                                table.render(option);
+                                layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
+                            }
+                        }
+                    }
+                })
+            }
             //浠ヤ笂涓簂ayui妯″潡
         });
     </script>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
index 864d63a..7c71f70 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
@@ -92,6 +92,7 @@
                                         <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
                                         <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                             <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                            <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -361,83 +362,19 @@
 
             
 
-
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Sb_PDA_EquipMaintainBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID": data.HInterID,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HQty": "1"
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                                HProcExchBillNoFlag = true;
-                                get_MaintainItem();
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
-            function get_MaintainItem() {
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMaintainItemtemByEquipProjectID",
-                    type: "GET",
-                    data: { "EquipProjectID": $("#HEquipID").val() },
-                    success: function (result) {
-                        if (result != null) {
-                            if (result.count == 1) {
-                                var BYData = result.list[0];//淇濆吇
-                                var rowdate1 = layui.table.cache["mainTable"];
-                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
-                                table.render(option);
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
 
-                                if (BYData.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
-                                {
-                                    buttonArr = [];//娓呯┖鏁扮粍
-                                    for (var i = 0; i < BYData.length; i++) {
-                                        var checkrow = {
-                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
-                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
-                                        };
-                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
-                                    }
-                                    table.reload("mainTable", {
-                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                    })
-                                }
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }
-                    }
-                })
-            }
+            
+            
 
             //閫�鍑�-鍏抽棴椤甸潰鏂规硶
             $('#Cancel').on('click', function () {
@@ -773,6 +710,78 @@
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
             }
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+                if (!HBarCode) {
+                    layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                    return;
+                }
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Sb_PDA_EquipMaintainBill/txtHBarCode_KeyDown",
+                    type: "GET",
+                    data: { "HBarCode": HBarCode },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+                            $("#HEquipID").val(data.HItemID);
+                            $("#HBarName").val(data.HName);
+                            $("#HBarSpec").val(data.HModel);
+                            $("#HBarModel").val(data.HModel2);
+                            $("#HQty").val(1);
+                            $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                            $("#HBarCode").css("background-color", "#efefef4d");
+                            HProcExchBillNoFlag = true;
+                            get_MaintainItem();
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            function get_MaintainItem() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMaintainItemtemByEquipProjectID",
+                    type: "GET",
+                    data: { "EquipProjectID": $("#HEquipID").val() },
+                    success: function (result) {
+                        if (result != null) {
+                            if (result.count == 1) {
+                                var BYData = result.list[0];//淇濆吇
+                                var rowdate1 = layui.table.cache["mainTable"];
+                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                                table.render(option);
+
+                                if (BYData.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                                {
+                                    buttonArr = [];//娓呯┖鏁扮粍
+                                    for (var i = 0; i < BYData.length; i++) {
+                                        var checkrow = {
+                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
+                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
+                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+                                        };
+                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                    }
+                                    table.reload("mainTable", {
+                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    })
+                                }
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }
+                    }
+                })
+            }
             //浠ヤ笂涓簂ayui妯″潡
         });
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
index dbfa734..37f49e5 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
@@ -85,6 +85,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉$爜</label>
                             <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -349,47 +350,15 @@
                 }
             });
 
-
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Sb_PDA_EquipMaintainBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID": data.HItemID,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel,
-                                    "HBarModel": data.HModel2,
-                                    "HQty": "1"
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
             });
 
 
@@ -540,7 +509,43 @@
             $("#HMaintainItem").val(obj[0].HName);
             $("#HMaintainItemID").val(obj[0].HItemID);
         }
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Sb_PDA_EquipMaintainBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.count == 1) {
+                        var data = result.data[0];
+                        $("#HEquipID").val(data.HItemID);
+                        $("#HBarName").val(data.HName);
+                        $("#HBarSpec").val(data.HModel);
+                        $("#HBarModel").val(data.HModel2);
+                        $("#HQty").val(1);
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
 
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index ecf53e8..02bda93 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -212,7 +212,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鍑哄巶鏃ユ湡</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="date" class="layui-input" name="HOutComDate" id="HOutComDate" style="padding-left: 32px; width:185px;">
+                                                    <input type="date" class="layui-input" name="HOutComDate" id="HOutComDate" style="padding-left: 32px;">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
@@ -256,7 +256,7 @@
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">璁惧鐘舵��</label>
-                                                <div class="layui-input-block">
+                                                <div class="layui-input-block"  style="margin-left: 125px;width:55%;">
                                                     <select name="HStatus" lay-filter="aihao" id="HStatus">
                                                         <option value="绌洪棽" selected="selected">绌洪棽</option>
                                                         <option value="鍗犵敤">鍗犵敤</option>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
index 4db1db9..a72c05c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
@@ -29,18 +29,10 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 10px;">
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
-                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
-                        </button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">棰勮</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼 </button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -53,7 +45,7 @@
                                     <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <div class="layui-input-block" style="margin-left: 115px;width:63%;">
                                                 <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                             </div>
@@ -61,12 +53,12 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 32px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 32px; width: 112%; margin-left: 2px; ">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍐呴儴鍗曟嵁鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <div class="layui-input-block" style="margin-left: 122px;">
                                                 <input type="text" class="layui-input" lay-verify="HInnerBillNo" name="HInnerBillNo" id="HInnerBillNo">
                                             </div>
                                         </div>
@@ -77,8 +69,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HDeptIDName" name="HDeptIDName" id="HDeptIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -87,8 +79,8 @@
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HEmpIDName" lay-verify="HEmpIDName" id="HEmpIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HEmpID" lay-verify="HEmpID" id="HEmpID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -97,8 +89,8 @@
                                             <div class="layui-input-block" style="margin-left: 57px;">
                                                 <input type="text" class="layui-input" name="HManagerIDName" lay-verify="HManagerIDName" id="HManagerIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HManagerID" lay-verify="HManagerID" id="HManagerID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHManagerID" id="btnHManagerID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHManagerID" id="btnHManagerID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -106,21 +98,21 @@
                                     <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">璁惧</label>
-                                            <div class="layui-input-block" style="margin-left: 87px;">
+                                            <div class="layui-input-block" style="margin-left: 78px;">
                                                 <input type="text" class="layui-input" name="HEquipIDName" lay-verify="HEquipIDName" id="HEquipIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HEquipID" lay-verify="HEquipID" id="HEquipID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquipID" id="btnHEquipID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquipID" id="btnHEquipID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨椤圭洰</label>
-                                            <div class="layui-input-block" style="margin-left: 67px;">
+                                            <label class="layui-form-label" style="width: 85px;">缁翠慨椤圭洰</label>
+                                            <div class="layui-input-block" style="margin-left: 78px;">
                                                 <input type="text" class="layui-input" name="HRepairIDName" lay-verify="HRepairIDName" id="HRepairIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HRepairID" lay-verify="HRepairID" id="HRepairID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRepairID" id="btnHRepairID" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRepairID" id="btnHRepairID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -134,44 +126,44 @@
                                     <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">棰勮缁翠慨寮�濮嬫棩鏈�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <div class="layui-input-block" style="margin-left: 115px; width: 67%;">
                                                 <input type="date" class="layui-input" lay-verify="HRepairPlanBeginDate" name="HRepairPlanBeginDate" id="HRepairPlanBeginDate" style="padding-left: 32px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">棰勮缁翠慨缁撴潫鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <label class="layui-form-label" style="width: 85px; margin-left: 25px;">棰勮缁翠慨缁撴潫鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 140px;">
                                                 <input type="date" class="layui-input" lay-verify="HRepairPlanEndDate" name="HRepairPlanEndDate" id="HRepairPlanEndDate" style="padding-left: 32px;">
                                             </div>
                                         </div>
-                                        <div class="layui-inline" style="width:13%">
-                                            <label class="layui-form-label" style="width: 60px;">鏃堕棿鍗曚綅</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃堕棿鍗曚綅</label>
+                                            <div class="layui-input-block" style="margin-left: 125px;">
                                                 <input type="text" class="layui-input" name="HCycleUnit" lay-verify="HCycleUnit" style="width:100%" id="HCycleUnit" value="" onmouseover="this.title=this.value">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline" >
-                                            <label class="layui-form-label" style="width: 100px;">璁″垝缁翠慨宸ユ椂</label>
-                                            <div class="layui-input-block" style="margin-left: 130px;">
-                                                <input type="text" class="layui-input" name="HPlanTimes" lay-verify="HPlanTimes" style="width:30%" id="HPlanTimes" value="" onmouseover="this.title=this.value">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁″垝缁翠慨宸ユ椂</label>
+                                            <div class="layui-input-block" style="margin-left: 115px;">
+                                                <input type="text" class="layui-input" name="HPlanTimes" lay-verify="HPlanTimes"  id="HPlanTimes" value="" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
                                         <div class="layui-inline" style="width: 56%;">
                                             <label class="layui-form-label" style="width: 85px;">鎽樿</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" lay-verify="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" lay-verify="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 95%;">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline" style="width: 56%;">
                                             <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <div class="layui-input-block" style="margin-left: 115px;">
                                                 <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
                                                 <input type="hidden" class="layui-input" name="HUpDater" id="HUpDater" lay-verify="HUpDater" value="">
-                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 95%;">
                                             </div>
                                         </div>
                                     </div>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index de33998..f1b88f4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -82,7 +82,7 @@
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
-                                                <div class="layui-input-block">
+                                                <div class="layui-input-block" style="width:190px;">
                                                     <select name="HCycleUnit" lay-filter="HCycleUnit" id="HCycleUnit">
                                                         <option value="澶�" selected="selected">澶�</option>
                                                         <option value="鍛�">鍛�</option>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill.html"
index d92737e..80d7010 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill.html"
@@ -36,18 +36,10 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 10px;">
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
-                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
-                        </button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">棰勮</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨 </button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index 42339aa..5954661 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -38,116 +38,89 @@
 
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs2">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                         <input id="HInterID" name="HInterID" value="0" type="hidden" />
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">鐢熶骇璧勬簮锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HSource" id="HSource" autocomplete="off">
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductionResources-BT">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮锛�</label>
+                                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                                        <input type="text" class="layui-input" lay-verify="HSource" name="HSource" id="HSource" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HSourceID" name="HSourceID" type="hidden" />
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                         </button>
-                                                        <input id="HSourceID" name="HSourceID" type="hidden" />
-
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">浠诲姟鍗曞彿锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HICMOBillNo" id="HICMOBillNo" lay-verify="" autocomplete="off" class="layui-input">
-
-                                                        <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmployeeID-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>-->
-                                                        <!--<input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" />-->
-
-                                                    </div>
-                                                </div>
-
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">浠诲姟鍗曟暟閲忥細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HICMOQty" id="HICMOQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">浠诲姟鍗曞唴鐮侊細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HICMOInterID" id="HICMOInterID" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
-                                                    </div>
-                                                </div>
-
-
                                             </div>
                                             <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">浜у搧鍐呯爜锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HMater" id="HMater" lay-verify="HMater" readonly="readonly" autocomplete="off" class="layui-input">
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HMateria-BT">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 80px;">浠诲姟鍗曞彿锛�</label>
+                                                    <div class="layui-input-block" style="margin-left: 72px;">
+                                                        <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" />
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                         </button>
-                                                        <input id="HMaterID" name="HMaterID" type="hidden" />
-                                                        <input id="HMaterNumber" name="HMaterNumber" type="hidden" />
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 娴佽浆鍗℃暟閲忥細</label>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="margin-left:5px;">浠诲姟鍗曟暟閲忥細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HICMOQty" id="HICMOQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="margin-left:10px;">浠诲姟鍗曞唴鐮侊細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" name="HICMOInterID" id="HICMOInterID" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 80px;">浜у搧鍐呯爜锛�</label>
+                                                    <div class="layui-input-block" style="margin-left: 72px;">
+                                                        <input type="text" class="layui-input" lay-verify="HMater" name="HMater" id="HMater" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HMaterID" name="HMaterID" type="hidden" />
+                                                        <input id="HMaterNumber" name="HMaterNumber" type="hidden" />
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMateria-BT" id="HMateria-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="margin-left:5px;"> 娴佽浆鍗℃暟閲忥細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HProcExchQty" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" id="HProcExchQty" autocomplete="off">
 
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 宸ュ簭娴佽浆鍗″彿锛�</label>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="margin-left:10px;"> 宸ュ簭娴佽浆鍗″彿锛�</label>
                                                     <div class="layui-input-inline">
                                                         <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="" autocomplete="off" class="layui-input">
 
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 娴佽浆鍗D锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HProcExchInterID" value="0" lay-verify="" id="HProcExchInterID" autocomplete="off">
-
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 娴佽浆鍗″瓙ID锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HProcExchEntryID" value="0" lay-verify="" id="HProcExchEntryID" autocomplete="off">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">妫�楠屽憳锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HEmpName" id="HEmpName" lay-verify="" autocomplete="off" class="layui-input">
-
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmployeeID-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" />
-
-                                                    </div>
-                                                </div>
-
                                             </div>
                                         </div>
 
@@ -163,6 +136,33 @@
                                         </div>-->
                                         <div class="layui-form-item">
                                             <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label"> 娴佽浆鍗D锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HProcExchInterID" value="0" lay-verify="" id="HProcExchInterID" autocomplete="off">
+
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label"> 娴佽浆鍗″瓙ID锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HProcExchEntryID" value="0" lay-verify="" id="HProcExchEntryID" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳锛�</label>
+                                                    <div class="layui-input-block" style="margin-left: 77px;">
+                                                        <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                        <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" />
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
 
                                                 <div class="layui-colorpicker-xs">
                                                     <label class="layui-form-label"> 澶囨敞锛�</label>
@@ -173,17 +173,15 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                            </div>
+                                        </div>
+                                    </div>
                         </div>
 
                         <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index f3dba95..c523195 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -48,9 +48,9 @@
                         <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                             <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
                         </button>-->
-                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
-                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
-                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -72,14 +72,14 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px;">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 47px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                                 <input type="hidden" name="HSourceID" id="HSourceID" value="0">
@@ -91,7 +91,7 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
@@ -115,7 +115,7 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍐呯爜</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
@@ -130,7 +130,7 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
@@ -153,7 +153,7 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                                 <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
@@ -165,7 +165,7 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                                 <input type="hidden" name="HQCCheckProjectID" id="HQCCheckProjectID" value="0">
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index fd0f611..60a2555 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -53,9 +53,9 @@
                         <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                             <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
                         </button>-->
-                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
-                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
-                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -77,14 +77,14 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px;">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px; width: 110%;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                            <label class="layui-form-label" style="width: 100px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-block" style="margin-left: 92px;">
                                                 <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                                 <input type="hidden" name="HSourceID" id="HSourceID" value="0">
@@ -96,7 +96,7 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
@@ -120,7 +120,7 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍐呯爜</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
@@ -135,7 +135,7 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
@@ -158,7 +158,7 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHFirstCheckEmp" id="btnSearchHFirstCheckEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                                 <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
@@ -170,7 +170,7 @@
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: left;margin-right: 3px;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                                 <input type="hidden" name="HQCCheckProjectID" id="HQCCheckProjectID" value="0">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill_Mul_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill_Mul_PDA.html"
index 7992630..3b29a3e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill_Mul_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill_Mul_PDA.html"
@@ -57,6 +57,9 @@
                                 <label class="layui-form-label">鏉″舰鐮�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HBarCode" id="HBarCode" placeholder="璇疯緭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="QueDin" id="QueDin" style="width: 70px;">
+                                        纭畾
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -382,27 +385,36 @@
             });
             //#endregion
 
+            //#region 鎵潯鐮佺‘瀹氭寜閽�
+            form.on('submit(QueDin)', function () {
+                GetMeesageByBarCode();
+            });
+            //#endregion
+
             //#region 鎵潯褰㈢爜(娴佽浆鍗�)
             $('#HBarCode').on('keydown', function (event) {
                 if (event.keyCode == 13) {
-                    if ($("#HProcNo").val() == "") {
-                        layer.msg("璇疯緭鍏ユ祦姘村彿锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HQty").val() == "") {
-                        layer.msg("璇峰厛濉啓鍙戝嚭鏁伴噺锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HEmpID").val() == "") {
-                        layer.msg("璇烽�夋嫨鍙戝嚭浜猴紒", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    txtHBarCode_KeyDown($("#HBarCode").val());
+                    GetMeesageByBarCode();
                 }
             });
+            function GetMeesageByBarCode(obj) {
+                if ($("#HProcNo").val() == "") {
+                    layer.msg("璇疯緭鍏ユ祦姘村彿锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HQty").val() == "") {
+                    layer.msg("璇峰厛濉啓鍙戝嚭鏁伴噺锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HEmpID").val() == "") {
+                    layer.msg("璇烽�夋嫨鍙戝嚭浜猴紒", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                txtHBarCode_KeyDown($("#HBarCode").val());
+            }
             //#endregion
 
             //#region 鎻愪氦鎸夐挳(淇濆瓨)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill_PDA.html"
index f4f3a40..6b5b57c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill_PDA.html"
@@ -61,6 +61,7 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
                             <div class="layui-input-block" style="margin-left: 120px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -302,8 +303,7 @@
             $("#HEmpID").val(sessionStorage["Czybm"]);
             $("#HEmp").val(sessionStorage["HUserName"]);
             $("#HMaker").val(sessionStorage["HUserName"]);
-            //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
-            var HProcExchBillNoFlag = false;
+           
 
             //鑾峰彇鏈�澶у崟鎹彿
             $.ajax({
@@ -319,64 +319,8 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                    "HICMOInterID": data.hicmointerid,
-                                    "HMaterID": data.HMaterID,
-                                    "HMaterName": data.浜у搧,
-                                    "HMaterNumber": data.浜у搧浠g爜,
-                                    "HMaterModel": data.瑙勬牸鍨嬪彿,
-                                    "HQty": 0,
-                                    "HPieceQty": data.鐢熶骇鏁伴噺,
-                                    "HPlanQty": data.鐢熶骇鏁伴噺,
-                                    "lngBillSubKey": data.HSubID,
-                                    "lngBillKey": data.HMainID,
-                                    "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                    "HICMOQty": data.浠诲姟鍗曟暟閲�,
-                                    "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
-                                    "HStationInTime": Format(new Date(), "yyyy-MM-dd hh:mm:ss"),
-                                    "HMoney": 0,
-                                    //"HProcID": data.HProcID,
-                                    //"HProcNo": data.宸ュ簭鍙�,
-                                    //"HProcName": data.宸ュ簭,
-                                    "HSupID": data.HSupID,
-                                    "HSup": data.渚涘簲鍟�,
-                                    "HSourceID": data.HSourceID,
-                                    "HSource": data.鐢熶骇璧勬簮,
-                                    "HGroupID": data.HGroupID,
-                                    "HGroup": data.鐝粍,
-                                    "HDeptID": sessionStorage["HDeptID"],
-                                    "HDept": sessionStorage["HDept"]
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
 
@@ -427,6 +371,11 @@
                     parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
                 });
             })
+
+            //纭畾鎸夐挳
+            form.on('submit(QueDin)', function (data) {//閫�鍑�
+                GetMeesageByBarCode();
+            });
 
             //鎻愪氦
             form.on('submit(Saver)', function (data) {//鎻愪氦
@@ -491,7 +440,6 @@
             form.on('submit(btnSearchMater)', function () {
                 layer.msg('绂佹閫夋嫨');
             });
-
         //浠ヤ笂涓簂ayui妯″潡
         });
 
@@ -501,6 +449,66 @@
             $("#HProcID").val(obj[0].HItemID);
         }
 
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+            if (HBarCode == "") {
+                layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                return;
+            }
+            $.ajax({
+                url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.count == 1) {
+                        var data = result.data[0];
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HICMOBillNo": data.浠诲姟鍗曞彿,
+                            "HICMOInterID": data.hicmointerid,
+                            "HMaterID": data.HMaterID,
+                            "HMaterName": data.浜у搧,
+                            "HMaterNumber": data.浜у搧浠g爜,
+                            "HMaterModel": data.瑙勬牸鍨嬪彿,
+                            "HQty": 0,
+                            "HPieceQty": data.鐢熶骇鏁伴噺,
+                            "HPlanQty": data.鐢熶骇鏁伴噺,
+                            "lngBillSubKey": data.HSubID,
+                            "lngBillKey": data.HMainID,
+                            "HProcExchBillNo": data.鍗曟嵁鍙�,
+                            "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                            "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                            "HStationInTime": Format(new Date(), "yyyy-MM-dd hh:mm:ss"),
+                            "HMoney": 0,
+                            //"HProcID": data.HProcID,
+                            //"HProcNo": data.宸ュ簭鍙�,
+                            //"HProcName": data.宸ュ簭,
+                            "HSupID": data.HSupID,
+                            "HSup": data.渚涘簲鍟�,
+                            "HSourceID": data.HSourceID,
+                            "HSource": data.鐢熶骇璧勬簮,
+                            "HGroupID": data.HGroupID,
+                            "HGroup": data.鐝粍,
+                            "HDeptID": sessionStorage["HDeptID"],
+                            "HDept": sessionStorage["HDept"]
+                        });
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
+                        
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill_Mul_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill_Mul_PDA.html"
index adf7498..72e812c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill_Mul_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill_Mul_PDA.html"
@@ -57,6 +57,9 @@
                                 <label class="layui-form-label">鏉″舰鐮�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HBarCode" id="HBarCode" placeholder="璇疯緭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="QueDin" id="QueDin" style="width: 70px;">
+                                        纭畾
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -390,32 +393,42 @@
             });
             //#endregion
 
+            //#region 鎵潯鐮佺‘瀹氭寜閽�
+            form.on('submit(QueDin)', function () {
+                GetMeesageByBarCode();
+            });
+            //#endregion
+
             //#region 鎵潯褰㈢爜(娴佽浆鍗�)
             $('#HBarCode').on('keydown', function (event) {
                 if (event.keyCode == 13) {
-                    if ($("#HProcNo").val() == "") {
-                        layer.msg("璇疯緭鍏ユ祦姘村彿锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HSupID").val() == "") {
-                        layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HEmpID").val() == "" || $("#HEmpID").val() == 0) {
-                        layer.msg("璇烽�夋嫨鎺ユ敹浜猴紒", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HQty").val() == "") {
-                        layer.msg("璇峰厛濉啓鎺ユ敹鏁伴噺锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    txtHBarCode_KeyDown($("#HBarCode").val());
+                    GetMeesageByBarCode();
                 }
             });
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                if ($("#HProcNo").val() == "") {
+                    layer.msg("璇疯緭鍏ユ祦姘村彿锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HSupID").val() == "") {
+                    layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HEmpID").val() == "" || $("#HEmpID").val() == 0) {
+                    layer.msg("璇烽�夋嫨鎺ユ敹浜猴紒", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HQty").val() == "") {
+                    layer.msg("璇峰厛濉啓鎺ユ敹鏁伴噺锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                txtHBarCode_KeyDown($("#HBarCode").val());
+            }
             //#endregion
 
             //#region 鎻愪氦鎸夐挳(淇濆瓨)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill_PDA.html"
index 5b2f82f..5c4de73 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill_PDA.html"
@@ -61,6 +61,9 @@
                             <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
                             <div class="layui-input-block" style="margin-left: 120px;width:46%;">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="QueDin" id="QueDin" style="width: 70px; background-color: #1492ff;">
+                                    纭畾
+                                </button>
                             </div>
                         </div>
                     </div>
@@ -346,64 +349,8 @@
 
             //鏉″舰鐮佸洖杞︽柟娉�
             $('#HBarCode').on('keydown', function (event) {
-                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (!HBarCode) {
-                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
-                        return;
-                    }
-                    var index = layer.load();
-                    $.ajax({
-                        url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
-                        type: "GET",
-                        data: { "HBarCode": HBarCode },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                var data = result.data[0];
-                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                    "HICMOInterID": data.hicmointerid,
-                                    "HMaterID": data.HMaterID,
-                                    "HMaterName": data.浜у搧,
-                                    "HMaterNumber": data.浜у搧浠g爜,
-                                    "HMaterModel": data.瑙勬牸鍨嬪彿,
-                                    "HQty": 0,
-                                    "HPieceQty": data.鐢熶骇鏁伴噺,
-                                    "HPlanQty": data.鐢熶骇鏁伴噺,
-                                    "lngBillSubKey": data.HSubID,
-                                    "lngBillKey": data.HMainID,
-                                    "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                    "HICMOQty": data.浠诲姟鍗曟暟閲�,
-                                    "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
-                                    "HStationInTime": Format(new Date(), "yyyy-MM-dd hh:mm:ss"),
-                                    "HMoney": 0,
-                                    //"HProcID": data.HProcID,
-                                    //"HProcNo": data.宸ュ簭鍙�,
-                                    //"HProcName": data.宸ュ簭,
-                                    "HSupID": data.HSupID,
-                                    "HSup": data.渚涘簲鍟�,
-                                    "HSourceID": data.HSourceID,
-                                    "HSource": data.鐢熶骇璧勬簮,
-                                    "HGroupID": data.HGroupID,
-                                    "HGroup": data.鐝粍,
-                                    "HDeptID": sessionStorage["HDeptID"],
-                                    "HDept": sessionStorage["HDept"]
-                                });
-                                $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                $("#HBarCode").css("background-color", "#efefef4d");
-                                HProcExchBillNoFlag = true;
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
 
@@ -454,6 +401,11 @@
                     parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
                 });
             })
+
+            //纭畾
+            form.on('submit(QueDin)', function () {
+                GetMeesageByBarCode();
+            });
 
             //鎻愪氦
             form.on('submit(Saver)', function (data) {//鎻愪氦
@@ -527,7 +479,67 @@
             $("#HProcName").val(obj[0].HName);
             $("#HProcID").val(obj[0].HItemID);
         }
-
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+            if (!HBarCode) {
+                layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                return;
+            }
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                type: "GET",
+                data: { "HBarCode": HBarCode },
+                success: function (result) {
+                    if (result.count == 1) {
+                        var data = result.data[0];
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HICMOBillNo": data.浠诲姟鍗曞彿,
+                            "HICMOInterID": data.hicmointerid,
+                            "HMaterID": data.HMaterID,
+                            "HMaterName": data.浜у搧,
+                            "HMaterNumber": data.浜у搧浠g爜,
+                            "HMaterModel": data.瑙勬牸鍨嬪彿,
+                            "HQty": 0,
+                            "HPieceQty": data.鐢熶骇鏁伴噺,
+                            "HPlanQty": data.鐢熶骇鏁伴噺,
+                            "lngBillSubKey": data.HSubID,
+                            "lngBillKey": data.HMainID,
+                            "HProcExchBillNo": data.鍗曟嵁鍙�,
+                            "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                            "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                            "HStationInTime": Format(new Date(), "yyyy-MM-dd hh:mm:ss"),
+                            "HMoney": 0,
+                            //"HProcID": data.HProcID,
+                            //"HProcNo": data.宸ュ簭鍙�,
+                            //"HProcName": data.宸ュ簭,
+                            "HSupID": data.HSupID,
+                            "HSup": data.渚涘簲鍟�,
+                            "HSourceID": data.HSourceID,
+                            "HSource": data.鐢熶骇璧勬簮,
+                            "HGroupID": data.HGroupID,
+                            "HGroup": data.鐝粍,
+                            "HDeptID": sessionStorage["HDeptID"],
+                            "HDept": sessionStorage["HDept"]
+                        });
+                        $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        $("#HBarCode").css("background-color", "#efefef4d");
+                        HProcExchBillNoFlag = true;
+                        layer.close(index);
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index f5fb00b..cb436f4 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -148,7 +148,7 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
                                             <div class="layui-input-block">
-                                                <input type="text" class="layui-input" value="0" name="HPlanQty" id="HPlanQty">
+                                                <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
                                             </div>
                                         </div>
                                     </div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_PDA.html"
index 1d12b25..7b33860 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_PDA.html"
@@ -57,6 +57,9 @@
                                 <label class="layui-form-label">鏉″舰鐮�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HBarCode" id="HBarCode" placeholder="璇疯緭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="QueDin" id="QueDin" style="width: 70px;">
+                                        纭畾
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -424,42 +427,52 @@
             });
             //#endregion
 
+            //#region 鎵潯鐮佺‘瀹氭寜閽�
+            form.on('submit(QueDin)', function () {
+                GetMeesageByBarCode();
+            });
+            //#endregion
+
             //#region 鎵潯褰㈢爜(娴佽浆鍗�)
             $('#HBarCode').on('keydown', function (event) {
                 if (event.keyCode == 13) {
-                    if ($("#HProcNo").val() == "") {
-                        layer.msg("璇疯緭鍏ユ祦姘村彿锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HEmpID").val() == 0) {
-                        layer.msg("璇烽�夋嫨鎿嶄綔鍛橈紒", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HQty").val() == "") {
-                        layer.msg("璇峰厛濉啓鍚堟牸鏁伴噺锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HQCCheckID").val() == 0) {
-                        layer.msg("璇烽�夋嫨妫�楠屽憳锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HGroupID").val() == 0) {
-                        layer.msg("璇烽�夋嫨鐝粍锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HSourceID").val() == 0) {
-                        layer.msg("璇烽�夋嫨鐢熶骇璧勬簮锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    txtHBarCode_KeyDown($("#HBarCode").val());
+                    GetMeesageByBarCode();
                 }
             });
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                if ($("#HProcNo").val() == "") {
+                    layer.msg("璇疯緭鍏ユ祦姘村彿锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HEmpID").val() == 0) {
+                    layer.msg("璇烽�夋嫨鎿嶄綔鍛橈紒", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HQty").val() == "") {
+                    layer.msg("璇峰厛濉啓鍚堟牸鏁伴噺锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HQCCheckID").val() == 0) {
+                    layer.msg("璇烽�夋嫨妫�楠屽憳锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HGroupID").val() == 0) {
+                    layer.msg("璇烽�夋嫨鐝粍锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HSourceID").val() == 0) {
+                    layer.msg("璇烽�夋嫨鐢熶骇璧勬簮锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                txtHBarCode_KeyDown($("#HBarCode").val());
+            }
             //#endregion
 
             //#region 鎻愪氦鎸夐挳(淇濆瓨)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
index 08d82e7..7547b4f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
@@ -56,8 +56,9 @@
                             <tbody>
                                 <tr>
                                     <th>鏉″舰鐮�</th>
-                                    <td class="t1_input">
+                                    <td class="bz_td">
                                         <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜" style="border-radius: 50px;">
+                                        <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
                                     </td>
                                 </tr>
                                 <tr>
@@ -250,48 +251,8 @@
 
             //鎵潯褰㈢爜鏂规硶
             $('#HBarCode').on('keydown', function (event) {   //鎵潯褰㈢爜
-                var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
                 if (event.keyCode == 13) {
-                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                    if (HBarCode == "") {
-                        layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        return;
-                    }
-                    $.ajax({
-                        url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
-                        type: "GET",
-                        data: {
-                            "sBillBarCode": HBarCode
-                        },
-                        success: function (result) {
-                            if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
-                                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HProcExchBillNo": $("#HBarCode").val()
-                                    //, "HProcID": data.HProcID
-                                    //, "HProc": data.宸ュ簭
-                                    //, "HCenter": data.宸ヤ綔涓績
-                                    //, "HCenterID": data.宸ヤ綔涓績浠g爜
-                                    , "HICMOInterID": data.hicmointerid
-                                    , "HICMOBillNo": data.浠诲姟鍗曞彿
-                                    , "HDeptID": data.HDeptID
-                                    , "HQty": data.璁″垝鏁伴噺
-                                    , "HMaterID": data.HMaterID
-                                    , "HMaterName": data.浜у搧
-                                    , "HMaterModel": data.瑙勬牸鍨嬪彿
-                                    , "HICMOQty": data.鐢熶骇鏁伴噺
-                                    , "HOrderProcNO":data.璁㈠崟璺熻釜鍙�
-                                });
-                                //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                //$("#HBarCode").css("background-color", "#efefef4d");
-                                $("#HBarCode").css("box-shadow", "none");
-                            } else {
-                                layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                            }
-                        }, error: function () {
-                            layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
 
@@ -454,10 +415,10 @@
                 });
             });
 
-
-
-
-
+            //纭畾鎸夐挳
+            form.on('submit(QueDin)', function (data) {//閫�鍑�
+                GetMeesageByBarCode();
+            });
 
             //浠ヤ笂涓簂ayui妯″潡
         });
@@ -518,7 +479,50 @@
             }
         }
 
-
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+            if (HBarCode == "") {
+                layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                return;
+            }
+            $.ajax({
+                url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
+                type: "GET",
+                data: {
+                    "sBillBarCode": HBarCode
+                },
+                success: function (result) {
+                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
+                        form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HProcExchBillNo": $("#HBarCode").val()
+                            //, "HProcID": data.HProcID
+                            //, "HProc": data.宸ュ簭
+                            //, "HCenter": data.宸ヤ綔涓績
+                            //, "HCenterID": data.宸ヤ綔涓績浠g爜
+                            , "HICMOInterID": data.hicmointerid
+                            , "HICMOBillNo": data.浠诲姟鍗曞彿
+                            , "HDeptID": data.HDeptID
+                            , "HQty": data.璁″垝鏁伴噺
+                            , "HMaterID": data.HMaterID
+                            , "HMaterName": data.浜у搧
+                            , "HMaterModel": data.瑙勬牸鍨嬪彿
+                            , "HICMOQty": data.鐢熶骇鏁伴噺
+                            , "HOrderProcNO": data.璁㈠崟璺熻釜鍙�
+                        });
+                        //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        //$("#HBarCode").css("background-color", "#efefef4d");
+                        $("#HBarCode").css("box-shadow", "none");
+                    } else {
+                        layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    }
+                }, error: function () {
+                    layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
index e2ee7a3..2c9e317 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
@@ -56,8 +56,9 @@
                             <tbody>
                                 <tr>
                                     <th>鏉″舰鐮�</th>
-                                    <td class="t1_input">
+                                    <td class="bz_td">
                                         <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜" style="border-radius: 50px;">
+                                        <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
                                     </td>
                                 </tr>
                                 <tr>
@@ -268,49 +269,8 @@
 
             //鎵潯褰㈢爜鏂规硶
             $('#HBarCode').on('keydown', function (event) {   //鎵潯褰㈢爜
-                var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
                 if (event.keyCode == 13) {
-                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                    if (HBarCode == "") {
-                        layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        return;
-                    }
-                    //
-                    $.ajax({
-                        url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
-                        type: "GET",
-                        data: {
-                            "sBillBarCode": HBarCode
-                        },
-                        success: function (result) {
-                            var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
-                            if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HProcExchBillNo": $("#HBarCode").val()
-                                    //, "HProcID": data.HProcID
-                                    //, "HProc": data.宸ュ簭
-                                    //, "HCenter": data.宸ヤ綔涓績
-                                    //, "HCenterID": data.宸ヤ綔涓績浠g爜
-                                    , "HICMOInterID": data.hicmointerid
-                                    , "HICMOBillNo": data.浠诲姟鍗曞彿
-                                    , "HDeptID": data.HDeptID
-                                    , "HQty": data.璁″垝鏁伴噺
-                                    , "HMaterID": data.HMaterID
-                                    , "HMaterName": data.浜у搧
-                                    , "HMaterModel": data.瑙勬牸鍨嬪彿
-                                    , "HICMOQty": data.鐢熶骇鏁伴噺
-                                    , "HOrderProcNO": data.璁㈠崟璺熻釜鍙�
-                                });
-                                //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                //$("#HBarCode").css("background-color", "#efefef4d");
-                                $("#HBarCode").css("box-shadow", "none");
-                            } else {
-                                layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                            }
-                        }, error: function () {
-                            layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
-                        }
-                    });
+                    GetMeesageByBarCode();
                 }
             });
 
@@ -503,7 +463,10 @@
                 });
             });
 
-
+            //纭畾鎸夐挳
+            form.on('submit(QueDin)', function (data) {//閫�鍑�
+                GetMeesageByBarCode();
+            });
 
 
 
@@ -587,7 +550,51 @@
             $("#HQCCheckID").val(obj[0].HItemID);
         }
 
-
+        //鎵潯鐮�
+        function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+            var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+            if (HBarCode == "") {
+                layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                return;
+            }
+            //
+            $.ajax({
+                url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
+                type: "GET",
+                data: {
+                    "sBillBarCode": HBarCode
+                },
+                success: function (result) {
+                    var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
+                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HProcExchBillNo": $("#HBarCode").val()
+                            //, "HProcID": data.HProcID
+                            //, "HProc": data.宸ュ簭
+                            //, "HCenter": data.宸ヤ綔涓績
+                            //, "HCenterID": data.宸ヤ綔涓績浠g爜
+                            , "HICMOInterID": data.hicmointerid
+                            , "HICMOBillNo": data.浠诲姟鍗曞彿
+                            , "HDeptID": data.HDeptID
+                            , "HQty": data.璁″垝鏁伴噺
+                            , "HMaterID": data.HMaterID
+                            , "HMaterName": data.浜у搧
+                            , "HMaterModel": data.瑙勬牸鍨嬪彿
+                            , "HICMOQty": data.鐢熶骇鏁伴噺
+                            , "HOrderProcNO": data.璁㈠崟璺熻釜鍙�
+                        });
+                        //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                        //$("#HBarCode").css("background-color", "#efefef4d");
+                        $("#HBarCode").css("box-shadow", "none");
+                    } else {
+                        layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    }
+                }, error: function () {
+                    layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
+                }
+            });
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 366d1fa..f6e0eef 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -152,8 +152,8 @@
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HEquipMentName" id="HEquipMentName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                 <input type="hidden" name="HEquipMentID" id="HEquipMentID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul_PDA.html"
index bd88ea8..5c94c85 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul_PDA.html"
@@ -57,6 +57,9 @@
                                 <label class="layui-form-label">鏉″舰鐮�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HBarCode" id="HBarCode" placeholder="璇疯緭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="QueDin" id="QueDin" style="width: 70px;">
+                                        纭畾
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -384,37 +387,47 @@
             });
             //#endregion
 
+            //#region 鎵潯鐮佺‘瀹氭寜閽�
+            form.on('submit(QueDin)', function () {
+                GetMeesageByBarCode();
+            });
+            //#endregion
+
             //#region 鎵潯褰㈢爜(娴佽浆鍗�)
             $('#HBarCode').on('keydown', function (event) {
                 if (event.keyCode == 13) {
-                    if ($("#HProcNo").val() == "") {
-                        layer.msg("璇疯緭鍏ユ祦姘村彿锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HQty").val() == "") {
-                        layer.msg("璇峰厛濉啓鎺ユ敹鏁伴噺锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HSourceID").val() == 0) {
-                        layer.msg("璇烽�夋嫨鐢熶骇璧勬簮锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HGroupID").val() == 0) {
-                        layer.msg("璇烽�夋嫨鐝粍锛�", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    if ($("#HEmpID").val() == 0) {
-                        layer.msg("璇烽�夋嫨鎺ユ敹浜猴紒", { icon: 7 });
-                        $("#HBarCode").val("");
-                        return;
-                    }
-                    txtHBarCode_KeyDown($("#HBarCode").val());
+                    GetMeesageByBarCode();
                 }
             });
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                if ($("#HProcNo").val() == "") {
+                    layer.msg("璇疯緭鍏ユ祦姘村彿锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HQty").val() == "") {
+                    layer.msg("璇峰厛濉啓鎺ユ敹鏁伴噺锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HSourceID").val() == 0) {
+                    layer.msg("璇烽�夋嫨鐢熶骇璧勬簮锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HGroupID").val() == 0) {
+                    layer.msg("璇烽�夋嫨鐝粍锛�", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                if ($("#HEmpID").val() == 0) {
+                    layer.msg("璇烽�夋嫨鎺ユ敹浜猴紒", { icon: 7 });
+                    $("#HBarCode").val("");
+                    return;
+                }
+                txtHBarCode_KeyDown($("#HBarCode").val());
+            }
             //#endregion
 
             //#region 鎻愪氦鎸夐挳(淇濆瓨)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index 58f2203..ad5695a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -1,37 +1,24 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <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">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+       
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+        .layui-col-xs4 {
+            width: 20.333333%;
+        }
+    </style>
 </head>
-<!--<style>
-    @media screen and (max-width: 450px) {
-        .layui-form-item .mobile {
-            display: inline-block;
-            float: none;
-            left: -3px;
-            width: 55%;
-            margin: 0 0 10px 10px;
-        }
 
-        .layui-form-item .layui-btn {
-            position: relative;
-            top: -6px;
-        }
-       .layui-form-item .layui-input.mobile {
-            display: inline;
-            float: none;
-            left: -3px;
-            width: 55%;
-            margin: 0 0 10px 10px;
-        }
-    }
-</style>-->
 <body>
     <div class="layui-fluid">
         <div class="layui-card" style="padding: 1px">
@@ -57,17 +44,20 @@
                                                 <option value="-1">鎵嬪伐褰曞叆</option>
                                             </select>
                                         </div>
-                                        </div>
+                                    </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <div class="layui-row">
                                         <div class="layui-col-xs4">
                                             <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">
-                                            </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
                                         </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <div class="layui-tab-item">
@@ -223,288 +213,313 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
-    layui.config({
-        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-    }).extend({
-        index: 'lib/index' //涓诲叆鍙fā鍧�
-    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-        var $ = layui.$
-        , admin = layui.admin
-        , layer = layui.layer
-        , table = layui.table
-        , form = layui.form
-        , element = layui.element;
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
 
 
-        //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 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"]);
-        $("#HSecManager").val(sessionStorage["HSecManager"]);
-        $("#HKeeperID").val(sessionStorage["HKeeperID"]);
-        $("#HKeeper").val(sessionStorage["HKeeper"]);
-        $("#HMaker").val(sessionStorage["HUserName"]);
-        $("#HMaker").hide();
-        $("#HMakerID").hide();
-        $("#HBillerID").val(sessionStorage["HBillerID"]);
-        $("#HBillerID").hide();
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 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"]);
+            $("#HSecManager").val(sessionStorage["HSecManager"]);
+            $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+            $("#HKeeper").val(sessionStorage["HKeeper"]);
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMaker").hide();
+            $("#HMakerID").hide();
+            $("#HBillerID").val(sessionStorage["HBillerID"]);
+            $("#HBillerID").hide();
 
 
 
 
-        //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
 
 
-        //鑾峰彇鍙傛暟
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
-        }
-        var params = getUrlVars();
-        var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-        var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-        
-        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);
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
                 }
-            })
-        }
+                return vars;
+            }
+            var params = getUrlVars();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            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);
+                    }
+                })
+            }
 
 
-        function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
-        {
-            table.render({
+            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            {
+                table.render({
                     elem: '#wl-table'
                     , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
                     , toolbar: '#toolbarDemo'
                     , where: { HBillID: linterid, HBillType: '1206', sWhere: '' }
                     , cols: [[
                         { type: 'radio' }
-                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                    , { 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: 'HQty', title: '鏁伴噺', width: 150 }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                        , { 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 }
+                    ]]
                     , height: 500
                     , done: function () {
                         layer.closeAll("loading");
                     }
-            });
-        }
-             
-        //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+                });
+            }
 
-            
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
 
-            
 
-            
 
-        //鍒ゆ柇鏄惁鏂板
-        if (linterid == null || linterid == 0) {
-            //鑾峰彇鏈�澶у崟鎹彿 new
-            $("#HInterID").val("");
-            $("#HBillNo").val(""); 
-            $.ajax({ 
-                url: GetWEBURL() + "/Web/GetMAXNum",
-                type: "GET",
-                data: { "HBillType": '1206' },
-                success: function (d) {
-                    //console.log(d.data);
-                    $("#HInterID").val(d.data[0].HInterID);
-                    $("#HBillNo").val(d.data[0].HBillNo);
+
+
+
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1206' },
+                    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);
+            }
+
+            $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HStockPlaceName').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#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' });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
                 }
             });
-        }
-        else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-            RoadBillMain(linterid);
-            RoadBillSub(linterid);
-        }
-
-
-        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_StockPlaceList.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
-        //        , area: ['100%', '100%']
-        //        , title: '淇濈鍒楄〃'
-        //        , shade: 0.6 //閬僵閫忔槑搴�
-        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-        //        , resize: false
-        //        , cancel: function () {
-        //            //$(".layui-btn").removeClass("layui-btn-disabled");
-        //        }
-        //    })
-        //});
-        //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
-        //    var sMainStr = JSON.stringify(data.field);
-        //    layer.open({
-        //        type: 2
-        //        , area: ['100%', '100%']
-        //        , title: '楠屾敹鍒楄〃'
-        //        , shade: 0.6 //閬僵閫忔槑搴�
-        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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('璇烽�夋嫨鏁版嵁');
+            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");
                     }
-                    $("#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('璇烽�夋嫨鏁版嵁');
+                })
+            });
+            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_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
-                    $("#HSecManager").val(checkStatus.data[0].HName);
-                    $("#HSecManagerID").val(checkStatus.data[0].HItemID);
-                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                }
-                , btn2: function (index, layero) { }
+                })
+            });
+            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
+            //        , area: ['100%', '100%']
+            //        , title: '淇濈鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+            //    var sMainStr = JSON.stringify(data.field);
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '楠屾敹鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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 () {
+                sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
             })
-        });
 
-
-
-        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 () {
-            sessionStorage["SourceFlag"] = false;
-            parent.location.href = "../../../views/index.html"
-            //window.close();//鍏抽棴褰撳墠椤�
-        })
-
-        form.on('submit(cmdModify)', function () {//缂栬緫
-            var sSubStr = table.cache['wl-table'];
-            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
@@ -518,151 +533,253 @@
                         //$(".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 = '1206'
-            var sAuxPropID = data[0].HAuxPropID
-            //var sMTONo = data[0].HMTONo
-            var sMTONo = ''
-            var sSourceInterID = data[0].HSourceInterID
-            var sSourceEntryID = data[0].HSourceEntryID
-            $.ajax(
-               {
-                   type: "Get",
-                   //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                   url: GetWEBURL() + "/OtherOutBill/Delete_Json",
-                   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) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                           //layer.msg(data.Message, { icon: 1 });
-                           table.render({
-                               elem: '#wl-table' 
-                               , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
-                               , cellMinWidth: 80
-                               , toolbar: '#toolbarDemo'
-                               , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
-                               , cols: [[
-                                  { type: 'radio' }
-                                , { field: 'HQty', title: '鏁伴噺', width: 80 }
-                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
-                                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
-                                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
-                                , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
-                                , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
-                                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                                , { field: 'HBatchNo', title: '鎵规', width: 100 }
-                                , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
-                                , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
-                               ]]
-                         , height: 500
-                           })
-                       }
-                       else {
-                           layer.msg(data.Message, { icon: 2 });
-                       }
-                   },
-                   error: function (err) {
-                       layer.msg('閿欒' + err, {
-                           icon: 5,
-                           time: 20000
-                       }, function () {
-                           //do something
-                       });
-                   }
-               });
-        });
-
-
-        form.on('submit(Saver)', function (data) {//鎻愪氦
-            //debugger;
-            var sMainStr = JSON.stringify(data.field);
-            var sSubStr = table.cache['wl-table'];
-            var sSourceType = $("#HBillType").val();
-            if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
-            {
-                layer.load(3);
+            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 = '1206'
+                var sAuxPropID = data[0].HAuxPropID
+                //var sMTONo = data[0].HMTONo
+                var sMTONo = ''
+                var sSourceInterID = data[0].HSourceInterID
+                var sSourceEntryID = data[0].HSourceEntryID
                 $.ajax(
+                    {
+                        type: "Get",
+                        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/OtherOutBill/Delete_Json",
+                        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) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //layer.msg(data.Message, { icon: 1 });
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
+                                    , cellMinWidth: 80
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
+                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
+                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                                        , { field: 'HBatchNo', title: '鎵规', width: 100 }
+                                        , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
+                                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
+                                    ]]
+                                    , height: 500
+                                })
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 2 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, {
+                                icon: 5,
+                                time: 20000
+                            }, function () {
+                                //do something
+                            });
+                        }
+                    });
+            });
+
+
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //debugger;
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = $("#HBillType").val();
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
                 {
-                    type: "POST",                    
-                    url: GetWEBURL() + "/OtherOutBill/set_set_SaveOtherOutBill_Json",
-                    async: true,
-                    data: { "oMain": sMainStr  },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message + $("#HBillNo").val(), { icon: 1 });
-                        }
-                        else {
-                            layer.msg(data.Message, { icon: 5 });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.msg("閿欒:" + err, { icon: 5 });
-                    }
-                });
-                return false;
-            } 
-        });
-        //鐩戝惉鎻愪氦
-        form.verify({
-            numberOrEmpty: function (value, item) {
-                // if (value != '') {
-                if (!/^\d+$/.test(value)) {
-                    return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/OtherOutBill/set_set_SaveOtherOutBill_Json",
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message + $("#HBillNo").val(), { icon: 1 });
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5 });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5 });
+                            }
+                        });
+                    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();
+            });
+
+           
+
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://localhost:8083/OtherOutBill/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+            function GetHWHValue(obj)  //杩斿洖浠撳簱
+            {
+                $("#HWHNAME").val(obj[0].HName);
+                //sessionStorage["HWHID"] = obj[0].HItemID;
+                $("#HWHID").val(obj[0].HItemID);
+            }
+            function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
+            }
+            function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
+            }
+            function GetHKeeperValue(obj) {  //杩斿洖淇濈
+                $("#HKeeper").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
+            }
+            function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+            function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
+            }
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                //if ($("#HSourceBillNo").val() == '') {
+                //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+                //    return false;
                 //}
+                //if($("#HDeptName").val()=='')
+                //{
+                //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HSecManager").val() == '') {
+                //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HKeeper").val() == '') {
+                //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HSupName").val() == '') {
+                //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HWHNAME").val() == '') {
+                //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                if ($("#HBillNo").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5 });
+                    return false;
+                }
+                if ($("#HInterID").val() == '') {
+                    layer.msg("閿欒鐨勫唴鐮�!", { icon: 5 });
+                    return false;
+                }
+                if (sSubStr == '') {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5 });
+                    return false;
+                }
+                if (sSubStr != '') {
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                        if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                            if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                                layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5 });
+                                return false;
+                            }
+                        }
+                    }
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (parseFloat(sSubStr[i].HQty) > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        layer.msg("鍏朵粬鍑哄簱璁板綍鏈壂鐮侊紒", { icon: 5 });
+                        return false;
+                    }
+                }
+                else {
+                    return true;
+                }
             }
-        });
-        $('#HBarCode').on('keydown', function (event) {  //鎵潯鐮�
-            var sSubStr = table.cache['wl-table'];
-            var sBarCode = $('#HBarCode').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            var sQty = $("#HQty").val()
-            var sHBillType = $("#HBillType").val()
-            var sHWHID = $("#HWHID").val()
-            var sHSPID = $("#HStockPlaceID").val()
-            var sSourceBillNo = $("#HSourceBillNo").val()
-            //var Flag = sessionStorage["SourceFlag"];
-            if (sQty == "") {
-                sQty = 0;
-            }
-            //if ($("#HSourceBillNo").val() == '') {
-            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HDeptName").val() == '') {
-            //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HSecManager").val() == '') {
-            //    layer.msg("鍙戞枡浜烘病鏈夐�夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HKeeper").val() == '') {
-            //    layer.msg("棰嗘枡浜烘病鏈夐�夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HSupName").val() == '') {
-            //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            if (event.keyCode == 13) {
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sSubStr = table.cache['wl-table'];
+                var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sQty = $("#HQty").val()
+                var sHBillType = $("#HBillType").val()
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sSourceBillNo = $("#HSourceBillNo").val()
+
                 if (sBarCode == '') {
                     playSound();
                     layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
@@ -675,7 +792,6 @@
                     $('#HQty').val("");
                 }
                 sessionStorage["SourceFlag"] = false;
-                //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
                 $.ajax({
                     url: GetWEBURL() + "/OtherOutBill/get_CheckTypeByBarCode_Out_Json",
                     type: "GET",
@@ -750,29 +866,29 @@
                             //$("#HDeptName").val(result.data.HDeptName);
                             layer.load(3)
                             table.render({
-                                elem: '#wl-table' 
+                                elem: '#wl-table'
                                 , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
-                          , toolbar: '#toolbarDemo'
-                          , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
-                          , cellMinWidth: 90
-                          , cols: [[
-                              { type: 'radio' }
-                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                            , { 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 }
-                          ]]
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
+                                , cellMinWidth: 90
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { 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 }
+                                ]]
                                 // , data: [linterid]
                                 // , page: true
-                          , height: 500
-                          , done: function () {
-                              layer.closeAll("loading");
-                          }
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
                             });
                         }
                         else {
@@ -785,28 +901,23 @@
                     }
                 });
             }
-            //else
-            //{
-            //    layer.msg(result.Message, { icon: 5 });
-            //}
-            //layer.closeAll("loading");
-            //}
-        });
-
-        function playSound() {
-            var audio = document.getElementById("cs");
-            if (audio == null)
-                $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
-            var audio = document.getElementById("cs");
-            audio.play();
-        }
-
-
-        $('#HSourceBillNo').on('keydown', function (event) {
-            var HSourceBillNo = $('#HSourceBillNo').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            if (event.keyCode == 13) {
+            function playSound() {
+                var audio = document.getElementById("cs");
+                if (audio == null)
+                    $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+                var audio = document.getElementById("cs");
+                audio.play();
+            }
+            //鎵簮鍗�
+            function GetMeesageBySourceBillNo(obj) {
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").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///OtherOutBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                     url: GetWEBURL() + "/OtherOutBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
@@ -818,27 +929,27 @@
                             table.render({
                                 elem: '#wl-table'
                                 // , url: 'http://61.130.49.162:9090/WMSAPI///OtherOutBill/DisBillEntryList_Webs_Json'
-                                 , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
-                              , toolbar: '#toolbarDemo'
-                              , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
-                              , cols: [[
-                                  { type: 'radio' }
-                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                , { 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 }
-                              ]]
+                                , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Webs_Json'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { 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 }
+                                ]]
                                 // , data: [linterid]
                                 // , page: true
-                              , height: 500
-                              , done: function () {
-                                  layer.closeAll("loading");
-                              }
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
                             });
                         }
                         else {
@@ -849,142 +960,10 @@
                         layer.closeAll("loading");
                     }
                 });
-               // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
             }
-        });
 
-
-        $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
-            var HBarCode = $('#HStockPlaceName').val()
-            if (event.keyCode == 13) {
-                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetSpName_Json",
-                    type: "GET",
-                    data: { "HBarCode": HBarCode },
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            $("#HStockPlaceName").val(result.data[0].HName);
-                            $("#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' });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
-                // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
-            }
         });
-
-        table.render({
-            elem: '#mx-table'
-            // , url: 'http://localhost:8083/OtherOutBill/GetHBarCodeShowBillSub'
-            //, toolbar: '#toolbarDemo'
-            // , where: { sMsg: linterid, sMsg2: lentryid }
-         , cols: [[
-           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-         ]]
-         , page: true
-         , height: 500
-         , done: function () {
-         }
-        });
-    });
-    function GetHWHValue(obj)  //杩斿洖浠撳簱
-    {
-        $("#HWHNAME").val(obj[0].HName);
-        //sessionStorage["HWHID"] = obj[0].HItemID;
-        $("#HWHID").val(obj[0].HItemID);
-    }
-    function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-        $("#HStockPlaceName").val(obj[0].HName);
-        $("#HStockPlaceID").val(obj[0].HItemID);
-    }
-    function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
-        $("#HSupName").val(obj[0].HName);
-        $("#HSupID").val(obj[0].HItemID);
-    }
-    function GetHKeeperValue(obj) {  //杩斿洖淇濈
-        $("#HKeeper").val(obj[0].HName);
-        $("#HKeeperID").val(obj[0].HItemID);
-    }
-    function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-        $("#HSecManager").val(obj[0].HName);
-        $("#HSecManagerID").val(obj[0].HItemID);
-    }
-    function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-        $("#HDeptName").val(obj[0].HName);
-        $("#HDeptID").val(obj[0].HItemID);
-    }
-    function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-        //if ($("#HSourceBillNo").val() == '') {
-        //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-        //    return false;
-        //}
-        //if($("#HDeptName").val()=='')
-        //{
-        //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HSecManager").val() == '') {
-        //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HKeeper").val() == '') {
-        //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HSupName").val() == '') {
-        //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HWHNAME").val() == '') {
-        //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        if ($("#HBillNo").val() == '') {
-            layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5 });
-            return false;
-        }
-        if ($("#HInterID").val() == '') {
-            layer.msg("閿欒鐨勫唴鐮�!", { icon: 5 });
-            return false;
-        }
-        if(sSubStr=='')
-        {
-            layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5 });
-            return false;
-        }
-        if (sSubStr != '') {
-            for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                    if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                    {
-                        layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5 });
-                        return false;
-                    }
-                }
-            }
-            for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                if (parseFloat(sSubStr[i].HQty) > 0) {
-                    s = 1;
-                }
-            }
-            if (s == 0) {
-                layer.msg("鍏朵粬鍑哄簱璁板綍鏈壂鐮侊紒", { icon: 5 });
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }
-    }
+       
     </script>
 
 </body>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
index d0a211f..bdb63a6 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
@@ -139,7 +139,7 @@
             var sBillType = '1206'
             table.render({
                 elem: '#dj-table'
-                , url: GetWEBURL() + '/OtherOutBill/DisBillEntryList_Mate_Webs_Json'
+                , url: GetWEBURL() + '/Web/chanpinruk'
                     ,toolbar: '#toolbarDemo'
                     , where: { HBillType: sBillType,sWhere:''}
                     , cols: [[
@@ -282,7 +282,7 @@
 
         table.render({
             elem: '#dj-table'
-            , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
+            , url: GetWEBURL() + '/Web/chanpinruk'
             , toolbar: '#toolbarDemo'
             , where: { HBillType: sBillType, sWhere: '' }
             , cols: [[
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index c4eeb63..39cad41 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -1,13 +1,19 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <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">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
 </head>
 
 <body>
@@ -25,6 +31,9 @@
                             </div>
                             <div class="layui-col-xs8">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -56,6 +65,9 @@
                                         </div>
                                         <div class="layui-col-xs8">
                                             <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -303,337 +315,337 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
-    layui.config({
-        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-    }).extend({
-        index: 'lib/index' //涓诲叆鍙fā鍧�
-    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-        var $ = layui.$
-        , admin = layui.admin
-        , layer = layui.layer
-        , table = layui.table
-        , form = layui.form
-        , element = layui.element;
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
 
-        var RZ = "";
-        //$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "涓�閿壂鐮侊紝娴嬭瘯\n");
+            var RZ = "";
+            //$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "涓�閿壂鐮侊紝娴嬭瘯\n");
 
-        //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
-        $("#HWHID").val(sessionStorage["HWHID"]);
-        $("#HWHNAME").val(sessionStorage["HWHName"]);
-        $("#HSupID").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"]);
-        $("#HSecManager").val(sessionStorage["HSecManager"]);
-        $("#HKeeperID").val(sessionStorage["HKeeperID"]);
-        $("#HKeeper").val(sessionStorage["HKeeper"]);
-        $("#HMaker").val(sessionStorage["HUserName"]);
-        $("#HMaker").hide();
-        $("#HMakerID").hide();
-        $("#HBillerID").val(sessionStorage["HBillerID"]);
-        $("#HBillerID").hide();
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+            $("#HWHID").val(sessionStorage["HWHID"]);
+            $("#HWHNAME").val(sessionStorage["HWHName"]);
+            $("#HSupID").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"]);
+            $("#HSecManager").val(sessionStorage["HSecManager"]);
+            $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+            $("#HKeeper").val(sessionStorage["HKeeper"]);
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMaker").hide();
+            $("#HMakerID").hide();
+            $("#HBillerID").val(sessionStorage["HBillerID"]);
+            $("#HBillerID").hide();
 
-        //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
 
 
-        //鑾峰彇鍙傛暟
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
-        }
-        var params = getUrlVars();
-        var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-        var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-        
-        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);
-                    RoadSup();
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
                 }
-            })
-        }
-
-        function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇渚涘簲鍟�
-        {
-            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;
+                return vars;
             }
-            else {
+            var params = getUrlVars();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
                 $.ajax({
-                    url: GetWEBURL() + "/EntrustOut/get_GetWW_WWPPBomList",
+                    url: GetWEBURL() + "/Web/GetPonderationBill",
                     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-EntrustOutBill', '2');
-                            layer.load(3);
-                        }
-                        else {
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
+                    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);
+                        RoadSup();
                     }
-                });
+                })
             }
-        }
+
+            function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇渚涘簲鍟�
+            {
+                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() + "/EntrustOut/get_GetWW_WWPPBomList",
+                        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-EntrustOutBill', '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'
+            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            {
+                table.render({
+                    elem: '#wl-table'
                     , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
                     , toolbar: '#toolbarDemo'
                     , where: { HBillID: linterid, HBillType: '1211', sWhere: '' }
                     , cols: [[
                         { type: 'radio' }
-                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
-                    , { 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: 'HQty', title: '鏁伴噺', width: 150 }
+                        , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+                        , { 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 }
                     ]]
                     , height: 500
                     , done: function () {
                         layer.closeAll("loading");
                     }
-            });
-        }
-             
-        //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+                });
+            }
 
-            
-
-            
-
-            
-
-        //鍒ゆ柇鏄惁鏂板
-        if (linterid == null || linterid == 0) {
-            //鑾峰彇鏈�澶у崟鎹彿 new
-            $("#HInterID").val("");
-            $("#HBillNo").val(""); 
-            $.ajax({ 
-                url: GetWEBURL() + "/Web/GetMAXNum",
-                type: "GET",
-                data: { "HBillType": '1211' },
-                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);
-        }
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
 
 
 
 
-        //閫夋嫨浠撳簱
-        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_StockPlaceList.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
-        //        , area: ['100%', '100%']
-        //        , title: '鍙戞枡浜哄垪琛�'
-        //        , shade: 0.6 //閬僵閫忔槑搴�
-        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-        //        , resize: false
-        //        , cancel: function () {
-        //            //$(".layui-btn").removeClass("layui-btn-disabled");
-        //        }
-        //    })
-        //});
-
-        ////閫夋嫨楠屾敹
-        //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
-        //    var sMainStr = JSON.stringify(data.field);
-        //    layer.open({
-        //        type: 2
-        //        , area: ['100%', '100%']
-        //        , title: '棰嗘枡浜哄垪琛�'
-        //        , shade: 0.6 //閬僵閫忔槑搴�
-        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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('璇烽�夋嫨鏁版嵁');
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1211' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
                     }
-                    $("#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('璇烽�夋嫨鏁版嵁');
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+                RoadBillSub(linterid);
+            }
+
+
+
+
+            //閫夋嫨浠撳簱
+            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");
                     }
-                    $("#HSecManager").val(checkStatus.data[0].HName);
-                    $("#HSecManagerID").val(checkStatus.data[0].HItemID);
-                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                }
-                , btn2: function (index, layero) { }
+                })
+            });
+
+            //閫夋嫨浠撲綅
+            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_StockPlaceList.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
+            //        , area: ['100%', '100%']
+            //        , title: '鍙戞枡浜哄垪琛�'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+
+            ////閫夋嫨楠屾敹
+            //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+            //    var sMainStr = JSON.stringify(data.field);
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '棰嗘枡浜哄垪琛�'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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 () {
+                sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
             })
-        });
 
-
-        //閫夋嫨閮ㄩ棬
-        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 () {
-            sessionStorage["SourceFlag"] = false;
-            parent.location.href = "../../../views/index.html"
-            //window.close();//鍏抽棴褰撳墠椤�
-        })
-
-        //缂栬緫鎸夐挳
-        form.on('submit(cmdModify)', function () {//缂栬緫
-            var sSubStr = table.cache['wl-table'];
-            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+            //缂栬緫鎸夐挳
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
@@ -647,103 +659,270 @@
                         //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
-           // }
-        });
+                // }
+            });
 
-        //鎻愪氦
-        form.on('submit(Saver)', function (data) {//鎻愪氦
-            //debugger;
-            var sMainStr = JSON.stringify(data.field);
-            var sSubStr = table.cache['wl-table'];
-            var sSourceType = $("#HBillType").val();
-            
-            if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
-            {
-                layer.load(3);
-                $.ajax(
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //debugger;
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = $("#HBillType").val();
+
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
                 {
-                    type: "POST", 
-                    url: GetWEBURL() + "/EntrustOut/set_SaveEntrustOutBill_Json",
-                    async: true,
-                    data: { "oMain": sMainStr },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                            layer.confirm("鐢熸垚濮斿鍑哄簱鍗�" + data.Message + $("#HBillNo").val(), {
-                                icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                btn2: function () {
-                                    //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                    //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                    parent.location.href = "../../../views/index.html"
-                                }//鍏抽棴
-                            }, function () { window.location.reload(); });//鏂板
-                        }
-                        else {
-                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        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';
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/EntrustOut/set_SaveEntrustOutBill_Json",
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm("鐢熸垚濮斿鍑哄簱鍗�" + data.Message + $("#HBillNo").val(), {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }, function () { window.location.reload(); });//鏂板
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    return false;
                 }
-                //}
-            }
-        });
+            });
 
-        //鎵粨浣�
-        $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
-            var HBarCode = $('#HStockPlaceName').val()
-            if (event.keyCode == 13) {
-                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetSpName_Json",
-                    type: "GET",
-                    data: { "HBarCode": HBarCode },
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            $("#HStockPlaceName").val(result.data[0].HName);
-                            $("#HWHID").val(result.data[0].HWHID);
-                            $("#HWHNAME").val(result.data[0].HWhName);
-                            element.tabChange('tab-POStockInBill', '2');
-                        }
-                        else {
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
                     }
-                });
-            }
-        });
+                    //}
+                }
+            });
 
-        //鎵潯鐮佹柟娉�
-        $('#HBarCode').on('keydown', function (event) {
-            var sBarCode = $('#HBarCode').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            var sQty = $("#HQty").val()
-            var sWHID = $("#HWHID").val()
-            var sSPID = $("#HSupID").val()
-            var sHBillType = $("#HBillType").val()
-            var sSourceBillNo = $("#HSourceBillNo").val()
-            var Flag = sessionStorage["SourceFlag"];
-            var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠$悊
-            var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊
-            if (sQty == "") {
-                sQty = 0;
+            //鎵粨浣�
+            $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HStockPlaceName').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                $("#HWHNAME").val(result.data[0].HWhName);
+                                element.tabChange('tab-POStockInBill', '2');
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#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();
+            });
+
+            table.render({
+                elem: '#mx-table'
+                , url: GetWEBURL() + "/Kf_EntrustInBill/get_CheckTypeByBarCode_All_Blue_Json"
+                //, toolbar: '#toolbarDemo'
+                //, where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+            //涓�閿壂鐮�
+            $('#txtHBarCode').on('keydown', function (event) {
+                var sCode = $("#txtHBarCode").val();
+                var HBillID = $("#HInterID").val();
+                var HBillType = "1211";
+                var HBillNo = $("#HBillNo").val();
+                var HMaker = sessionStorage["HUserName"];
+                var HWhID = sessionStorage["HWHID"];
+                var HSPID = sessionStorage["HSPID"];
+                var HQty = $("#HQty").val();
+                var HRedBlueFlag = false;
+                var SourceFlag = false;
+                var HSourceBillNo = $("#HSourceBillNo").val();
+                var HSourceBillType = "1604";
+                var HOWNERID = 0;
+                var HExpressNumber = "";
+                $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "涓�閿壂鐮侊紝娴嬭瘯\n");
+
+                //$.ajax({
+                //    url: GetWEBURL() + "/Kf_EntrustInBill/get_CheckTypeByBarCode_All_Blue_Json",
+                //    type: "GET",
+                //    data: {
+                //        "sCode": sCode, "HBillID": HBillID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker,
+                //        "HWhID": HWhID, "HSPID": HSPID, "HQty": HQty, "HRedBlueFlag": HRedBlueFlag,
+                //        "SourceFlag": SourceFlag, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType,
+                //        "HOWNERID": HOWNERID, "HExpressNumber": HExpressNumber,
+                //    },
+                //    success: function (result) {
+                //        if (result.count == 1) {
+
+                //        }
+                //        else {
+                //            // $("#verifycode").click();
+                //            //layer.msg(result.Message, { icon: 5 });
+                //            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                //        }
+                //        layer.closeAll("loading");
+                //    }
+                //});
+            });
+
+            function GetHWHValue(obj)  //杩斿洖浠撳簱
+            {
+                $("#HWHNAME").val(obj[0].HName);
+                //sessionStorage["HWHID"] = obj[0].HItemID;
+                $("#HWHID").val(obj[0].HItemID);
             }
-            if (event.keyCode == 13) {
+            function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
+            }
+            function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
+            }
+            function GetHKeeperValue(obj) {  //杩斿洖淇濈
+                $("#HKeeper").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
+            }
+            function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+            function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
+            }
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                //if ($("#HSourceBillNo").val() == '') {
+                //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+                //    return false;
+                //}
+                //if($("#HDeptName").val()=='')
+                //{
+                //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HSecManager").val() == '') {
+                //    layer.msg("棰嗘枡浜烘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HKeeper").val() == '') {
+                //    layer.msg("鍙戞枡浜烘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HSupName").val() == '') {
+                //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HWHNAME").val() == '') {
+                //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                if ($("#HBillNo").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HInterID").val() == '') {
+                    layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (typeof (sSubStr) == "undefined") {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                var s = 0;
+                if (!typeof (sSubStr) == "undefined") {
+                    //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                    //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                    //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
+                    //        {
+                    //            layer.msg("鏁伴噺涓嶈兘澶т簬搴斿彂鏁伴噺锛�", { icon: 5 });
+                    //            return false;
+                    //        }
+                    //    }
+                    //}
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (parseFloat(sSubStr[i].HQty) > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        layer.msg("濮斿鍑哄簱璁板綍鏈壂鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                }
+                else {
+                    return true;
+                }
+            }
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sQty = $("#HQty").val()
+                var sWHID = $("#HWHID").val()
+                var sSPID = $("#HSupID").val()
+                var sHBillType = $("#HBillType").val()
+                var sSourceBillNo = $("#HSourceBillNo").val()
+                var Flag = sessionStorage["SourceFlag"];
+                var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠$悊
+                var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊
+
                 if (sBarCode == '') {
                     playSound();
                     layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -755,11 +934,11 @@
                 if (sQty != "") {
                     $('#HQty').val("");
                 }
-                $.ajax({ 
+                $.ajax({
                     url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
                     type: "GET",
                     data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
-                    success:function(result){
+                    success: function (result) {
                         if (result.count == 1) {
                             playSound1();
                             $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮侊紝鎴愬姛\n");
@@ -825,26 +1004,21 @@
                     }
                 });
             }
-        });
-
-
-        function playSound() {
-            var audio = document.getElementById("cs");
-            audio.play();
-        }
-
-        function playSound1() {
-            var audio = document.getElementById("cs2");
-            audio.play();
-        }
-
-        //鎵簮鍗曞彿
-        $('#HSourceBillNo').on('keydown', function (event) {
-            var HSourceBillNo = $('#HSourceBillNo').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            var HSourceBillType = $("#HBillType").val();
-            if (event.keyCode == 13) {
+            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()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val();
+                //
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///EntrustOut/set_SavePonderationBillMain_Temp_Entrust_Source_Fast_Json",
                     url: GetWEBURL() + "/EntrustOut/set_SavePonderationBillMain_Temp_Entrust_Source_Fast_Json",
@@ -860,27 +1034,27 @@
                             table.render({
                                 elem: '#wl-table'
                                 // , url: 'http://61.130.49.162:9090/WMSAPI///EntrustOut/DisBillEntryList_Entrust_Webs_Json'
-                              , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
-                              , toolbar: '#toolbarDemo'
+                                , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
+                                , toolbar: '#toolbarDemo'
                                 , where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
-                              , cols: [[
-                                  { type: 'radio' }
-                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
-                                , { 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 }
-                              ]]
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+                                    , { 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 }
+                                ]]
                                 // , data: [linterid]
                                 // , page: true
-                              , height: 500
-                              , done: function () {
-                                  layer.closeAll("loading");
-                              }
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
                             });
                         }
                         else {
@@ -892,157 +1066,9 @@
                     }
                 });
             }
+
         });
-
-        table.render({
-            elem: '#mx-table'
-             , url: GetWEBURL() + "/Kf_EntrustInBill/get_CheckTypeByBarCode_All_Blue_Json"
-            //, toolbar: '#toolbarDemo'
-             //, where: { sMsg: linterid, sMsg2: lentryid }
-            , cols: [[
-           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-         ]]
-         , page: true
-         , height: 500
-         , done: function () {
-         }
-        });
-
-        //涓�閿壂鐮�
-        $('#txtHBarCode').on('keydown', function (event) {
-            var sCode = $("#txtHBarCode").val(); 
-            var HBillID = $("#HInterID").val();
-            var HBillType = "1211";
-            var HBillNo = $("#HBillNo").val();
-            var HMaker = sessionStorage["HUserName"];
-            var HWhID = sessionStorage["HWHID"];
-            var HSPID = sessionStorage["HSPID"];
-            var HQty = $("#HQty").val();
-            var HRedBlueFlag = false;
-            var SourceFlag = false;
-            var HSourceBillNo = $("#HSourceBillNo").val();
-            var HSourceBillType = "1604";
-            var HOWNERID = 0;
-            var HExpressNumber = "";
-            $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "涓�閿壂鐮侊紝娴嬭瘯\n");
-
-            //$.ajax({
-            //    url: GetWEBURL() + "/Kf_EntrustInBill/get_CheckTypeByBarCode_All_Blue_Json",
-            //    type: "GET",
-            //    data: {
-            //        "sCode": sCode, "HBillID": HBillID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker,
-            //        "HWhID": HWhID, "HSPID": HSPID, "HQty": HQty, "HRedBlueFlag": HRedBlueFlag,
-            //        "SourceFlag": SourceFlag, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType,
-            //        "HOWNERID": HOWNERID, "HExpressNumber": HExpressNumber,
-            //    },
-            //    success: function (result) {
-            //        if (result.count == 1) {
-                        
-            //        }
-            //        else {
-            //            // $("#verifycode").click();
-            //            //layer.msg(result.Message, { icon: 5 });
-            //            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-            //        }
-            //        layer.closeAll("loading");
-            //    }
-            //});
-        });
-
-
-    });
-    function GetHWHValue(obj)  //杩斿洖浠撳簱
-    {
-        $("#HWHNAME").val(obj[0].HName);
-        //sessionStorage["HWHID"] = obj[0].HItemID;
-        $("#HWHID").val(obj[0].HItemID);
-    }
-    function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-        $("#HStockPlaceName").val(obj[0].HName);
-        $("#HSupID").val(obj[0].HItemID);
-    }
-    function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
-        $("#HSupName").val(obj[0].HName);
-        $("#HSupID").val(obj[0].HItemID);
-    }
-    function GetHKeeperValue(obj) {  //杩斿洖淇濈
-        $("#HKeeper").val(obj[0].HName);
-        $("#HKeeperID").val(obj[0].HItemID);
-    }
-    function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-        $("#HSecManager").val(obj[0].HName);
-        $("#HSecManagerID").val(obj[0].HItemID);
-    }
-    function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-        $("#HDeptName").val(obj[0].HName);
-        $("#HDeptID").val(obj[0].HItemID);
-    }
-    function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-        //if ($("#HSourceBillNo").val() == '') {
-        //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-        //    return false;
-        //}
-        //if($("#HDeptName").val()=='')
-        //{
-        //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HSecManager").val() == '') {
-        //    layer.msg("棰嗘枡浜烘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HKeeper").val() == '') {
-        //    layer.msg("鍙戞枡浜烘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HSupName").val() == '') {
-        //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HWHNAME").val() == '') {
-        //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        if ($("#HBillNo").val() == '') {
-            layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if ($("#HInterID").val() == '') {
-            layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if (typeof (sSubStr) == "undefined")
-        {
-            layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        var s = 0;
-        if (!typeof (sSubStr) == "undefined") {
-            //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-            //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-            //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-            //        {
-            //            layer.msg("鏁伴噺涓嶈兘澶т簬搴斿彂鏁伴噺锛�", { icon: 5 });
-            //            return false;
-            //        }
-            //    }
-            //}
-            for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                if (parseFloat(sSubStr[i].HQty) > 0) {
-                    s = 1;
-                }
-            }
-            if (s == 0)
-            {
-                layer.msg("濮斿鍑哄簱璁板綍鏈壂鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }
-    }
+        
     </script>
 
 </body>
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 b86aa84..1f8fb02 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"
@@ -8,7 +8,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-
+    <style>
+        
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
 </head>
 
 <body>
@@ -26,6 +31,9 @@
                             </div>
                             <div class="layui-col-xs8">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -61,6 +69,9 @@
                                         </div>
                                         <div class="layui-col-xs8">
                                             <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -821,256 +832,18 @@
 
             //鎵潯鐮�-鐩存帴璋僿ebservice
             $('#HBarCode').on('keydown', function (event) {
-                var sOldBarCode = $('#HBarCode').val()
-                var HDeleteFlag = sOldBarCode.substring(0, 1);
-                var sBarCode = sOldBarCode.slice(1);
-
-
-                //var sBarCode = $('#HBarCode').val()//鏉$爜
-                var sInterID = $("#HInterID").val()//鍗曟嵁鍙稩D
-                var sBillType = '1205'
-                var sBillNo = $("#HBillNo").val()//鍗曟嵁鍙�
-                var sMaker = sessionStorage["HUserName"];
-                var sHWHID = $("#HWHID").val();//浠撳簱ID
-                var sHSPID = $("#HStockPlaceID").val();//浠撲綅ID
-                var sQty = $("#HQty").val()//鏁伴噺
-                //var SourceFlag = sessionStorage["SourceFlag"];
-                var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
-                var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷-鍙戣揣閫氱煡鍗曪細1402锛岄攢鍞鍗�1401
-                var sBillType = '1205'
                 if (sQty == "") {
                     sQty = 0;
                 }
                 if (event.keyCode == 13) {
-                    if (HDeleteFlag == "*") {
-                        if (sBarCode != "") {
-                            $('#HBarCode').val("");
-                        }
-                        $.ajax({
-                                type: "Get",
-                                url: GetWEBURL() + "/ProductIn/Delete_Json",
-                                async: true,
-                                data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
-                                dataType: "json",
-                                success: function (data) {
-                                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                                        playSound1();
-                                        table.render({
-                                            elem: '#wl-table'
-                                            // , url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
-                                            , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
-                                            , toolbar: '#toolbarDemo'
-                                            , defaultToolbar: []
-                                            , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
-                                            , cols: [[
-                                                { type: 'radio' }
-                                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                                , { 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: 'HInterID', title: '鍗曟嵁ID', width: 150, hide: true }
-                                                , { field: 'HBilltype', title: '鍗曟嵁绫诲瀷', width: 150, hide: true }
-                                                , { field: 'Hbarcode', title: '鏉$爜缂栧彿', width: 150, hide: true }
-                                                , { field: 'HSCWHID', title: '璋冨嚭浠撳簱ID', width: 150, hide: true }
-                                                , { field: 'HSCSPID', title: '璋冨嚭浠撲綅ID', width: 150, hide: true }
-                                                , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 150, hide: true }
-                                                , { field: 'HMTONo', title: 'MTO鍙�', width: 150, hide: true }
-                                                , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
-                                            ]]
-                                            // , data: [linterid]
-                                            // , page: true
-                                            //, height: 500
-                                            , done: function () {
-                                                layer.closeAll("loading");
-                                            }
-                                        })
-                                    }
-                                    else {
-                                        playSound();
-                                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-
-                                    }
-                                },
-                                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' });
-                            //11
-                            return false;
-                        }
-                        if (sBarCode != "") {
-                            $('#HBarCode').val("");
-                        }
-                        $.ajax({
-                            url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
-                            type: "GET",
-                            data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    playSound1();
-                                    if (result.data.HBarType == '浠撳簱鏉$爜') {
-                                        $("#HWHNAME").val(result.data.HWhName);
-                                        $("#HWHID").val(result.data.HWhID);
-                                        $("#HStockPlaceName").val("");
-                                        $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
-                                        element.tabChange('tab-Kf_SellOutBill', '3');  //璺宠浆椤电
-                                    }
-                                    else if (result.data.HBarType == '浠撲綅鏉$爜') {
-                                        $("#HStockPlaceName").val(result.data.HSPName);
-                                        $("#HStockPlaceID").val(result.data.HSPID);
-                                        $("#HWHNAME").val(result.data.HWhName);
-                                        $("#HWHID").val(result.data.HWhID);
-                                        $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
-                                        element.tabChange('tab-Kf_SellOutBill', '3');//璺宠浆椤电
-                                    }
-                                    else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
-                                        $("#HDeptName").val(result.data.HDeptName);
-                                        $("#HDeptID").val(result.data.HDeptID);
-                                        $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
-                                        element.tabChange('tab-Kf_SellOutBill', '3');//璺宠浆椤电
-                                    }
-                                    else if (result.data.HBarType == '婧愬崟鏉$爜') {
-                                        //$("#HSupName").val(result.data.HSupName);
-                                        $("#HSupID").val(result.data.HSupID);
-                                        //$("#HDeptName").val(result.data.HDeptName);
-                                        $("#HDeptID").val(result.data.HDeptID);
-                                        $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                        HSourceFlag = true;
-                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                        if (result.data.HSourceBillType == "1402") {
-                                            $("#HBillType").val("1402");
-
-                                        }
-                                        else if (result.data.HSourceBillType == "1401") {
-                                            $("#HBillType").val("1401");
-                                        }
-                                        else {
-                                            $("#HBillType").val("鎵嬪伐褰曞叆");
-                                        }
-                                        $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
-                                        element.tabChange('tab-Kf_SellOutBill', '3');
-                                    }
-                                    else {
-                                        if (HSourceFlag == "true") {
-                                            element.tabChange('tab-Kf_SellOutBill', '3');
-                                        }
-                                        else {
-                                            //$("#HSupName").val(result.data.HSupName);
-                                            $("#HSupID").val(result.data.HSupID);
-                                            //$("#HDeptName").val(result.data.HDeptName);
-                                            $("#HDeptID").val(result.data.HDeptID);
-                                            $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                            HSourceFlag = true;
-                                            //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                            if (result.data.HSourceBillType == "1402") {
-                                                $("#HBillType").val("1402");
-
-                                            }
-                                            else if (result.data.HSourceBillType == "1401") {
-                                                $("#HBillType").val("1401");
-                                            }
-                                            //else if (result.data.HSourceBillType == "1601") {
-                                            //    $("#HBillType").val("1601");
-                                            //}
-                                            $("#HNote").val(";鐗╂枡鏉$爜");
-                                            element.tabChange('tab-Kf_SellOutBill', '3');
-                                        }
-                                    }
-                                    //$("#HSupID").val(result.data.HSupID);
-                                    //$("#HSupName").val(result.data.HSupName);
-                                    //$("#HDeptID").val(result.data.HDeptID);
-                                    //$("#HDeptName").val(result.data.HDeptName);
-                                    layer.load(3)
-                                    table.render({
-                                        elem: '#wl-table'
-                                        // , url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
-                                        , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
-                                        , toolbar: '#toolbarDemo'
-                                        , defaultToolbar: []
-                                        , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
-                                        , cols: [[
-                                            { type: 'radio' }
-                                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                            , { 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: 'HInterID', title: '鍗曟嵁ID', width: 150, hide: true }
-                                            , { field: 'HBilltype', title: '鍗曟嵁绫诲瀷', width: 150, hide: true }
-                                            , { field: 'Hbarcode', title: '鏉$爜缂栧彿', width: 150, hide: true }
-                                            , { field: 'HSCWHID', title: '璋冨嚭浠撳簱ID', width: 150, hide: true }
-                                            , { field: 'HSCSPID', title: '璋冨嚭浠撲綅ID', width: 150, hide: true }
-                                            , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 150, hide: true }
-                                            , { field: 'HMTONo', title: 'MTO鍙�', width: 150, hide: true }
-                                            , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
-                                        ]]
-                                        // , data: [linterid]
-                                        // , page: true
-                                        //, height: 500
-                                        , done: function () {
-                                            layer.closeAll("loading");
-                                        }
-                                    });
-                                }
-                                else {
-                                    // $("#verifycode").click();
-                                    //layer.msg(result.Message, { icon: 5 });
-                                    //
-                                    playSound();
-                                    layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                    //11
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-                                playSound();
-                                layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                //11
-                            }
-                        });
-                    }
+                    GetMeesageByBarCode();
                 }
             });
-
-            function playSound() {
-                console.log("playSound");
-                //var audio = document.getElementById("cs");
-                //$("appendAut").html("");
-                //if (audio == null)
-                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
-                //$("appendAut").attr("src","../../video/jingbao.wav")
-                var audio = document.getElementById("cs");
-                audio.play();
-            }
-
-            function playSound1() {
-                console.log("playSound1");
-                //var audio = document.getElementById("cs");
-                //$("appendAut").html("");
-                //if (audio == null)
-                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/success.wav" type = "audio/ogg"> </audio >');
-                //$("appendAut").attr("src", "../../video/success.wav")
-                var audio = document.getElementById("cs2");
-                audio.play();
-            }
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+            
 
             $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
                 var HBarCode = $('#HStockPlaceName').val()
@@ -1173,69 +946,16 @@
             //});
 
             //鎵簮鍗�
-            $('#HSourceBillNo').on('keydown', function (event) {    //鎵簮鍗�
-                var HSourceBillNo = $('#HSourceBillNo').val()
-                var sInterID = $("#HInterID").val()
-                var sBillNo = $("#HBillNo").val()
-                var HSourceBillType = $("#HBillType").val()
+            $('#HSourceBillNo').on('keydown', function (event) {    
                 if (event.keyCode == 13) {
-                    var index = layer.load(0);
-                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                    if (HSourceBillNo == "" || sInterID <= 0) {
-                        layer.close(index);
-                        layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return;
-                    }
-                    $.ajax({
-                        url: GetWEBURL() + "/SellOut/set_SavePonderationBillMain_Temp_Source_Fast_Json",
-                        type: "GET",
-                        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
-                        success: function (result) {
-                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                GetSellOutFindSP();
-                                $("#HSupID").val(result.data[0].HSupID);
-                                $("#HSupName").val(result.data[0].HSupName);
-                                //$("#HDeptID").val(result.data[0].HDeptID);
-                                //$("#HDeptName").val(result.data[0].HDeptName);
-                                HSourceFlag = true;
-                                element.tabChange('tab-SellOutBill', '3');
-                                table.render({
-                                    elem: '#wl-table'
-                                    , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
-                                    , toolbar: '#toolbarDemo'
-                                    , defaultToolbar: []
-                                  , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
-                                  , cols: [[
-                                      { type: 'radio' }
-                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
-                                    , { 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 }
-                                  ]]
-                                    // , data: [linterid]
-                                    // , page: true
-                                  //, height: 500
-                                  , done: function () {
-                                      layer.close(index);
-                                  }
-                                });
-                                $("#HSourceBillNo").attr("disabled", "true");
-                                layer.close(index);
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                            layer.close(index);
-                        }
-                    });
+                    GetMeesageBySourceBillNo();
                 }
             });
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                GetMeesageBySourceBillNo();
+            });
+
             //鍒锋柊鏄庣粏椤电
             table.render({
                 elem: '#mx-table'
@@ -1302,96 +1022,400 @@
                     }
                 });
             }
-
-        //浠ヤ笂涓簂ayui妯″潡
-        });
-        function GetHWHValue(obj)  //杩斿洖浠撳簱
-        {
-            $("#HWHNAME").val(obj[0].HName);
-            //sessionStorage["HWHID"] = obj[0].HItemID;
-            $("#HWHID").val(obj[0].HItemID);
-        }
-        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-            $("#HStockPlaceName").val(obj[0].HName);
-            $("#HStockPlaceID").val(obj[0].HItemID);
-        }
-        function GetHSupValue(obj) {  //杩斿洖瀹㈡埛
-            $("#HSupName").val(obj[0].HName);
-            $("#HSupID").val(obj[0].HItemID);
-        }
-        function GetHKeeperValue(obj) {  //杩斿洖淇濈
-            $("#HKeeper").val(obj[0].HName);
-            $("#HKeeperID").val(obj[0].HItemID);
-        }
-        function GetHSecManagerValue(obj) {  //杩斿洖鍙戣揣
-            $("#HSecManager").val(obj[0].HName);
-            $("#HSecManagerID").val(obj[0].HItemID);
-        }
-        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-            $("#HDeptName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-        }
-        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    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;
+            function GetHWHValue(obj)  //杩斿洖浠撳簱
+            {
+                $("#HWHNAME").val(obj[0].HName);
+                //sessionStorage["HWHID"] = obj[0].HItemID;
+                $("#HWHID").val(obj[0].HItemID);
             }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("鍙戣揣浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
             }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHSupValue(obj) {  //杩斿洖瀹㈡埛
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
             }
-            //if ($("#HSupName").val() == '') {
-            //    layer.msg("瀹㈡埛娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHKeeperValue(obj) {  //杩斿洖淇濈
+                $("#HKeeper").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
             }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHSecManagerValue(obj) {  //杩斿洖鍙戣揣
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
             }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
             }
-            if (!typeof (sSubStr) == "undefined") {
-                for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴斿彂鏁伴噺
-                    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
-                            layer.msg("鏁伴噺涓嶈兘澶т簬搴斿彂鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return false;
-                        }
-                    }
-                }
-                var s = 0;
-                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    if (parseFloat(sSubStr[i].HQty) > 0) {
-                        s = 1;
-                    }
-                }
-                if (s == 0) {
-                    layer.msg("閿�鍞嚭搴撹褰曟湭鎵爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                //if ($("#HSourceBillNo").val() == '') {
+                //    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 ($("#HSupName").val() == '') {
+                //    layer.msg("瀹㈡埛娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HWHNAME").val() == '') {
+                //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                if ($("#HBillNo").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HInterID").val() == '') {
+                    layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (typeof (sSubStr) == "undefined") {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (!typeof (sSubStr) == "undefined") {
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴斿彂鏁伴噺
+                        if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                            if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                                layer.msg("鏁伴噺涓嶈兘澶т簬搴斿彂鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                return false;
+                            }
+                        }
+                    }
+                    var s = 0;
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (parseFloat(sSubStr[i].HQty) > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        layer.msg("閿�鍞嚭搴撹褰曟湭鎵爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                }
+                else {
+                    return true;
+                }
             }
-            else {
-                return true;
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+                var sInterID = $("#HInterID").val()//鍗曟嵁鍙稩D
+                var sBillType = '1205'
+                var sBillNo = $("#HBillNo").val()//鍗曟嵁鍙�
+                var sMaker = sessionStorage["HUserName"];
+                var sHWHID = $("#HWHID").val();//浠撳簱ID
+                var sHSPID = $("#HStockPlaceID").val();//浠撲綅ID
+                var sQty = $("#HQty").val()//鏁伴噺
+                //var SourceFlag = sessionStorage["SourceFlag"];
+                var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
+                var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷-鍙戣揣閫氱煡鍗曪細1402锛岄攢鍞鍗�1401
+                var sBillType = '1205'
+
+                if (HDeleteFlag == "*") {
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/ProductIn/Delete_Json",
+                            async: true,
+                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    playSound1();
+                                    table.render({
+                                        elem: '#wl-table'
+                                        // , url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
+                                        , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+                                        , toolbar: '#toolbarDemo'
+                                        , defaultToolbar: []
+                                        , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+                                        , cols: [[
+                                            { type: 'radio' }
+                                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                            , { 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: 'HInterID', title: '鍗曟嵁ID', width: 150, hide: true }
+                                            , { field: 'HBilltype', title: '鍗曟嵁绫诲瀷', width: 150, hide: true }
+                                            , { field: 'Hbarcode', title: '鏉$爜缂栧彿', width: 150, hide: true }
+                                            , { field: 'HSCWHID', title: '璋冨嚭浠撳簱ID', width: 150, hide: true }
+                                            , { field: 'HSCSPID', title: '璋冨嚭浠撲綅ID', width: 150, hide: true }
+                                            , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 150, hide: true }
+                                            , { field: 'HMTONo', title: 'MTO鍙�', width: 150, hide: true }
+                                            , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
+                                        ]]
+                                        // , data: [linterid]
+                                        // , page: true
+                                        //, height: 500
+                                        , done: function () {
+                                            layer.closeAll("loading");
+                                        }
+                                    })
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+                                }
+                            },
+                            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' });
+                        //11
+                        return false;
+                    }
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    $.ajax({
+                        url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
+                        type: "GET",
+                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+                        success: function (result) {
+                            playSound1();
+                            if (result.count == 1) {
+                                if (result.data.HBarType == '浠撳簱鏉$爜') {
+                                    $("#HWHNAME").val(result.data.HWhName);
+                                    $("#HWHID").val(result.data.HWhID);
+                                    $("#HStockPlaceName").val("");
+                                    $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+                                    element.tabChange('tab-Kf_SellOutBill', '3');  //璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '浠撲綅鏉$爜') {
+                                    $("#HStockPlaceName").val(result.data.HSPName);
+                                    $("#HStockPlaceID").val(result.data.HSPID);
+                                    $("#HWHNAME").val(result.data.HWhName);
+                                    $("#HWHID").val(result.data.HWhID);
+                                    $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+                                    element.tabChange('tab-Kf_SellOutBill', '3');//璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
+                                    $("#HDeptName").val(result.data.HDeptName);
+                                    $("#HDeptID").val(result.data.HDeptID);
+                                    $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+                                    element.tabChange('tab-Kf_SellOutBill', '3');//璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '婧愬崟鏉$爜') {
+                                    //$("#HSupName").val(result.data.HSupName);
+                                    $("#HSupID").val(result.data.HSupID);
+                                    //$("#HDeptName").val(result.data.HDeptName);
+                                    $("#HDeptID").val(result.data.HDeptID);
+                                    $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                    HSourceFlag = true;
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                    if (result.data.HSourceBillType == "1402") {
+                                        $("#HBillType").val("1402");
+
+                                    }
+                                    else if (result.data.HSourceBillType == "1401") {
+                                        $("#HBillType").val("1401");
+                                    }
+                                    else {
+                                        $("#HBillType").val("鎵嬪伐褰曞叆");
+                                    }
+                                    $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+                                    element.tabChange('tab-Kf_SellOutBill', '3');
+                                }
+                                else {
+                                    if (HSourceFlag == "true") {
+                                        element.tabChange('tab-Kf_SellOutBill', '3');
+                                    }
+                                    else {
+                                        //$("#HSupName").val(result.data.HSupName);
+                                        $("#HSupID").val(result.data.HSupID);
+                                        //$("#HDeptName").val(result.data.HDeptName);
+                                        $("#HDeptID").val(result.data.HDeptID);
+                                        $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                        HSourceFlag = true;
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                        if (result.data.HSourceBillType == "1402") {
+                                            $("#HBillType").val("1402");
+
+                                        }
+                                        else if (result.data.HSourceBillType == "1401") {
+                                            $("#HBillType").val("1401");
+                                        }
+                                        //else if (result.data.HSourceBillType == "1601") {
+                                        //    $("#HBillType").val("1601");
+                                        //}
+                                        $("#HNote").val(";鐗╂枡鏉$爜");
+                                        element.tabChange('tab-Kf_SellOutBill', '3');
+                                    }
+                                }
+                                //$("#HSupID").val(result.data.HSupID);
+                                //$("#HSupName").val(result.data.HSupName);
+                                //$("#HDeptID").val(result.data.HDeptID);
+                                //$("#HDeptName").val(result.data.HDeptName);
+                                layer.load(3)
+                                table.render({
+                                    elem: '#wl-table'
+                                    // , url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
+                                    , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+                                    , toolbar: '#toolbarDemo'
+                                    , defaultToolbar: []
+                                    , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                        , { 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: 'HInterID', title: '鍗曟嵁ID', width: 150, hide: true }
+                                        , { field: 'HBilltype', title: '鍗曟嵁绫诲瀷', width: 150, hide: true }
+                                        , { field: 'Hbarcode', title: '鏉$爜缂栧彿', width: 150, hide: true }
+                                        , { field: 'HSCWHID', title: '璋冨嚭浠撳簱ID', width: 150, hide: true }
+                                        , { field: 'HSCSPID', title: '璋冨嚭浠撲綅ID', width: 150, hide: true }
+                                        , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 150, hide: true }
+                                        , { field: 'HMTONo', title: 'MTO鍙�', width: 150, hide: true }
+                                        , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
+                                    ]]
+                                    // , data: [linterid]
+                                    // , page: true
+                                    //, height: 500
+                                    , done: function () {
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                // $("#verifycode").click();
+                                //layer.msg(result.Message, { icon: 5 });
+                                //
+                                playSound();
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                //11
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            playSound();
+                            layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            //11
+                        }
+                    });
+                }
             }
-        }
+            function playSound() {
+                console.log("playSound");
+                //var audio = document.getElementById("cs");
+                //$("appendAut").html("");
+                //if (audio == null)
+                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+                //$("appendAut").attr("src","../../video/jingbao.wav")
+                var audio = document.getElementById("cs");
+                audio.play();
+            }
+            function playSound1() {
+                console.log("playSound1");
+                //var audio = document.getElementById("cs");
+                //$("appendAut").html("");
+                //if (audio == null)
+                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/success.wav" type = "audio/ogg"> </audio >');
+                //$("appendAut").attr("src", "../../video/success.wav")
+                var audio = document.getElementById("cs2");
+                audio.play();
+            }
+            //鎵簮鍗�
+            function GetMeesageBySourceBillNo(obj) {
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                if (HSourceBillNo == "" || sInterID <= 0) {
+                    layer.close(index);
+                    layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                $.ajax({
+                    url: GetWEBURL() + "/SellOut/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    type: "GET",
+                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            GetSellOutFindSP();
+                            $("#HSupID").val(result.data[0].HSupID);
+                            $("#HSupName").val(result.data[0].HSupName);
+                            //$("#HDeptID").val(result.data[0].HDeptID);
+                            //$("#HDeptName").val(result.data[0].HDeptName);
+                            HSourceFlag = true;
+                            element.tabChange('tab-SellOutBill', '3');
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+                                , toolbar: '#toolbarDemo'
+                                , defaultToolbar: []
+                                , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+                                    , { 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 }
+                                ]]
+                                // , data: [linterid]
+                                // , page: true
+                                //, height: 500
+                                , done: function () {
+                                    layer.close(index);
+                                }
+                            });
+                            $("#HSourceBillNo").attr("disabled", "true");
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.close(index);
+                    }
+                });
+            }
+        //浠ヤ笂涓簂ayui妯″潡
+        });
+       
     </script>
 
 </body>
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 32e8da9..63301fe 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"
@@ -1,13 +1,18 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <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">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
 </head>
 
 <body>
@@ -25,6 +30,9 @@
                             </div>
                             <div class="layui-col-xs8">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -98,6 +106,9 @@
                                         </div>
                                         <div class="layui-col-xs8">
                                             <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -205,15 +216,15 @@
                             <!--鐗╂枡娓呭崟-->
                             <div class="layui-tab-item">
                                 <!--<div class="layui-form-item" style="padding:0px;margin:0px">
-                <div class="layui-row">
-                    <div class="layui-col-xs4">
-                        <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">
-                    </div>
-                </div>
-            </div>-->
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4">
+                                            <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">
+                                        </div>
+                                    </div>
+                                </div>-->
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
@@ -326,7 +337,7 @@
                             <div class="layui-tab-item">
                                 <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
                             </div>
-                        
+
                         </div>
                         <!--<div class="layui-form-item" style="margin-bottom: 20px;">
                             <div class="layui-row">
@@ -344,340 +355,340 @@
                                 </div>
                             </div>
                         </div>-->
-                                    <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
-                                </div>
-                        </div>
+                        <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
                     </div>
-                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
-                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
-                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
-                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
-                    </div>
-                    <div id="" style="display:none;">
-                        <audio id="cs" hidden controls>
-                            <source src="../../video/jingbao.wav" type="audio/ogg">
-                        </audio>
-                    </div>
-                    <div id="" style="display:none;">
-                        <audio id="cs2" hidden controls>
-                            <source src="../../video/success.wav" type="audio/ogg">
-                        </audio>
-                    </div>
-                </form>
             </div>
         </div>
+        <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+            <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+            <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+            <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+            <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+        </div>
+        <div id="" style="display:none;">
+            <audio id="cs" hidden controls>
+                <source src="../../video/jingbao.wav" type="audio/ogg">
+            </audio>
+        </div>
+        <div id="" style="display:none;">
+            <audio id="cs2" hidden controls>
+                <source src="../../video/success.wav" type="audio/ogg">
+            </audio>
+        </div>
+        </form>
+    </div>
+    </div>
     </div>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
-    layui.config({
-        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-    }).extend({
-        index: 'lib/index' //涓诲叆鍙fā鍧�
-    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-        var $ = layui.$
-        , admin = layui.admin
-        , layer = layui.layer
-        , table = layui.table
-        , form = layui.form
-        , element = layui.element;
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
 
-        $("#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"]);
-        $("#HSecManager").val(sessionStorage["HSecManager"]);
-        $("#HKeeperID").val(sessionStorage["HKeeperID"]);
-        $("#HKeeper").val(sessionStorage["HKeeper"]);
-        $("#HMaker").val(sessionStorage["HUserName"]);
-        $("#HMaker").hide();
-        $("#HMakerID").hide();
-        $("#HBillerID").val(sessionStorage["HBillerID"]);
-        $("#HBillerID").hide();
-        var HSourceFlag = sessionStorage["SourceFlag"];
+            $("#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"]);
+            $("#HSecManager").val(sessionStorage["HSecManager"]);
+            $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+            $("#HKeeper").val(sessionStorage["HKeeper"]);
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMaker").hide();
+            $("#HMakerID").hide();
+            $("#HBillerID").val(sessionStorage["HBillerID"]);
+            $("#HBillerID").hide();
+            var HSourceFlag = sessionStorage["SourceFlag"];
 
 
-        //鑾峰彇鍙傛暟
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
             }
-            return vars;
-        }
-        var params = getUrlVars();
-        var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-        var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            var params = getUrlVars();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
 
-        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);
+            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);
 
-                    HSourceFlag = true;
-                    //$("#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);
-                }
-            })
-        }
-
-
-        function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
-        {
-            $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
-            //缂栬緫鍔犺浇鏁版嵁
-            var sInterID = $("#HInterID").val();
-            table.render({
-                elem: '#wl-table'
-                //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
-                , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
-                , toolbar: '#toolbarDemo'
-                , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
-                , cols: [[
-                    { type: 'radio' }
-                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
-                    , { 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 }
-                ]]
-                // , data: [linterid]
-                // , page: true
-                , height: 500
-                , done: function () {
-                    layer.closeAll("loading");
-                }
-            });
-        }
-
-
-
-        //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
-
-        //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
-
-        //鑾峰彇鏈�澶у崟鎹彿 new
-
-        //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
-
-        //鍒ゆ柇鏄惁鏂板
-        if (linterid == null || linterid == 0) {
-            $("#HInterID").val("");
-            $("#HBillNo").val("");
-            $.ajax({ 
-                url: GetWEBURL() + "/Web/GetMAXNum",
-                type: "GET",
-                data: { "HBillType": '1204' },
-                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);
-        }
-
-        //閫夋嫨浠撳簱
-        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(HFIFOWHID-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=HFIFOWHID', '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_StockPlaceList.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
-        //        , area: ['100%', '100%']
-        //        , title: '棰嗘枡浜哄垪琛�'
-        //        , shade: 0.6 //閬僵閫忔槑搴�
-        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-        //        , resize: false
-        //        , cancel: function () {
-        //            //$(".layui-btn").removeClass("layui-btn-disabled");
-        //        }
-        //    })
-        //});
-        //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
-        //    var sMainStr = JSON.stringify(data.field);
-        //    layer.open({
-        //        type: 2
-        //        , area: ['100%', '100%']
-        //        , title: '鍙戞枡浜哄垪琛�'
-        //        , shade: 0.6 //閬僵閫忔槑搴�
-        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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('璇烽�夋嫨鏁版嵁');
+                        HSourceFlag = true;
+                        //$("#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);
                     }
-                    $("#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('璇烽�夋嫨鏁版嵁');
+                })
+            }
+
+
+            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                var sInterID = $("#HInterID").val();
+                table.render({
+                    elem: '#wl-table'
+                    //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+                    , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+                    , toolbar: '#toolbarDemo'
+                    , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                        , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+                        , { 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 }
+                    ]]
+                    // , data: [linterid]
+                    // , page: true
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
                     }
-                    $("#HSecManager").val(checkStatus.data[0].HName);
-                    $("#HSecManagerID").val(checkStatus.data[0].HItemID);
-                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                }
-                , btn2: function (index, layero) { }
+                });
+            }
+
+
+
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+
+            //鑾峰彇鏈�澶у崟鎹彿 new
+
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1204' },
+                    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);
+            }
+
+            //閫夋嫨浠撳簱
+            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(HFIFOWHID-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=HFIFOWHID', '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_StockPlaceList.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
+            //        , area: ['100%', '100%']
+            //        , title: '棰嗘枡浜哄垪琛�'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+            //    var sMainStr = JSON.stringify(data.field);
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '鍙戞枡浜哄垪琛�'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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 () {
+                sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
             })
-        });
 
-        //閫夋嫨閮ㄩ棬
-        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 () {
-            sessionStorage["SourceFlag"] = false;
-            parent.location.href = "../../../views/index.html"
-            //window.close();//鍏抽棴褰撳墠椤�
-        })
-
-        //缂栬緫
-        form.on('submit(cmdModify)', function () {//缂栬緫
-            var sSubStr = table.cache['wl-table'];
-            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+            //缂栬緫
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
@@ -691,192 +702,394 @@
                         //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
-           // }
-        });
+                // }
+            });
 
 
-        //$('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
-        //    var HBarCode = $('#HStockPlaceName').val()
-        //    if (event.keyCode == 13) {
-        //        //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-        //        $.ajax({
-        //            url: GetWEBURL() + "/Web/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-MateOutBill', '2');
-        //                }
-        //                else {
-        //                    layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-        //                }
-        //                layer.closeAll("loading");
-        //            }
-        //        });
-        //    }
-        //});
+            //$('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
+            //    var HBarCode = $('#HStockPlaceName').val()
+            //    if (event.keyCode == 13) {
+            //        //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+            //        $.ajax({
+            //            url: GetWEBURL() + "/Web/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-MateOutBill', '2');
+            //                }
+            //                else {
+            //                    layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //                }
+            //                layer.closeAll("loading");
+            //            }
+            //        });
+            //    }
+            //});
 
 
-        //鎵粨浣�
-        $('#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-ProductlnBill', '2');
+            //鎵粨浣�
+            $('#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-ProductlnBill', '2');
+                            }
+                            else {
+                                // $("#verifycode").click();
+                                //layer.msg(result.Message, { icon: 5 });
+                                layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            }
+                            layer.closeAll("loading");
                         }
-                        else {
-                            // $("#verifycode").click();
-                            //layer.msg(result.Message, { icon: 5 });
-                            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
-            }
-        });
-
-        //鍒犻櫎
-        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 = '1204'
-            var sAuxPropID = data[0].HAuxPropID
-            //var sMTONo = data[0].HMTONo
-            var sMTONo = ''
-            var sSourceInterID = data[0].HSourceInterID
-            var sSourceEntryID = data[0].HSourceEntryID
-            $.ajax(
-               {
-                   type: "Get",
-                   url: GetWEBURL() + "/MateOutBill/Delete_Json",
-                   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) { // 璇存槑楠岃瘉鎴愬姛浜�
-                           table.render({
-                               elem: '#wl-table' 
-                               , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
-                               //, cellMinWidth: 80
-                               , toolbar: '#toolbarDemo'
-                               , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
-                               , cols: [[
-                                  { type: 'radio' }
-                                , { field: 'HSNO', title: '搴忓彿', width: 60 }
-                                , { field: 'HQty', title: '鏁伴噺', width: 80 }
-                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
-                                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
-                                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                                , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
-                                , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
-                                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                                , { field: 'HBatchNo', title: '鎵规', width: 100 }
-                                , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
-                                , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
-                               ]]
-                         , height: 500
-                           })
-                       }
-                       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) {//鎻愪氦
-            //debugger;
-            var sMainStr = JSON.stringify(data.field);
-            var sSubStr = table.cache['wl-table'];
-            var sSourceType = $("#HBillType").val();
-            if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
-            {
-                layer.load(3);
-                $.ajax(
-                {
-                    type: "POST",
-                    url: GetWEBURL() + "/MateOut/set_SaveMateOutBill_Json",
-                    async: true,
-                    data: { "oMain": sMainStr  },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                            layer.confirm("鐢熸垚棰嗘枡鍑哄簱鍗�" + data.Message + $("#HBillNo").val(), {
-                                icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                btn2: function () {
-                                    //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                    //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                    parent.location.href = "../../../views/index.html"
-                                }//鍏抽棴
-                            }, function () { window.location.reload(); });//鏂板
-                        }
-                        else {
-                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        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 sBarCode = $('#HBarCode').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            var sQty = $("#HQty").val()
-            var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷
-            var sBillType = '1204'
-            var sHWHID = $("#HWHID").val()
-            var sHSPID = $("#HStockPlaceID").val()
-            var sSourceBillNo = $("#HSourceBillNo").val()
-            var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠$悊
-            var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊
-            //var Flag = sessionStorage["SourceFlag"];
-            if (sQty == "") {
-                sQty = 0;
-            }
-            if (sHBillType == '-1')
+            //鍒犻櫎
+            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 = '1204'
+                var sAuxPropID = data[0].HAuxPropID
+                //var sMTONo = data[0].HMTONo
+                var sMTONo = ''
+                var sSourceInterID = data[0].HSourceInterID
+                var sSourceEntryID = data[0].HSourceEntryID
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/MateOutBill/Delete_Json",
+                        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) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
+                                    //, cellMinWidth: 80
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HSNO', title: '搴忓彿', width: 60 }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
+                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
+                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                                        , { field: 'HBatchNo', title: '鎵规', width: 100 }
+                                        , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
+                                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
+                                    ]]
+                                    , height: 500
+                                })
+                            }
+                            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) {//鎻愪氦
+                //debugger;
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = $("#HBillType").val();
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/MateOut/set_SaveMateOutBill_Json",
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm("鐢熸垚棰嗘枡鍑哄簱鍗�" + data.Message + $("#HBillNo").val(), {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }, function () { window.location.reload(); });//鏂板
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                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) {
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                if (sHBillType == '-1') {
+                    sSourceBillNo = ''
+                }
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+            //鎵簮鍗�
+            $('#HSourceBillNo').on('keydown', function (event) {
+                if (HPPQty == "") {
+                    HPPQty = 0;
+                }
+                if (event.keyCode == 13) {
+                    GetMeesageBySourceBillNo();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                GetMeesageByBarCode();
+            });
+            ////鎵簮鍗曟祴璇曠敤
+            //$('#HSourceBillNo').on('keydown', function (event) {      //鎵簮鍗�
+            //    var sInterID = $('#HInterID').val();
+            //    var sBillNo = $('#HBillNo').val();
+            //    var HBillType = "1204";
+            //    var sSourceBillNo = $('#HSourceBillNo').val();
+            //    var sSourceType = $('#HBillType').val();
+            //    var sRedBlue = false;
+            //    var sMaker = sessionStorage["HUserName"];
+            //    var sPPQty = 0;
+            //    var sPlanMode = 0;
+            //    var sWhID = $('#HWHID').val();
+            //    var sHOWNERID = 0;
+            //    if (event.keyCode == 13) {
+            //        $.ajax({
+            //            url: GetWEBURL() + "/MateOut/set_SavePonderationBillMain_Temp_SourceBill_MateOut",
+            //            type: "GET",
+            //            data: {
+            //                "sInterID": sInterID,
+            //                "sBillNo": sBillNo,
+            //                "HBillType": HBillType,
+            //                "sSourceBillNo": sSourceBillNo,
+            //                "sSourceType": sSourceType,
+            //                "sRedBlue": sRedBlue,
+            //                "sMaker": sMaker,
+            //                "sPPQty": sPPQty,
+            //                "sPlanMode": sPlanMode,
+            //                "sWhID": sWhID,
+            //                "sHOWNERID": sHOWNERID
+            //            },
+            //            success: function (result) {
+            //                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+            //                    layer.load(3);
+            //                    element.tabChange('tab-MoveStockBill', '2');
+            //                    table.render({
+            //                        elem: '#wl-table'
+            //                      , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
+            //                      , toolbar: '#toolbarDemo'
+            //                      , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
+            //                      , cols: [[
+            //                          { type: 'radio' }
+            //                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+            //                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+            //                        , { 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 }
+            //                      ]]
+            //                        // , data: [linterid]
+            //                        // , page: true
+            //                      , 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' });
+            //                }
+            //                layer.closeAll("loading");
+            //            }
+            //        });
+            //        // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+            //    }
+            //});
+
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://61.130.49.162:9090/WMSAPI///MateOut/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+
+            function GetHWHValue(obj)  //杩斿洖浠撳簱
             {
-                sSourceBillNo=''
+                $("#HWHNAME").val(obj[0].HName);
+                //sessionStorage["HWHID"] = obj[0].HItemID;
+                $("#HWHID").val(obj[0].HItemID);
             }
-            if (event.keyCode == 13) {
+            function GetHFIFOWHNAMEValue(obj)  //杩斿洖鍏堣繘鍏堝嚭浠撳簱
+            {
+                $("#HFIFOWHNAME").val(obj[0].HName);
+                //sessionStorage["HWHID"] = obj[0].HItemID;
+                $("#HFIFOWHID").val(obj[0].HItemID);
+            }
+            function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
+            }
+            function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
+            }
+            function GetHKeeperValue(obj) {  //杩斿洖淇濈
+                $("#HKeeper").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
+            }
+            function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+            function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
+            }
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                //if ($("#HSourceBillNo").val() == '') {
+                //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+                //    return false;
+                //}
+                //if($("#HDeptName").val()=='')
+                //{
+                //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HSecManager").val() == '') {
+                //    layer.msg("鍙戞枡浜烘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HKeeper").val() == '') {
+                //    layer.msg("棰嗘枡浜烘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HSupName").val() == '') {
+                //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HWHNAME").val() == '') {
+                //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                if ($("#HBillNo").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HInterID").val() == '') {
+                    layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (typeof (sSubStr) == "undefined") {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                var s = 0;
+                if (!typeof (sSubStr) == "undefined") {
+                    //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                    //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                    //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
+                    //        {
+                    //            layer.msg("鏁伴噺涓嶈兘澶т簬搴斿彂鏁伴噺锛�", { icon: 5 });
+                    //            return false;
+                    //        }
+                    //    }
+                    //}
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (parseFloat(sSubStr[i].HQty) > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        layer.msg("鐢熶骇棰嗘枡鍑哄簱璁板綍鏈壂鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                }
+                else {
+                    return true;
+                }
+            }
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sQty = $("#HQty").val()
+                var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷
+                var sBillType = '1204'
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sSourceBillNo = $("#HSourceBillNo").val()
+                var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠$悊
+                var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊
+
                 if (sBarCode == '') {
                     playSound();
                     layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -973,7 +1186,7 @@
                             layer.load(3)
 
                             $.ajax({
-                                url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1', 
+                                url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
                                 type: "GET",
                                 data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1204', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                 success: function (result) {
@@ -1005,69 +1218,49 @@
                     }
                 });
             }
-        });
-
-        var listOption = {
-            elem: '#wl-table'
-            , toolbar: '#toolbarDemo'
-            , cellMinWidth: 90
-            , cols: [[
-                { type: 'radio' }
-                , { field: 'HSNO', title: '搴忓彿', width: 60 }
-                , { field: 'HQty', title: '鏁伴噺', width: 80 }
-                , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
-                , { 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 }
-            ]]
-            , height: 500
-            , done: function () {
-                layer.closeAll("loading");
+            var listOption = {
+                elem: '#wl-table'
+                , toolbar: '#toolbarDemo'
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HSNO', title: '搴忓彿', width: 60 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+                    , { 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 }
+                ]]
+                , 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();
-        }
-
-
-
-
-        //鎵簮鍗�
-        $('#HSourceBillNo').on('keydown', function (event) {
-            var HSourceBillNo = $('#HSourceBillNo').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            var HSourceBillType = $("#HBillType").val()
-            var HPPQty = $("#HPPQty").val()
-            var HFIFOWHID = $("#HFIFOWHID").val()
-            var HPlanMode = $("#HPlanMode").val()
-            
-            
-
-            if (HPPQty == "")
-            {
-                HPPQty = 0;
+            function playSound() {
+                var audio = document.getElementById("cs");
+                audio.play();
             }
-
-           
-
-            if (event.keyCode == 13) { 
+            function playSound1() {
+                var audio = document.getElementById("cs2");
+                audio.play();
+            }
+            //鎵簮鍗�
+            function GetMeesageBySourceBillNo(obj) {
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                var HPPQty = $("#HPPQty").val()
+                var HFIFOWHID = $("#HFIFOWHID").val()
+                var HPlanMode = $("#HPlanMode").val()
                 $.ajax({
                     url: GetWEBURL() + "/MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json",
                     type: "GET",
-                    data: { "sInterID": sInterID, "sBillNo": sBillNo, "HBillType": '1204', "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "sMaker": sessionStorage["HUserName"], "sPPQty": HPPQty, "sPlanMode": HPlanMode, "sFIFOWHID": HFIFOWHID, "HOWNERID": sessionStorage["OrganizationID"]},
+                    data: { "sInterID": sInterID, "sBillNo": sBillNo, "HBillType": '1204', "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "sMaker": sessionStorage["HUserName"], "sPPQty": HPPQty, "sPlanMode": HPlanMode, "sFIFOWHID": HFIFOWHID, "HOWNERID": sessionStorage["OrganizationID"] },
                     success: function (result) {
                         sessionStorage["SourceFlag"] = true;
                         $("#HPlanMode").attr("disabled", "true");
@@ -1077,27 +1270,27 @@
                             playSound1();
                             layer.load(3)
                             table.render({
-                                elem: '#wl-table' 
+                                elem: '#wl-table'
                                 , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
-                              , toolbar: '#toolbarDemo'
-                              , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
-                              , cols: [[
-                                  { type: 'radio' }
-                                , { field: 'HSNO', title: '搴忓彿', width: 60 }
-                                , { field: 'HQty', title: '鏁伴噺', width: 80 }
-                                , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
-                                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
-                                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 90 }
-                                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
-                                , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
-                                , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
-                                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
-                                , { field: 'HBatchNo', title: '鎵规', width: 90 }
-                              ]]
-                              , height: 500
-                              , done: function () {
-                                  layer.closeAll("loading");
-                              }
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HSNO', title: '搴忓彿', width: 60 }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
+                                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 90 }
+                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
+                                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
+                                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
+                                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
+                                    , { field: 'HBatchNo', title: '鎵规', width: 90 }
+                                ]]
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
                             });
                         }
                         else {
@@ -1110,189 +1303,6 @@
             }
         });
 
-        ////鎵簮鍗曟祴璇曠敤
-        //$('#HSourceBillNo').on('keydown', function (event) {      //鎵簮鍗�
-        //    var sInterID = $('#HInterID').val();
-        //    var sBillNo = $('#HBillNo').val();
-        //    var HBillType = "1204";
-        //    var sSourceBillNo = $('#HSourceBillNo').val();
-        //    var sSourceType = $('#HBillType').val();
-        //    var sRedBlue = false;
-        //    var sMaker = sessionStorage["HUserName"];
-        //    var sPPQty = 0;
-        //    var sPlanMode = 0;
-        //    var sWhID = $('#HWHID').val();
-        //    var sHOWNERID = 0;
-        //    if (event.keyCode == 13) {
-        //        $.ajax({
-        //            url: GetWEBURL() + "/MateOut/set_SavePonderationBillMain_Temp_SourceBill_MateOut",
-        //            type: "GET",
-        //            data: {
-        //                "sInterID": sInterID,
-        //                "sBillNo": sBillNo,
-        //                "HBillType": HBillType,
-        //                "sSourceBillNo": sSourceBillNo,
-        //                "sSourceType": sSourceType,
-        //                "sRedBlue": sRedBlue,
-        //                "sMaker": sMaker,
-        //                "sPPQty": sPPQty,
-        //                "sPlanMode": sPlanMode,
-        //                "sWhID": sWhID,
-        //                "sHOWNERID": sHOWNERID
-        //            },
-        //            success: function (result) {
-        //                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-        //                    layer.load(3);
-        //                    element.tabChange('tab-MoveStockBill', '2');
-        //                    table.render({
-        //                        elem: '#wl-table'
-        //                      , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
-        //                      , toolbar: '#toolbarDemo'
-        //                      , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
-        //                      , cols: [[
-        //                          { type: 'radio' }
-        //                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
-        //                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-        //                        , { 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 }
-        //                      ]]
-        //                        // , data: [linterid]
-        //                        // , page: true
-        //                      , 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' });
-        //                }
-        //                layer.closeAll("loading");
-        //            }
-        //        });
-        //        // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
-        //    }
-        //});
-
-        table.render({
-            elem: '#mx-table'
-            // , url: 'http://61.130.49.162:9090/WMSAPI///MateOut/GetHBarCodeShowBillSub'
-            //, toolbar: '#toolbarDemo'
-            // , where: { sMsg: linterid, sMsg2: lentryid }
-         , cols: [[
-           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-         ]]
-         , page: true
-         , height: 500
-         , done: function () {
-         }
-        });
-    });
-    function GetHWHValue(obj)  //杩斿洖浠撳簱
-    {
-        $("#HWHNAME").val(obj[0].HName);
-        //sessionStorage["HWHID"] = obj[0].HItemID;
-        $("#HWHID").val(obj[0].HItemID);
-    }
-        function GetHFIFOWHNAMEValue(obj)  //杩斿洖鍏堣繘鍏堝嚭浠撳簱
-        {
-            $("#HFIFOWHNAME").val(obj[0].HName);
-            //sessionStorage["HWHID"] = obj[0].HItemID;
-            $("#HFIFOWHID").val(obj[0].HItemID);
-        }
-    function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-        $("#HStockPlaceName").val(obj[0].HName);
-        $("#HStockPlaceID").val(obj[0].HItemID);
-    }
-    function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
-        $("#HSupName").val(obj[0].HName);
-        $("#HSupID").val(obj[0].HItemID);
-    }
-    function GetHKeeperValue(obj) {  //杩斿洖淇濈
-        $("#HKeeper").val(obj[0].HName);
-        $("#HKeeperID").val(obj[0].HItemID);
-    }
-    function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-        $("#HSecManager").val(obj[0].HName);
-        $("#HSecManagerID").val(obj[0].HItemID);
-    }
-    function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-        $("#HDeptName").val(obj[0].HName);
-        $("#HDeptID").val(obj[0].HItemID);
-    }
-    function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-        //if ($("#HSourceBillNo").val() == '') {
-        //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-        //    return false;
-        //}
-        //if($("#HDeptName").val()=='')
-        //{
-        //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HSecManager").val() == '') {
-        //    layer.msg("鍙戞枡浜烘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HKeeper").val() == '') {
-        //    layer.msg("棰嗘枡浜烘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HSupName").val() == '') {
-        //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HWHNAME").val() == '') {
-        //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        if ($("#HBillNo").val() == '') {
-            layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if ($("#HInterID").val() == '') {
-            layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if (typeof (sSubStr) == "undefined")
-        {
-            layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        var s = 0;
-        if (!typeof (sSubStr) == "undefined") {
-            //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-            //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-            //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-            //        {
-            //            layer.msg("鏁伴噺涓嶈兘澶т簬搴斿彂鏁伴噺锛�", { icon: 5 });
-            //            return false;
-            //        }
-            //    }
-            //}
-            for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                if (parseFloat(sSubStr[i].HQty) > 0) {
-                    s = 1;
-                }
-            }
-            if (s == 0)
-            {
-                layer.msg("鐢熶骇棰嗘枡鍑哄簱璁板綍鏈壂鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }
-    }
     </script>
 
 </body>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index e86e327..79f055c 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -1,13 +1,19 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <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">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+       
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
 </head>
 
 <body>
@@ -25,6 +31,9 @@
                             </div>
                             <div class="layui-col-xs8">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -47,11 +56,11 @@
                                             <input type="text" value="鐢熶骇璁㈠崟" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
                                             <input type="hidden" value="3710" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
                                             <!--<input type="text" value="鐢熶骇姹囨姤鍗�" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
-                            <input type=-->
+                                            <input type=-->
                                             <!--"hidden" value="3711" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">-->
                                             <!--<select name="HBillType" id="HBillType">
-                                <option value="3711">鐢熶骇姹囨姤鍗�</option>
-                            </select>-->
+                                                <option value="3711">鐢熶骇姹囨姤鍗�</option>
+                                            </select>-->
                                         </div>
                                     </div>
                                 </div>
@@ -62,6 +71,9 @@
                                         </div>
                                         <div class="layui-col-xs8">
                                             <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -165,15 +177,15 @@
                             </div>
                             <div class="layui-tab-item">
                                 <!--<div class="layui-form-item" style="padding:0px;margin:0px">
-                    <div class="layui-row">
-                        <div class="layui-col-xs4">
-                            <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">
-                        </div>
-                    </div>
-                </div>-->
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4">
+                                            <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">
+                                        </div>
+                                    </div>
+                                </div>-->
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
@@ -194,21 +206,21 @@
                             </div>
                         </div>
                         <!--<div class="layui-form-item" style="margin-bottom: 20px;">
-            <div class="layui-row">
-                <div class="layui-col-xs3">
-                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
-                </div>
-                <div class="layui-col-xs3">
-                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
-                </div>
-                <div class="layui-col-xs3">
-                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
-                </div>
-                <div class="layui-col-xs3">
-                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
-                </div>
-            </div>
-        </div>-->
+                            <div class="layui-row">
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                                </div>
+                            </div>
+                        </div>-->
                     </div>
                     <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                         <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
@@ -241,11 +253,11 @@
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
             var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form
-            , element = layui.element;
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
 
 
             var option = [];
@@ -337,8 +349,8 @@
             var params = getUrlVars();
             var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
             var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-        
-            function  RoadBillMain(linterid)//鍔犺浇琛ㄥご
+
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
             {
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetPonderationBill",
@@ -373,7 +385,7 @@
                     , defaultToolbar: []
                     , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
                     , cols: [[
-                          { type: 'radio' }
+                        { type: 'radio' }
                         , { field: 'HQty', title: '鏁伴噺', width: 150 }
                         , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
                         , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
@@ -392,20 +404,20 @@
                     }
                 });
             }
-             
+
             //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
 
-            
 
-            
 
-            
+
+
+
 
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
                 //鑾峰彇鏈�澶у崟鎹彿 new
                 $("#HInterID").val("");
-                $("#HBillNo").val(""); 
+                $("#HBillNo").val("");
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
@@ -417,82 +429,83 @@
                         set_InitGrid();
                     }
                 });
-            } 
+            }
             else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
                 RoadBillMain(linterid);
                 RoadBillSub(linterid);
             }
 
 
-        //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣   new
-        //if (1 == 2)
-        //{
-        //    element.tabChange('tab-ProductlnBill', '3');
-        //    var pFocus = $("#HBarCode");
-        //    pFocus.focus();
-        //    pFocus.select();
-        //}
-        //else
-        //{
-        //    element.tabChange('tab-ProductlnBill', '1');
-        //    var pFocus = $("#HSourceBillNo");
-        //    pFocus.focus();
-        //    pFocus.select();
-        //}
-        //
-        //
+            //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣   new
+            //if (1 == 2)
+            //{
+            //    element.tabChange('tab-ProductlnBill', '3');
+            //    var pFocus = $("#HBarCode");
+            //    pFocus.focus();
+            //    pFocus.select();
+            //}
+            //else
+            //{
+            //    element.tabChange('tab-ProductlnBill', '1');
+            //    var pFocus = $("#HSourceBillNo");
+            //    pFocus.focus();
+            //    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(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_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', '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_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
 
-        //閫夋嫨淇濈
-        //form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
-        //    layer.open({
-        //        type: 2
-        //        , area: ['100%', '100%']
-        //        , title: '淇濈鍒楄〃'
-        //        , shade: 0.6 //閬僵閫忔槑搴�
-        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-        //        , resize: false
-        //        , cancel: function () {
-        //            //$(".layui-btn").removeClass("layui-btn-disabled");
-        //        }
-        //    })
-        //});
-            form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+            //閫夋嫨淇濈
+            //form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '淇濈鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', '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' //鍔犱笂杈规
@@ -516,25 +529,25 @@
             });
 
 
-        //閫夋嫨楠屾敹
-        //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
-        //    var sMainStr = JSON.stringify(data.field);
-        //    layer.open({
-        //        type: 2
-        //        , area: ['100%', '100%']
-        //        , title: '楠屾敹鍒楄〃'
-        //        , shade: 0.6 //閬僵閫忔槑搴�
-        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-        //        , resize: false
-        //        , cancel: function () {
-        //            //$(".layui-btn").removeClass("layui-btn-disabled");
-        //        }
-        //    })
-        //});
-
-            form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+            //閫夋嫨楠屾敹
+            //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+            //    var sMainStr = JSON.stringify(data.field);
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '楠屾敹鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            //閫夋嫨楠屾敹
+            form.on('submit(HSecManagerID-BT)', function (data) {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -557,27 +570,27 @@
                 })
             });
 
-        //閫夋嫨閮ㄩ棬
-        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(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(cmdModify)', function () {//缂栬緫
-            var sSubStr = table.cache['wl-table'];
-            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+            //缂栬緫
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
@@ -591,168 +604,357 @@
                         //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
-           // }
-        });
+                // }
+            });
 
-        form.on('submit(Cancel)', function () {
-            //sessionStorage["SourceFlag"] = false;
-            parent.location.href = "../../../views/index.html"
-            //window.close();//鍏抽棴褰撳墠椤�
-        })
+            form.on('submit(Cancel)', function () {
+                //sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
 
-        //鍒犻櫎
-        form.on('submit(cmdDelete)', function () {//鍒犻櫎
-            var checkStatus = table.checkStatus('wl-table')
-            , data = checkStatus.data;
-            var sInterID = $('#HInterID').val()
-            var sMaterID = data[0].HMaterID
-            var sBillType = '1202'
-            var sAuxPropID = data[0].HAuxPropID
-            //var sMTONo = data[0].HMTONo
-            var sMTONo = ''
-            var sSourceInterID = data[0].HSourceInterID
-            var sSourceEntryID = data[0].HSourceEntryID
-            var HBillNo = $("#HBillNo").val()
-            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) { // 璇存槑楠岃瘉鎴愬姛浜�
-                         //  table.render({
-                         //      elem: '#wl-table'
-                         //      //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Mate_Webs_Json'
-                         //      , url: GetWEBURL() + '/ProductIn/DisPlayBarCodeList_Json'
-                         //, cellMinWidth: 80
-                         //, toolbar: '#toolbarDemo'
-                         //      , where: { HBillID: sInterID, HBillNo: HBillNo, HBillType: '1202', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl}
-                         //, cols: [[
-                         //       { type: 'radio' }
-                         //       , { field: 'HQty', title: '鏁伴噺', width: 80 }
-                         //       , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
-                         //       , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
-                         //       , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                         //       , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
-                         //       , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
-                         //       , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
-                         //       , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                         //       , { field: 'HBatchNo', title: '鎵规', width: 100 }
-                         //       , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
-                         //       , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
-                         //       , { field: 'HMaterID', title: '鐗╂枡ID', width: 100 }
-                         //]]
-                         //, height: 500
-                         //  })
-                           table.render({
-                               elem: '#wl-table'
-                               //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
-                               , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
-                               , toolbar: '#toolbarDemo'
-                               , defaultToolbar: []
-                               , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
-                               , cols: [[
-                                   { type: 'radio' }
-                                   , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                   , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                   , { 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 }
-                               ]]
-                               // , data: [linterid]
-                               // , page: true
-                               , height: 500
-                               , done: function () {
-                                   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) {//鎻愪氦
-            //debugger;
-            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;
-                }
-                else
-                {
-                    $("#HExplanation").val($("#HWHNAME").val());
-                }
-            }
-            var sMainStr = JSON.stringify(data.field);
-            var sSubStr = table.cache['wl-table'];
-            //var sSourceType = $("#HBillType").val();
-            var sSourceType = "3711";
-            if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
-            {
-                layer.load(3);
+            //鍒犻櫎
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                var sInterID = $('#HInterID').val()
+                var sMaterID = data[0].HMaterID
+                var sBillType = '1202'
+                var sAuxPropID = data[0].HAuxPropID
+                //var sMTONo = data[0].HMTONo
+                var sMTONo = ''
+                var sSourceInterID = data[0].HSourceInterID
+                var sSourceEntryID = data[0].HSourceEntryID
+                var HBillNo = $("#HBillNo").val()
+                var sMouldManagerCtl = 'N'
+                var sFIFOCtl = 'N'
                 $.ajax(
-                {
-                    type: "POST",
-                    //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/set_SaveProductInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    url: GetWEBURL() + "/ProductIn/set_SaveProductInBill_Json",
-                    async: true,
-                    data: { "oMain": sMainStr  },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                            layer.confirm("鐢熸垚浜у搧鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), {
-                                icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                btn2: function () {
-                                    //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                    //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                    parent.location.href = "../../../views/index.html"
-                                }//鍏抽棴
-                            }, function () { window.location.reload(); });//鏂板
+                    {
+                        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) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                //  table.render({
+                                //      elem: '#wl-table'
+                                //      //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Mate_Webs_Json'
+                                //      , url: GetWEBURL() + '/ProductIn/DisPlayBarCodeList_Json'
+                                //, cellMinWidth: 80
+                                //, toolbar: '#toolbarDemo'
+                                //      , where: { HBillID: sInterID, HBillNo: HBillNo, HBillType: '1202', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl}
+                                //, cols: [[
+                                //       { type: 'radio' }
+                                //       , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                                //       , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+                                //       , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
+                                //       , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                //       , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                //       , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
+                                //       , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
+                                //       , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                                //       , { field: 'HBatchNo', title: '鎵规', width: 100 }
+                                //       , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
+                                //       , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
+                                //       , { field: 'HMaterID', title: '鐗╂枡ID', width: 100 }
+                                //]]
+                                //, height: 500
+                                //  })
+                                table.render({
+                                    elem: '#wl-table'
+                                    //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+                                    , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+                                    , toolbar: '#toolbarDemo'
+                                    , defaultToolbar: []
+                                    , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                        , { 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 }
+                                    ]]
+                                    // , data: [linterid]
+                                    // , page: true
+                                    , height: 500
+                                    , done: function () {
+                                        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: "娓╅Θ鎻愮ず" });
                         }
-                        else {
-                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    });
+            });
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //debugger;
+                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;
                     }
-                });
-                return false;
-            } 
-        });
-
-        //鐩戝惉鎻愪氦
-        form.verify({
-            numberOrEmpty: function (value, item) {
-                // if (value != '') {
-                if (!/^\d+$/.test(value)) {
-                    return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    else {
+                        $("#HExplanation").val($("#HWHNAME").val());
+                    }
                 }
-                //}
-            }
-        });
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                //var sSourceType = $("#HBillType").val();
+                var sSourceType = "3711";
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/set_SaveProductInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            url: GetWEBURL() + "/ProductIn/set_SaveProductInBill_Json",
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm("鐢熸垚浜у搧鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }, function () { window.location.reload(); });//鏂板
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    return false;
+                }
+            });
 
-        //鎵潯鐮�
-            $('#HBarCode').on('keydown', function (event) {  //鎵潯鐮�
+            //鐩戝惉鎻愪氦
+            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-ProductlnBill', '2');
+                            }
+                            else {
+                                // $("#verifycode").click();
+                                //layer.msg(result.Message, { icon: 5 });
+                                layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
+            //鎵玀ES浠撲綅
+            $('#HMESSPName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HMESSPName').val();
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                $("#HMESSPID").val(result.data[0].HWHID);
+                                $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+                                $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+                                $.ajax({
+                                    url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+                                    type: "GET",
+                                    data: { "HERPWHID": result.data[0].HWHID },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            $("#HWHID").val(result.data[0].HMESWHID);
+                                            $("#HWHNAME").val(result.data[0].HMESWHNAME);
+                                            $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+                                            $("#HMESSPName").css("background-color", "#efefef4d");
+                                        }
+                                        else {
+                                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
+            //鍒锋柊鏄庣粏椤电
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://61.130.49.162:9090/WMSAPI///Web/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+
+            function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+            {
+                $("#HWHNAME").val(obj[0].HName);
+                //sessionStorage["HWHID"] = obj[0].HItemID;
+                $("#HWHID").val(obj[0].HItemID);
+            }
+            function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
+            }
+            function GetHKeeperValue(obj) {  //杩斿洖淇濈
+                $("#HKeeper").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
+            }
+            function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+            function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
+            }
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                //if ($("#HSourceBillNo").val() == '') {
+                //    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 ($("#HWHNAME").val() == '') {
+                //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                if ($("#HBillNo").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HInterID").val() == '') {
+                    layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (typeof (sSubStr) == "undefined") {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (!typeof (sSubStr) == "undefined") {
+                    //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                    //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                    //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
+                    //        {
+                    //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                    //            return false;
+                    //        }
+                    //    }
+                    //}
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (parseFloat(sSubStr[i].HQty) > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                }
+                else {
+                    return true;
+                }
+            }
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
                 var sOldBarCode = $('#HBarCode').val()
                 var HDeleteFlag = sOldBarCode.substring(0, 1);
                 var sBarCode = sOldBarCode.slice(1);
@@ -765,9 +967,7 @@
                 var sHWHID = $("#HWHID").val()
                 var sHSPID = $("#HStockPlaceID").val()
                 var sSourceBillNo = $("#HSourceBillNo").val()
-                if (event.keyCode == 13) {
-                if (HDeleteFlag == "*")
-                {
+                if (HDeleteFlag == "*") {
                     if (sBarCode != "") {
                         $('#HBarCode').val("");
                     }
@@ -777,7 +977,7 @@
                             type: "Get",
                             url: GetWEBURL() + "/ProductIn/Delete_Json",
                             async: true,
-                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode},
+                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
                             dataType: "json",
                             success: function (data) {
                                 if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
@@ -828,176 +1028,158 @@
                     }
                     //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
                     if (sBarCode == '') {
+                        playSound();
+                        layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    if (sQty != "") {
+                        $('#HQty').val("");
+                    }
+                    if (sHWHID == "184154") {
+                        if (sHSPID == "0") {
                             playSound();
-                            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;
                         }
-                        if (sBarCode != "") {
-                            $('#HBarCode').val("");
-                        }
-                        if (sQty != "") {
-                            $('#HQty').val("");
-                        }
-                        if (sHWHID == "184154") {
-                            if (sHSPID == "0") {
-                                playSound();
-                                layer.msg("浠撲綅涓虹┖锛岃閫夋嫨浠撲綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                return false;
-                            }
-                        }
-                        //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
-                        $.ajax({
-                            //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
-                            url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
-                            type: "GET",
-                            data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
-                            success: function (result) {
-                                //debugger;
-                                playSound1();
-                                if (result.count == 1) {
-                                    if (result.data.HBarType == '浠撳簱鏉$爜') {
-                                        $("#HWHNAME").val(result.data.HWhName);
-                                        $("#HWHID").val(result.data.HWhID);
-                                        $("#HStockPlaceName").val("");
-                                        $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
-                                        element.tabChange('tab-ProductlnBill', '2');  //璺宠浆椤电
+                    }
+                    //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
+                    $.ajax({
+                        //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
+                        url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
+                        type: "GET",
+                        data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+                        success: function (result) {
+                            //debugger;
+                            playSound1();
+                            if (result.count == 1) {
+                                if (result.data.HBarType == '浠撳簱鏉$爜') {
+                                    $("#HWHNAME").val(result.data.HWhName);
+                                    $("#HWHID").val(result.data.HWhID);
+                                    $("#HStockPlaceName").val("");
+                                    $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+                                    element.tabChange('tab-ProductlnBill', '2');  //璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '浠撲綅鏉$爜') {
+                                    $("#HStockPlaceName").val(result.data.HSPName);
+                                    $("#HStockPlaceID").val(result.data.HSPID);
+                                    $("#HWHNAME").val(result.data.HWhName);
+                                    $("#HWHID").val(result.data.HWhID);
+                                    $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+                                    element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
+                                    $("#HDeptName").val(result.data.HDeptName);
+                                    $("#HDeptID").val(result.data.HDeptID);
+                                    $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+                                    element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '婧愬崟鏉$爜') {
+                                    $("#HSupName").val(result.data.HSupName);
+                                    $("#HSupID").val(result.data.HSupID);
+                                    $("#HDeptName").val(result.data.HDeptName);
+                                    $("#HDeptID").val(result.data.HDeptID);
+                                    $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                    HSourceFlag = true;
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                    //if (result.data.HSourceBillType == "3711") {
+                                    //    $("#HBillType").val("3711");
+                                    //}
+                                    //else {
+                                    //    $("#HBillType").val("-1");
+                                    //}
+                                    $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+                                    element.tabChange('tab-ProductlnBill', '3');
+                                }
+                                else {
+                                    if (HSourceFlag == "true") {
+                                        element.tabChange('tab-ProductlnBill', '3');
                                     }
-                                    else if (result.data.HBarType == '浠撲綅鏉$爜') {
-                                        $("#HStockPlaceName").val(result.data.HSPName);
-                                        $("#HStockPlaceID").val(result.data.HSPID);
-                                        $("#HWHNAME").val(result.data.HWhName);
-                                        $("#HWHID").val(result.data.HWhID);
-                                        $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
-                                        element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
-                                    }
-                                    else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
-                                        $("#HDeptName").val(result.data.HDeptName);
-                                        $("#HDeptID").val(result.data.HDeptID);
-                                        $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
-                                        element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
-                                    }
-                                    else if (result.data.HBarType == '婧愬崟鏉$爜') {
+                                    else {
                                         $("#HSupName").val(result.data.HSupName);
                                         $("#HSupID").val(result.data.HSupID);
-                                        $("#HDeptName").val(result.data.HDeptName);
-                                        $("#HDeptID").val(result.data.HDeptID);
+                                        //$("#HDeptName").val(result.data.HDept);
+                                        //$("#HDeptID").val(result.data.HDeptID);
                                         $("#HSourceBillNo").val(result.data.HSourceBillNo);
                                         HSourceFlag = true;
                                         //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
                                         //if (result.data.HSourceBillType == "3711") {
                                         //    $("#HBillType").val("3711");
+
                                         //}
+
                                         //else {
                                         //    $("#HBillType").val("-1");
                                         //}
-                                        $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+                                        $("#HNote").val(";鐗╂枡鏉$爜");
                                         element.tabChange('tab-ProductlnBill', '3');
                                     }
-                                    else {
-                                        if (HSourceFlag == "true") {
-                                            element.tabChange('tab-ProductlnBill', '3');
-                                        }
-                                        else {
-                                            $("#HSupName").val(result.data.HSupName);
-                                            $("#HSupID").val(result.data.HSupID);
-                                            //$("#HDeptName").val(result.data.HDept);
-                                            //$("#HDeptID").val(result.data.HDeptID);
-                                            $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                            HSourceFlag = true;
-                                            //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                            //if (result.data.HSourceBillType == "3711") {
-                                            //    $("#HBillType").val("3711");
-
-                                            //}
-
-                                            //else {
-                                            //    $("#HBillType").val("-1");
-                                            //}
-                                            $("#HNote").val(";鐗╂枡鏉$爜");
-                                            element.tabChange('tab-ProductlnBill', '3');
-                                        }
+                                }
+                                //$("#HSupID").val(result.data.HSupID);
+                                //$("#HSupName").val(result.data.HSupName);
+                                //$("#HDeptID").val(result.data.HDeptID);
+                                //$("#HDeptName").val(result.data.HDeptName);
+                                layer.load(3)
+                                table.render({
+                                    elem: '#wl-table'
+                                    //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+                                    , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+                                    , toolbar: '#toolbarDemo'
+                                    , defaultToolbar: []
+                                    , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                        , { 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 }
+                                    ]]
+                                    // , data: [linterid]
+                                    // , page: true
+                                    , height: 500
+                                    , done: function () {
+                                        layer.closeAll("loading");
                                     }
-                                    //$("#HSupID").val(result.data.HSupID);
-                                    //$("#HSupName").val(result.data.HSupName);
-                                    //$("#HDeptID").val(result.data.HDeptID);
-                                    //$("#HDeptName").val(result.data.HDeptName);
-                                    layer.load(3)
-                                    table.render({
-                                        elem: '#wl-table'
-                                        //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
-                                        , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
-                                        , toolbar: '#toolbarDemo'
-                                        , defaultToolbar: []
-                                        , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
-                                        , cols: [[
-                                            { type: 'radio' }
-                                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                            , { 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 }
-                                        ]]
-                                        // , data: [linterid]
-                                        // , page: true
-                                        , height: 500
-                                        , done: function () {
-                                            layer.closeAll("loading");
-                                        }
-                                    });
-                                }
-                                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: "娓╅Θ鎻愮ず" });
-                                console.log(err);
+                                });
                             }
-                        });
-                    }
+                            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: "娓╅Θ鎻愮ず" });
+                            console.log(err);
+                        }
+                    });
                 }
-            });
-
-
+            }
             function playSound() {
                 console.log("playSound");
-                //var audio = document.getElementById("cs");
-                //$("appendAut").html("");
-                //if (audio == null)
-                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
-                //$("appendAut").attr("src","../../video/jingbao.wav")
                 var audio = document.getElementById("cs");
                 audio.play();
             }
-
             function playSound1() {
                 console.log("playSound1");
-                //var audio = document.getElementById("cs");
-                //$("appendAut").html("");
-                //if (audio == null)
-                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/success.wav" type = "audio/ogg"> </audio >');
-                //$("appendAut").attr("src", "../../video/success.wav")
                 var audio = document.getElementById("cs2");
                 audio.play();
             }
-
-        //鎵簮鍗�
-        $('#HSourceBillNo').on('keydown', function (event) {   //鎵簮鍗�
-            var HSourceBillNo = $('#HSourceBillNo').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            var HSourceBillType = $("#HBillType").val()
-            if (event.keyCode == 13) {
-                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+            //鎵簮鍗�
+            function GetMeesageBySourceBillNo(obj) {
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
                 if (HSourceBillNo == "" || sInterID <= 0) {
-                    playSound();
                     layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
@@ -1016,28 +1198,28 @@
                             table.render({
                                 elem: '#wl-table'
                                 //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
-                              , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+                                , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
                                 , toolbar: '#toolbarDemo'
                                 , defaultToolbar: []
-                              , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
-                              , cols: [[
-                                  { type: 'radio' }
-                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                , { 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 }
-                              ]]
+                                , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { 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 }
+                                ]]
                                 // , data: [linterid]
                                 // , page: true
-                              , height: 500
-                              , done: function () {
-                                  layer.closeAll("loading");
-                              }
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
                             });
                         }
                         else {
@@ -1049,173 +1231,7 @@
                 });
             }
         });
-
-        //鎵粨浣�
-        $('#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-ProductlnBill', '2');
-                        }
-                        else {
-                            // $("#verifycode").click();
-                            //layer.msg(result.Message, { icon: 5 });
-                            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
-            }
-        });
-
-        //鎵玀ES浠撲綅
-        $('#HMESSPName').on('keydown', function (event) {      //鎵粨浣�
-            var HBarCode = $('#HMESSPName').val();
-            if (event.keyCode == 13) {
-                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                $.ajax({
-                    url: GetWEBURL() + "/LookingFor/getSpName_Json",
-                    type: "GET",
-                    data: { "HBarCode": HBarCode },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            $("#HMESSPID").val(result.data[0].HWHID);
-                            $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
-                            $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
-                            $.ajax({
-                                url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
-                                type: "GET",
-                                data: { "HERPWHID": result.data[0].HWHID },
-                                success: function (result) {
-                                    if (result.count == 1) {
-                                        $("#HWHID").val(result.data[0].HMESWHID);
-                                        $("#HWHNAME").val(result.data[0].HMESWHNAME);
-                                        $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
-                                        $("#HMESSPName").css("background-color", "#efefef4d");
-                                    }
-                                    else {
-                                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                    }
-                                    layer.closeAll("loading");
-                                }
-                            });
-                        }
-                        else {
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
-            }
-        });
-
-        //鍒锋柊鏄庣粏椤电
-        table.render({
-            elem: '#mx-table'
-            // , url: 'http://61.130.49.162:9090/WMSAPI///Web/GetHBarCodeShowBillSub'
-            //, toolbar: '#toolbarDemo'
-            // , where: { sMsg: linterid, sMsg2: lentryid }
-         , cols: [[
-           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-         ]]
-         , page: true
-         , height: 500
-         , done: function () {
-         }
-        });
-    });
-    function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
-    {
-        $("#HWHNAME").val(obj[0].HName);
-        //sessionStorage["HWHID"] = obj[0].HItemID;
-        $("#HWHID").val(obj[0].HItemID);
-    }
-    function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-        $("#HStockPlaceName").val(obj[0].HName);
-        $("#HStockPlaceID").val(obj[0].HItemID);
-    }
-    function GetHKeeperValue(obj) {  //杩斿洖淇濈
-        $("#HKeeper").val(obj[0].HName);
-        $("#HKeeperID").val(obj[0].HItemID);
-    }
-    function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-        $("#HSecManager").val(obj[0].HName);
-        $("#HSecManagerID").val(obj[0].HItemID);
-    }
-    function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-        $("#HDeptName").val(obj[0].HName);
-        $("#HDeptID").val(obj[0].HItemID);
-    }
-    function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-        //if ($("#HSourceBillNo").val() == '') {
-        //    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 ($("#HWHNAME").val() == '') {
-        //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        if ($("#HBillNo").val() == '') {
-            layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if ($("#HInterID").val() == '') {
-            layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if (typeof (sSubStr) == "undefined")
-        {
-            layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if (!typeof (sSubStr) == "undefined") {
-            //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-            //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-            //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-            //        {
-            //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' }); 
-            //            return false;
-            //        }
-            //    }
-            //}
-            for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                if (parseFloat(sSubStr[i].HQty) > 0) {
-                    s = 1;
-                }
-            }
-            if (s == 0) {
-                layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }
-    }
+        
     </script>
 
 </body>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index af2dce0..c2032be 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -1,13 +1,18 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <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">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-col-xs4 {
+            width: 12.333333%
+        }
+    </style>
 </head>
 <body>
     <div class="layui-fluid">
@@ -43,6 +48,9 @@
                                         </div>
                                         <div class="layui-col-xs8">
                                             <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -169,6 +177,9 @@
                                         <div class="layui-col-xs8">
                                             <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                                         </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
@@ -216,137 +227,18 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
-    layui.config({
-        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-    }).extend({
-        index: 'lib/index' //涓诲叆鍙fā鍧�
-    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-        var $ = layui.$
-        , admin = layui.admin
-        , layer = layui.layer
-        , table = layui.table
-        , form = layui.form
-        , element = layui.element;
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
 
-        //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 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"]);
-        $("#HSecManager").val(sessionStorage["HSecManager"]);
-        $("#HKeeperID").val(sessionStorage["HKeeperID"]);
-        $("#HKeeper").val(sessionStorage["HKeeper"]);
-        $("#HMaker").val(sessionStorage["HUserName"]);
-        $("#HMaker").hide();
-        $("#HMakerID").hide();
-        $("#HBillerID").val(sessionStorage["HBillerID"]);
-        $("#HBillerID").hide();
-        $("#HOrgID").val(sessionStorage["OrganizationID"]);
-        $("#HOrgID").hide();
-        //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
-
-
-        //鑾峰彇鍙傛暟
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
-        }
-        var params = getUrlVars();
-        var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-        var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-        
-        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);
-                }
-            })
-        }
-
-
-        function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
-        {
-            table.render({
-                elem: '#wl-table'
-                , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                , toolbar: '#toolbarDemo'
-                , where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
-                , cols: [[
-                    { type: 'radio' }
-                , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                , { 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 }
-                ]]
-                , height: 500
-                , done: function () {
-                    layer.closeAll("loading");
-                }
-            });
-        }
-             
-        //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
-
-            
-
-            
-
-            
-
-        //鍒ゆ柇鏄惁鏂板
-        if (linterid == null || linterid == 0) {
-            //鑾峰彇鏈�澶у崟鎹彿 new
-            $("#HInterID").val("");
-            $("#HBillNo").val(""); 
-
-            $.ajax({ 
-                url: GetWEBURL() + "/Web/GetMAXNum",
-                type: "GET",
-                data: { "HBillType": '1203' },
-                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);
-        }
-
-        //
-        function Sub_ClearBill() {
             //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
             $("#HWHID").val(sessionStorage["HWHID"]);
             $("#HWHNAME").val(sessionStorage["HWHName"]);
@@ -365,204 +257,323 @@
             $("#HMakerID").hide();
             $("#HBillerID").val(sessionStorage["HBillerID"]);
             $("#HBillerID").hide();
+            $("#HOrgID").val(sessionStorage["OrganizationID"]);
+            $("#HOrgID").hide();
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
+
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            var params = getUrlVars();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            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);
+                    }
+                })
+            }
+
+
+            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            {
+                table.render({
+                    elem: '#wl-table'
+                    , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+                    , toolbar: '#toolbarDemo'
+                    , where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                        , { 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 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+
+
+
+
+
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1203' },
+                    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);
+            }
+
             //
-            //$("#HSumQtys").val("");
-            //$("#HBarcodeQtys").val("");
+            function Sub_ClearBill() {
+                //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 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"]);
+                $("#HSecManager").val(sessionStorage["HSecManager"]);
+                $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+                $("#HKeeper").val(sessionStorage["HKeeper"]);
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMaker").hide();
+                $("#HMakerID").hide();
+                $("#HBillerID").val(sessionStorage["HBillerID"]);
+                $("#HBillerID").hide();
+                //
+                //$("#HSumQtys").val("");
+                //$("#HBarcodeQtys").val("");
 
-            //璁剧疆鍗曟嵁鍙�
-            $("#HInterID").val("");
-            $("#HBillNo").val("");
-            $.ajax({
-                url: GetWEBURL() + "/Web/GetMAXNum",
-                type: "GET",
-                data: { "HBillType": '1203' },
-                success: function (d) {
-                    $("#HInterID").val(d.data[0].HInterID);
-                    $("#HBillNo").val(d.data[0].HBillNo);
-                }
-            });
-            //鐒︾偣
-            //element.tabChange('tab-Kf_SellOutBill', '3');
-            //var pFocus = $("#HBarCode");
-            //pFocus.focus();
-            //pFocus.select();
-            //鍒锋柊
-            var sInterID = $("#HInterID").val()
-            table.render({
-                elem: '#wl-table'
-                , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                , toolbar: '#toolbarDemo'
-                , where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
-                , cols: [[
-                    { type: 'radio' }
-                , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                , { 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 }
-                ]]
-                , height: 500
-                , done: function () {
-                    layer.closeAll("loading");
-                }
-            });
-        }
-        //
-
-        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_StockPlaceList.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
-        //        , area: ['100%', '100%']
-        //        , title: '淇濈鍒楄〃'
-        //        , shade: 0.6 //閬僵閫忔槑搴�
-        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-        //        , resize: false
-        //        , cancel: function () {
-        //            //$(".layui-btn").removeClass("layui-btn-disabled");
-        //        }
-        //    })
-        //});
-        //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
-        //    var sMainStr = JSON.stringify(data.field);
-        //    layer.open({
-        //        type: 2
-        //        , area: ['100%', '100%']
-        //        , title: '楠屾敹鍒楄〃'
-        //        , shade: 0.6 //閬僵閫忔槑搴�
-        //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-        //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-        //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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('璇烽�夋嫨鏁版嵁');
+                //璁剧疆鍗曟嵁鍙�
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1203' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
                     }
-                    $("#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('璇烽�夋嫨鏁版嵁');
+                });
+                //鐒︾偣
+                //element.tabChange('tab-Kf_SellOutBill', '3');
+                //var pFocus = $("#HBarCode");
+                //pFocus.focus();
+                //pFocus.select();
+                //鍒锋柊
+                var sInterID = $("#HInterID").val()
+                table.render({
+                    elem: '#wl-table'
+                    , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+                    , toolbar: '#toolbarDemo'
+                    , where: { HBillID: linterid, HBillType: '1203', sWhere: '' }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                        , { 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 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
                     }
-                    $("#HSecManager").val(checkStatus.data[0].HName);
-                    $("#HSecManagerID").val(checkStatus.data[0].HItemID);
-                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                }
-                , btn2: function (index, layero) { }
+                });
+            }
+            //
+
+            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_StockPlaceList.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
+            //        , area: ['100%', '100%']
+            //        , title: '淇濈鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            //form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+            //    var sMainStr = JSON.stringify(data.field);
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '楠屾敹鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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 () {
+                sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
             })
-        });
 
-
-
-        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 () {
-            sessionStorage["SourceFlag"] = false;
-            parent.location.href = "../../../views/index.html"
-            //window.close();//鍏抽棴褰撳墠椤�
-        })
-
-        form.on('submit(cmdModify)', function () {//缂栬緫
-            var sSubStr = table.cache['wl-table'];
-            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
@@ -576,151 +587,304 @@
                         //$(".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 = '1203'
-            var sAuxPropID = data[0].HAuxPropID
-            //var sMTONo = data[0].HMTONo
-            var sMTONo = ''
-            var sSourceInterID = data[0].HSourceInterID
-            var sSourceEntryID = data[0].HSourceEntryID
-            $.ajax(
-               {
-                   type: "Get",
-                   //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                   url: GetWEBURL() + "/OtherInBill/Delete_Json",
-                   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) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                           table.render({
-                               elem: '#wl-table'
-                                  , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                                  , toolbar: '#toolbarDemo'
-                                  , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
-                                  , cols: [[
-                                      { type: 'radio' }
-                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                    , { 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 }
-                                  ]]
-                                  , height: 500
-                                  , done: function () {
-                                      layer.closeAll("loading");
-                                  }
-                           });
-                       }
-                       else {
-                           layer.msg(data.Message, { icon: 2 });
-                       }
-                   },
-                   error: function (err) {
-                       layer.msg('閿欒' + err, {
-                           icon: 5,
-                           time: 20000
-                       }, function () {
-                           //do something
-                       });
-                   }
-               });
-        });
-
-        form.on('submit(Saver)', function (data) {//鎻愪氦
-            //鐏板害鎻愪氦鎸夐挳Saver  
-            document.getElementById("Saver").disabled = true;
-            //debugger;
-            data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
-            var sMainStr = JSON.stringify(data.field);
-            //var hOrgID = sessionStorage["OrganizationID"];
-            var sMain = sMainStr ;
-            var sSubStr = table.cache['wl-table'];
-            var sSourceType = $("#HBillType").val();
-            if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
-            {
-                layer.load(3);
+            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 = '1203'
+                var sAuxPropID = data[0].HAuxPropID
+                //var sMTONo = data[0].HMTONo
+                var sMTONo = ''
+                var sSourceInterID = data[0].HSourceInterID
+                var sSourceEntryID = data[0].HSourceEntryID
                 $.ajax(
+                    {
+                        type: "Get",
+                        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/OtherInBill/Delete_Json",
+                        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) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                        , { 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 }
+                                    ]]
+                                    , height: 500
+                                    , done: function () {
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 2 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, {
+                                icon: 5,
+                                time: 20000
+                            }, function () {
+                                //do something
+                            });
+                        }
+                    });
+            });
+
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //鐏板害鎻愪氦鎸夐挳Saver
+                document.getElementById("Saver").disabled = true;
+                //debugger;
+                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+                var sMainStr = JSON.stringify(data.field);
+                //var hOrgID = sessionStorage["OrganizationID"];
+                var sMain = sMainStr;
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = $("#HBillType").val();
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
                 {
-                    type: "POST",                    
-                        url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
-                     //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                        data: { "oMain": sMain },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message + $("#HBillNo").val(), { icon: 1 });
-                            //
-                            //Sub_ClearBill();
-                            //
-                            //鐏板害鎻愪氦鎸夐挳Saver  
-                            document.getElementById("Saver").disabled = false;
-                        }
-                        else {
-                            layer.msg(data.Message, { icon: 5 });
-                            //鐏板害鎻愪氦鎸夐挳Saver  
-                            document.getElementById("Saver").disabled = false;
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.msg("閿欒:" + err, { icon: 5 }); 
-                        //鐏板害鎻愪氦鎸夐挳Saver  
-                        document.getElementById("Saver").disabled = false;
-                    }
-                });
-            }
-            else
-            {
-                layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:" , { icon: 5 });
-                //鐏板害鎻愪氦鎸夐挳Saver  
-                document.getElementById("Saver").disabled = false;
-            }
-        });
-
-
-        //鐩戝惉鎻愪氦
-        form.verify({
-            numberOrEmpty: function (value, item) {
-                // if (value != '') {
-                if (!/^\d+$/.test(value)) {
-                    return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
+                            //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMain },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message + $("#HBillNo").val(), { icon: 1 });
+                                    //
+                                    //Sub_ClearBill();
+                                    //
+                                    //鐏板害鎻愪氦鎸夐挳Saver
+                                    document.getElementById("Saver").disabled = false;
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5 });
+                                    //鐏板害鎻愪氦鎸夐挳Saver
+                                    document.getElementById("Saver").disabled = false;
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5 });
+                                //鐏板害鎻愪氦鎸夐挳Saver
+                                document.getElementById("Saver").disabled = false;
+                            }
+                        });
                 }
+                else {
+                    layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
+                    //鐏板害鎻愪氦鎸夐挳Saver
+                    document.getElementById("Saver").disabled = false;
+                }
+            });
+
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //鎵粨浣�
+            $('#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);
+                                $("#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' });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+                }
+            });
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#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();
+            });
+
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://localhost:8083/OtherInStockBill/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+
+            function GetHWHValue(obj)  //杩斿洖浠撳簱
+            {
+                $("#HWHNAME").val(obj[0].HName);
+                //sessionStorage["HWHID"] = obj[0].HItemID;
+                $("#HWHID").val(obj[0].HItemID);
+            }
+            function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
+            }
+            //function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+            //    $("#HSupName").val(obj[0].HName);
+            //    $("#HSupID").val(obj[0].HItemID);
+            //}
+            function GetHKeeperValue(obj) {  //杩斿洖淇濈
+                $("#HKeeper").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
+            }
+            function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+            function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
+            }
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                //if ($("#HSourceBillNo").val() == '') {
+                //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+                //    return false;
                 //}
+                //if($("#HDeptName").val()=='')
+                //{
+                //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HSecManager").val() == '') {
+                //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HKeeper").val() == '') {
+                //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HSupName").val() == '') {
+                //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HWHNAME").val() == '') {
+                //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                if ($("#HBillNo").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5 });
+                    return false;
+                }
+                if ($("#HInterID").val() == '') {
+                    layer.msg("閿欒鐨勫唴鐮�!", { icon: 5 });
+                    return false;
+                }
+                if (sSubStr == '' || sSubStr.length == 0) {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5 });
+                    return false;
+                }
+                if (sSubStr != '') {
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                        if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                            if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                                layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5 });
+                                return false;
+                            }
+                        }
+                    }
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (parseFloat(sSubStr[i].HQty) > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        layer.msg("鍏朵粬鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
+                        return false;
+                    }
+                }
+                else {
+                    return true;
+                }
             }
-        });
-        $('#HBarCode').on('keydown', function (event) {  //鎵潯鐮�
-            var sSubStr = table.cache['wl-table'];
-            var sBarCode = $('#HBarCode').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            var sQty = $("#HQty").val()
-            var sHBillType = $("#HBillType").val()
-            var sHWHID = $("#HWHID").val()
-            var sHSPID = $("#HStockPlaceID").val()
-            var sSourceBillNo = $("#HSourceBillNo").val()
-            var HOrgID = $("#HOrgID").val();//缁勭粐
-            //var Flag = sessionStorage["SourceFlag"];
-            if (sQty == "") {
-                sQty = 0;
-            }
-            if (event.keyCode == 13) {
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sSubStr = table.cache['wl-table'];
+                var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sQty = $("#HQty").val()
+                var sHBillType = $("#HBillType").val()
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sSourceBillNo = $("#HSourceBillNo").val()
+                var HOrgID = $("#HOrgID").val();//缁勭粐
+                //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
                 if (sBarCode == '') {
                     playSound();
-                    layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                    layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
                 if (sBarCode != "") {
@@ -803,13 +967,13 @@
                             //$("#HDeptName").val(result.data.HDeptName);
                             layer.load(3)
                             table.render({
-                                elem: '#wl-table' 
-                                  , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                                  , toolbar: '#toolbarDemo'
-                                  , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
-                                 , cellMinWidth: 90
-                                  , cols: [[
-                                      { type: 'radio' }
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+                                , cellMinWidth: 90
+                                , cols: [[
+                                    { type: 'radio' }
                                     , { field: 'HQty', title: '鏁伴噺', width: 150 }
                                     , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
                                     , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
@@ -819,11 +983,11 @@
                                     , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
                                     , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
                                     , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                                  ]] 
-                                  , height: 500
-                                  , done: function () {
-                                      layer.closeAll("loading");
-                                  }
+                                ]]
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
                             });
                         }
                         else {
@@ -835,54 +999,27 @@
                     }
                 });
             }
-            //else
-            //{
-            //    layer.msg(result.Message, { icon: 5 });
-            //}
-            //layer.closeAll("loading");
-            //}
-        });
-
-        function playSound() {
-            var audio = document.getElementById("cs");
-            if (audio == null)
-                $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
-            var audio = document.getElementById("cs");
-            audio.play();
-        }
-
-        $('#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);
-                            $("#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' });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
-                // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+            function playSound() {
+                var audio = document.getElementById("cs");
+                if (audio == null)
+                    $("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+                var audio = document.getElementById("cs");
+                audio.play();
             }
-        });
-
-        $('#HSourceBillNo').on('keydown', function (event) {
-            var HSourceBillNo = $('#HSourceBillNo').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            if (event.keyCode == 13) {
+            function playSound1() {
+                var audio = document.getElementById("cs2");
+                audio.play();
+            }
+            //鎵簮鍗�
+            function GetMeesageBySourceBillNo(obj) {
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").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///OtherInStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                     url: GetWEBURL() + "/OtherInStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
@@ -895,26 +1032,26 @@
                                 elem: '#wl-table'
                                 //, url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
                                 , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
-                              , toolbar: '#toolbarDemo'
-                              , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
-                              , cols: [[
-                                  { type: 'radio' }
-                                , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                , { 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 }
-                              ]]
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { 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 }
+                                ]]
                                 // , data: [linterid]
                                 // , page: true
-                              , height: 500
-                              , done: function () {
-                                  layer.closeAll("loading");
-                              }
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
                             });
                         }
                         else {
@@ -925,114 +1062,9 @@
                         layer.closeAll("loading");
                     }
                 });
-               // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
             }
         });
 
-        table.render({
-            elem: '#mx-table'
-            // , url: 'http://localhost:8083/OtherInStockBill/GetHBarCodeShowBillSub'
-            //, toolbar: '#toolbarDemo'
-            // , where: { sMsg: linterid, sMsg2: lentryid }
-         , cols: [[
-           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-         ]]
-         , page: true
-         , height: 500
-         , done: function () {
-         }
-        });
-    });
-    function GetHWHValue(obj)  //杩斿洖浠撳簱
-    {
-        $("#HWHNAME").val(obj[0].HName);
-        //sessionStorage["HWHID"] = obj[0].HItemID;
-        $("#HWHID").val(obj[0].HItemID);
-    }
-    function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-        $("#HStockPlaceName").val(obj[0].HName);
-        $("#HStockPlaceID").val(obj[0].HItemID);
-    }
-    //function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
-    //    $("#HSupName").val(obj[0].HName);
-    //    $("#HSupID").val(obj[0].HItemID);
-    //}
-    function GetHKeeperValue(obj) {  //杩斿洖淇濈
-        $("#HKeeper").val(obj[0].HName);
-        $("#HKeeperID").val(obj[0].HItemID);
-    }
-    function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-        $("#HSecManager").val(obj[0].HName);
-        $("#HSecManagerID").val(obj[0].HItemID);
-    }
-    function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-        $("#HDeptName").val(obj[0].HName);
-        $("#HDeptID").val(obj[0].HItemID);
-    }
-    function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-        //if ($("#HSourceBillNo").val() == '') {
-        //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-        //    return false;
-        //}
-        //if($("#HDeptName").val()=='')
-        //{
-        //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HSecManager").val() == '') {
-        //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HKeeper").val() == '') {
-        //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HSupName").val() == '') {
-        //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        //if ($("#HWHNAME").val() == '') {
-        //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        if ($("#HBillNo").val() == '') {
-            layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5 });
-            return false;
-        }
-        if ($("#HInterID").val() == '') {
-            layer.msg("閿欒鐨勫唴鐮�!", { icon: 5 });
-            return false;
-        }
-        if(sSubStr=='' || sSubStr.length==0)
-        {
-            layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5 });
-            return false;
-        }
-        if (sSubStr != '') {
-            for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                    if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                    {
-                        layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5 });
-                        return false;
-                    }
-                }
-            }
-            for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                if (parseFloat(sSubStr[i].HQty) > 0) {
-                    s = 1;
-                }
-            }
-            if (s == 0) {
-                layer.msg("鍏朵粬鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }
-    }
     </script>
 
 </body>
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 57e9058..24d2070 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"
@@ -13,6 +13,9 @@
             height: auto;
             white-space: normal;
         }
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
     </style>
 </head>
 <body>
@@ -38,8 +41,11 @@
                             <div class="layui-col-xs3">
                                 <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
                             </div>
-                            <div class="layui-col-xs8">
+                            <div class="layui-col-xs5">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
                             </div>
                         </div>
                     </div>
@@ -72,6 +78,9 @@
                                         </div>
                                         <div class="layui-col-xs8">
                                             <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -526,8 +535,7 @@
             }
             else {
                 element.tabChange('tab-POStockInBill', '1');
-                //var pFocus = $("#HSourceBillNo");
-                var pFocus = $("#HBarCode");
+                var pFocus = $("#HSourceBillNo");
                 pFocus.focus();
                 pFocus.select();
             }
@@ -795,8 +803,212 @@
                 }
             });
 
+            
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#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 });
+                }
+            });
+            //鍒锋柊鏄庣粏椤电
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+
+            //鎵玀ES浠撲綅
+            $('#HMESSPName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HMESSPName').val();
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                $("#HMESSPID").val(result.data[0].HWHID);
+                                $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+                                $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+                                $.ajax({
+                                    url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+                                    type: "GET",
+                                    data: { "HERPWHID": result.data[0].HWHID },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            $("#HWHID").val(result.data[0].HMESWHID);
+                                            $("#HWHNAME").val(result.data[0].HMESWHNAME);
+                                            $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+                                            $("#HMESSPName").css("background-color", "#efefef4d");
+                                        }
+                                        else {
+                                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
+            //浠ヤ笂涓簂ayui妯″潡
+
+            function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+            {
+                $("#HWHNAME").val(obj[0].HName);
+                //sessionStorage["HWHID"] = obj[0].HItemID;
+                $("#HWHID").val(obj[0].HItemID);
+            }
+            function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
+            }
+            function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
+            }
+            function GetHKeeperValue(obj) {  //杩斿洖淇濈
+                $("#HKeeper").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
+            }
+            function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+            function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
+            }
+            function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
+                //if ($("#HSourceBillNo").val() == '') {
+                //    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 ($("#HSupName").val() == '') {
+                //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                //    return false;
+                //}
+                //if ($("#HWHNAME").val() == '') {
+                //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                if ($("#HBillNo").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HInterID").val() == '') {
+                    layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (typeof (sSubStr) == "undefined") {
+                    //layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (bnt == 'Saver') {
+                    if (!typeof (sSubStr) == "undefined") {
+                        //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                        //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                        //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                        //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                        //            return false;
+                        //        }
+                        //    }
+                        //}
+                        for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                            if (parseFloat(sSubStr[i].HQty) > 0) {
+                                s = 1;
+                            }
+                        }
+                        if (s == 0) {
+                            layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                    }
+                }
+                else {
+                    return true;
+                }
+            }
             //鎵潯鐮�
-            $('#HBarCode').on('keydown', function (event) {  //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
                 var sSubStr = table.cache['wl-table'];
                 var sBarCode = $('#HBarCode').val()
                 var sInterID = $("#HInterID").val()
@@ -807,186 +1019,165 @@
                 var sHWHID = $("#HWHID").val()
                 var sHSPID = $("#HStockPlaceID").val()
                 var sSourceBillNo = $("#HSourceBillNo").val()
-                var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠$悊
-                var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊
-                // var Flag = sessionStorage["SourceFlag"];
-                if (sQty == "") {
-                    sQty = 0;
+
+                //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
+                if (sBarCode == '') {
+                    playSound();
+                    layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
                 }
-                if (event.keyCode == 13) {
-                    //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
-                    if (sBarCode == '') {
+                if (sBarCode != "") {
+                    $('#HBarCode').val("");
+                }
+                if (sQty != "") {
+                    $('#HQty').val("");
+                }
+                if (sHWHID == "184154") {
+                    if (sHSPID == "0") {
                         playSound();
-                        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;
                     }
-                    if (sBarCode != "") {
-                        $('#HBarCode').val("");
-                    }
-                    if (sQty != "") {
-                        $('#HQty').val("");
-                    }
-                    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() + "/POStockInBill/get_CheckTypeByBarCode_Json",
-                        type: "GET",
-                        data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": true, "sSourceBillNo": sSourceBillNo, "sSourceType": '1103', "HOWNERID": sessionStorage["OrganizationID"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                playSound1();
-                                if (result.data.HBarType == '浠撳簱鏉$爜') {
-                                    $("#HWHNAME").val(result.data.HWhName);
-                                    $("#HWHID").val(result.data.HWhID);
-                                    $("#HStockPlaceName").val("");
-                                    $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
-                                    element.tabChange('tab-POStockInBill', '2');  //璺宠浆椤电
-                                }
-                                else if (result.data.HBarType == '浠撲綅鏉$爜') {
-                                    $("#HStockPlaceName").val(result.data.HSPName);
-                                    $("#HStockPlaceID").val(result.data.HSPID);
-                                    $("#HWHNAME").val(result.data.HWhName);
-                                    $("#HWHID").val(result.data.HWhID);
-                                    $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
-                                    element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
-                                }
-                                else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
-                                    $("#HDeptName").val(result.data.HDeptName);
-                                    $("#HDeptID").val(result.data.HDeptID);
-                                    $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
-                                    element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
-                                }
-                                else if (result.data.HBarType == '婧愬崟鏉$爜') {
-                                    $("#HSupName").val(result.data.HSupName);
-                                    $("#HSupID").val(result.data.HSupID);
-                                    $("#HDeptName").val(result.data.HDeptName);
-                                    $("#HDeptID").val(result.data.HDeptID);
-                                    $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                    sessionStorage["SourceFlag"] = true;
-                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                    if (result.data.HSourceBillType == "1102") {
-                                        $("#HBillType").val("1102");
+                }
+                $.ajax({
+                    url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
+                    type: "GET",
+                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": true, "sSourceBillNo": sSourceBillNo, "sSourceType": '1103', "HOWNERID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            playSound1();
+                            if (result.data.HBarType == '浠撳簱鏉$爜') {
+                                $("#HWHNAME").val(result.data.HWhName);
+                                $("#HWHID").val(result.data.HWhID);
+                                $("#HStockPlaceName").val("");
+                                $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+                                element.tabChange('tab-POStockInBill', '2');  //璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '浠撲綅鏉$爜') {
+                                $("#HStockPlaceName").val(result.data.HSPName);
+                                $("#HStockPlaceID").val(result.data.HSPID);
+                                $("#HWHNAME").val(result.data.HWhName);
+                                $("#HWHID").val(result.data.HWhID);
+                                $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+                                element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
+                                $("#HDeptName").val(result.data.HDeptName);
+                                $("#HDeptID").val(result.data.HDeptID);
+                                $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+                                element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '婧愬崟鏉$爜') {
+                                $("#HSupName").val(result.data.HSupName);
+                                $("#HSupID").val(result.data.HSupID);
+                                $("#HDeptName").val(result.data.HDeptName);
+                                $("#HDeptID").val(result.data.HDeptID);
+                                $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                sessionStorage["SourceFlag"] = true;
+                                //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                if (result.data.HSourceBillType == "1102") {
+                                    $("#HBillType").val("1102");
 
-                                    }
-                                    else if (result.data.HSourceBillType == "1103") {
-                                        $("#HBillType").val("1103");
-                                    }
-                                    else {
-                                        $("#HBillType").val("鎵嬪伐褰曞叆");
-                                    }
-                                    $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+                                }
+                                else if (result.data.HSourceBillType == "1103") {
+                                    $("#HBillType").val("1103");
+                                }
+                                else {
+                                    $("#HBillType").val("鎵嬪伐褰曞叆");
+                                }
+                                $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+                                element.tabChange('tab-POStockInBill', '3');
+                            }
+                            else {
+                                if (sessionStorage["SourceFlag"] == "true") {
                                     element.tabChange('tab-POStockInBill', '3');
                                 }
                                 else {
-                                    if (sessionStorage["SourceFlag"] == "true") {
-                                        element.tabChange('tab-POStockInBill', '3');
+                                    $("#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);
+                                    sessionStorage["SourceFlag"] = true;
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                    if (result.data.hSourceBillTypeField == "1102") {
+                                        $("#HBillType").val("1102");
+                                    }
+                                    $("#HNote").val(";鐗╂枡鏉$爜");
+                                    element.tabChange('tab-POStockInBill', '3');
+                                }
+                            }
+
+                            layer.load(3)
+                            $.ajax({
+                                url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
+                                type: "GET",
+                                data: { HBillID: sInterID, HBillType: '1201', sWhere: '' },
+                                success: function (result) {
+                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        listOption.data = result.data.list;
+                                        table.render(listOption);
+                                        $("#HBarCode_B").val(result.data.list1[0].HBarCode);
+                                        $("#HMaterName_B").val(result.data.list1[0].HMaterName);
+                                        $("#HMaterModel_B").val(result.data.list1[0].HMaterModel);
+                                        $("#HBatchNo_B").val(result.data.list1[0].HBatchNo);
+                                        $("#HUnitName_B").val(result.data.list1[0].HUnitName);
+                                        $("#HQty_B").val(result.data.list1[0].HQty);
+                                        $("#HTMQty_B").val(result.data.list1[0].HTMQty);
+                                        $("#HWHName_B").val(result.data.list1[0].HWHName);
+                                        $("#HSPName_B").val(result.data.list1[0].HSPName);
                                     }
                                     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);
-                                        sessionStorage["SourceFlag"] = true;
-                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                        if (result.data.hSourceBillTypeField == "1102") {
-                                            $("#HBillType").val("1102");
-                                        }
-                                        else if (result.data.hSourceBillTypeField == "1103") {
-                                            $("#HBillType").val("1103");
-                                        }
-                                        else {
-                                            $("#HBillType").val("鎵嬪伐褰曞叆");
-                                        }
-                                        $("#HNote").val(";鐗╂枡鏉$爜");
-                                        element.tabChange('tab-POStockInBill', '4');
+                                        layer.msg(result.Message);
                                     }
+                                    layer.closeAll("loading");
                                 }
-
-                                layer.load(3)
-                                table.render({
-                                    elem: '#wl-table'
-                                    , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
-                                    , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
-                                    , cellMinWidth: 115
-                                    , 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");
-                                    }
-                                });
-
-                                $.ajax({
-                                    url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
-                                    type: "GET",
-                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
-                                    //data: { HBillID: sInterID, HBillType: '1201', sWhere: '' },
-                                    success: function (result) {
-                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                            //listOption.data = result.data.list;
-                                            table.render(result.data.list);
-                                            $("#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);
-                                        }
-                                        else {
-                                            layer.msg(result.Message);
-                                        }
-                                        layer.closeAll("loading");
-                                    }
-                                });
-                            }
-                            else {
-                                playSound();
-                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                            layer.closeAll("loading");
+                            });
                         }
-                    });
+                        else {
+                            playSound();
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+            var listOption = {
+                elem: '#wl-table'
+                , toolbar: '#toolbarDemo'
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HSNO', title: '搴忓彿', width: 60 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+                    , { 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 }
+                ]]
+                , 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();
-        }
-
-        
-        //鎵簮鍗�
-        $('#HSourceBillNo').on('keydown', function (event) {      //鎵簮鍗�
-            var HSourceBillNo = $('#HSourceBillNo').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            var HSourceBillType = $("#HBillType").val()
-            if (event.keyCode == 13) {
-                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+            }
+            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()
+                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;
@@ -1001,8 +1192,6 @@
                         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;
                             layer.load(3);
                             element.tabChange('tab-POStockInBill', '2');
@@ -1041,185 +1230,10 @@
                         layer.closeAll("loading");
                     }
                 });
-                // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
             }
         });
 
-        //鎵粨浣�
-        $('#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 });
-            }
-        });
-        //鍒锋柊鏄庣粏椤电
-        table.render({
-            elem: '#mx-table'
-            // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
-            //, toolbar: '#toolbarDemo'
-            // , where: { sMsg: linterid, sMsg2: lentryid }
-            , cols: [[
-                , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-            ]]
-            , page: true
-            , height: 500
-            , done: function () {
-            }
-        });
-
-        //鎵玀ES浠撲綅
-        $('#HMESSPName').on('keydown', function (event) {      //鎵粨浣�
-            var HBarCode = $('#HMESSPName').val();
-            if (event.keyCode == 13) {
-                $.ajax({
-                    url: GetWEBURL() + "/LookingFor/getSpName_Json",
-                    type: "GET",
-                    data: { "HBarCode": HBarCode },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            $("#HMESSPID").val(result.data[0].HWHID);
-                            $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
-                            $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
-                            $.ajax({
-                                url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
-                                type: "GET",
-                                data: { "HERPWHID": result.data[0].HWHID },
-                                success: function (result) {
-                                    if (result.count == 1) {
-                                        $("#HWHID").val(result.data[0].HMESWHID);
-                                        $("#HWHNAME").val(result.data[0].HMESWHNAME);
-                                        $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
-                                        $("#HMESSPName").css("background-color", "#efefef4d");
-                                    }
-                                    else {
-                                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                    }
-                                    layer.closeAll("loading");
-                                }
-                            });
-                        }
-                        else {
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
-            }
-        });
-
-                //浠ヤ笂涓簂ayui妯″潡
-            });
-
-        function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
-        {
-            $("#HWHNAME").val(obj[0].HName);
-            //sessionStorage["HWHID"] = obj[0].HItemID;
-            $("#HWHID").val(obj[0].HItemID);
-        }
-        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-            $("#HStockPlaceName").val(obj[0].HName);
-            $("#HStockPlaceID").val(obj[0].HItemID);
-        }
-        function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
-            $("#HSupName").val(obj[0].HName);
-            $("#HSupID").val(obj[0].HItemID);
-        }
-        function GetHKeeperValue(obj) {  //杩斿洖淇濈
-            $("#HKeeper").val(obj[0].HName);
-            $("#HKeeperID").val(obj[0].HItemID);
-        }
-        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-            $("#HSecManager").val(obj[0].HName);
-            $("#HSecManagerID").val(obj[0].HItemID);
-        }
-        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-            $("#HDeptName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-        }
-        function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    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 ($("#HSupName").val() == '') {
-            //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-            //    return false;
-            //}
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if (typeof (sSubStr) == "undefined") {
-                //layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if (bnt == 'Saver') {
-                if (!typeof (sSubStr) == "undefined") {
-                    //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                    //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                    //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
-                    //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                    //            return false;
-                    //        }
-                    //    }
-                    //}
-                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                        if (parseFloat(sSubStr[i].HQty) > 0) {
-                            s = 1;
-                        }
-                    }
-                    if (s == 0) {
-                        layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
-                    }
-                }
-            }
-            else {
-                return true;
-            }
-        }
+        
     </script>
 
 </body>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index fee2447..6cfe4dd 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -8,6 +8,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
 </head>
 
 <body>
@@ -36,6 +41,9 @@
                             <div class="layui-col-xs8">
                                 <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                             </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+                            </div>
                         </div>
                     </div>
                     <div class="layui-tab layui-col-xs12" lay-filter="tab-Kf_EntrustInBill">
@@ -58,8 +66,8 @@
                                             <input type="hidden" value="1103" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
 
                                             <!--<select name="HBillType" id="HBillType">
-                                <option value="1103">鏀舵枡閫氱煡鍗�-濮斿</option>
-                            </select>-->
+                                                <option value="1103">鏀舵枡閫氱煡鍗�-濮斿</option>
+                                            </select>-->
                                         </div>
                                     </div>
                                     <div class="layui-row">
@@ -68,6 +76,9 @@
                                         </div>
                                         <div class="layui-col-xs8">
                                             <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
                                         </div>
                                     </div>
                                 </div>
@@ -472,8 +483,8 @@
             //        }
             //    })
             //});
-
-            form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+            //閫夋嫨淇濈
+            form.on('submit(HKeeperID-BT)', function () {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -495,7 +506,8 @@
                     , btn2: function (index, layero) { }
                 })
             });
-            form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨鍙戣揣
+            //閫夋嫨鍙戣揣
+            form.on('submit(HSecManagerID-BT)', function (data) {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -517,8 +529,6 @@
                     , btn2: function (index, layero) { }
                 })
             });
-
-
             //閫夋嫨閮ㄩ棬
             form.on('submit(HDeptID-BT)', function () {
                 layer.open({
@@ -535,7 +545,6 @@
                     }
                 })
             });
-
             //缂栬緫鎸夐挳
             form.on('submit(cmdModify)', function () {
                 var sSubStr = table.cache['wl-table'];
@@ -629,260 +638,30 @@
 
             //鎵潯鐮�
             $('#HBarCode').on('keydown', function (event) {
-                var sSubStr = table.cache['wl-table'];
-                var sBarCode = $('#HBarCode').val()
-                var sInterID = $("#HInterID").val()
-                var sBillNo = $("#HBillNo").val()
-                var sQty = $("#HQty").val()
-                var sHBillType = $("#HBillType").val()
-                var sHWHID = $("#HWHID").val()
-                var sHSPID = $("#HStockPlaceID").val()
-                var sSourceBillNo = $("#HSourceBillNo").val()
                 if (sQty == "") {
                     sQty = 0;
                 }
-                //if ($("#HSourceBillNo").val() == '') {
-                //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-                //    return false;
-                //}
-                //if ($("#HDeptName").val() == '') {
-                //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
-                //    return false;
-                //}
-                //if ($("#HSecManager").val() == '') {
-                //    layer.msg("鍙戞枡浜烘病鏈夐�夋嫨!", { icon: 5 });
-                //    return false;
-                //}
-                //if ($("#HKeeper").val() == '') {
-                //    layer.msg("棰嗘枡浜烘病鏈夐�夋嫨!", { icon: 5 });
-                //    return false;
-                //}
-                //if ($("#HSupName").val() == '') {
-                //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
-                //    return false;
-                //}
-                //if ($("#HWHNAME").val() == '') {
-                //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-                //    return false;
-                //}
                 if (event.keyCode == 13) {
-                    //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
-                    if (sBarCode == '') {
-                        playSound();
-                        layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
-                    }
-                    if (sBarCode != "") {
-                        $('#HBarCode').val("");
-                    }
-                    if (sQty != "") {
-                        $('#HQty').val("");
-                    }
-                    //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
-                    $.ajax({
-                        //url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/get_CheckTypeByBarCode_Json",
-                        url: GetWEBURL() + "/Kf_EntrustInBill/get_CheckTypeByBarCode_Json",
-                        type: "GET",
-                        data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                playSound1();
-                                if (result.data.HBarType == '浠撳簱鏉$爜') {
-                                    $("#HWHNAME").val(result.data.HWhName);
-                                    $("#HWHID").val(result.data.HWhID);
-                                    $("#HStockPlaceName").val("");
-                                    //$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
-                                    $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佷粨搴撴潯鐮侊紝鎴愬姛\n");
-                                    element.tabChange('tab-Kf_EntrustInBill', '2');  //璺宠浆椤电
-                                }
-                                else if (result.data.HBarType == '浠撲綅鏉$爜') {
-                                    $("#HStockPlaceName").val(result.data.HSPName);
-                                    $("#HStockPlaceID").val(result.data.HSPID);
-                                    $("#HWHNAME").val(result.data.HWhName);
-                                    $("#HWHID").val(result.data.HWhID);
-                                    //$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
-                                    $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佷粨浣嶆潯鐮侊紝鎴愬姛\n");
-                                    element.tabChange('tab-Kf_EntrustInBill', '2');//璺宠浆椤电
-                                }
-                                else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
-                                    $("#HDeptName").val(result.data.HDeptName);
-                                    $("#HDeptID").val(result.data.HDeptID);
-                                    //$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
-                                    $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮侀儴闂ㄦ潯鐮侊紝鎴愬姛\n");
-                                    element.tabChange('tab-Kf_EntrustInBill', '2');//璺宠浆椤电
-                                }
-                                else if (result.data.HBarType == '婧愬崟鏉$爜') {
-                                    $("#HSupName").val(result.data.HSupName);
-                                    $("#HSupID").val(result.data.HSupID);
-                                    $("#HDeptName").val(result.data.HDeptName);
-                                    $("#HDeptID").val(result.data.HDeptID);
-                                    $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                    Flag = true;
-                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                    if (result.data.HSourceBillType == "1103") {
-                                        $("#HBillType").val("1103");
-
-                                    }
-                                    else if (result.data.HSourceBillType == "1601") {
-                                        $("#HBillType").val("1601");
-                                    }
-                                    else {
-                                        $("#HBillType").val("鎵嬪伐褰曞叆");
-                                    }
-                                    //$("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
-                                    $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佹簮鍗曟潯鐮侊紝鎴愬姛\n");
-                                    element.tabChange('tab-Kf_EntrustInBill', '3');
-                                }
-                                else {
-                                    if (Flag == "true") {
-                                        element.tabChange('tab-Kf_EntrustInBill', '3');
-                                    }
-                                    else {
-                                        //$("#HSupName").val(result.data.HSupName);                20210719淇敼
-                                        //$("#HSupID").val(result.data.HSupID);                    20210719淇敼
-                                        //$("#HDeptName").val(result.data.HDeptName);
-                                        //$("#HDeptID").val(result.data.HDeptID);
-                                        $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                        Flag = true;
-                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                        if (result.data.HSourceBillType == "1103") {
-                                            $("#HBillType").val("1103");
-
-                                        }
-                                        else if (result.data.HSourceBillType == "1601") {
-                                            $("#HBillType").val("1601");
-                                        }
-                                        else {
-                                            $("#HBillType").val("鎵嬪伐褰曞叆");
-                                        }
-                                        //$("#HNote").val(";鐗╂枡鏉$爜");
-                                        $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佺墿鏂欐潯鐮侊紝鎴愬姛\n");
-                                        element.tabChange('tab-Kf_EntrustInBill', '3');
-                                    }
-                                }
-                                //$("#HSupID").val(result.data.HSupID);
-                                //$("#HSupName").val(result.data.HSupName);
-                                //$("#HDeptID").val(result.data.HDeptID);
-                                //$("#HDeptName").val(result.data.HDeptName);
-                                layer.load(3)
-                                table.render({
-                                    elem: '#wl-table'
-                                    , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
-                                    , toolbar: '#toolbarDemo'
-                                    , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
-                                    , cellMinWidth: 90
-                                    , cols: [[
-                                        { type: 'radio' }
-                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                        , { 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 }
-                                    ]]
-                                    , height: 500
-                                    , done: function () {
-                                        layer.closeAll("loading");
-                                    }
-                                });
-                            }
-                            else {
-                                // $("#verifycode").click();
-                                //layer.msg(result.Message, { icon: 5 });
-                                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: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    GetMeesageByBarCode
                 }
-                //else
-                //{
-                //    layer.msg(result.Message, { icon: 5 });
-                //}
-                //layer.closeAll("loading");
-                //}
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
             });
 
 
-            function playSound() {
-                var audio = document.getElementById("cs");
-                audio.play();
-            }
-
-            function playSound1() {
-                var audio = document.getElementById("cs2");
-                audio.play();
-            }
-
-            //鎵簮鍗曟柟娉�
+            //鎵簮鍗�
             $('#HSourceBillNo').on('keydown', function (event) {
-                var HSourceBillNo = $('#HSourceBillNo').val()
-                var sInterID = $("#HInterID").val()
-                var sBillNo = $("#HBillNo").val()
-                var HSourceBillType = $("#HBillType").val()
                 if (event.keyCode == 13) {
-                    $.ajax({
-                        //url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
-                        url: GetWEBURL() + "/Kf_EntrustInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
-                        type: "GET",
-                        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
-                        success: function (result) {
-                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                playSound1();
-                                $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵簮鍗曪紝鎴愬姛\n");
-                                $("#HSupID").val(result.data[0].HSupID);
-                                $("#HSupName").val(result.data[0].HSupName);
-                                //$("#HDeptID").val(result.data[0].HDeptID);
-                                //$("#HDeptName").val(result.data[0].HDeptName);
-                                Flag = true;
-                                layer.load(3);
-                                element.tabChange('tab-Kf_EntrustInBill', '2');
-                                table.render({
-                                    elem: '#wl-table'
-                                    //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
-                                    , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
-                                    , toolbar: '#toolbarDemo'
-                                    , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
-                                    , cols: [[
-                                        { type: 'radio' }
-                                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-                                        , { 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 }
-                                    ]]
-                                    // , data: [linterid]
-                                    // , page: true
-                                    , height: 500
-                                    , done: function () {
-                                        layer.closeAll("loading");
-                                    }
-                                });
-                            }
-                            else {
-                                // $("#verifycode").click();
-                                //layer.msg(result.Message, { icon: 5 });
-                                playSound();
-                                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 });
+                    GetMeesageBySourceBillNo();
                 }
             });
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                GetMeesageBySourceBillNo();
+            });
+
 
             //鎵粨浣�
             $('#HStockPlaceName').on('keydown', function (event) {
@@ -962,139 +741,336 @@
                     });
                 }
             });
-
-            //浠ヤ笂涓簂ayui妯″潡
-        });
-        //娓呯┖琛ㄥご
-        //function f_ClearTitle() {
-
-        //    $("#HBarCode").val("");
-        //    $("#HSpName").val("");
-        //    $("#HSpID").val("0");
-        //    $("#HQty").val("0");
-        //    $("#HSourceBillNo").val("");
-        //    $("#HWHNAME").val("");
-        //    $("#HWHID").val("0");
-        //    $("#HSCWHNAME").val("");
-        //    $("#HSCWHID").val("0");
-        //    $("#HSupName").val("");
-        //    $("#HSupID").val("0");
-        //    $("#HKeeper").val("");
-        //    $("#HKeeperID").val("0");
-        //    $("#HSecManager").val("0");
-        //    $("#HSecManagerID").val("");
-        //    $("#HDeptName").val("");
-        //    $("#HDeptID").val("0");
-        //    $("#HBillNo").val("");
-        //    $("#HInterID").val("0");
-        //}
-        function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
-        {
-            $("#HWHNAME").val(obj[0].HName);
-            //sessionStorage["HWHID"] = obj[0].HItemID;
-            $("#HWHID").val(obj[0].HItemID);
-        }
-        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-            $("#HStockPlaceName").val(obj[0].HName);
-            $("#HStockPlaceID").val(obj[0].HItemID);
-        }
-        function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
-            $("#HSupName").val(obj[0].HName);
-            $("#HSupID").val(obj[0].HItemID);
-        }
-        function GetHKeeperValue(obj) {  //杩斿洖淇濈
-            $("#HKeeper").val(obj[0].HName);
-            $("#HKeeperID").val(obj[0].HItemID);
-        }
-        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-            $("#HSecManager").val(obj[0].HName);
-            $("#HSecManagerID").val(obj[0].HItemID);
-        }
-        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-            $("#HDeptName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-        }
-        //function Get_CheckWhAndSP(sInterID, sHBillType, sBarCode, sHWHID, sHSPID) {   //杩斿洖閮ㄩ棬
-        //    $.ajax({
-        //        url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/Get_CheckWhAndSP_Josn",
-        //        type: "GET",
-        //        data: { "sHInterID": sInterID, "sHBillType": sHBillType, "sBarCode": sBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID },
-        //        success: function (result) {
-        //            if(result.count==1)
-        //            {
-        //               // layer.msg(result.Message, { icon: 1 });
-        //                return true;
-        //            }
-        //            else
-        //            {
-        //                layer.msg(result.Message, { icon: 5 });
-        //                return false;
-        //            }
-        //        }
-        //    })
-        //}
-        function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HDeptName").val() == '') {
-            //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HSecManager").val() == '') {
-            //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HKeeper").val() == '') {
-            //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HSupName").val() == '') {
-            //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+            {
+                $("#HWHNAME").val(obj[0].HName);
+                //sessionStorage["HWHID"] = obj[0].HItemID;
+                $("#HWHID").val(obj[0].HItemID);
             }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
             }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+                $("#HSupName").val(obj[0].HName);
+                $("#HSupID").val(obj[0].HItemID);
             }
-            if (bnt == 'Saver') {
-                if (!typeof (sSubStr) == "undefined") {
-                    for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                        if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                            if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
-                                layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                return false;
+            function GetHKeeperValue(obj) {  //杩斿洖淇濈
+                $("#HKeeper").val(obj[0].HName);
+                $("#HKeeperID").val(obj[0].HItemID);
+            }
+            function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+            function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+                $("#HDeptName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
+            }
+            //function Get_CheckWhAndSP(sInterID, sHBillType, sBarCode, sHWHID, sHSPID) {   //杩斿洖閮ㄩ棬
+            //    $.ajax({
+            //        url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/Get_CheckWhAndSP_Josn",
+            //        type: "GET",
+            //        data: { "sHInterID": sInterID, "sHBillType": sHBillType, "sBarCode": sBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID },
+            //        success: function (result) {
+            //            if(result.count==1)
+            //            {
+            //               // layer.msg(result.Message, { icon: 1 });
+            //                return true;
+            //            }
+            //            else
+            //            {
+            //                layer.msg(result.Message, { icon: 5 });
+            //                return false;
+            //            }
+            //        }
+            //    })
+            //}
+            function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
+                //if ($("#HSourceBillNo").val() == '') {
+                //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HDeptName").val() == '') {
+                //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HSecManager").val() == '') {
+                //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HKeeper").val() == '') {
+                //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HSupName").val() == '') {
+                //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                //if ($("#HWHNAME").val() == '') {
+                //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+                //    return false;
+                //}
+                if ($("#HBillNo").val() == '') {
+                    layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HInterID").val() == '') {
+                    layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (typeof (sSubStr) == "undefined") {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (bnt == 'Saver') {
+                    if (!typeof (sSubStr) == "undefined") {
+                        for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                            if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                                if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                                    layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    return false;
+                                }
                             }
                         }
-                    }
-                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                        if (parseFloat(sSubStr[i].HQty) > 0) {
-                            s = 1;
+                        for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                            if (parseFloat(sSubStr[i].HQty) > 0) {
+                                s = 1;
+                            }
+                        }
+                        if (s == 0) {
+                            layer.msg("濮斿鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
                         }
                     }
-                    if (s == 0) {
-                        layer.msg("濮斿鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
-                    }
+                }
+                else {
+                    return true;
                 }
             }
-            else {
-                return true;
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sSubStr = table.cache['wl-table'];
+                var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sQty = $("#HQty").val()
+                var sHBillType = $("#HBillType").val()
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sSourceBillNo = $("#HSourceBillNo").val()
+
+                //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
+                if (sBarCode == '') {
+                    playSound();
+                    layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (sBarCode != "") {
+                    $('#HBarCode').val("");
+                }
+                if (sQty != "") {
+                    $('#HQty').val("");
+                }
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/get_CheckTypeByBarCode_Json",
+                    url: GetWEBURL() + "/Kf_EntrustInBill/get_CheckTypeByBarCode_Json",
+                    type: "GET",
+                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            playSound1();
+                            if (result.data.HBarType == '浠撳簱鏉$爜') {
+                                $("#HWHNAME").val(result.data.HWhName);
+                                $("#HWHID").val(result.data.HWhID);
+                                $("#HStockPlaceName").val("");
+                                //$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+                                $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佷粨搴撴潯鐮侊紝鎴愬姛\n");
+                                element.tabChange('tab-Kf_EntrustInBill', '2');  //璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '浠撲綅鏉$爜') {
+                                $("#HStockPlaceName").val(result.data.HSPName);
+                                $("#HStockPlaceID").val(result.data.HSPID);
+                                $("#HWHNAME").val(result.data.HWhName);
+                                $("#HWHID").val(result.data.HWhID);
+                                //$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+                                $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佷粨浣嶆潯鐮侊紝鎴愬姛\n");
+                                element.tabChange('tab-Kf_EntrustInBill', '2');//璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
+                                $("#HDeptName").val(result.data.HDeptName);
+                                $("#HDeptID").val(result.data.HDeptID);
+                                //$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+                                $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮侀儴闂ㄦ潯鐮侊紝鎴愬姛\n");
+                                element.tabChange('tab-Kf_EntrustInBill', '2');//璺宠浆椤电
+                            }
+                            else if (result.data.HBarType == '婧愬崟鏉$爜') {
+                                $("#HSupName").val(result.data.HSupName);
+                                $("#HSupID").val(result.data.HSupID);
+                                $("#HDeptName").val(result.data.HDeptName);
+                                $("#HDeptID").val(result.data.HDeptID);
+                                $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                Flag = true;
+                                //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                if (result.data.HSourceBillType == "1103") {
+                                    $("#HBillType").val("1103");
+
+                                }
+                                else if (result.data.HSourceBillType == "1601") {
+                                    $("#HBillType").val("1601");
+                                }
+                                else {
+                                    $("#HBillType").val("鎵嬪伐褰曞叆");
+                                }
+                                //$("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+                                $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佹簮鍗曟潯鐮侊紝鎴愬姛\n");
+                                element.tabChange('tab-Kf_EntrustInBill', '3');
+                            }
+                            else {
+                                if (Flag == "true") {
+                                    element.tabChange('tab-Kf_EntrustInBill', '3');
+                                }
+                                else {
+                                    //$("#HSupName").val(result.data.HSupName);                20210719淇敼
+                                    //$("#HSupID").val(result.data.HSupID);                    20210719淇敼
+                                    //$("#HDeptName").val(result.data.HDeptName);
+                                    //$("#HDeptID").val(result.data.HDeptID);
+                                    $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                    Flag = true;
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                    if (result.data.HSourceBillType == "1103") {
+                                        $("#HBillType").val("1103");
+
+                                    }
+                                    else if (result.data.HSourceBillType == "1601") {
+                                        $("#HBillType").val("1601");
+                                    }
+                                    else {
+                                        $("#HBillType").val("鎵嬪伐褰曞叆");
+                                    }
+                                    //$("#HNote").val(";鐗╂枡鏉$爜");
+                                    $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮佺墿鏂欐潯鐮侊紝鎴愬姛\n");
+                                    element.tabChange('tab-Kf_EntrustInBill', '3');
+                                }
+                            }
+                            //$("#HSupID").val(result.data.HSupID);
+                            //$("#HSupName").val(result.data.HSupName);
+                            //$("#HDeptID").val(result.data.HDeptID);
+                            //$("#HDeptName").val(result.data.HDeptName);
+                            layer.load(3)
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
+                                , cellMinWidth: 90
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { 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 }
+                                ]]
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                            // $("#verifycode").click();
+                            //layer.msg(result.Message, { icon: 5 });
+                            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: "娓╅Θ鎻愮ず" });
+                    }
+                });
             }
-        }
+            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()
+                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///Kf_EntrustInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    url: GetWEBURL() + "/Kf_EntrustInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    type: "GET",
+                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            playSound1();
+                            $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵簮鍗曪紝鎴愬姛\n");
+                            $("#HSupID").val(result.data[0].HSupID);
+                            $("#HSupName").val(result.data[0].HSupName);
+                            //$("#HDeptID").val(result.data[0].HDeptID);
+                            //$("#HDeptName").val(result.data[0].HDeptName);
+                            Flag = true;
+                            layer.load(3);
+                            element.tabChange('tab-Kf_EntrustInBill', '2');
+                            table.render({
+                                elem: '#wl-table'
+                                //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+                                , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                                    , { 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 }
+                                ]]
+                                // , data: [linterid]
+                                // , page: true
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                            // $("#verifycode").click();
+                            //layer.msg(result.Message, { icon: 5 });
+                            playSound();
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+
     </script>
 
 </body>

--
Gitblit v1.9.1