From bc98c6f8166a69604ef2cdccb30a08706c85baca Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 09 五月 2022 09:55:47 +0800
Subject: [PATCH] 1

---
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html          |  127 +
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Check_New.html     | 1027 ++++++++++++++
 WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html          |  495 +++++-
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html          |   19 
 WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html            |   59 
 WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastCheck.html       | 1031 ++++++++++++++
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_CheckList_New.html |  228 +++
 WebTM/views/领料发货/领料出库/Kf_MateOutBill_CheckList_New.html   |  228 +++
 WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNewList.html |    4 
 WebTM/views/home/console_Mobile.html                      |   12 
 WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html            |  108 +
 WebTM/views/领料发货/领料出库/Kf_MateOutBill_Check_New.html       |  966 +++++++++++++
 WebTM/WebTM.csproj                                        |    5 
 13 files changed, 4,102 insertions(+), 207 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 4a8fa25..ff94536 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -140,6 +140,8 @@
     <Content Include="views\video\1.wav" />
     <Content Include="views\video\jingbao.wav" />
     <Content Include="views\video\success.wav" />
+    <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockBill_CheckList_New.html" />
+    <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Check_New.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockRequestBillList.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockStepOutBill_Fast.html" />
     <Content Include="views\浠撳瓨绠$悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillList.html" />
@@ -970,6 +972,9 @@
     <Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
     <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBillLEdit.html" />
     <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBackBillList.html" />
+    <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_FastCheck.html" />
+    <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_CheckList_New.html" />
+    <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_Check_New.html" />
     <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 6a75b59..fbe63d6 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -124,6 +124,18 @@
                                       <cite>鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�</cite>
                                   </a>
                               </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Check_New.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>棰嗘枡鍑哄簱鍗曟牎楠�</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_CheckList_New.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>棰嗘枡鍑哄簱鍗曟牎楠岀紦瀛樺垪琛�</cite>
