From b3770cb16a7e55e46d7016eb20849a4365e86825 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 26 九月 2022 09:23:43 +0800
Subject: [PATCH] 下架找货单 委外入库 产品入库 增加班组和职员

---
 WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html |  120 +++
 WebTM/views/Baseset/基础资料/Gy_EmployeeList.html    |   36 
 WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 1380 +++++++++++++++++++++++--------------------
 WebTM/views/Baseset/基础资料/Gy_GroupList.html       |  107 +++
 WebTM/layuiadmin/Scripts/webConfig.js            |   14 
 WebTM/views/仓存管理/仓库调拨/Cc_LookingForBill.html     |  159 +++-
 WebTM/WebTM.csproj                               |    1 
 7 files changed, 1,105 insertions(+), 712 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a7efeea..da2cfc5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -299,6 +299,7 @@
     <Content Include="views\Baseset\SRM_OpenTmpList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_CustomerList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_DepartmentList.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_GroupList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_EmployeeList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProductionResourcesList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_WorkCenterList.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 050e8c6..2a88ec6 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,19 +1,11 @@
 锘縡unction GetWEBURL() {
-    //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
-    var WEBURL = "http://124.70.129.242/WebAPI/";          //闆呯惇璇�
     //var WEBURL = "http://124.70.129.242:9090/WebAPI/";          //闆呯惇璇烘祴璇�
-    //var WEBURL = "http://localhost:8084/WebAPI/";
-    //61.130.49.162:9090
-    //WEBURL = "";
+    var WEBURL = "http://localhost:8082/yqnwmsAPI/";
     return WEBURL
 }
 
 function GetWEBURL1() {
-    //var WEBURL = 'http://192.168.16.80:8011/';           //鍔炲叕瀹ゆ湇鍔″櫒
-    var WEBURL = 'http://124.70.129.242/WebAPI/';          //闆呯惇璇�
-    //var WEBURL = 'http://124.70.129.242:9090/WebAPI/';          //闆呯惇璇烘祴璇�
-    //var WEBURL = 'http://localhost:8084/WebAPI/';
-    //61.130.49.162:9090
-    //WEBURL = "";
+    //var WEBURL = 'http://124.70.129.242/WebAPI/';          //闆呯惇璇�
+    var WEBURL = "http://localhost:8082/yqnwmsAPI/";
     return WEBURL
 }
\ No newline at end of file
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 3bdfea9..17ad527 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -50,8 +50,8 @@
 
         layui.use(['table', 'form', 'layer'], function () {
             var table = layui.table
-            , form = layui.form
-            , layer = layui.layer;
+                , form = layui.form
+                , layer = layui.layer;
 
             form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
                 //var sMainStr = JSON.stringify(table.cache['ck-table']);
@@ -59,8 +59,13 @@
             });
             form.on('submit(FH)', function () {//閫夋嫨浠撳簱
                 //var sMainStr = JSON.stringify(table.cache['ck-table']);
+                var index = parent.layer.getFrameIndex(window.name);
                 var checkStatus = table.checkStatus('ck-table')
-                 , data = checkStatus.data;
+                    , data = checkStatus.data;
+                if (data.length == 0) {
+                    parent.layer.close(index);
+                    return;
+                }
                 switch (Type) {
                     case "HKeeper":  //杩斿洖淇濈
                         parent.GetHKeeperValue(data);
@@ -71,23 +76,28 @@
                     case "HWorker":  //杩斿洖鎿嶄綔宸�
                         parent.GetHWorkerValue(data);
                         break;
+                    case "HEmpID1":  //
+                        parent.GetHEmpID1Value(data);
+                        break;
+                    case "HEmpID2":  //
+                        parent.GetHEmpID2Value(data);
+                        break;
                 }
-                var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
             });
             RoadQuery($('#Value').val(), 0);
             table.render({
                 elem: '#ck-table'
                 // , url: '/demo/table/user/'
-               , data: []
-              , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-              , cols: [[
-                  { type: 'radio' }
-                , { field: 'HItemID', width: 150, title: '鑱屽憳ID', hide: true }
-                , { field: 'HNumber', width: 150, title: '鑱屽憳浠g爜' }
-                , { field: 'HName', width: 150, title: '鑱屽憳鍚嶇О', sort: true }
-              ]]
-              , page: true
+                , data: []
+                , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HItemID', width: 150, title: '鑱屽憳ID', hide: true }
+                    , { field: 'HNumber', width: 150, title: '鑱屽憳浠g爜' }
+                    , { field: 'HName', width: 150, title: '鑱屽憳鍚嶇О', sort: true }
+                ]]
+                , page: true
             });
             ///鍔犺浇鏄剧ず鏁版嵁
             function RoadQuery(Where, HGroupID) {
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GroupList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GroupList.html"
new file mode 100644
index 0000000..911391b
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GroupList.html"
@@ -0,0 +1,107 @@
+锘�<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <!--<div class="layui-card-header"></div>-->
+            <div class="layui-card-body" style="padding: 15px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">杩囨护鍒�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+                            </div>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <table class="layui-hide" id="ck-table"></table>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.use(['table', 'form', 'layer'], function () {
+            var table = layui.table
+                , form = layui.form
+                , layer = layui.layer;
+
+            form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['ck-table']);
+                RoadQuery($('#Value').val());
+            });
+            form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['ck-table']);
+                var index = parent.layer.getFrameIndex(window.name);
+                var checkStatus = table.checkStatus('ck-table')
+                    , data = checkStatus.data;
+                if (data.length == 0) {
+                    parent.layer.close(index);
+                    return;
+                }
+                parent.GetGroupValue(data);
+                parent.layer.close(index);
+            });
+            RoadQuery($('#Value').val());
+            table.render({
+                elem: '#ck-table'
+                // , url: '/demo/table/user/'
+                , data: []
+                , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HItemID', width: 150, title: '鐝粍ID', hide: true }
+                    , { field: 'HNumber', width: 150, title: '鐝粍浠g爜' }
+                    , { field: 'HName', width: 150, title: '鐝粍鍚嶇О', sort: true }
+                ]]
+                , page: true
+            });
+            ///鍔犺浇鏄剧ず鏁版嵁
+            function RoadQuery(Where) {
+                var Value = Where;
+                if (Value == null) {
+                    Value = '';
+                }
+                $.ajax({
+                    type: "get",
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
+                    url: GetWEBURL() + "/Web/GetProductionTeamList_Json",
+                    async: true,
+                    data: { "sWhere": Value },
+                    //data: { "Value": Value },
+                    success: function (result) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+                        table.reload('ck-table', {
+                            data: ajaxReturnData
+                            , height: 'full-10'
+                            , loading: false
+                            , done: function (index, res) {
+
+                            }
+                        });
+                    },
+                    error: function (result) {
+                        console.log(result);
+                        //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                    }
+                });
+            };
+        });
+    </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/Cc_LookingForBill.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/Cc_LookingForBill.html"
index 453d22b..c9c7797 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/Cc_LookingForBill.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/Cc_LookingForBill.html"
@@ -1,8 +1,8 @@
 锘�<!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 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">
