From 047ebcfe7352ea3ef5bd46887cf112f662d3c5d3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 22 十一月 2022 08:43:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html       |   36 +++
 WebTM/views/验收入库/产品入库/Kf_ICStockBillSub_WMS_List.html |  167 ++++++++++++++++
 WebTM/views/验收入库/产品入库/Kf_ProductInBillList.html       |   39 +++
 WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html        |   41 +++
 WebTM/views/基础资料/工资基础资料/Gy_WorkDay.html               |   36 +--
 WebTM/views/基础资料/工资基础资料/Add_Edit_Gy_WorkDay.html      |  181 +++++++----------
 WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html         |   33 +++
 WebTM/WebTM.csproj                                    |    6 
 WebTM/views/系统管理/组织架构设置/Gy_DutyEdit.html              |   14 
 9 files changed, 406 insertions(+), 147 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1c11569..0d8aaa0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -1095,6 +1095,7 @@
     <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_FastCheck.html" />
     <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_CheckList_New.html" />
     <Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_MateOutBill_Check_New.html" />
+    <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ICStockBillSub_WMS_List.html" />
     <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
@@ -1476,10 +1477,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Files\000000001043\" />
-    <Folder Include="Files\000000001077\" />
-    <Folder Include="Files\000000001078\" />
-    <Folder Include="Files\000000001080\" />
+    <Folder Include="Files\" />
     <Folder Include="views\浠撳瓨绠$悊\璋冩嫧鍗曟牳瀵筡" />
     <Folder Include="views\浠撳瓨绠$悊\璋冩嫧鍗曠ń鏍竆" />
   </ItemGroup>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
index 75b0a28..c7e373a 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
@@ -112,6 +112,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -166,6 +167,10 @@
                     //鍒犻櫎
                     case 'set_DeleteBill': set_DeleteBill();
                         break;
+                    //鏄庣粏
+                    case 'btn-WmsSub':
+                        getWmsSub();
+                        break;
                     //鍏抽棴
                     case 'set_CloseBill': set_CloseBill();
                         break;