+                                  </a>
+                              </li>
                           </ul>
                       </div>
                   </div>
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_CheckList_New.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_CheckList_New.html"
new file mode 100644
index 0000000..b512c21
--- /dev/null
+++ "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_CheckList_New.html"
@@ -0,0 +1,228 @@
+锘�<!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">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-POStockInBillList">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1">鍗曟嵁鍒楄〃</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item  layui-show">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="margin-bottom: 20px;">
+                            <div class="layui-row">
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+                                </div>
+                            </div>
+                        </div>
+                    </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;
+        //娓呯┖鐣岄潰  new
+
+        //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+        //鍔犺浇婧愬崟绫诲瀷
+
+        //璇诲彇鍗曟嵁鍒楄〃
+        //
+
+        form.on('submit(Cancel)', function () {
+            parent.location.href = "../../../views/index.html"
+            //window.close();//鍏抽棴褰撳墠椤�
+        })
+
+
+
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            layer.open({
+                type: 2
+                , area: ['100%', '100%']
+                , title: '棰嗘枡鍑哄簱鏍¢獙'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Check_New.html?linterid=' + data[0].HInterID + '&lBillNo=' + data[0].HBillNo, 'yes']
+                , resize: false
+                , cancel: function () {
+                    $(".layui-btn").removeClass("layui-btn-disabled");
+                }
+            })
+        });
+        var option = {
+            elem: '#dj-table'
+            , toolbar: '#toolbarDemo'
+            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+            , cols: [[
+                { type: 'radio' }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        }
+        // url: GetWEBURL() + '/Web/chanpinruk',
+        form.on('submit(cmdRefresh)', function () {//鍒锋柊
+            table.render({
+                elem: '#dj-table'
+                ,url: GetWEBURL() + '/Web/chanpinruk'
+                , toolbar: '#toolbarDemo'
+                , defaultToolbar: []
+                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                    , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            })
+        });
+
+
+
+        form.on('submit(cmdDelete)', function () {//鍒犻櫎
+            var checkStatus = table.checkStatus('dj-table')
+            , data = checkStatus.data;
+            var sInterID = data[0].HInterID
+            $.ajax(
+               {
+                   type: "Get",
+                   url: GetWEBURL() + "/ProductInBillList/Delete_Json",
+                   async: true,
+                   data: { "sHInterID": sInterID },
+                   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: 2 });
+                       }
+                   },
+                   error: function (err) {
+                       layer.msg('閿欒' + err, {
+                           icon: 5,
+                           time: 20000
+                       }, function () {
+                           //do something
+                       });
+                   }
+               });
+        });
+        
+       
+        
+        var sBillType = '1204'
+                table.render({
+                    elem: '#dj-table'
+                    , url: GetWEBURL() + '/OtherOutBill_Check_New/DisPonderationBillMain_TempList_BillCheck'
+                    , toolbar: '#toolbarDemo'
+                    , defaultToolbar: []
+                    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"]}
+                    , cols: [[
+                          { type: 'radio' }
+                        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                        , { field: 'HOWNERName', title: '缁勭粐', width: 100 }
+                        ]]
+                      , height: 500
+                      , done: function () {
+                          layer.closeAll("loading");
+                      }
+                })
+
+        //鍒锋柊鏄庣粏椤电
+        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 () {
+         }
+        });
+    });
+    //娓呯┖琛ㄥご
+    </script>
+
+</body>
+</html>
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_Check_New.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_Check_New.html"
new file mode 100644
index 0000000..21a063a
--- /dev/null
+++ "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_Check_New.html"
@@ -0,0 +1,1027 @@
+锘�<!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">
+    <style>
+        .layui-col-xs4 {
+            width: 12.333333%
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <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 class="layui-col-xs2">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+                            </div>-->
+                            <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="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-Kf_OtherInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <!-- <li lay-id="1">婧愬崟淇℃伅</li>-->
+                            <li lay-id="1">琛ㄥご淇℃伅</li>
+                            <li lay-id="2">浠撳簱淇℃伅</li>
+                            <li lay-id="3">鐗╂枡淇℃伅</li>
+                            <li lay-id="4">鍚堣淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item">
+                                <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" 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-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+                                        </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:60px;padding-left:0px;">璋冨叆浠撲綅</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
+                                        </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:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HSCWHID-BT" lay-submit="" class="layui-btn" lay-filter="HSCWHID-BT">...</button>
+                                        </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:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HOSpID-BT" lay-submit="" class="layui-btn" lay-filter="HOSpID-BT" style="display:none">...</button>
+                                        </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:30px;padding-left:0px;">璋冨嚭缁勭粐</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HStockOutOrgName" id="HStockOutOrgName" lay-verify="HStockOutOrgName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HStockOutOrgID" id="HStockOutOrgID" lay-verify="HStockOutOrgID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HStockOutOrgID-BT">...</button>
+                                        </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:30px;padding-left:0px;">璋冨叆缁勭粐</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HStockInOrgName" id="HStockInOrgName" lay-verify="HStockInOrgName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HStockInOrgID" id="HStockInOrgID" lay-verify="HStockInOrgID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HStockInOrgID-BT">...</button>
+                                        </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" id="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>
+                </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;
+
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+            $("#HWHID").val(sessionStorage["HWHID"]);
+            $("#HWHNAME").val(sessionStorage["HWHName"]);
+            $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+            $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� 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 lBillNo = params[params[1]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/OtherOutBill_Check_New/bj",
+                    type: "GET",
+                    data: { "HBillNo": lBillNo, "HBillType": '1207'},
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //console.log(JSON.stringify(result.data.hItemIDField))
+                            //return;
+                            $("#HStockPlaceName").val(result.data.hSPNameField);
+                            $("#HWHID").val(result.data.hWhIDField);
+                            $("#HWHNAME").val(result.data.hWhNameField);
+                             $("#HStockPlaceName").val(result.data.hSPNameField);
+                            $("#HWHID").val(result.data.hWhIDField);
+                            $("#HWHNAME").val(result.data.hWhNameField);
+                            $('#HInterID').val(result.data.hInterIDField)
+                            $('#HBillNo').val(result.data.hBillNoField)
+                            var HBillID = $('#HInterID').val()
+                            element.tabChange('tab-Kf_OtherInBill', '2');
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: HBillID, HBillType: '1207', 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: 'HBatchNo', title: '鎵规', width: 150 }
+                                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                                    , { field: 'HWHName', title: '浠撳簱', width: 150 }
+                                    , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                                    , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+                                    , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                                ]]
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+
+            //function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            //{
+            //    table.render({
+            //        elem: '#wl-table'
+            //        , url: GetWEBURL() + '/OtherOutBill_Check_New/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 }
+            //        ]]
+            //        , 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": '1207' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        //$("#HInterID").val(d.data[0].HInterID);
+                        //$("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+            }
+
+
+            if (1 == 2) {
+                element.tabChange('tab-Kf_OtherInBill', '2');
+                var pFocus = $("#HBarCode");
+                pFocus.focus();
+                pFocus.select();
+            }
+            else {
+                element.tabChange('tab-Kf_OtherInBill', '1');
+                var pFocus = $("#HBillNo");
+                pFocus.focus();
+                pFocus.select();
+            }
+
+            //
+            function Sub_ClearBill() {
+                //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+                $("#HWHID").val(sessionStorage["HWHID"]);
+                $("#HWHNAME").val(sessionStorage["HWHName"]);
+                $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+                $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+               
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMaker").hide();
+                $("#HMakerID").hide();
+
+                //璁剧疆鍗曟嵁鍙�
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                //$.ajax({
+                //    url: GetWEBURL() + "/Web/GetMAXNum",
+                //    type: "GET",
+                //    data: { "HBillType": '1206' },
+                //    success: function (d) {
+                //        $("#HInterID").val(d.data[0].HInterID);
+                //        $("#HBillNo").val(d.data[0].HBillNo);
+                //    }
+                //});
+                //鐒︾偣
+                //鍒锋柊
+                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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#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(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+                // }
+            });
+
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                // console.log(data);
+                var sInterID = $('#HInterID').val()
+                var sMaterID = data[0].HMaterID
+                var sBillType = '1207'
+                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() + "/MateBill/Delete_Json1",
+                        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;
+                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+                var sMainStr = JSON.stringify(data.field);
+                var sMain = sMainStr;
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = $("#HBillType").val();
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/MateOutBill_Check_New/set_SaveMateOutBill_Check_New_Json",
+                            async: true,
+                            data: { "oMain": sMain },
+                            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 });
+                                    //鐏板害鎻愪氦鎸夐挳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';
+                    }
+                    //}
+                }
+            });
+
+            //鎵崟鎹彿
+            $('#HBillNo').on('keydown', function (event) {
+                var HBillNo = $('#HBillNo').val()
+                //var HBillID = $('#HInterID').val()
+                var HBillType = '1207'
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + "/MoveStockBill/BillNo2",
+                        type: "GET",
+                        data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": sessionStorage["HUserName"], "HOwnerID": sessionStorage["OrganizationID"]},
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //console.log(JSON.stringify(result.data.hItemIDField))
+                                //return;
+                                $("#HStockPlaceName").val(result.data.hSPNameField);
+                                $("#HWHID").val(result.data.hWhIDField);
+                                $("#HWHNAME").val(result.data.hWhNameField);
+                                $("#HSCWHID").val(result.data.hSCWhIDField);
+                                $("#HSCWHNAME").val(result.data.hSCWhNameField);
+                                $('#HInterID').val(result.data.hInterIDField)
+                                $('#HBillNo').val(result.data.hBillNoField)
+                                var HBillID = $('#HInterID').val()
+                                element.tabChange('tab-Kf_OtherInBill', '2');
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: HBillID, HBillType: HBillType, 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: 'HBatchNo', title: '鎵规', width: 150 }
+                                        , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                                        , { field: 'HWHName', title: '浠撳簱', width: 150 }
+                                        , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                                        , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+                                        , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                                    ]]
+                                    , 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 });
+                }
+            });
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                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 GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sSubStr = table.cache['wl-table'];
+                var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sQty = $("#HQty").val()
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                var sHBillType = '1207'
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sHSCWHID = $("#HSCWHID").val()
+                var sHSCSPID = $("#HSCStockPlaceID").val()
+                var HOrgID = $("#HOrgID").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://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "/OtherOutBill_Check_New/get_InfoByBarCode_Source_Json",
+                    type: "GET",
+                    data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sHBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "SCWhID": sHSCWHID, "SCSPID": sHSCSPID, "sQty": sQty, "HOWNERID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        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_OtherInBill', '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-Kf_OtherInBill', '2');//璺宠浆椤电
+                            }
+                            else {
+                                element.tabChange('tab-Kf_OtherInBill', '3');
+                            }
+                            layer.load(3)
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1207', 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: 'HBatchNo', title: '鎵规', width: 150 }
+                                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                                    , { field: 'HWHName', title: '浠撳簱', width: 150 }
+                                    , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                                    , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+                                    , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                                ]]
+                                , 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");
+                    }
+                });
+            }
+            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 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",
+                    type: "GET",
+                    data: { "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.load(3)
+                            table.render({
+                                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 }
+                                ]]
+                                // , 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");
+                    }
+                });
+            }
+        });
+        //浠ヤ笂涓� Layui妯″潡
+        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>
+</html>
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 56753bf..83db064 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"
@@ -867,13 +867,6 @@
             //鎵潯鐮�
             $('#HBarCode').on('keydown', function (event) {
                 var sQty = $("#HQty").val();
-                if (sSourceBillNo == null)
-                {
-                    sSourceBillNo = "";
-                }
-                if (sQty == "") {
-                    sQty = 0;
-                }
                 if (event.keyCode == 13) {
                     GetMeesageByBarCode();
                 }
@@ -999,6 +992,18 @@
                 var HOrgID = $("#HOrgID").val();//缁勭粐
                 var sBillType = '1207';
                 var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
+                if (sSourceBillNo == null) {
+                    sSourceBillNo = "";
+                }
+                if (sQty == "") {
+                    sQty = 0;
+                }
+
+                if (HWHID == SCWhID)
+                {
+                    layer.msg("璋冨叆浠撳簱璺熻皟鍑轰粨搴撲竴鑷达紝璇烽噸鏂伴�夋嫨璋冨叆浠撳簱鎴栬�呰皟鍑轰粨搴�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
 
                 if (HDeleteFlag == "*") {
                     if (sBarCode != "") {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html"
index be3b74b..5f2744a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBill_FastNewList.html"
@@ -107,7 +107,7 @@
         //璇诲彇鍗曟嵁鍒楄〃
         //
 
-        form.on('submit(Cancel)', function () {
+        form.on('submit(cmdCancel)', function () {
             parent.location.href = "../../../views/index.html"
             //window.close();//鍏抽棴褰撳墠椤�
         })
@@ -212,7 +212,7 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                           layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                           layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // 寰楀埌frame绱㈠紩
                                var index = layer.getFrameIndex(window.name);
                                //鍏抽棴褰撳墠frame
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 3fe49e8..04ba901 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"
@@ -36,6 +36,16 @@
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
                             </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" autocomplete="off" class="layui-input">
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <div class="layui-tab layui-col-xs12" lay-filter="tab-SellOutBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -188,6 +198,7 @@
                                     </div>
                                 </div>
                             </div>
+
                             <!--鐗╂枡娓呭崟-->
                             <div class="layui-tab-item">
                                 <!--<div class="layui-form-item" style="padding:0px;margin:0px">
@@ -200,16 +211,7 @@
                 </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" autocomplete="off" class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
+
                                 <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                             </div>
                             <!--鏄庣粏娓呭崟-->
@@ -222,7 +224,30 @@
                             </div>
                             <!--鏃ュ織-->
                             <div class="layui-tab-item">
-                                <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
+                                <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 layui-input-inline mobile">
+                                        <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <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 layui-input-inline mobile">
+                                        <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" value="0" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <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 layui-input-inline mobile">
+                                        <input type="text" name="HNote" id="HNote" lay-verify="HNote" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
                             </div>
                         </div>
                         <!--<div class="layui-form-item" style="margin-bottom: 20px;">
@@ -1161,9 +1186,38 @@
                                 //$("#HSupName").val(result.data.HSupName);
                                 //$("#HDeptID").val(result.data.HDeptID);
                                 //$("#HDeptName").val(result.data.HDeptName);
-                                table.reload('wl-table', {
-                                    where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: sInterID, HBillType: '1205', 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");
+                                    }
                                 });
+
+                                var count = 0;
+                                var count1 = 0;
+                                for (var i = 0; i < result.data.length; i++) {
+                                    count += result.data.HQty;
+                                    count1 += result.data.HPieceQty;
+                                }
+                                $("#HSumQtys").val(count);
+                                $("#HBarCodeQtys").val(count1);
                             }
                             else {
                                 // $("#verifycode").click();
@@ -1226,8 +1280,32 @@
                             //$("#HDeptName").val(result.data[0].HDeptName);
                             HSourceFlag = true;
                             element.tabChange('tab-SellOutBill', '3');
-                            table.reload('wl-table', {
-                                where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+                            //table.reload('wl-table', {
+                            //    where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+                            //});
+
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1205', 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");
+                                }
                             });
                             $("#HSourceBillNo").attr("disabled", "true");
                         }
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_CheckList_New.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_CheckList_New.html"
new file mode 100644
index 0000000..b512c21
--- /dev/null
+++ "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_CheckList_New.html"
@@ -0,0 +1,228 @@
+锘�<!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">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-POStockInBillList">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1">鍗曟嵁鍒楄〃</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item  layui-show">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="margin-bottom: 20px;">
+                            <div class="layui-row">
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+                                </div>
+                            </div>
+                        </div>
+                    </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;
+        //娓呯┖鐣岄潰  new
+
+        //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+        //鍔犺浇婧愬崟绫诲瀷
+
+        //璇诲彇鍗曟嵁鍒楄〃
+        //
+
+        form.on('submit(Cancel)', function () {
+            parent.location.href = "../../../views/index.html"
+            //window.close();//鍏抽棴褰撳墠椤�
+        })
+
+
+
+
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            layer.open({
+                type: 2
+                , area: ['100%', '100%']
+                , title: '棰嗘枡鍑哄簱鏍¢獙'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Check_New.html?linterid=' + data[0].HInterID + '&lBillNo=' + data[0].HBillNo, 'yes']
+                , resize: false
+                , cancel: function () {
+                    $(".layui-btn").removeClass("layui-btn-disabled");
+                }
+            })
+        });
+        var option = {
+            elem: '#dj-table'
+            , toolbar: '#toolbarDemo'
+            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+            , cols: [[
+                { type: 'radio' }
+                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        }
+        // url: GetWEBURL() + '/Web/chanpinruk',
+        form.on('submit(cmdRefresh)', function () {//鍒锋柊
+            table.render({
+                elem: '#dj-table'
+                ,url: GetWEBURL() + '/Web/chanpinruk'
+                , toolbar: '#toolbarDemo'
+                , defaultToolbar: []
+                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                    , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 100 }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            })
+        });
+
+
+
+        form.on('submit(cmdDelete)', function () {//鍒犻櫎
+            var checkStatus = table.checkStatus('dj-table')
+            , data = checkStatus.data;
+            var sInterID = data[0].HInterID
+            $.ajax(
+               {
+                   type: "Get",
+                   url: GetWEBURL() + "/ProductInBillList/Delete_Json",
+                   async: true,
+                   data: { "sHInterID": sInterID },
+                   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: 2 });
+                       }
+                   },
+                   error: function (err) {
+                       layer.msg('閿欒' + err, {
+                           icon: 5,
+                           time: 20000
+                       }, function () {
+                           //do something
+                       });
+                   }
+               });
+        });
+        
+       
+        
+        var sBillType = '1204'
+                table.render({
+                    elem: '#dj-table'
+                    , url: GetWEBURL() + '/OtherOutBill_Check_New/DisPonderationBillMain_TempList_BillCheck'
+                    , toolbar: '#toolbarDemo'
+                    , defaultToolbar: []
+                    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"]}
+                    , cols: [[
+                          { type: 'radio' }
+                        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 80 }
+                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 80 }
+                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 100 }
+                        , { field: 'HOWNERName', title: '缁勭粐', width: 100 }
+                        ]]
+                      , height: 500
+                      , done: function () {
+                          layer.closeAll("loading");
+                      }
+                })
+
+        //鍒锋柊鏄庣粏椤电
+        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 () {
+         }
+        });
+    });
+    //娓呯┖琛ㄥご
+    </script>
+
+</body>
+</html>
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_Check_New.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_Check_New.html"
new file mode 100644
index 0000000..a48154d
--- /dev/null
+++ "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_Check_New.html"
@@ -0,0 +1,966 @@
+锘�<!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">
+    <style>
+        .layui-col-xs4 {
+            width: 12.333333%
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-tab" lay-filter="tab-Kf_OtherInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <!-- <li lay-id="1">婧愬崟淇℃伅</li>-->
+                            <li lay-id="1">琛ㄥご淇℃伅</li>
+                            <li lay-id="2">鐗╂枡淇℃伅</li>
+                            <li lay-id="3">鍚堣淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item">
+                                <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:30px;padding-left:0px;">浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+                                        </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:30px;padding-left:0px;">浠撲綅</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
+                                        </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" 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 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">
+                                    <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="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                            </div>
+                            <div 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" id="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>
+                </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;
+
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+            $("#HWHID").val(sessionStorage["HWHID"]);
+            $("#HWHNAME").val(sessionStorage["HWHName"]);
+            $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+            $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� 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 lBillNo = params[params[1]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/OtherOutBill_Check_New/bj",
+                    type: "GET",
+                    data: { "HBillNo": lBillNo, "HBillType": '1204'},
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //console.log(JSON.stringify(result.data.hItemIDField))
+                            //return;
+                            $("#HStockPlaceName").val(result.data.hSPNameField);
+                            $("#HWHID").val(result.data.hWhIDField);
+                            $("#HWHNAME").val(result.data.hWhNameField);
+                            $('#HInterID').val(result.data.hInterIDField)
+                            $('#HBillNo').val(result.data.hBillNoField)
+                            var HBillID = $('#HInterID').val()
+                            element.tabChange('tab-Kf_OtherInBill', '2');
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: HBillID, HBillType: '1204', 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: 'HBatchNo', title: '鎵规', width: 150 }
+                                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                                    , { field: 'HWHName', title: '浠撳簱', width: 150 }
+                                    , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                                    , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+                                    , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                                ]]
+                                , height: 500
+                                , done: function () {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+
+            //function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            //{
+            //    table.render({
+            //        elem: '#wl-table'
+            //        , url: GetWEBURL() + '/OtherOutBill_Check_New/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 }
+            //        ]]
+            //        , 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": '1204' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        //$("#HInterID").val(d.data[0].HInterID);
+                        //$("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+            }
+
+
+            if (1 == 2) {
+                element.tabChange('tab-Kf_OtherInBill', '2');
+                var pFocus = $("#HBarCode");
+                pFocus.focus();
+                pFocus.select();
+            }
+            else {
+                element.tabChange('tab-Kf_OtherInBill', '1');
+                var pFocus = $("#HBillNo");
+                pFocus.focus();
+                pFocus.select();
+            }
+
+            //
+            function Sub_ClearBill() {
+                //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+                $("#HWHID").val(sessionStorage["HWHID"]);
+                $("#HWHNAME").val(sessionStorage["HWHName"]);
+                $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+                $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+               
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMaker").hide();
+                $("#HMakerID").hide();
+
+                //璁剧疆鍗曟嵁鍙�
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                //$.ajax({
+                //    url: GetWEBURL() + "/Web/GetMAXNum",
+                //    type: "GET",
+                //    data: { "HBillType": '1206' },
+                //    success: function (d) {
+                //        $("#HInterID").val(d.data[0].HInterID);
+                //        $("#HBillNo").val(d.data[0].HBillNo);
+                //    }
+                //});
+                //鐒︾偣
+                //鍒锋柊
+                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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#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(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+                // }
+            });
+
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                // console.log(data);
+                var sInterID = $('#HInterID').val()
+                var sMaterID = data[0].HMaterID
+                var sBillType = '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: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/MateBill/Delete_Json1",
+                        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;
+                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+                var sMainStr = JSON.stringify(data.field);
+                var sMain = sMainStr;
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = $("#HBillType").val();
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/MateOutBill_Check_New/set_SaveMateOutBill_Check_New_Json",
+                            async: true,
+                            data: { "oMain": sMain },
+                            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 });
+                                    //鐏板害鎻愪氦鎸夐挳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';
+                    }
+                    //}
+                }
+            });
+
+            //鎵崟鎹彿
+            $('#HBillNo').on('keydown', function (event) {
+                var HBillNo = $('#HBillNo').val()
+                //var HBillID = $('#HInterID').val()
+                var HBillType = '1204'
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + "/MateBill/BillNo1",
+                        type: "GET",
+                        data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": sessionStorage["HUserName"], "HOwnerID": sessionStorage["OrganizationID"]},
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //console.log(JSON.stringify(result.data.hItemIDField))
+                                //return;
+                                $("#HStockPlaceName").val(result.data.hSPNameField);
+                                $("#HWHID").val(result.data.hWhIDField);
+                                $("#HWHNAME").val(result.data.hWhNameField);
+                                $('#HInterID').val(result.data.hInterIDField)
+                                $('#HBillNo').val(result.data.hBillNoField)
+                                var HBillID = $('#HInterID').val()
+                                element.tabChange('tab-Kf_OtherInBill', '2');
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: HBillID, HBillType: HBillType, 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: 'HBatchNo', title: '鎵规', width: 150 }
+                                        , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                                        , { field: 'HWHName', title: '浠撳簱', width: 150 }
+                                        , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                                        , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+                                        , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                                    ]]
+                                    , 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 });
+                }
+            });
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                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 GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sSubStr = table.cache['wl-table'];
+                var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sQty = $("#HQty").val()
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                var sHBillType = '1204'
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var HOrgID = $("#HOrgID").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://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "/OtherOutBill_Check_New/get_InfoByBarCode_Source_Json",
+                    type: "GET",
+                    data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sHBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "HOWNERID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        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_OtherInBill', '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-Kf_OtherInBill', '2');//璺宠浆椤电
+                            }
+                            else {
+                                element.tabChange('tab-Kf_OtherInBill', '2');
+                            }
+                            layer.load(3)
+                            table.render({
+                                elem: '#wl-table'
+                                , url: GetWEBURL() + '/OtherOutBill_Check_New/DisBillEntryList_Webs_Json1'
+                                , toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1204', 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: 'HBatchNo', title: '鎵规', width: 150 }
+                                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                                    , { field: 'HWHName', title: '浠撳簱', width: 150 }
+                                    , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                                    , { field: 'HMTONo', title: 'MTO鍙�', width: 150 }
+                                    , { field: 'HSourceBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                                ]]
+                                , 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");
+                    }
+                });
+            }
+            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 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",
+                    type: "GET",
+                    data: { "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.load(3)
+                            table.render({
+                                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 }
+                                ]]
+                                // , 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");
+                    }
+                });
+            }
+        });
+        //浠ヤ笂涓� Layui妯″潡
+        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>
+</html>
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 48b662e..d3ae225 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"
@@ -35,6 +35,14 @@
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
                             </div>
                         </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+                            </div>