@@ -43,13 +43,13 @@
                     </div>
                     <div class="layui-tab layui-col-xs12" lay-filter="tab-LookingForBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1" style="padding:1px;display:none">琛ㄥご淇℃伅</li>
+                            <li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
                             <li lay-id="2" style="padding:1px;" class="layui-this">鏄庣粏淇℃伅</li>
                             <li lay-id="3" style="padding:1px;">宸叉壂淇℃伅</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--琛ㄥご淇℃伅-->
-                            <div class="layui-tab-item" style="display:none">
+                            <div class="layui-tab-item">
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
@@ -89,6 +89,35 @@
                                         </div>
                                         <div class="layui-col-xs3">
                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductionTeam-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: 90px; padding-left: 0px;">鑱屽憳1</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HEmpName1" id="HEmpName1" lay-verify="HEmpName1" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HEmpID1" id="HEmpID1" lay-verify="HEmpID1" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID1-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: 90px; padding-left: 0px; ">鑱屽憳2</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HEmpName2" id="HEmpName2" lay-verify="HEmpName2" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HEmpID2" id="HEmpID2" lay-verify="HEmpID2" value="0" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HJiaYe" id="HJiaYe" lay-verify="HJiaYe" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID2-BT">...</button>
                                         </div>
                                     </div>
                                 </div>
@@ -172,12 +201,18 @@
             $("#HWHName").val(sessionStorage["HWHName"]);
             $("#HSPID").val(sessionStorage["HSPID"]);
             $("#HSPName").val(sessionStorage["HSPName"]);
-            $("#HGroupID").val(sessionStorage["HGroupID"]);
-            $("#HGroup").val(sessionStorage["HGroup"]);
             $("#HSourceID").val(sessionStorage["HSourceID"]);
             $("#HSource").val(sessionStorage["HSource"]);
             $("#HMakerID").val(sessionStorage["Czybm"]);
             $("#HMaker").val(sessionStorage["HUserName"]);
+
+            $("#HGroupID").val(sessionStorage["HGroupID"])
+            $("#HGroup").val(sessionStorage["HGroup"] == 'undefined' ? '' : sessionStorage["HGroup"]);
+
+            $("#HEmpID1").val(sessionStorage["HBillerID"])
+            $("#HEmpName1").val(sessionStorage["HUserName"])
+
+            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
 
 
             //鍒ゆ柇鐢ㄦ埛鏄惁缁戝畾鐝粍鍜岀敓浜ц祫婧�
@@ -385,8 +420,7 @@
                             //    layer.close(index);
                             //    layer.msg("璇ュ疄鐗╁湪" + sSubStr[i].HSource+"瑁佸垏涓紝涓嶅厑璁告壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             //}
-                            else
-                            {
+                            else {
                                 sSubStr[i].HIsStatus = "鏄�";
                                 sSubStr[i].HSourceID = $("#HSourceID").val();
                                 sSubStr[i].HSource = $("#HSource").val();
@@ -460,9 +494,44 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GroupList.html', 'yes']
                     , resize: false
                     , cancel: function (index, layero) {
+                    }
+                })
+            });
+
+            //閫夋嫨鑱屽憳1
+            form.on('submit(HEmpID1-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=HEmpID1', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+
+            //閫夋嫨鑱屽憳2
+            form.on('submit(HEmpID2-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=HEmpID2', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
             });
@@ -507,41 +576,41 @@
                 //    }
                 //}
                 var sSubStr = JSON.stringify(tableData);
-                sSubStr = "{\"oSub\": " + sSubStr + "}";
+                sSubStr = "{\"oSub\": " + sSubStr + "}" ;
                 //sSubStr = JSON.stringify(sSubStr);
                 //var json = "{\"oMain\":" + sMainStr + "},{\"oMain\":" + sSubStr + "}";
                 if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
                 {
                     var index = layer.load();
                     $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "/LookingFor/set_SaveLookingForBill_Json",
-                        //url:"http://localhost:12761/LookingFor/set_SaveLookingForBill_Json",
-                        async: true,
-                        data: { "oMain": sSubStr },
-                        dataType: "json",
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.confirm(result.Message, {
-                                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 {
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/LookingFor/set_SaveLookingForBill_Json",
+                            //url:"http://localhost:12761/LookingFor/set_SaveLookingForBill_Json",
+                            async: true,
+                            data: { "oMain": sSubStr, "HJiaYe": $("#HJiaYe").val() },
+                            dataType: "json",
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.confirm(result.Message, {
+                                        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.close(index);
+                                    layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
                                 layer.close(index);
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                        });
                 }
             });
             //鐩戝惉鎻愪氦
@@ -625,18 +694,25 @@
                 $("#HSPID").val(obj[0].HItemID);
             }
         }