@@ -219,7 +224,8 @@
                     , limit: 50
                     , limits: [50, 500, 5000, 20000]
                     , cols: [[
-                        { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        { type: 'checkbox', fixed: 'left' }
+                        ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                         , { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true }
@@ -298,6 +304,34 @@
                 DisPlay_HideColumn();
             }
 
+            //鏉$爜鏄庣粏
+            function getWmsSub() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var BillType = "1207";
+                    layer.open({
+                        type: 2
+                        , skin: "layui-layer-rim" //鍔犱笂杈规
+                        , title: "鏉$爜鏄庣粏"  //鏍囬
+                        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                        , shift: 2 //寮瑰嚭鍔ㄧ敾
+                        , area: ["90%", "90%"] //绐椾綋澶у皬
+                        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                        , content: ['../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
+                        , btn: ["纭畾", "鍙栨秷"]
+                        //, end : function () {
+                        //    //鍒锋柊琛ㄦ牸鏁版嵁
+                        //    get_Display(sWhere);
+                        //}
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
 
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
index f3382d2..16779c6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
@@ -27,7 +27,7 @@
     </style>
 </head>
 <body>
-        
+
     <div class="layui-fluid" style="padding: 0;">
         <div class="layui-card" style="padding: 15px;">
             <div class="layui-card-body" style="padding: 1px;">
@@ -43,54 +43,54 @@
                             <div class="layui-col-xs4 layui-inline">
                                 <label class="layui-form-label">鏃ユ湡</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
-                                    <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">涓婄彮鏃堕棿</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">涓嬬彮鏃堕棿锛�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                 </div>
                             </div>
                         </div>
                         <div class="layui-row">
                             <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鍒涘缓浜�</label>
+                                <label class="layui-form-label">涓婄彮鏃堕棿</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="HMakeEmp" id="HMakeEmp" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HMakeEmpID" id="HMakeEmpID" value="0">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                    </button>
+                                    <input class="layui-input" name="HWorkBegin" id="HWorkBegin" autocomplete="off" model="datetime">
                                 </div>
                             </div>
                             <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鍖呰鏉愯川</label>
+                                <label class="layui-form-label">涓嬬彮鏃堕棿锛�</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="HPackMaterial" id="HPackMaterial" lay-verify="HPackMaterial" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">澶囨敞</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                    <input class="layui-input" name="HWorkEnd" id="HWorkEnd" autocomplete="off" model="datetime">
                                 </div>
                             </div>
                         </div>
-                      
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鍗堜紤寮�濮�</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HNoonbreakBegin" id="HNoonbreakBegin" autocomplete="off" model="datetime">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鍗堜紤缁撴潫锛�</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HNoonbreakEnd" id="HNoonbreakEnd" autocomplete="off" model="datetime">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鏅氫紤寮�濮�</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HNightbreakBegin" id="HNightbreakBegin" autocomplete="off" model="datetime">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鏅氫紤缁撴潫锛�</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HNightbreakEnd" id="HNightbreakEnd" autocomplete="off" model="datetime">
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <input id="HItemID" name="HItemID" type="hidden" value="0" />
-                    <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
-                    <input id="HParentID" name="HParentID" type="hidden" value="0" />
-                    <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
-                    <input id="HShortNumber" name="HShortNumber" type="hidden" />
                 </form>
             </div>
         </div>
@@ -111,7 +111,8 @@
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
-                , element = layui.element;
+                , element = layui.element
+                , laydate = layui.laydate;
             var sWhere = "";
             var date = new Date();
             var day = date.getDate();
@@ -120,10 +121,37 @@
             var shijian = year + "-" + month + "-" + day;
             //#endregion
 
-
+            laydate.render({
+                elem: '#HDate'
+                //, type:'year'
+            });
+            laydate.render({
+                elem: '#HWorkBegin'
+                , type: 'time'
+            });
+            laydate.render({
+                elem: '#HWorkEnd'
+                , type: 'time'
+            });
+            laydate.render({
+                elem: '#HNoonbreakBegin'
+                , type: 'time'
+            });
+            laydate.render({
+                elem: '#HNoonbreakEnd'
+                , type: 'time'
+            });
+            laydate.render({
+                elem: '#HNightbreakBegin'
+                , type: 'time'
+            });
+            laydate.render({
+                elem: '#HNightbreakEnd'
+                , type: 'time'
+            });
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            $('#HMakeTime').val(Format(new Date(), "yyyy-MM-dd"))
+            $('#HDate').val(Format(new Date(), "yyyy-MM-dd"))
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
@@ -175,7 +203,7 @@
             form.on('submit(HEmp-BT)', function () {
                 get_checkEmp();
             });
-            
+
             //淇濆瓨鎸夐挳
             form.on('submit(set_SaveBill)', function (data) {
                 set_SaveBill(data);
@@ -201,7 +229,7 @@
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 var ajaxLoad = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "Gy_PackType/cx",
+                    url: GetWEBURL() + "Gy_WorkDay/cx",
                     type: "GET",
                     data: {
                         "HInterID": linterid
@@ -221,21 +249,13 @@
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HItemID": data.HItemID
-                                ,"HNumber": data.鍖呰鏂瑰紡浠g爜
-                                , "HName": data.鍖呰鏂瑰紡鍚嶇О
-                                , "HParentID": data.HParentID
-                                , "HShortNumber": data.鐭唬鐮�
-                                , "HHelpCode": data.鍔╄鐮�
-                                //, "HMakeEmp": data.鍒涘缓浜�
-                                , "HPackMaterial": data.鍖呰鏉愯川
-                                , "HLevel": data.绛夌骇
-                                , "HLenhth": data.闀�
-                                , "HWidth": data.瀹�
-                                , "HHeight": data.楂�
-                                //, "HStopflag": data.绂佺敤鏍囪
-                                , "HRemark": data.澶囨敞
-                                , "HUseFlag": data.浣跨敤鏍囪
-                                , "HMakeTime": Format(data.鍒涘缓鏃堕棿, "yyyy-MM-dd")
+                                , "HDate": data.HDate
+                                , "HWorkBegin": data.HWorkBegin
+                                , "HWorkEnd": data.HWorkEnd
+                                , "HNoonbreakBegin": data.HNoonbreakBegin
+                                , "HNoonbreakEnd": data.HNoonbreakEnd
+                                , "HNightbreakBegin": data.HNightbreakBegin
+                                , "HNightbreakEnd": data.HNightbreakEnd
                             });
                             layer.close(ajaxLoad);
                         } else {
@@ -253,33 +273,9 @@
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
                 var sMainStr = JSON.stringify(data.field);
-                if (!$("#HNumber").val()) {
-                    layer.msg("璇疯緭鍏ュ寘瑁呮柟寮忎唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HName").val()) {
-                    layer.msg("璇疯緭鍏ュ寘瑁呮柟寮忓悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HMakeEmpID").val() == 0) {
-                    layer.msg("璇烽�夋嫨鍒涘缓浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HLenhth").val()) {
-                    layer.msg("璇疯緭鍏ラ暱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HWidth").val()) {
-                    layer.msg("璇疯緭鍏ュ锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HHeight").val()) {
-                    layer.msg("璇疯緭鍏ラ珮锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "Gy_PackType/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "Gy_WorkDay/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
                     data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                     dataType: "json",
@@ -302,33 +298,6 @@
                 });
             }
             //#endregion
-
-            //#region 閫夋嫨鑱屽憳鏂规硶
-            function get_checkEmp() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鑱屽憳鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HMakeEmp").val(checkStatus.data[0].HName);
-                        $("#HMakeEmpID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //#endregion
-
-
             //#region 淇濆瓨鍚庢祻瑙堟柟娉�
             function ReRoadBillMain() {
                 location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html"
index 022d3cd..a4277e7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkDay.html"
@@ -25,15 +25,9 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鍖呰浠g爜</label>
+                                    <label class="layui-form-label">鏃ユ湡</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">鍖呰鍚嶇О</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                        <input type="text" class="layui-input" name="HDate" id="HDate">
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -110,11 +104,14 @@
             var sWhere = "";
             var option = [];
             var Organization = sessionStorage["Organization"]
-            var HModName = "Gy_PackType";
+            var HModName = "Gy_WorkDay";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID","HParentID",];
             //#endregion
-
+            laydate.render({
+                elem: '#HDate'
+                //, type:'year'
+            });
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //鍒濆鍖栫晫闈�
@@ -218,7 +215,7 @@
                 var ajaxLoad = layer.load();
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Gy_PackType/list',
+                    url: GetWEBURL() + '/Gy_WorkDay/list',
                     type: "GET",
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
 
@@ -286,12 +283,10 @@
 
             //#region 蹇�熻繃婊�
             function get_FastQuery() {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
+                var HDate = $("#HDate").val();
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
-
                 if (ColName != 0 && Comparator != 0) {
                     var com = "";
                     switch (Comparator) {
@@ -313,11 +308,8 @@
                     }
                     sWhere += " and " + ColName + " " + com;
                 }
-                if (HNumber) {
-                    sWhere += " and 鍖呰鏂瑰紡浠g爜 like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 鍖呰鏂瑰紡鍚嶇О like '%" + HName + "%'";
+                if (HDate) {
+                    sWhere += " and DATEDIFF(D,鏃ユ湡,'" + HDate +"')=0";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -341,7 +333,7 @@
                     type: 2
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '鍖呰鏂瑰紡鍒楄〃-鏂板'
+                    , title: '宸ヤ綔鏃�-鏂板'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
                     , content: '../宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_WorkDay.html?OperationType=1&linterid=&HSouceBillType='
                 })
@@ -358,7 +350,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '鍖呰鏂瑰紡鍒楄〃-缂栬緫'
+                        , title: '宸ヤ綔鏃�-缂栬緫'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: '../宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                     })
@@ -378,7 +370,7 @@
                         var wait = layer.load();
                         //閫昏緫鍒犻櫎鏂规硶
                         $.ajax({
-                            url: GetWEBURL() + 'DeltetGy_PackType',
+                            url: GetWEBURL() + 'DeltetGy_WorkDay',
                             type: "GET",
                             data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                             success: function (result) {
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html"
index ec8a9dd..bfecf4a 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html"
@@ -6,12 +6,12 @@
     <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">
-    <script src="../../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <style type="text/css">
         .layui-form-label {
             width: 85px;
@@ -109,7 +109,7 @@
 </html>
 <script>
     layui.config({
-        base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
     }).extend({
         index: 'lib/index', //涓诲叆鍙fā鍧�
     }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
index 2fe89a2..bce69e6 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
@@ -105,13 +105,14 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>--> 
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -171,6 +172,10 @@
                         break;
                     //鍒犻櫎鎸夐挳
                     case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鏄庣粏
+                    case 'btn-WmsSub':
+                        getWmsSub();
                         break;
                     //娴忚
                     case 'btn-view': get_ViewReport();
@@ -242,7 +247,8 @@
                     , limit: 50
                     , limits: [50, 500, 5000, 20000]
                     , cols: [[
-                        { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        { type: 'checkbox', fixed: 'left' }
+                        ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                         , { field: 'hmanagerid', title: 'hmanagerid', width: 160, hide: true }
@@ -308,6 +314,7 @@
                     ]]
                 }
             }
+
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             function get_Display(sWhere) {
                 var index = layer.load(0);
@@ -335,6 +342,34 @@
                 DisPlay_HideColumn();
             }
 
+
+            //鏉$爜鏄庣粏
+            function getWmsSub() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var BillType = "1206";
+                    layer.open({
+                        type: 2
+                        , skin: "layui-layer-rim" //鍔犱笂杈规
+                        , title: "鏉$爜鏄庣粏"  //鏍囬
+                        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                        , shift: 2 //寮瑰嚭鍔ㄧ敾
+                        , area: ["90%", "90%"] //绐椾綋澶у皬
+                        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                        , content: ['../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
+                        , btn: ["纭畾", "鍙栨秷"]
+                        //, end : function () {
+                        //    //鍒锋柊琛ㄦ牸鏁版嵁
+                        //    get_Display(sWhere);
+                        //}
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
 
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
@@ -374,7 +409,7 @@
 
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["鍗曟嵁ID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
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_ICStockBillSub_WMS_List.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_ICStockBillSub_WMS_List.html"
new file mode 100644
index 0000000..b0c502c
--- /dev/null
+++ "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_ICStockBillSub_WMS_List.html"
@@ -0,0 +1,167 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏉$爜鏄庣粏</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+
+<script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+        //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var sWhere = "";
+            var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            var params = getUrlVars();
+            var BillType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+            var HInterID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+            //if (BillType == undefined) {
+            //    BillType = 3711;
+            //    HInterID = 70;
+            //}
+          
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(1);
+                        break;
+                };
+            });
+            //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                         { type: 'numbers', title: '搴忓彿', totalRow: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , { field: '鏉$爜', title: '鏉$爜' }
+                        , { field: '鏁伴噺', title: '鏁伴噺' }
+                        , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜'}
+                        , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
+                    ]]
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                sWhere = " and HInterID=" + HInterID + " and HBillType='" + BillType+"'";
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Kf_ICStockBillSub_WMS/Kf_ICStockBillSub_WMS_List',
+                    type: "GET",
+                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+
+        //#endregion
+
+        //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.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_ProductInBillList.html"
index 62daf59..cedb8eb 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_ProductInBillList.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_ProductInBillList.html"
@@ -111,6 +111,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -256,6 +257,10 @@
                         else {
                             layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                         }
+                        break;
+                    //鏄庣粏
+                    case 'btn-WmsSub':
+                        getWmsSub();
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
@@ -475,9 +480,6 @@
             }
 
 
-        //#endregion
-
-
             // 蹇�熻繃婊�
             function get_FastQuery() {
                 var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
@@ -523,6 +525,35 @@
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
+
+            //鏉$爜鏄庣粏
+            function getWmsSub() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var BillType = "1202";
+                    layer.open({
+                        type: 2
+                        , skin: "layui-layer-rim" //鍔犱笂杈规
+                        , title: "鏉$爜鏄庣粏"  //鏍囬
+                        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                        , shift: 2 //寮瑰嚭鍔ㄧ敾
+                        , area: ["90%", "90%"] //绐椾綋澶у皬
+                        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                        , content: ['../浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
+                        , btn: ["纭畾", "鍙栨秷"]
+                        //, end : function () {
+                        //    //鍒锋柊琛ㄦ牸鏁版嵁
+                        //    get_Display(sWhere);
+                        //}
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
             // 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -543,7 +574,7 @@
                 set_ClearQuery();
                 get_Display(sWhere);
             }
-            //#endregion
+        //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
index 5efc92d..3efe374 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
@@ -111,6 +111,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -261,6 +262,10 @@
                             layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                         }
                         break;
+                    //鏄庣粏
+                    case 'btn-WmsSub':
+                        getWmsSub();
+                        break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
@@ -370,6 +375,34 @@
                 DisPlay_HideColumn();
             }
 
+            //鏉$爜鏄庣粏
+            function getWmsSub() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var BillType = "1203";
+                    layer.open({
+                        type: 2
+                        , skin: "layui-layer-rim" //鍔犱笂杈规
+                        , title: "鏉$爜鏄庣粏"  //鏍囬
+                        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                        , shift: 2 //寮瑰嚭鍔ㄧ敾
+                        , area: ["90%", "90%"] //绐椾綋澶у皬
+                        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                        , content: ['../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
+                        , btn: ["纭畾", "鍙栨秷"]
+                        //, end : function () {
+                        //    //鍒锋柊琛ㄦ牸鏁版嵁
+                        //    get_Display(sWhere);
+                        //}
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                }
+            }
+
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";

--
Gitblit v1.9.1