+                            <div class="layui-col-xs8">
+                                <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
                     </div>
                     <div class="layui-tab layui-col-xs12" lay-filter="tab-MateOutBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -226,14 +234,6 @@
                                     </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" autocomplete="off" class="layui-input">
-                                        </div>
-                                    </div>
                                 </div>
                                 <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                             </div>
@@ -357,8 +357,8 @@
                         </div>-->
                         <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
                     </div>
-            </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>
@@ -868,12 +868,6 @@
 
             //鎵潯鐮�
             $('#HBarCode').on('keydown', function (event) {
-                if (sQty == "") {
-                    sQty = 0;
-                }
-                if (sHBillType == '-1') {
-                    sSourceBillNo = ''
-                }
                 if (event.keyCode == 13) {
                     GetMeesageByBarCode();
                 }
@@ -994,7 +988,9 @@
                 var sSourceBillNo = $("#HSourceBillNo").val()
                 var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠$悊
                 var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊
-
+                if (sHBillType == '-1') {
+                    sSourceBillNo = ''
+                }
                 if (sBarCode == '') {
                     playSound();
                     layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1047,11 +1043,18 @@
                                 $("#HSupID").val(result.data.HSupID);
                                 $("#HDeptName").val(result.data.HDeptName);
                                 $("#HDeptID").val(result.data.HDeptID);
-                                $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                sessionStorage["SourceFlag"] = true;
+                                $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+                                $("#HBillType").val(result.data.hSourceBillTypeField)
+                                HSourceFlag = true;
                                 //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
                                 if (result.data.HSourceBillType == "3720") {
+                                    $("#HBillType").empty();
                                     $("#HBillType").val("3720");
+                                    var optionHtml = '';
+                                    optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+                                    $("#HBillType").append(optionHtml);
+                                    layui.form.render('select');
+                                    $("#HBillType").attr("readonly", "readonly");
 
                                 }
                                 else {
@@ -1061,7 +1064,7 @@
                                 element.tabChange('tab-Kf_MateOutBill', '3');
                             }
                             else {
-                                if (sessionStorage["SourceFlag"] == "true") {
+                                if (HSourceFlag == true) {
                                     element.tabChange('tab-Kf_MateOutBill', '3');
                                 }
                                 else {
@@ -1069,11 +1072,18 @@
                                     //$("#HSupID").val(result.data.HSupID);
                                     $("#HDeptName").val(result.data.HDept);
                                     $("#HDeptID").val(result.data.HDeptID);
-                                    $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                    sessionStorage["SourceFlag"] = true;
+                                    $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+                                    $("#HBillType").val(result.data.hSourceBillTypeField)
+                                    HSourceFlag = true;
                                     //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
                                     if (result.data.HSourceBillType == "3720") {
+                                        ("#HBillType").empty();
                                         $("#HBillType").val("3720");
+                                        var optionHtml = '';
+                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+                                        $("#HBillType").append(optionHtml);
+                                        layui.form.render('select');
+                                        $("#HBillType").attr("readonly", "readonly");
 
                                     }
                                     //else if (result.data.HSourceBillType == "1601") {
@@ -1162,12 +1172,15 @@
                 var HPPQty = $("#HPPQty").val()
                 var HFIFOWHID = $("#HFIFOWHID").val()
                 var HPlanMode = $("#HPlanMode").val()
+                if (HPPQty == "") {
+                    HPPQty = 0;
+                }
                 $.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"] },
                     success: function (result) {
-                        sessionStorage["SourceFlag"] = true;
+                        HSourceFlag = true;
                         $("#HPlanMode").attr("disabled", "true");
                         $("#HBillType").attr("disabled", "true");
                         element.tabChange('tab-MateOutBill', '2');
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_FastCheck.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_FastCheck.html"
new file mode 100644
index 0000000..e09a5b2
--- /dev/null
+++ "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_FastCheck.html"
@@ -0,0 +1,1031 @@
+锘�<!DOCTYPE html>
+<html>
+<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">
+    <style>
+        .layui-table-cell {
+            height: auto;
+            white-space: normal;
+        }
+
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 5px; height:800px;">
+                <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:40px;padding-left:0px;">鏉$爜</label>
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-col-xs5">
+                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+                                <input type="text" name="HQty" id="HQty" lay-verify="HQty" 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-POStockInBill">
+                        <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>
+                        </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">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <select name="HBillType" id="HBillType">
+                                                <option value="1103">鏀舵枡閫氱煡鍗�</option>
+                                                <option value="1102">閲囪喘璁㈠崟</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <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="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">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+                                                </div>
+                                                <div class="layui-col-xs8">
+                                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍚堣淇℃伅-->
+                            <div class="layui-tab-item">
+                                <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 layui-input-inline mobile">
+                                        <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" value="0" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <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 layui-input-inline mobile">
+                                        <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" value="0" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <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 layui-input-inline mobile">
+                                        <input type="text" name="HNote" id="HNote" lay-verify="HNote" autocomplete="off" class="layui-input">
+                                    </div>
+                                </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;
+            //娓呯┖鐣岄潰  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();
+            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� 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);
+                        HSourceFlag = true;
+                        RoadSup();
+                    }
+                })
+            }
+            //鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇渚涘簲鍟�
+            function RoadSup() {
+                //var sInterID = $("#HInterID").val()
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                if (HSourceBillNo == "" || sInterID <= 0) {
+                    layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                else {
+                    $.ajax({
+                        url: GetWEBURL() + "/POStockInBill/get_GetCg_POOrderBillList",
+                        type: "GET",
+                        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HSupID").val(result.data[0].HSupID);
+                                $("#HSupName").val(result.data[0].HSupName);
+                                $("#HDeptID").val(result.data[0].HDeptID);
+                                $("#HDeptName").val(result.data[0].HDeptName);
+                                sessionStorage["SourceFlag"] = true;
+                                element.tabChange('tab-POStockInBill', '2');
+                                layer.load(3);
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            }
+            //鍔犺浇琛ㄤ綋
+            function RoadBillSub(linterid) {
+                table.render({
+                    elem: '#wl-table'
+                    , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+                    , where: { HBillID: linterid, HBillType: '1201', sWhere: '' }
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100 }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', sort: true, width: 200 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
+                        , { field: 'HBatchNo', title: '鎵规', sort: true, width: 200 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    //url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    type: "GET",
+                    data: { "HBillType": '1201' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+                RoadBillSub(linterid);
+                RoadSup();
+            }
+            //濡傛灉淇敼鍒欒蛋涓嬮潰 new
+
+
+
+
+            //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣   new
+            if (1 == 2) {
+                element.tabChange('tab-POStockInBill', '3');
+                var pFocus = $("#HBarCode");
+                pFocus.focus();
+                pFocus.select();
+            }
+            else {
+                element.tabChange('tab-POStockInBill', '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(HSupID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '渚涘簲鍟嗗垪琛�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //閫夋嫨淇濈
+            form.on('submit(HKeeperID-BT)', function () {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeper").val(checkStatus.data[0].HName);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            //閫夋嫨鍙戣揣
+            form.on('submit(HSecManagerID-BT)', function (data) {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManager").val(checkStatus.data[0].HName);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            //閫夋嫨閮ㄩ棬
+            form.on('submit(HDeptID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //閫�鍑�
+            form.on('submit(Cancel)', function () {
+                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) {//闈炵┖楠岃瘉
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+                // }
+            });
+            //鍒犻櫎
+            form.on('submit(cmdDelete)', function () {
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                // console.log(data);
+                var sInterID = $('#HInterID').val()
+                var sMaterID = data[0].HMaterID
+                var sBillType = '1201'
+                var sAuxPropID = data[0].HAuxPropID
+                //var sMTONo = data[0].HMTONo
+                var sMTONo = ''
+                var sSourceInterID = data[0].HSourceInterID
+                var sSourceEntryID = data[0].HSourceEntryID
+                $.ajax(
+                    {
+                        type: "Get",
+                        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/POStockInBill/Delete_Json",
+                        async: true,
+                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": '1103', },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //layer.msg(data.Message, { icon: 1 });
+                                table.render({
+                                    elem: '#wl-table'
+                                    //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Mate_Webs_Json'
+                                    //, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Mate_Webs_Json'
+                                    , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+                                    , cellMinWidth: 80
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100 }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 200 }
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200 }
+                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200 }
+                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+                                        , { field: 'HBatchNo', title: '鎵规', width: 200 }
+                                        , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 200 }
+                                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 200 }
+                                    ]]
+                                    , 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) {//鎻愪氦
+                if ($("#HExplanation").val() == "") {
+                    if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
+                        $("#HWHNAME").val("");
+                        $("#HWHID").val("");
+                        layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                }
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = $("#HBillType").val();
+                if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePOStockInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            url: GetWEBURL() + "/POStockInBill/set_SavePOStockInBill_Json",
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    sessionStorage["SourceFlag"] = false;
+                                    layer.confirm("鏀舵枡" + data.Message + $("#HBillNo").val(), {
+                                        icon: 1,
+                                        skin: 'layui-layer-lan',
+                                        closeBtn: 0,
+                                        btn: ['纭'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            //window.location.reload();//鏂板
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }
+                                        , function () { parent.location.href = "../../../views/index.html"; }//鏂板
+                                    );
+                                }
+                                else {
+                                    //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                                layui.form.render();
+                            },
+                            error: function (err) {
+                                //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    return false;
+                }
+            });
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                var sQty = $("#HQty").val();
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+
+            //鎵簮鍗�
+            $('#HSourceBillNo').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageBySourceBillNo();
+                }
+            });
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                GetMeesageBySourceBillNo();
+            });
+
+
+
+            //鎵粨浣�
+            $('#HStockPlaceName').on('keydown', function (event) {
+                var HBarCode = $('#HStockPlaceName').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                $("#HWHNAME").val(result.data[0].HWhName);
+                                element.tabChange('tab-POStockInBill', '2');
+                            }
+                            else {
+                                // $("#verifycode").click();
+                                //layer.msg(result.Message, { icon: 5 });
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                    // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+                }
+            });
+            //鍒锋柊鏄庣粏椤电
+            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");
+                        }
+                    });
+                }
+            });
+
+            //鎵潯鐮�
+            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 sBillType = '1201'
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sSourceBillNo = $("#HSourceBillNo").val()
+                var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠$悊
+                var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊
+
+                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 (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");
+
+                                }
+                                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 {
+                                    $("#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, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+                                success: function (result) {
+                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        listOption.data = result.data.list;
+                                        table.render(listOption);
+                                        $("#HBarCode_B").val(result.data.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 {
+                                        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");
+                    }
+                });
+            }
+            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();
+            }
+            //鎵簮鍗�
+            function GetMeesageBySourceBillNo(obj) {
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                if (HSourceBillNo == "" || sInterID <= 0) {
+                    layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                //
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    url: GetWEBURL() + "/POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                    type: "GET",
+                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            $("#HSupID").val(result.data[0].HSupID);
+                            $("#HSupName").val(result.data[0].HSupName);
+                            sessionStorage["SourceFlag"] = true;
+                            layer.load(3);
+                            element.tabChange('tab-POStockInBill', '2');
+                            table.render({
+                                elem: '#wl-table'
+                                , cellMinWidth: 80
+                                //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
+                                , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
+                                //, toolbar: '#toolbarDemo'
+                                , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
+                                , cols: [[
+                                    { type: 'radio' }
+                                    , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100 }
+                                    , { 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: '鎵规' }
+                                ]]
+                                // , 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', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        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>
+</html>
\ No newline at end of file
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 7c3d54f..4bfdfd3 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"
@@ -35,6 +35,14 @@
                             <div class="layui-col-xs2">
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
                             </div>
+                            <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="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div class="layui-tab layui-col-xs12" lay-filter="tab-ProductlnBill">
@@ -43,26 +51,42 @@
                             <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
                             <li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
                             <li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>
-                            <!--<li lay-id="5">鏃ュ織</li>-->
+                            <li lay-id="5" style="padding:1px;">鍚堣淇℃伅</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">
+                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+            </div>
+            <div class="layui-col-xs8">
+                <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=-->
+                                    <!--"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>-->
+                                    <!--</div>
+            </div>-->
+
+
                                     <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" 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=-->
-                                            <!--"hidden" value="3711" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">-->
-                                            <!--<select name="HBillType" id="HBillType">
+                                            <select name="HBillType" id="HBillType">
+                                                <option value="3710">鐢熶骇璁㈠崟</option>
                                                 <option value="3711">鐢熶骇姹囨姤鍗�</option>
-                                            </select>-->
+                                            </select>
                                         </div>
                                     </div>
+
+
+
                                 </div>
                                 <div class="layui-form-item">
                                     <div class="layui-row">
@@ -175,32 +199,67 @@
                                     </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-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 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="mx-table" lay-filter="mx-table"></table>-->
+                                <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="HBarCodeQtys" id="HBarCodeQtys" lay-verify="HBarCodeQtys" 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="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+
+
                             <div class="layui-tab-item">
                                 <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
                             </div>
@@ -225,7 +284,7 @@
                     <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="cmdDelete">鍒犻櫎</button>
                         <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
                     </div>
                     <div id="" style="display:none;">
@@ -339,12 +398,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]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
@@ -374,6 +433,13 @@
 
             function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
             {
+                //var checkStatus = table.checkStatus('wl-table')
+                //    , data = checkStatus.data;
+                //var sInterID = $('#HInterID').val()
+                //var sBillNo = $("#HBillNo").val()
+                //var sMouldManagerCtl = 'N'
+                //var sFIFOCtl = 'N'
+
                 $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
                 //缂栬緫鍔犺浇鏁版嵁
                 var sInterID = $("#HInterID").val();
@@ -403,6 +469,38 @@
                         layer.closeAll("loading");
                     }
                 });