-
-        //杩斿洖鐝粍
-        function GetProductionTeamValue(obj) {   //杩斿洖鐝粍
+        function GetGroupValue(obj) {
             if (obj.length == 0) {
                 layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
             } else {
-                $("#HGroupName").val(obj[0].鐝粍);
+                $("#HGroup").val(obj[0].HName);
                 $("#HGroupID").val(obj[0].HItemID);
                 layer.closeAll();
             }
         }
-
+        function GetHEmpID1Value(obj) {
+            $("#HEmpName1").val(obj[0].HName);
+            $("#HEmpID1").val(obj[0].HItemID);
+            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
+        }
+        function GetHEmpID2Value(obj) {
+            $("#HEmpName2").val(obj[0].HName);
+            $("#HEmpID2").val(obj[0].HItemID);
+            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
+        }
         //杩斿洖鐢熶骇璧勬簮
         function GetProductionResourcesValue(obj) {  //杩斿洖鐢熶骇璧勬簮
             if (obj.length == 0) {
@@ -649,6 +725,7 @@
         }
 
         function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
+            return true;
             if ($("#HSourceBillNo").val() == '') {
                 layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
                 return false;
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 502ed94..fc3bd3c 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -1,7 +1,7 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>浜у搧鍏ュ簱</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -159,6 +159,49 @@
                                 <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="HGroupName" id="HGroupName" lay-verify="HGroupName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupID-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:40px;padding-left:0px;">鑱屽憳1</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HEmpName1" id="HEmpName1" lay-verify="HEmpName1" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HEmpID1" id="HEmpID1" lay-verify="HEmpID1" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID1-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: 40px; padding-left: 0px; ">鑱屽憳2</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HEmpName2" id="HEmpName2" lay-verify="HEmpName2" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HEmpID2" id="HEmpID2" lay-verify="HEmpID2" value="0" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HJiaYe" id="HJiaYe" lay-verify="HJiaYe" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID2-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">
@@ -172,15 +215,15 @@
                             </div>
                             <div class="layui-tab-item">
                                 <!--<div class="layui-form-item" style="padding:0px;margin:0px">
-                    <div class="layui-row">
-                        <div class="layui-col-xs4">
-                            <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
-                        </div>
-                        <div class="layui-col-xs8">
-                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
-                        </div>
-                    </div>
-                </div>-->
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>-->
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
@@ -201,21 +244,21 @@
                             </div>
                         </div>
                         <!--<div class="layui-form-item" style="margin-bottom: 20px;">
-            <div class="layui-row">
-                <div class="layui-col-xs3">
-                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
-                </div>
-                <div class="layui-col-xs3">
-                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
-                </div>
-                <div class="layui-col-xs3">
-                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
-                </div>
-                <div class="layui-col-xs3">
-                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
-                </div>
-            </div>
-        </div>-->
+                            <div class="layui-row">
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                                </div>
+                            </div>
+                        </div>-->
                     </div>
                     <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                         <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
@@ -238,11 +281,11 @@
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
             var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form
-            , element = layui.element;
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
             //娓呯┖鐣岄潰  new
 
             //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
@@ -263,6 +306,15 @@
             $("#HMakerID").hide();
             $("#HBillerID").val(sessionStorage["HBillerID"]);
             $("#HBillerID").hide();
+
+            $("#HGroupID").val(sessionStorage["HGroupID"])
+            $("#HGroupName").val(sessionStorage["HGroup"] == 'undefined' ? '' : sessionStorage["HGroup"]);
+
+            $("#HEmpID1").val(sessionStorage["HBillerID"])
+            $("#HEmpName1").val(sessionStorage["HUserName"])
+
+            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
+
             var HSourceFlag = sessionStorage["SourceFlag"];
             //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
 
@@ -290,8 +342,8 @@
             var params = getUrlVars();
             var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
             var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-        
-            function  RoadBillMain(linterid)//鍔犺浇琛ㄥご
+
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
             {
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetPonderationBill",
@@ -312,8 +364,6 @@
                     }
                 })
             }
-
-
             function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
             {
                 table.render({
@@ -323,37 +373,29 @@
                     , toolbar: '#toolbarDemo'
                     , where: { HBillID: linterid, HBillType: '1202', sWhere: '' }
                     , cols: [[
-                            { type: 'radio' }
-                            , { field: 'HQty', title: '鏁伴噺', width: 80 }
-                            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
-                            , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
-                            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
-                            , { 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 }
+                        { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                        , { 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
                 })
             }
-             
             //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
-
-            
-
-            
-
-            
-
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
                 //鑾峰彇鏈�澶у崟鎹彿 new
                 $("#HInterID").val("");
-                $("#HBillNo").val(""); 
+                $("#HBillNo").val("");
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
@@ -364,121 +406,167 @@
                         $("#HBillNo").val(d.data[0].HBillNo);
                     }
                 });
-            } 
+            }
             else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
                 RoadBillMain(linterid);
                 RoadBillSub(linterid);
             }
 
 