+
+
+
+
+                //$.ajax({
+                //    url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json',
+                //    type: "GET",
+                //    data: { HBillID: sInterID, HBillType: '1202', sWhere: '' },
+                //    success: function (result) {
+                //        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                //            listOption.data = result.data.list;
+                //            table.render(listOption);
+
+                //            //console.log(result.data.list2);
+                //            var count = 0;
+                //            var count1 = 0;
+                //            for (var i = 0; i < result.data.list.length; i++) {
+                //                count += result.data.list[i].HQty;
+                //                count1 += result.data.list[i].HPieceQty;
+                //            }
+                //            $("#HSumQtys").val(count);
+                //            $("#HBarCodeQtys").val(count1);
+                //            //return;
+                //        }
+                //        else {
+                //            layer.msg(result.Message);
+                //        }
+                //        layer.closeAll("loading");
+                //    }
+                //});
+
+
             }
 
             //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
@@ -613,6 +711,93 @@
                 //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(cmdDelete)', function () {//鍒犻櫎
                 var checkStatus = table.checkStatus('wl-table')
@@ -625,7 +810,7 @@
                 var sMTONo = ''
                 var sSourceInterID = data[0].HSourceInterID
                 var sSourceEntryID = data[0].HSourceEntryID
-                var HBillNo = $("#HBillNo").val()
+                var sBillNo = $("#HBillNo").val()
                 var sMouldManagerCtl = 'N'
                 var sFIFOCtl = 'N'
                 $.ajax(
@@ -637,57 +822,33 @@
                         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 () {
+                            if (data.count == 1) { 
+                                $.ajax({
+                                    url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
+                                    type: "GET",
+                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1202', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+                                    success: function (result) {
+                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            listOption.data = result.data.list;
+                                            table.render(listOption);
+
+                                            //console.log(result.data.list2);
+                                            var count = 0;
+                                            var count1 = 0;
+                                            for (var i = 0; i < result.data.list.length; i++) {
+                                                count += result.data.list[i].HQty;
+                                                count1 += result.data.list[i].HPieceQty;
+                                            }
+                                            $("#HSumQtys").val(count);
+                                            $("#HBarCodeQtys").val(count1);
+                                            //return;
+                                        }
+                                        else {
+                                            layer.msg(result.Message);
+                                        }
                                         layer.closeAll("loading");
                                     }
-                                })
+                                });
                             }
                             else {
                                 layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -874,7 +1035,7 @@
                 }
             });
 