-        //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣   new
-        //if (1 == 2)
-        //{
-        //    element.tabChange('tab-ProductlnBill', '3');
-        //    var pFocus = $("#HBarCode");
-        //    pFocus.focus();
-        //    pFocus.select();
-        //}
-        //else
-        //{
-        //    element.tabChange('tab-ProductlnBill', '1');
-        //    var pFocus = $("#HSourceBillNo");
-        //    pFocus.focus();
-        //    pFocus.select();
-        //}
-        //
-        //
+            //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣   new
+            //if (1 == 2)
+            //{
+            //    element.tabChange('tab-ProductlnBill', '3');
+            //    var pFocus = $("#HBarCode");
+            //    pFocus.focus();
+            //    pFocus.select();
+            //}
+            //else
+            //{
+            //    element.tabChange('tab-ProductlnBill', '1');
+            //    var pFocus = $("#HSourceBillNo");
+            //    pFocus.focus();
+            //    pFocus.select();
+            //}
+            //
+            //
 
-        //閫夋嫨浠撳簱
-        form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
-            layer.open({
-                type: 2
-                , area: ['100%', '100%']
-                , title: '浠撳簱鍒楄〃'
-                , shade: 0.6 //閬僵閫忔槑搴�
-                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
-                , resize: false
-                , cancel: function () {
-                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                }
-            })
-        });
+            //閫夋嫨浠撳簱
+            form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
 
-        //閫夋嫨浠撲綅
-        form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
-            layer.open({
-                type: 2
-                , area: ['100%', '100%']
-                , title: '浠撲綅鍒楄〃'
-                , shade: 0.6 //閬僵閫忔槑搴�
-                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
-                , resize: false
-                , cancel: function () {
-                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                }
-            })
-        });
+            //閫夋嫨浠撲綅
+            form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
 
-        //閫夋嫨淇濈
-        form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
-            layer.open({
-                type: 2
-                , area: ['100%', '100%']
-                , title: '淇濈鍒楄〃'
-                , shade: 0.6 //閬僵閫忔槑搴�
-                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                , resize: false
-                , cancel: function () {
-                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                }
-            })
-        });
+            //閫夋嫨淇濈
+            form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+                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(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");
+                    }
+                })
+            });
+            //閫夋嫨鑱屽憳1
+            form.on('submit(HEmpID1-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=HEmpID1', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //閫夋嫨鑱屽憳2
+            form.on('submit(HEmpID2-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=HEmpID2', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //閫夋嫨鐝粍
+            form.on('submit(HGroupID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GroupList.html', '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(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
-            layer.open({
-                type: 2
-                , area: ['100%', '100%']
-                , title: '閮ㄩ棬鍒楄〃'
-                , shade: 0.6 //閬僵閫忔槑搴�
-                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                , resize: false
-                , cancel: function () {
-                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                }
-            })
-        });
-
-        //缂栬緫
-        form.on('submit(cmdModify)', function () {//缂栬緫
-            var sSubStr = table.cache['wl-table'];
-            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+            //缂栬緫
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
@@ -492,518 +580,520 @@
                         //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
-           // }
-        });
+                // }
+            });
 