-          
+
             //鎵潯鐮�
             function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
                 var sOldBarCode = $('#HBarCode').val()
@@ -889,6 +1050,8 @@
                 var sHWHID = $("#HWHID").val()
                 var sHSPID = $("#HStockPlaceID").val()
                 var sSourceBillNo = $("#HSourceBillNo").val()
+                var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠$悊
+                var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊
                 if (HDeleteFlag == "*") {
                     if (sBarCode != "") {
                         $('#HBarCode').val("");
@@ -922,6 +1085,7 @@
                                             , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
                                             , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
                                             , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                                            , { field: 'HBarcodeQtys', title: '鏉$爜鏁伴噺', width: 150 }
                                         ]]
                                         // , data: [linterid]
                                         // , page: true
@@ -1003,7 +1167,7 @@
                                     $("#HSupID").val(result.data.HSupID);
                                     $("#HDeptName").val(result.data.HDeptName);
                                     $("#HDeptID").val(result.data.HDeptID);
-                                    $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                    $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                     HSourceFlag = true;
                                     //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
                                     //if (result.data.HSourceBillType == "3711") {
@@ -1016,25 +1180,41 @@
                                     element.tabChange('tab-ProductlnBill', '3');
                                 }
                                 else {
-                                    if (HSourceFlag == "true") {
+                                    if (HSourceFlag == true) {
                                         element.tabChange('tab-ProductlnBill', '3');
+                                        $("#HSourceBillNo").attr("readonly", "readonly");
                                     }
                                     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);
+                                        $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+                                        $("#HBillType").val(result.data.hSourceBillTypeField)
                                         HSourceFlag = true;
                                         //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                        //if (result.data.HSourceBillType == "3711") {
-                                        //    $("#HBillType").val("3711");
-
-                                        //}
-
-                                        //else {
-                                        //    $("#HBillType").val("-1");
-                                        //}
+                                        if (result.data.hSourceBillTypeField == "3711") {
+                                            $("#HBillType").empty();
+                                            $("#HBillType").val("3711");
+                                            var optionHtml = '';
+                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇姹囨姤鍗�' + "</option>";
+                                            $("#HBillType").append(optionHtml);
+                                            layui.form.render('select');
+                                            $("#HBillType").attr("readonly", "readonly");
+                                        }
+                                        if (result.data.hSourceBillTypeField == "3710") {
+                                            $("#HBillType").empty();
+                                            $("#HBillType").val("3711");
+                                            var optionHtml = '';
+                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇璁㈠崟' + "</option>";
+                                            $("#HBillType").append(optionHtml);
+                                            layui.form.render('select');
+                                            $("#HBillType").attr("readonly", "readonly");
+                                        }
+                                        else {
+                                            //$("#HBillType").val("-1");
+                                        }
+                                        $("#HSourceBillNo").attr("readonly", "readonly");
                                         $("#HNote").val(";鐗╂枡鏉$爜");
                                         element.tabChange('tab-ProductlnBill', '3');
                                     }