-        form.on('submit(Cancel)', function () {
-            //sessionStorage["SourceFlag"] = false;
-            parent.location.href = "../../../views/index.html"
-            //window.close();//鍏抽棴褰撳墠椤�
-        })
+            form.on('submit(Cancel)', function () {
+                //sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
 
-        //鍒犻櫎
-        form.on('submit(cmdDelete)', function () {//鍒犻櫎
-            var checkStatus = table.checkStatus('wl-table')
-            , data = checkStatus.data;
-            var sInterID = $('#HInterID').val()
-            var sMaterID = data[0].HMaterID
-            var sBillType = '1202'
-            var sAuxPropID = data[0].HAuxPropID
-            //var sMTONo = data[0].HMTONo
-            var sMTONo = ''
-            var sSourceInterID = data[0].HSourceInterID
-            var sSourceEntryID = data[0].HSourceEntryID
-            $.ajax(
-               {
-                   type: "Get",
-                   //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                   url: GetWEBURL() + "/ProductIn/Delete_Json",
-                   async: true,
-                   data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
-                   dataType: "json",
-                   success: function (data) {
-                       if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                           table.render({
-                               elem: '#wl-table'
-                               //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Mate_Webs_Json'
-                         , url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
-                         , cellMinWidth: 80
-                         , toolbar: '#toolbarDemo'
-                         , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
-                         , cols: [[
-                                { type: 'radio' }
-                                , { field: 'HQty', title: '鏁伴噺', width: 80 }
-                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
-                                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
-                                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
-                                , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
-                                , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
-                                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
-                                , { field: 'HBatchNo', title: '鎵规', width: 100 }
-                                , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
-                                , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
-                                , { field: 'HMaterID', title: '鐗╂枡ID', width: 100 }
-                         ]]
-                         , height: 500
-                           })
-                       }
-                       else {
-                           layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                       }
-                   },
-                   error: function (err) {
-                       layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                   }
-               });
-        });
-
-        //鎻愪氦
-        form.on('submit(Saver)', function (data) {//鎻愪氦
-            //debugger;
-            if ($("#HExplanation").val() == "") {
-                if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
-                    $("#HWHNAME").val("");
-                    $("#HWHID").val("");
-                    layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                else
-                {
-                    $("#HExplanation").val($("#HWHNAME").val());
-                }
-            }
-            var sMainStr = JSON.stringify(data.field);
-            var sSubStr = table.cache['wl-table'];
-            //var sSourceType = $("#HBillType").val();
-            var sSourceType = "3711";
-            if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
-            {
-                layer.load(3);
+            //鍒犻櫎
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                var sInterID = $('#HInterID').val()
+                var sMaterID = data[0].HMaterID
+                var sBillType = '1202'
+                var sAuxPropID = data[0].HAuxPropID
+                //var sMTONo = data[0].HMTONo
+                var sMTONo = ''
+                var sSourceInterID = data[0].HSourceInterID
+                var sSourceEntryID = data[0].HSourceEntryID
                 $.ajax(
-                {
-                    type: "POST",
-                    //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/set_SaveProductInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    url: GetWEBURL() + "/ProductIn/set_SaveProductInBill_Json",
-                    async: true,
-                    data: { "oMain": sMainStr  },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
-                            layer.confirm("鐢熸垚浜у搧鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), {
-                                icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                btn2: function () {
-                                    //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                    //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                    parent.location.href = "../../../views/index.html"
-                                }//鍏抽棴
-                            }, function () { window.location.reload(); });//鏂板
-                        }
-                        else {
-                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    }
-                });
-                return false;
-            } 
-        });
-
-        //鐩戝惉鎻愪氦
-        form.verify({
-            numberOrEmpty: function (value, item) {
-                // if (value != '') {
-                if (!/^\d+$/.test(value)) {
-                    return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                }
-                //}
-            }
-        });
-
-        //鎵潯鐮�
-        $('#HBarCode').on('keydown', function (event) {  //鎵潯鐮�
-            var sSubStr = table.cache['wl-table'];
-            var sBarCode = $('#HBarCode').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            var sQty = $("#HQty").val()
-            var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷
-            var sBillType = '1202'
-            var sHWHID = $("#HWHID").val()
-            var sHSPID = $("#HStockPlaceID").val()
-            var sSourceBillNo = $("#HSourceBillNo").val()
-            //var Flag = sessionStorage["SourceFlag"];
-            if (sQty == "") {
-                sQty = 0;
-            }
-            if (event.keyCode == 13) {
-                //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
-                if (sBarCode == '') {
-                    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")
                     {
-                        layer.msg("浠撲綅涓虹┖锛岃閫夋嫨浠撲綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        return false;
-                    }
-                }
-                //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
-                    url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
-                    type: "GET",
-                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
-                    success: function (result) {
-                        //debugger;
-                        if (result.count == 1) {
-                            if (result.data.HBarType == '浠撳簱鏉$爜') {
-                                $("#HWHNAME").val(result.data.HWhName);
-                                $("#HWHID").val(result.data.HWhID);
-                                $("#HStockPlaceName").val("");
-                                $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
-                                element.tabChange('tab-ProductlnBill', '2');  //璺宠浆椤电
-                            }
-                            else if (result.data.HBarType == '浠撲綅鏉$爜') {
-                                $("#HStockPlaceName").val(result.data.HSPName);
-                                $("#HStockPlaceID").val(result.data.HSPID);
-                                $("#HWHNAME").val(result.data.HWhName);
-                                $("#HWHID").val(result.data.HWhID);
-                                $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
-                                element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
-                            }
-                            else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
-                                $("#HDeptName").val(result.data.HDeptName);
-                                $("#HDeptID").val(result.data.HDeptID);
-                                $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
-                                element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
-                            }
-                            else if (result.data.HBarType == '婧愬崟鏉$爜') {
-                                $("#HSupName").val(result.data.HSupName);
-                                $("#HSupID").val(result.data.HSupID);
-                                $("#HDeptName").val(result.data.HDeptName);
-                                $("#HDeptID").val(result.data.HDeptID);
-                                $("#HSourceBillNo").val(result.data.HSourceBillNo);
-                                HSourceFlag = true;
-                                //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                //if (result.data.HSourceBillType == "3711") {
-                                //    $("#HBillType").val("3711");
-                                //}
-                                //else {
-                                //    $("#HBillType").val("-1");
-                                //}
-                                $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
-                                element.tabChange('tab-ProductlnBill', '3');
+                        type: "Get",
+                        //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/ProductIn/Delete_Json",
+                        async: true,
+                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                table.render({
+                                    elem: '#wl-table'
+                                    //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Mate_Webs_Json'
+                                    , url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
+                                    , cellMinWidth: 80
+                                    , toolbar: '#toolbarDemo'
+                                    , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
+                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
+                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                                        , { field: 'HBatchNo', title: '鎵规', width: 100 }
+                                        , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
+                                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
+                                        , { field: 'HMaterID', title: '鐗╂枡ID', width: 100 }
+                                    ]]
+                                    , height: 500
+                                })
                             }
                             else {
-                                if (HSourceFlag == "true") {
-                                    element.tabChange('tab-ProductlnBill', '3');
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+            });
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //debugger;
+                if ($("#HExplanation").val() == "") {
+                    if ($("#HWHNAME").val() == "瀹藉箙鎴愬搧浠揘EW" || $("#HWHNAME").val() == "鏍锋湰浠揘EW") {
+                        $("#HWHNAME").val("");
+                        $("#HWHID").val("");
+                        layer.msg("璇锋壂MES搴撲綅鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    else {
+                        $("#HExplanation").val($("#HWHNAME").val());
+                    }
+                }
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                //var sSourceType = $("#HBillType").val();
+                var sSourceType = "3711";
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/set_SaveProductInBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            url: GetWEBURL() + "/ProductIn/set_SaveProductInBill_Json",
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm("鐢熸垚浜у搧鍏ュ簱鍗�" + data.Message + $("#HBillNo").val(), {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }, function () { window.location.reload(); });//鏂板
                                 }
                                 else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    return false;
+                }
+            });
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //鎵潯鐮�
+            $('#HBarCode').on('keydown', function (event) {  //鎵潯鐮�
+                var sSubStr = table.cache['wl-table'];
+                var sBarCode = $('#HBarCode').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var sQty = $("#HQty").val()
+                var sHBillType = $("#HBillType").val()  //婧愬崟绫诲瀷
+                var sBillType = '1202'
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sSourceBillNo = $("#HSourceBillNo").val()
+                //var Flag = sessionStorage["SourceFlag"];
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
+                    if (sBarCode == '') {
+                        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") {
+                            layer.msg("浠撲綅涓虹┖锛岃閫夋嫨浠撲綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                    }
+                    //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//闈炵┖楠岃瘉
+                    $.ajax({
+                        //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
+                        url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
+                        type: "GET",
+                        data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
+                        success: function (result) {
+                            //debugger;
+                            if (result.count == 1) {
+                                if (result.data.HBarType == '浠撳簱鏉$爜') {
+                                    $("#HWHNAME").val(result.data.HWhName);
+                                    $("#HWHID").val(result.data.HWhID);
+                                    $("#HStockPlaceName").val("");
+                                    $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+                                    element.tabChange('tab-ProductlnBill', '2');  //璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '浠撲綅鏉$爜') {
+                                    $("#HStockPlaceName").val(result.data.HSPName);
+                                    $("#HStockPlaceID").val(result.data.HSPID);
+                                    $("#HWHNAME").val(result.data.HWhName);
+                                    $("#HWHID").val(result.data.HWhID);
+                                    $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+                                    element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '閮ㄩ棬鏉$爜') {
+                                    $("#HDeptName").val(result.data.HDeptName);
+                                    $("#HDeptID").val(result.data.HDeptID);
+                                    $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+                                    element.tabChange('tab-ProductlnBill', '2');//璺宠浆椤电
+                                }
+                                else if (result.data.HBarType == '婧愬崟鏉$爜') {
                                     $("#HSupName").val(result.data.HSupName);
                                     $("#HSupID").val(result.data.HSupID);
-                                    //$("#HDeptName").val(result.data.HDept);
-                                    //$("#HDeptID").val(result.data.HDeptID);
+                                    $("#HDeptName").val(result.data.HDeptName);
+                                    $("#HDeptID").val(result.data.HDeptID);
                                     $("#HSourceBillNo").val(result.data.HSourceBillNo);
                                     HSourceFlag = true;
                                     //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
                                     //if (result.data.HSourceBillType == "3711") {
                                     //    $("#HBillType").val("3711");
-
                                     //}
-
                                     //else {
                                     //    $("#HBillType").val("-1");
                                     //}
-                                    $("#HNote").val(";鐗╂枡鏉$爜");
+                                    $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
                                     element.tabChange('tab-ProductlnBill', '3');
                                 }
-                            }
-                            //$("#HSupID").val(result.data.HSupID);
-                            //$("#HSupName").val(result.data.HSupName);
-                            //$("#HDeptID").val(result.data.HDeptID);
-                            //$("#HDeptName").val(result.data.HDeptName);
-                            layer.load(3)
-                            table.render({
-                                elem: '#wl-table'
-                            //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
-                                , url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
-                                , toolbar: '#toolbarDemo'
-                                , 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(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.msg("鎺ュ彛璇锋眰寮傚父:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        console.log(err);
-                    }
-                });
-            }
-            //else
-            //{
-            //    layer.msg(result.Message, { icon: 5 });
-            //}
-            //layer.closeAll("loading");
-            //}
-        });
-
-        //鎵簮鍗�
-        $('#HSourceBillNo').on('keydown', function (event) {   //鎵簮鍗�
-            var HSourceBillNo = $('#HSourceBillNo').val()
-            var sInterID = $("#HInterID").val()
-            var sBillNo = $("#HBillNo").val()
-            var HSourceBillType = $("#HBillType").val()
-            if (event.keyCode == 13) {
-                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                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///ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",
-                    url: GetWEBURL() + "/ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",
-                    type: "GET",
-                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            HSourceFlag = true;
-                            layer.load(3)
-                            element.tabChange('tab-ProductlnBill', '2');
-                            table.render({
-                                elem: '#wl-table'
-                                //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
-                              , url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
-                              , toolbar: '#toolbarDemo'
-                              , 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(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
-            }
-        });
-
-        //鎵粨浣�
-        $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
-            var HBarCode = $('#HStockPlaceName').val()
-            if (event.keyCode == 13) {
-                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                $.ajax({
-                    url: GetWEBURL() + "/LookingFor/getSpName_Json",
-                    type: "GET",
-                    data: { "HBarCode": HBarCode },
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            $("#HStockPlaceName").val(result.data[0].HName);
-                            $("#HStockPlaceID").val(result.data[0].HItemID);
-                            $("#HWHID").val(result.data[0].HWHID);
-                            $("#HWHNAME").val(result.data[0].HWhName);
-                            element.tabChange('tab-ProductlnBill', '2');
-                        }
-                        else {
-                            // $("#verifycode").click();
-                            //layer.msg(result.Message, { icon: 5 });
-                            layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                        layer.closeAll("loading");
-                    }
-                });
-            }
-        });
-
-        //鎵玀ES浠撲綅
-        $('#HMESSPName').on('keydown', function (event) {      //鎵粨浣�
-            var HBarCode = $('#HMESSPName').val();
-            if (event.keyCode == 13) {
-                //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                $.ajax({
-                    url: GetWEBURL() + "/LookingFor/getSpName_Json",
-                    type: "GET",
-                    data: { "HBarCode": HBarCode },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            $("#HMESSPID").val(result.data[0].HWHID);
-                            $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
-                            $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
-                            $.ajax({
-                                url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
-                                type: "GET",
-                                data: { "HERPWHID": result.data[0].HWHID },
-                                success: function (result) {
-                                    if (result.count == 1) {
-                                        $("#HWHID").val(result.data[0].HMESWHID);
-                                        $("#HWHNAME").val(result.data[0].HMESWHNAME);
-                                        $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
-                                        $("#HMESSPName").css("background-color", "#efefef4d");
+                                else {
+                                    if (HSourceFlag == "true") {
+                                        element.tabChange('tab-ProductlnBill', '3');
                                     }
                                     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");
-                    }
-                });
-            }
-        });
+                                        $("#HSupName").val(result.data.HSupName);
+                                        $("#HSupID").val(result.data.HSupID);
+                                        //$("#HDeptName").val(result.data.HDept);
+                                        //$("#HDeptID").val(result.data.HDeptID);
+                                        $("#HSourceBillNo").val(result.data.HSourceBillNo);
+                                        HSourceFlag = true;
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                        //if (result.data.HSourceBillType == "3711") {
+                                        //    $("#HBillType").val("3711");
 
-        //鍒锋柊鏄庣粏椤电
-        table.render({
-            elem: '#mx-table'
-            // , url: 'http://61.130.49.162:9090/WMSAPI///Web/GetHBarCodeShowBillSub'
-            //, toolbar: '#toolbarDemo'
-            // , where: { sMsg: linterid, sMsg2: lentryid }
-         , cols: [[
-           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-         ]]
-         , page: true
-         , height: 500
-         , done: function () {
-         }
-        });
-    });
-    function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
-    {
-        $("#HWHNAME").val(obj[0].HName);
-        //sessionStorage["HWHID"] = obj[0].HItemID;
-        $("#HWHID").val(obj[0].HItemID);
-    }
-    function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
-        $("#HStockPlaceName").val(obj[0].HName);
-        $("#HStockPlaceID").val(obj[0].HItemID);
-    }
-    function GetHKeeperValue(obj) {  //杩斿洖淇濈
-        $("#HKeeper").val(obj[0].HName);
-        $("#HKeeperID").val(obj[0].HItemID);
-    }
-    function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-        $("#HSecManager").val(obj[0].HName);
-        $("#HSecManagerID").val(obj[0].HItemID);
-    }
-    function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-        $("#HDeptName").val(obj[0].HName);
-        $("#HDeptID").val(obj[0].HItemID);
-    }
-    function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-        //if ($("#HSourceBillNo").val() == '') {
-        //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-        //    return false;
-        //}
-        if($("#HDeptName").val()=='')
-        {
-            layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if ($("#HSecManager").val() == '') {
-            layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if ($("#HKeeper").val() == '') {
-            layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        //if ($("#HWHNAME").val() == '') {
-        //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-        //    return false;
-        //}
-        if ($("#HBillNo").val() == '') {
-            layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if ($("#HInterID").val() == '') {
-            layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if (typeof (sSubStr) == "undefined")
-        {
-            layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            return false;
-        }
-        if (!typeof (sSubStr) == "undefined") {
-            //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-            //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-            //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-            //        {
-            //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' }); 
-            //            return false;
-            //        }
-            //    }
-            //}
-            for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                if (parseFloat(sSubStr[i].HQty) > 0) {
-                    s = 1;
+                                        //}
+
+                                        //else {
+                                        //    $("#HBillType").val("-1");
+                                        //}
+                                        $("#HNote").val(";鐗╂枡鏉$爜");
+                                        element.tabChange('tab-ProductlnBill', '3');
+                                    }
+                                }
+                                //$("#HSupID").val(result.data.HSupID);
+                                //$("#HSupName").val(result.data.HSupName);
+                                //$("#HDeptID").val(result.data.HDeptID);
+                                //$("#HDeptName").val(result.data.HDeptName);
+                                layer.load(3)
+                                table.render({
+                                    elem: '#wl-table'
+                                    //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+                                    , url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
+                                    , toolbar: '#toolbarDemo'
+                                    , 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(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.msg("鎺ュ彛璇锋眰寮傚父:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            console.log(err);
+                        }
+                    });
                 }
-            }
-            if (s == 0) {
-                layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //else
+                //{
+                //    layer.msg(result.Message, { icon: 5 });
+                //}
+                //layer.closeAll("loading");
+                //}
+            });
+            //鎵簮鍗�
+            $('#HSourceBillNo').on('keydown', function (event) {   //鎵簮鍗�
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HSourceBillType = $("#HBillType").val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    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///ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                        url: GetWEBURL() + "/ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+                        type: "GET",
+                        data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                HSourceFlag = true;
+                                layer.load(3)
+                                element.tabChange('tab-ProductlnBill', '2');
+                                table.render({
+                                    elem: '#wl-table'
+                                    //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+                                    , url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
+                                    , toolbar: '#toolbarDemo'
+                                    , 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(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+            //鎵粨浣�
+            $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HStockPlaceName').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                $("#HWHNAME").val(result.data[0].HWhName);
+                                element.tabChange('tab-ProductlnBill', '2');
+                            }
+                            else {
+                                // $("#verifycode").click();
+                                //layer.msg(result.Message, { icon: 5 });
+                                layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+            //鎵玀ES浠撲綅
+            $('#HMESSPName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HMESSPName').val();
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                $("#HMESSPID").val(result.data[0].HWHID);
+                                $("#HMESSPName").val(result.data[0].HWhName + "-" + result.data[0].HName);
+                                $("#HExplanation").val(result.data[0].HName + "-" + result.data[0].HWhName);
+                                $.ajax({
+                                    url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+                                    type: "GET",
+                                    data: { "HERPWHID": result.data[0].HWHID },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            $("#HWHID").val(result.data[0].HMESWHID);
+                                            $("#HWHNAME").val(result.data[0].HMESWHNAME);
+                                            $("#HMESSPName").attr("readonly", "readonly");//MES浠撲綅鍙HExplanation
+                                            $("#HMESSPName").css("background-color", "#efefef4d");
+                                        }
+                                        else {
+                                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+            //鍒锋柊鏄庣粏椤电
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://61.130.49.162:9090/WMSAPI///Web/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+        });
+        function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+        {
+            $("#HWHNAME").val(obj[0].HName);
+            //sessionStorage["HWHID"] = obj[0].HItemID;
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+            $("#HStockPlaceName").val(obj[0].HName);
+            $("#HStockPlaceID").val(obj[0].HItemID);
+        }
+        function GetHKeeperValue(obj) {  //杩斿洖淇濈
+            $("#HKeeper").val(obj[0].HName);
+            $("#HKeeperID").val(obj[0].HItemID);
+        }
+        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+            $("#HSecManager").val(obj[0].HName);
+            $("#HSecManagerID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        function GetHEmpID1Value(obj) {
+            $("#HEmpName1").val(obj[0].HName);
+            $("#HEmpID1").val(obj[0].HItemID);
+            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
+        }
+        function GetHEmpID2Value(obj) {
+            $("#HEmpName2").val(obj[0].HName);
+            $("#HEmpID2").val(obj[0].HItemID);
+            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
+        }
+        function GetGroupValue(obj) {
+            $("#HGroupName").val(obj[0].HName);
+            $("#HGroupID").val(obj[0].HItemID);
+        }
+        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+            //if ($("#HSourceBillNo").val() == '') {
+            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+            //    return false;
+            //}
+            if ($("#HDeptName").val() == '') {
+                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
+            if ($("#HSecManager").val() == '') {
+                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HKeeper").val() == '') {
+                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //if ($("#HWHNAME").val() == '') {
+            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+            //    return false;
+            //}
+            if ($("#HBillNo").val() == '') {
+                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HInterID").val() == '') {
+                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (typeof (sSubStr) == "undefined") {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (!typeof (sSubStr) == "undefined") {
+                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
+                //        {
+                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+                //            return false;
+                //        }
+                //    }
+                //}
+                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                    if (parseFloat(sSubStr[i].HQty) > 0) {
+                        s = 1;
+                    }
+                }
+                if (s == 0) {
+                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+            }
+            else {
+                return true;
+            }
         }
-        else
-        {
-            return true;
-        }
-    }
     </script>
 
 </body>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index 8153781..1afea92 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -173,6 +173,49 @@
                                 <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="HGroupName" id="HGroupName" lay-verify="HGroupName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupID-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:40px;padding-left:0px;">鑱屽憳1</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HEmpName1" id="HEmpName1" lay-verify="HEmpName1" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HEmpID1" id="HEmpID1" lay-verify="HEmpID1" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID1-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: 40px; padding-left: 0px; ">鑱屽憳2</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HEmpName2" id="HEmpName2" lay-verify="HEmpName2" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HEmpID2" id="HEmpID2" lay-verify="HEmpID2" value="0" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HJiaYe" id="HJiaYe" lay-verify="HJiaYe" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID2-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">
@@ -281,10 +324,15 @@
             $("#HBillerID").val(sessionStorage["HBillerID"]);
             $("#HBillerID").hide();
 
+            $("#HGroupID").val(sessionStorage["HGroupID"])
+            $("#HGroupName").val(sessionStorage["HGroup"] == 'undefined' ? '' : sessionStorage["HGroup"] );
 
+            $("#HEmpID1").val(sessionStorage["HBillerID"])
+            $("#HEmpName1").val(sessionStorage["HUserName"])
+
+            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
+            //sessionStorage["HGroupID"]
             //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
-
-
             //鑾峰彇鍙傛暟
             function getUrlVars() {
                 var vars = [], hash;
@@ -465,6 +513,58 @@
                 })
             });
 
+            //閫夋嫨鑱屽憳1
+            form.on('submit(HEmpID1-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=HEmpID1', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+
+            //閫夋嫨鑱屽憳2
+            form.on('submit(HEmpID2-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=HEmpID2', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //閫夋嫨鐝粍
+            form.on('submit(HGroupID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GroupList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            
+
             //閫夋嫨閮ㄩ棬
             form.on('submit(HDeptID-BT)', function () {
                 layer.open({
@@ -517,6 +617,7 @@
                         return;
                     }
                 }
+                //$("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = table.cache['wl-table'];
                 var sSourceType = $("#HBillType").val();
@@ -930,6 +1031,7 @@
             $("#HKeeper").val(obj[0].HName);
             $("#HKeeperID").val(obj[0].HItemID);
         }
+
         function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
             $("#HSecManager").val(obj[0].HName);
             $("#HSecManagerID").val(obj[0].HItemID);
@@ -938,6 +1040,20 @@
             $("#HDeptName").val(obj[0].HName);
             $("#HDeptID").val(obj[0].HItemID);
         }
+        function GetHEmpID1Value(obj) {
+            $("#HEmpName1").val(obj[0].HName);
+            $("#HEmpID1").val(obj[0].HItemID);
+            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
+        }
+        function GetHEmpID2Value(obj) {
+            $("#HEmpName2").val(obj[0].HName);
+            $("#HEmpID2").val(obj[0].HItemID);
+            $("#HJiaYe").val($("#HEmpID1").val() + ',' + $("#HEmpID2").val());
+        }
+        function GetGroupValue(obj) {
+            $("#HGroupName").val(obj[0].HName);
+            $("#HGroupID").val(obj[0].HItemID);
+        }
         //function Get_CheckWhAndSP(sInterID, sHBillType, sBarCode, sHWHID, sHSPID) {   //杩斿洖閮ㄩ棬
         //    $.ajax({
         //        url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/Get_CheckWhAndSP_Josn",

--
Gitblit v1.9.1