@@ -1044,29 +1224,62 @@
                                 //$("#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 () {
+                                //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");
+                                //    }
+                                //});
+
+                                $.ajax({
+                                    //url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json',
+                                    //type: "GET",
+                                    //data: { HBillID: sInterID, HBillType: '1202', sWhere: '' },
+
+                                    url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
+                                    type: "GET",
+                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1202', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+                                    success: function (result) {
+                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            listOption.data = result.data.list;
+                                            table.render(listOption);
+                                            listOption1.data = result.data.list2;
+                                            table.render(listOption1);
+                                           
+                                            //console.log(result.data.list2);
+                                            var count = 0;
+                                            var count1 = 0;
+                                            for (var i = 0; i < result.data.list.length; i++) {
+                                                count += result.data.list[i].HQty;
+                                                count1 += result.data.list[i].HPieceQty;
+                                            }
+                                            $("#HSumQtys").val(count);
+                                            $("#HBarCodeQtys").val(count1);
+                                            //return;
+                                        }
+                                        else {
+                                            layer.msg(result.Message);
+                                        }
                                         layer.closeAll("loading");
                                     }
                                 });
@@ -1085,6 +1298,52 @@
                     });
                 }
             }
+
+            var listOption = {
+                elem: '#wl-table'
+                , toolbar: '#toolbarDemo'
+                , 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 }
+                    , { field: 'HPieceQty', title: '鏉$爜鏁伴噺', width: 150 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            }
+            var listOption1 = {
+                elem: '#mx-table'
+                , toolbar: '#toolbarDemo'
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                    , { field: 'HQtyMust', 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: 'HBatchNo', title: '鎵瑰彿', width: 150 }
+                    //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                    //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            }
+
             function playSound() {
                 console.log("playSound");
                 var audio = document.getElementById("cs");
@@ -1113,6 +1372,8 @@
                     data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            $("#HDeptID").val(result.data[0].HDeptID);
+                            $("#HDeptName").val(result.data[0].HDeptName);
                             playSound1();
                             HSourceFlag = true;
                             layer.load(3)
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 cc18b08..d77bc81 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"
@@ -227,6 +227,14 @@
                                             <input type="text" name="HBarCode_B" id="HBarCode_B" lay-verify="HBarCode_B" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
+                                    <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="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
                                 </div>
                                 <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                     <div class="layui-row">
@@ -316,7 +324,7 @@
                                         <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉$爜鏁伴噺</label>
                                     </div>
                                     <div class="layui-col-xs8 layui-input-inline mobile">
-                                        <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" value="0" autocomplete="off" class="layui-input">
+                                        <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="layui-row">
@@ -396,6 +404,7 @@
             $("#HMakerID").hide();
             $("#HBillerID").val(sessionStorage["HBillerID"]);
             $("#HBillerID").hide();
+            var HSourceFlag = sessionStorage["SourceFlag"];
             //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
 
 
@@ -689,41 +698,42 @@
                 var sMTONo = ''
                 var sSourceInterID = data[0].HSourceInterID
                 var sSourceEntryID = data[0].HSourceEntryID
+                var sMouldManagerCtl = 'N'
+                var sFIFOCtl = 'N'
                 $.ajax(
                     {
                         type: "Get",
-                        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        url: GetWEBURL() + "/POStockInBill/Delete_Json",
+                        //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": '1103', },
+                        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: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Mate_Webs_Json'
-                                    //, url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Mate_Webs_Json'
-                                    , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
-                                    , cellMinWidth: 80
-                                    , toolbar: '#toolbarDemo'
-                                    , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
-                                    , cols: [[
-                                        { type: 'radio' }
-                                        , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100 }
-                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 200 }
-                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
-                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
-                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200 }
-                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200 }
-                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
-                                        , { field: 'HBatchNo', title: '鎵规', width: 200 }
-                                        , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 200 }
-                                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 200 }
-                                    ]]
-                                    , height: 500
-                                })
+                            if (data.count == 1) {
+                                $.ajax({
+                                    url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
+                                    type: "GET",
+                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+                                    success: function (result) {
+                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            listOption.data = result.data.list;
+                                            table.render(listOption);
+                                            var count = 0;
+                                            var count1 = 0;
+                                            for (var i = 0; i < result.data.list.length; i++) {
+                                                count += result.data.list[i].HQty;
+                                                count1 += result.data.list[i].HPieceQty;
+                                            }
+                                            $("#HSumQtys").val(count);
+                                            $("#HBarCodeQtys").val(count1);
+                                            //return;
+                                        }
+                                        else {
+                                            layer.msg(result.Message);
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
                             }
                             else {
                                 layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -957,7 +967,7 @@
                 $.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"] },
+                    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) {
                         if (result.count == 1) {
                             playSound1();
@@ -987,7 +997,8 @@
                                 $("#HSupID").val(result.data.HSupID);
                                 $("#HDeptName").val(result.data.HDeptName);
                                 $("#HDeptID").val(result.data.HDeptID);
-                                $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+                                $("#HBillType").val(result.data.hSourceBillTypeField)
                                 sessionStorage["SourceFlag"] = true;
                                 //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
                                 if (result.data.HSourceBillType == "1102") {
@@ -1004,7 +1015,7 @@
                                 element.tabChange('tab-POStockInBill', '3');
                             }
                             else {
-                                if (sessionStorage["SourceFlag"] == "true") {
+                                if (HSourceFlag == true) {
                                     element.tabChange('tab-POStockInBill', '3');
                                 }
                                 else {
@@ -1013,11 +1024,31 @@
                                     //$("#HDeptName").val(result.data.HDept);
                                     //$("#HDeptID").val(result.data.HDeptID);
                                     $("#HSourceBillNo").val(result.data.hSourceBillNoField);
-                                    sessionStorage["SourceFlag"] = true;
+                                    $("#HBillType").val(result.data.hSourceBillTypeField)
+                                    HSourceFlag = true;
                                     //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
                                     if (result.data.hSourceBillTypeField == "1102") {
+                                        $("#HBillType").empty();
                                         $("#HBillType").val("1102");
+                                        var optionHtml = '';
+                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '閲囪喘璁㈠崟' + "</option>";
+                                        $("#HBillType").append(optionHtml);
+                                        layui.form.render('select');
+                                        $("#HBillType").attr("readonly", "readonly");
                                     }
+                                    if (result.data.hSourceBillTypeField == "1103") {
+                                        $("#HBillType").empty();
+                                        $("#HBillType").val("1103");
+                                        var optionHtml = '';
+                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鏀舵枡閫氱煡鍗�' + "</option>";
+                                        $("#HBillType").append(optionHtml);
+                                        layui.form.render('select');
+                                        $("#HBillType").attr("readonly", "readonly");
+                                    }
+                                    else {
+                                        //$("#HBillType").val("-1");
+                                    }
+                                    $("#HSourceBillNo").attr("readonly", "readonly");
                                     $("#HNote").val(";鐗╂枡鏉$爜");
                                     element.tabChange('tab-POStockInBill', '3');
                                 }
@@ -1032,15 +1063,24 @@
                                     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);
+                                        $("#HBarCode_B").val(result.data.list2[0].HBarCode);
+                                        $("#HMaterName_B").val(result.data.list2[0].HMaterName);
+                                        $("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
+                                        $("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
+                                        $("#HUnitName_B").val(result.data.list2[0].HUnitName);
+                                        $("#HQty_B").val(result.data.list2[0].HQty);
+                                        $("#HTMQty_B").val(result.data.list2[0].HTMQty);
+                                        $("#HWHName_B").val(result.data.list2[0].HWHName);
+                                        $("#HSPName_B").val(result.data.list2[0].HSPName);
+
+                                        var count = 0;
+                                        var count1 = 0;
+                                        for (var i = 0; i < result.data.list.length; i++) {
+                                            count += result.data.list[i].HQty;
+                                            count1 += result.data.list[i].HPieceQty;
+                                        }
+                                        $("#HSumQtys").val(count);
+                                        $("#HBarCodeQtys").val(count1);
                                     }
                                     else {
                                         layer.msg(result.Message);
@@ -1073,6 +1113,7 @@
                     , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
                     , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
                     , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                    , { field: 'HPieceQty', title: '鏉$爜鏁伴噺', width: 150 }
                 ]]
                 , height: 500
                 , done: function () {

--
Gitblit v1.9.1