MES-WEB-LayUI.git

parent: 7d74fc21 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI into master

王垚

2022-07-27 3e0b4dc5792d7a8ffb738bc49f298e6ce3262689

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI into master

10个文件已修改

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	2208 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html	221 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html	68 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/计划管理/工艺路线/Gy_RoutingBillimport.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html	409 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/销售出库/Kf_SellOutBill_FastList.html	71 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html	223 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html	201 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -7,7 +7,7 @@
    //var WEBURL = "http://localhost:8080/API/";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/lubao";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨é²æ¬å°éç½®
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW
    //var WEBURL = "http://47.96.97.237/API/";   //æºäºæå¡å¨
@@ -17,6 +17,7 @@
    //var WEBURL = "http://192.168.0.214/API/";   //çä¸ç¥ºæå¡å¨
    //var WEBURL = "http://192.168.10.66/API/";   //æ£®æ¥·æå¡å¨
    //var WEBURL = "http://localhost/API/";
    var WEBURL = "http://60.191.27.141:8090/API/"; 
    return WEBURL
}


 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html

@@ -870,7 +870,7 @@
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æéªè¯æåäº
                                    layer.confirm(data.Message , {
                                    layer.confirm("çæè°æ¨å" + data.Message + $("#HBillNo").val(), {
                                        icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
                                        btn2: function () {
                                            //parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
@@ -1031,6 +1031,8 @@
                var sMaker = $("#HMaker").val();//å¶åäºº
                var HOrgID = $("#HOrgID").val();//ç»ç»
                var HBillType = '1207';
                var sMouldManagerCtl = 'N'
                var sFIFOCtl = 'N'
                var sSourceBillNo = $("#HSourceBillNo").val();//æºåå·
                if (sSourceBillNo == null) {
                    sSourceBillNo = "";
@@ -1138,6 +1140,7 @@
                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": HBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": WhID, "SPID": SPID, "HSCWhID": HSCWhID, "HSCSPID": HSCSPID, "sQty": sQty, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sHSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle},
                        success: function (result) {
                            if (result.count == 1) {
                                sessionStorage["SourceFlag"] = true;
                                element.tabChange('tab-MoveStockBill', '3');
                                //$("#HWHNAME").attr("readOnly", "true");//è°å¥ä»åºä¸å¯å
                                //$("#HWHID-BT").attr("disabled", "true");
@@ -1148,37 +1151,68 @@
                                //$("#HOutStockPlaceName").attr("readOnly", "true");//è°å¥ä»ä½ä¸å¯å
                                //$("#HOSpID-BT").attr("disabled", "true");
                                layer.load(3)
                                table.render({
                                    elem: '#wl-table'
                                    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
                                    , toolbar: '#toolbarDemo'
                                    , defaultToolbar: []
                                    , totalRow: true
                                    , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
                                    , cols: [[
                                        { type: 'radio', totalRowText: 'åè®¡' }
                                        , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
                                        , { field: 'ä»¶æ°', title: 'ä»¶æ°', width: 150, totalRow: true }
                                        , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
                                        , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                                        , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                                        , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                                        , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
                                        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                                        , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                                        , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
                                        , { field: 'HMaterID', title: 'ç©æåç ', width: 150, hide: true }
                                        , { field: 'HAuxPropID', title: '', width: 150, hide: true }
                                        , { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 150, hide: true }
                                        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                                    ]]
                                    // , data: [linterid]
                                    // , page: true
                                    //, height: 500
                                    , done: function () {
                                //table.render({
                                //    elem: '#wl-table'
                                //    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
                                //    , toolbar: '#toolbarDemo'
                                //    , defaultToolbar: []
                                //    , totalRow: true
                                //    , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
                                //    , cols: [[
                                //        { type: 'radio', totalRowText: 'åè®¡' }
                                //        , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
                                //        , { field: 'ä»¶æ°', title: 'ä»¶æ°', width: 150, totalRow: true }
                                //        , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
                                //        , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                                //        , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                                //        , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                                //        , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
                                //        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                                //        , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                                //        , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
                                //        , { field: 'HMaterID', title: 'ç©æåç ', width: 150, hide: true }
                                //        , { field: 'HAuxPropID', title: '', width: 150, hide: true }
                                //        , { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 150, hide: true }
                                //        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                                //    ]]
                                //    // , data: [linterid]
                                //    // , page: true
                                //    //, height: 500
                                //    , done: function () {
                                //        layer.closeAll("loading");
                                //    }
                                //});

                                $.ajax({
                                    url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
                                    type: "GET",
                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                    success: function (result) {
                                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                                            listOption.data = result.data.list;
                                            table.render(listOption);
                                            listOption1.data = result.data.list2;
                                            table.render(listOption1);

                                            //console.log(result.data.list2);
                                            var count = 0;
                                            var count1 = 0;
                                            for (var i = 0; i < result.data.list.length; i++) {
                                                count += result.data.list[i].HQty;
                                                count1 += result.data.list[i].HPieceQty;
                                            }
                                            $("#HSumQtys").val(count);
                                            $("#HBarCodeQtys").val(count1);
                                            //return;
                                        }
                                        else {
                                            layer.msg(result.Message);
                                        }
                                        layer.closeAll("loading");
                                    }
                                });


                                playSound1();
                                var sSubStr = table.cache['wl-table'];
                            }
@@ -1223,6 +1257,9 @@
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
                var HSourceBillType = $("#HBillType").val()
                var sMouldManagerCtl = 'N'
                var sFIFOCtl = 'N'
                var HBillType = '1207'
                $.ajax({
                    url: GetWEBURL() + "/MoveStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                    type: "GET",
@@ -1256,33 +1293,63 @@
                            //}
                            layer.load(3);
                            element.tabChange('tab-MoveStockBill', '2');
                            table.render({
                                elem: '#wl-table'
                                , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
                                , toolbar: '#toolbarDemo'
                                , totalRow: true
                                , defaultToolbar: []
                                , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
                                , cols: [[
                                    { type: 'radio' }
                                    , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
                                    , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true}
                                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                                    , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                                    , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                                    , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
                                    , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                                    , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
                                    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                                ]]
                                // , data: [linterid]
                                // , page: true
                                , height: 500
                                , done: function () {
                            //table.render({
                            //    elem: '#wl-table'
                            //    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
                            //    , toolbar: '#toolbarDemo'
                            //    , totalRow: true
                            //    , defaultToolbar: []
                            //    , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
                            //    , cols: [[
                            //        { type: 'radio' }
                            //        , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
                            //        , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true}
                            //        , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                            //        , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                            //        , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                            //        , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
                            //        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                            //        , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                            //        , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
                            //        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                            //    ]]
                            //    // , data: [linterid]
                            //    // , page: true
                            //    , height: 500
                            //    , done: function () {
                            //        layer.closeAll("loading");
                            //    }
                            //});

                            $.ajax({
                                url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
                                type: "GET",
                                data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                success: function (result) {
                                    if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                                        listOption.data = result.data.list;
                                        table.render(listOption);
                                        listOption1.data = result.data.list2;
                                        table.render(listOption1);

                                        //console.log(result.data.list2);
                                        var count = 0;
                                        var count1 = 0;
                                        for (var i = 0; i < result.data.list.length; i++) {
                                            count += result.data.list[i].HQty;
                                            count1 += result.data.list[i].HPieceQty;
                                        }
                                        $("#HSumQtys").val(count);
                                        $("#HBarCodeQtys").val(count1);
                                        //return;
                                    }
                                    else {
                                        layer.msg(result.Message);
                                    }
                                    layer.closeAll("loading");
                                }
                            });

                            $("#HSourceBillNo").attr("disabled", "true");
                        }
                        else {
@@ -1296,6 +1363,54 @@
            
        });


        var listOption = {
            elem: '#wl-table'
            , toolbar: '#toolbarDemo'
            , cellMinWidth: 90
            , limit: 3000
            , totalRow: true
            , cols: [[
                { type: 'radio' }
            , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
            , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true}
            , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
            , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
            , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
            , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
            , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
            , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
            , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
            , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        }
        var listOption1 = {
            elem: '#mx-table'
            , toolbar: '#toolbarDemo'
            , cellMinWidth: 90
            , cols: [[
                { type: 'radio' }
                , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
                , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true }
                , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
                , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
                , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        }

        //ä»¥ä¸ä¸ºlayuiæ¨¡å
        function GetHWHValue(obj)  //è¿åè°å¥ä»åº
        {

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_FastList.html

@@ -323,28 +323,58 @@
            
        });
        //æ¥è¯¢
        //form.on('submit(cmdQuery)', function () {
        //    var HBillNo = $("#HBillNo").val();
        //    var HSourceBillNo = $("#HSourceBillNo").val();
        //    //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
        //    $.ajax({
        //        url: GetWEBURL() + '/Gy_Mould/list1',
        //        type: "GET",
        //        data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
        //        success: function (data1) {
        //            if (data1.count == 1) {
        //                option.data = data1.data;
        //                table.render(option);
        //                layer.close(index);
        //            } else {
        //                layer.close(index);
        //                layer.alert(data1.code + data1.Message, { icon: 5 });
        //            }
        //        }, error: function () {
        //            layer.close(index);
        //            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
        //        }
        //    });
        //});
        form.on('submit(cmdQuery)', function () {
            var HBillNo = $("#HBillNo").val();
            var HSourceBillNo = $("#HSourceBillNo").val();
            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            $.ajax({
                url: GetWEBURL() + '/Gy_Mould/list1',
                type: "GET",
                data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
            var HSourceBillNo = $("#HSourceBillNo").val();;


            table.render({
                elem: '#sy-table'
                , url: GetWEBURL() + '/ProductInBillList/list1'
                , toolbar: '#toolbarDemo'
                , defaultToolbar: []
                , where: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: 'åæ®åç ', width: 120 }
                    , { field: 'HBillNo', title: 'åæ®å·', width: 150 }
                    , { field: 'HMaker', title: 'å¶åäºº', width: 120 }
                    , { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                    , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                    , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                    , { field: 'HQty', title: 'æ°é', width: 100 }
                    , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                    , { field: 'HOrgID', title: 'ç»ç»', width: 120 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            });
            })
        });
       
        

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html

@@ -185,6 +185,16 @@
                                        <input type="hidden" value="false" name="HAutoTrunFlag" id="HAutoTrunFlag">
                                    </div>
                                </div>
                                <div class="layui-col-xs4 layui-inline">
                                    <label class="layui-form-label">å·¥ä½ä¸å¿</label>
                                    <div class="layui-input-inline">
                                        <input type="text" name="HWorkCenterName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                        <input type="hidden" name="HWorkCenterID" id="HDeptID" value="0">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkCenterID-BT" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-row">
                                <div class="layui-col-xs8 layui-inline">
@@ -310,7 +320,7 @@
            });

            //éæ©å·¥ä½ä¸å¿æé®
            form.on('submit(HWorkingProcedure-BT)', function () {
            form.on('submit(HWorkCenterID-BT)', function () {
                get_checkWorkCenter();
            });

@@ -542,8 +552,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HCenter").val(checkStatus.data[0].å·¥ä½ä¸å¿);
                        $("#HCenterID").val(checkStatus.data[0].HItemID);
                        $("#HWorkCenterName").val(checkStatus.data[0].å·¥ä½ä¸å¿);
                        $("#HWorkCenterID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕÂ·Ïß/Gy_RoutingBillimport.html

@@ -53,6 +53,15 @@
                                        <input type="hidden" name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">æ¯å¦è½¬å·¥åº</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name=" HTProcessFlag" id="HTProcessFlag">
                                            <option value="0">å¦</option>
                                            <option value="1">æ¯</option>
                                        </select>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -87,6 +87,20 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">åè¿ååºä»åº</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HWHNAME_FIFO" id="HWHNAME_FIFO" lay-verify="HWHNAME_FIFO" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HWHID_FIFO" id="HWHID_FIFO" lay-verify="HWHID_FIFO" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
@@ -127,7 +141,7 @@
                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" >...</button>
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
                                        </div>
                                    </div>
                                </div>
@@ -216,7 +230,7 @@

                            <!--ç©ææ¸å-->
                            <div class="layui-tab-item">
                                <!--<div class="layui-form-item" style="padding:0px;margin:0px">
                                <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>
@@ -225,11 +239,12 @@
                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                </div>
            </div>
        </div>-->
        </div>

                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                            </div>
                            <!--æç»æ¸å-->
                           
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
                            </div>
@@ -317,7 +332,7 @@
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
                , element = layui.element;
            , element = layui.element;



@@ -443,10 +458,11 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HDeptID").val(result.data[0].HDeptID);
                        $("#HDeptName").val(result.data[0].HDeptName);
                        $("#HSourceBillNo").attr("disabled", "true");
                        HSourceFlag = true;
                        $("#HDeptID").val(result.data[0].HDeptID);
                        $("#HDeptName").val(result.data[0].HDeptName);
                      
                        //$("#HWHID").val(d.data[0].HWhID);
                        //$("#HStockPlaceID").val(d.data[0].HSPID);
                        //$("#HKeeperID").val(d.data[0].HKeeperID);
@@ -524,6 +540,35 @@
                        layer.closeAll("loading");
                    }
                });

                //$.ajax({
                //    url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
                //    type: "GET",
                //    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                //    success: function (result) {
                //        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                //            listOption.data = result.data.list;
                //            table.render(listOption);
                //            listOption1.data = result.data.list2;
                //            table.render(listOption1);

                //            //console.log(result.data.list2);
                //            var count = 0;
                //            var count1 = 0;
                //            for (var i = 0; i < result.data.list.length; i++) {
                //                count += result.data.list[i].HQty;
                //                count1 += result.data.list[i].HPieceQty;
                //            }
                //            $("#HSumQtys").val(count);
                //            $("#HBarCodeQtys").val(count1);
                //            //return;
                //        }
                //        else {
                //            layer.msg(result.Message);
                //        }
                //        layer.closeAll("loading");
                //    }
                //});
            }
             
            //å¨æå è½½æºåç±»ååè¡¨ new
@@ -568,6 +613,21 @@
                    , 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_FIFO-BT)', function () {//éæ©åè¿ååºä»åº
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: 'ä»åºåè¡¨'
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
                    , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                    , content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -800,61 +860,61 @@

            //å é¤
            form.on('submit(cmdDelete)', function () {//å é¤
                var checkStatus = table.checkStatus('wl-table')
                , data = checkStatus.data;
                // console.log(data);
                var sInterID = $('#HInterID').val()
                var sMaterID = data[0].HMaterID
                var sBillType = '1205'
                var sAuxPropID = data[0].HAuxPropID
                //var sMTONo = data[0].HMTONo
                var sMTONo = ''
                var sSourceInterID = data[0].HSourceInterID
                var sSourceEntryID = data[0].HSourceEntryID
                $.ajax(
                   {
                       type: "Get",
                       //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                       url: GetWEBURL() + "/SellOut/Delete_Json",
                       async: true,
                       data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
                       dataType: "json",
                       success: function (data) {
                           if (data.count == 1) { // è¯´æéªè¯æåäº
                               table.render({
                                   elem: '#wl-table' 
                                   , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                                   , cellMinWidth: 80
                                   , toolbar: '#toolbarDemo'
                                   , defaultToolbar: []
                                   , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                   , cols: [[
                                      { type: 'radio' }
                                       , { field: 'HQty', title: 'æ°é', width: 80 }
                                       , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
                                    , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
                                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', 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: 'HWHID', title: 'ck', 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: "æ¸©é¦¨æç¤º" });
                       }
                   });
                //var checkStatus = table.checkStatus('wl-table')
                //, data = checkStatus.data;
                //// console.log(data);
                //var sInterID = $('#HInterID').val()
                //var sMaterID = data[0].HMaterID
                //var sBillType = '1205'
                //var sAuxPropID = data[0].HAuxPropID
                ////var sMTONo = data[0].HMTONo
                //var sMTONo = ''
                //var sSourceInterID = data[0].HSourceInterID
                //var sSourceEntryID = data[0].HSourceEntryID
                //$.ajax(
                //   {
                //       type: "Get",
                //       //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                //       url: GetWEBURL() + "/SellOut/Delete_Json",
                //       async: true,
                //       data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
                //       dataType: "json",
                //       success: function (data) {
                //           if (data.count == 1) { // è¯´æéªè¯æåäº
                //               table.render({
                //                   elem: '#wl-table' 
                //                   , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                //                   , cellMinWidth: 80
                //                   , toolbar: '#toolbarDemo'
                //                   , defaultToolbar: []
                //                   , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                //                   , cols: [[
                //                      { type: 'radio' }
                //                       , { field: 'HQty', title: 'æ°é', width: 80 }
                //                       , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
                //                    , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
                //                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', 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: 'HWHID', title: 'ck', 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: "æ¸©é¦¨æç¤º" });
                //       }
                //   });
            });


@@ -1135,6 +1195,8 @@
                var sHWHID = $("#HWHID").val();//ä»åºID
                var sHSPID = $("#HStockPlaceID").val();//ä»ä½ID
                var sQty = $("#HQty").val()//æ°é
                var sMouldManagerCtl = 'N'
                var sFIFOCtl = 'N'
                if (sQty == "") {
                    sQty = 0;
                }
@@ -1319,39 +1381,70 @@
                                //$("#HSupName").val(result.data.HSupName);
                                //$("#HDeptID").val(result.data.HDeptID);
                                //$("#HDeptName").val(result.data.HDeptName);
                                table.render({
                                    elem: '#wl-table'
                                    , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                                    , toolbar: '#toolbarDemo'
                                    , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                    , cols: [[
                                        { type: 'radio' }
                                        , { field: 'HSNO', title: 'åºå·', width: 60 }
                                        , { field: 'HQty', title: 'æ°é', width: 80 }
                                        , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
                                        , { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
                                        , { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
                                        , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
                                        , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
                                        , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
                                        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
                                        , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
                                        , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
                                    ]]
                                    , height: 500
                                    , done: function () {


                                //table.render({
                                //    elem: '#wl-table'
                                //    , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                                //    , toolbar: '#toolbarDemo'
                                //    , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                //    , cols: [[
                                //        { type: 'radio' }
                                //        , { field: 'HSNO', title: 'åºå·', width: 60 }
                                //        , { field: 'HQty', title: 'æ°é', width: 80 }
                                //        , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
                                //        , { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
                                //        , { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
                                //        , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
                                //        , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
                                //        , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
                                //        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
                                //        , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
                                //        , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
                                //    ]]
                                //    , height: 500
                                //    , done: function () {
                                //        layer.closeAll("loading");
                                //    }
                                //});

                                $.ajax({
                                    url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
                                    type: "GET",
                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                    success: function (result) {
                                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                                            listOption.data = result.data.list;
                                            table.render(listOption);
                                            listOption1.data = result.data.list2;
                                            table.render(listOption1);

                                            //console.log(result.data.list2);
                                            var count = 0;
                                            var count1 = 0;
                                            for (var i = 0; i < result.data.list.length; i++) {
                                                count += result.data.list[i].HQty;
                                                count1 += result.data.list[i].HPieceQty;
                                            }
                                            $("#HSumQtys").val(count);
                                            $("#HBarCodeQtys").val(count1);
                                            //return;
                                        }
                                        else {
                                            layer.msg(result.Message);
                                        }
                                        layer.closeAll("loading");
                                    }
                                });

                                var count = 0;
                                var count1 = 0;
                                for (var i = 0; i < result.data.length; i++) {
                                    count += result.data.HQty;
                                    count1 += result.data.HPieceQty;
                                }
                                $("#HSumQtys").val(count);
                                $("#HBarCodeQtys").val(count1);
                                //var count = 0;
                                //var count1 = 0;
                                //for (var i = 0; i < result.data.length; i++) {
                                //    count += result.data.HQty;
                                //    count1 += result.data.HPieceQty;
                                //}
                                //$("#HSumQtys").val(count);
                                //$("#HBarCodeQtys").val(count1);
                                playSound1();
                            }
                            else {
@@ -1370,6 +1463,57 @@
                            //11
                        }
                    });
                }
            }




            var listOption = {
                elem: '#wl-table'
                , toolbar: '#toolbarDemo'
                , cellMinWidth: 90
                , limit: 3000
                , totalRow: true
                , cols: [[
                    { type: 'radio' }
                  , { field: 'HSNO', title: 'åºå·', width: 60 }
                  , { field: 'HQty', title: 'æ°é', width: 80, totalRow: true }
                  , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80, totalRow: true }
                  , { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
                  , { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
                  , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
                  , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
                  , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
                  , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
                  , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
                  , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }
            var listOption1 = {
                elem: '#mx-table'
                , toolbar: '#toolbarDemo'
                , cellMinWidth: 90
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
                    , { field: 'HQtyMust', title: 'åºåæ°é', width: 150 }
                    , { field: 'HBarCode', title: 'æ¡ç ç¼å·', width: 150 }
                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                    , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                    , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                    , { field: 'HBatchNo', title: 'æ¹å·', width: 150 }
                    //, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
                    //, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                    , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }
            function playSound() {
@@ -1393,11 +1537,15 @@
                audio.play();
            }
            //æ«æºå
            function GetMeesageBySourceBillNo(obj) {
            function GetMeesageBySourceBillNo(obj) { 
                var HSourceBillNo = $('#HSourceBillNo').val()
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
                var HSourceBillType = $("#HBillType").val()
                var HBillType = '1205'
                var HWHID_FIFO = $("#HWHID_FIFO").val();//åè¿ååºä»åºID
                var sMouldManagerCtl = 'N'
                var sFIFOCtl = 'N'
                if (HSourceBillNo == "" || sInterID <= 0) {
                    layer.msg("æºåå·ä¸ºç©ºï¼æèåç ä¸åå¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
@@ -1405,7 +1553,7 @@
                $.ajax({
                    url: GetWEBURL() + "/SellOut/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                    type: "GET",
                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                    data: { sInterID: sInterID, sBillNo: sBillNo, HBillType: '1205',"HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            //GetSellOutFindSP();
@@ -1419,27 +1567,56 @@
                            //    where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                            //});

                            table.render({
                                elem: '#wl-table'
                                , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                                , toolbar: '#toolbarDemo'
                                , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                , cols: [[
                                    { type: 'radio' }
                                    , { field: 'HSNO', title: 'åºå·', width: 60 }
                                    , { field: 'HQty', title: 'æ°é', width: 80 }
                                    , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
                                    , { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
                                    , { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
                                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
                                    , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
                                    , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
                                    , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
                                    , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
                                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
                                ]]
                                , height: 500
                                , done: function () {
                            //table.render({
                            //    elem: '#wl-table'
                            //    , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                            //    , toolbar: '#toolbarDemo'
                            //    , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                            //    , cols: [[
                            //        { type: 'radio' }
                            //        , { field: 'HSNO', title: 'åºå·', width: 60 }
                            //        , { field: 'HQty', title: 'æ°é', width: 80 }
                            //        , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
                            //        , { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
                            //        , { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
                            //        , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
                            //        , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
                            //        , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
                            //        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
                            //        , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
                            //        , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
                            //    ]]
                            //    , height: 500
                            //    , done: function () {
                            //        layer.closeAll("loading");
                            //    }
                            //});

                            $.ajax({
                                url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
                                type: "GET",
                                data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                success: function (result) {
                                    if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                                        listOption.data = result.data.list;
                                        table.render(listOption);
                                        listOption1.data = result.data.list2;
                                        table.render(listOption1);

                                        //console.log(result.data.list2);
                                        var count = 0;
                                        var count1 = 0;
                                        for (var i = 0; i < result.data.list.length; i++) {
                                            count += result.data.list[i].HQty;
                                            count1 += result.data.list[i].HPieceQty;
                                        }
                                        $("#HSumQtys").val(count);
                                        $("#HBarCodeQtys").val(count1);
                                        //return;
                                    }
                                    else {
                                        layer.msg(result.Message);
                                    }
                                    layer.closeAll("loading");
                                }
                            });
@@ -1454,6 +1631,7 @@
        
        });


        //ä»¥ä¸ä¸ºlayuiæ¨¡å

        function GetHWHValue(obj)  //è¿åä»åº
@@ -1462,6 +1640,11 @@
            //sessionStorage["HWHID"] = obj[0].HItemID;
            $("#HWHID").val(obj[0].HItemID);
        }
        function GetHFIFOWHNAMEValue(obj)  //è¿ååè¿ååºä»åº
        {
            $("#HWHNAME_FIFO").val(obj[0].HName);
            $("#HWHID_FIFO").val(obj[0].HItemID);
        }
        function GetHSpValue(obj) {  //è¿åè°å¥ä»ä½
            $("#HStockPlaceName").val(obj[0].HName);
            $("#HStockPlaceID").val(obj[0].HItemID);

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_FastList.html

@@ -291,31 +291,60 @@
            
        });
        //æ¥è¯¢
        //form.on('submit(cmdQuery)', function () {
        //    var HBillNo = $("#HBillNo").val();
        //    var HSourceBillNo = $("#HSourceBillNo").val();
        //    //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
        //    $.ajax({
        //        url: GetWEBURL() + '/Gy_Mould/list1',
        //        type: "GET",
        //        data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
        //        success: function (data1) {
        //            if (data1.count == 1) {
        //                option.data = data1.data;
        //                table.render(option);
        //                layer.close(index);
        //            } else {
        //                layer.close(index);
        //                layer.alert(data1.code + data1.Message, { icon: 5 });
        //            }
        //        }, error: function () {
        //            layer.close(index);
        //            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
        //        }
        //    });
        //});
        
        form.on('submit(cmdQuery)', function () {
            var HBillNo = $("#HBillNo").val();
            var HSourceBillNo = $("#HSourceBillNo").val();
            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            $.ajax({
                url: GetWEBURL() + '/Gy_Mould/list1',
                type: "GET",
                data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
            var HSourceBillNo = $("#HSourceBillNo").val();;
           

            table.render({
                elem: '#sy-table'
                , url: GetWEBURL() + '/ProductInBillList/list1'
                , toolbar: '#toolbarDemo'
                , defaultToolbar: []
                , where: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: 'åæ®åç ', width: 120 }
                    , { field: 'HBillNo', title: 'åæ®å·', width: 150 }
                    , { field: 'HMaker', title: 'å¶åäºº', width: 120 }
                    , { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                    , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                    , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                    , { field: 'HQty', title: 'æ°é', width: 100 }
                    , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                    , { field: 'HOrgID', title: 'ç»ç»', width: 120 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            });
            })
        });
        
       
        
        
        table.render({

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_Fast.html

@@ -688,64 +688,106 @@
            });

            form.on('submit(cmdDelete)', function () {//å é¤
                var checkStatus = table.checkStatus('wl-table')
                    , data = checkStatus.data;
                // console.log(data);
                var sInterID = $('#HInterID').val()
                var sMaterID = data[0].HMaterID
                var sBillType = '1203'
                var sAuxPropID = data[0].HAuxPropID
                //var sMTONo = data[0].HMTONo
                var sMTONo = ''
                var sSourceInterID = data[0].HSourceInterID
                var sSourceEntryID = data[0].HSourceEntryID
                $.ajax(
                    {
                        type: "Get",
                        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        url: GetWEBURL() + "/OtherInBill/Delete_Json",
                        async: true,
                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                                table.render({
                                    elem: '#wl-table'
                                    , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
                                    , toolbar: '#toolbarDemo'
                                    , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
                                    , cols: [[
                                        { type: 'radio' }
                                        , { field: 'HQty', title: 'æ°é', width: 150 }
                                        , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
                                        , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                                        , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                                        , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                                        , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
                                        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                                        , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                                        , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
                                    ]]
                                    , height: 500
                                    , done: function () {
                                        layer.closeAll("loading");
                                    }
                                });
                            }
                            else {
                                layer.msg(data.Message, { icon: 2 });
                            }
                        },
                        error: function (err) {
                            layer.msg('éè¯¯' + err, {
                                icon: 5,
                                time: 20000
                            }, function () {
                                //do something
                            });
                        }
                    });
                //var checkStatus = table.checkStatus('wl-table')
                //    , data = checkStatus.data;
                //// console.log(data);
                //var sInterID = $('#HInterID').val()
                //var sMaterID = data[0].HMaterID
                //var sBillType = '1203'
                //var sAuxPropID = data[0].HAuxPropID
                ////var sMTONo = data[0].HMTONo
                //var sMTONo = ''
                //var sSourceInterID = data[0].HSourceInterID
                //var sSourceEntryID = data[0].HSourceEntryID
                //$.ajax(
                //    {
                //        type: "Get",
                //        //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                //        url: GetWEBURL() + "/OtherInBill/Delete_Json",
                //        async: true,
                //        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
                //        dataType: "json",
                //        success: function (data) {
                //            if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                //                table.render({
                //                    elem: '#wl-table'
                //                    , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
                //                    , toolbar: '#toolbarDemo'
                //                    , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
                //                    , cols: [[
                //                        { type: 'radio' }
                //                        , { field: 'HQty', title: 'æ°é', width: 150 }
                //                        , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
                //                        , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                //                        , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                //                        , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                //                        , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
                //                        , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                //                        , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                //                        , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
                //                    ]]
                //                    , height: 500
                //                    , done: function () {
                //                        layer.closeAll("loading");
                //                    }
                //                });
                //            }
                //            else {
                //                layer.msg(data.Message, { icon: 2 });
                //            }
                //        },
                //        error: function (err) {
                //            layer.msg('éè¯¯' + err, {
                //                icon: 5,
                //                time: 20000
                //            }, function () {
                //                //do something
                //            });
                //        }
                //    });
            });

            //form.on('submit(Saver)', function (data) {//æäº¤
            //    //ç°åº¦æäº¤æé®Saver
            //    document.getElementById("Saver").disabled = true;
            //    //debugger;
            //    data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//ç»ç»
            //    var sMainStr = JSON.stringify(data.field);
            //    //var hOrgID = sessionStorage["OrganizationID"];
            //    var sMain = sMainStr;
            //    var sSubStr = table.cache['wl-table'];
            //    var sSourceType = $("#HBillType").val();
            //    $.ajax(
            //        {
            //            type: "POST",
            //            url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
            //            //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
            //            async: true,
            //            data: { "oMain": sMain },
            //            dataType: "json",
            //            success: function (data) {
            //                if (data.count == 1) { // è¯´æéªè¯æåäºï¼
            //                    layer.msg(data.Message , { icon: 1 });
            //                    //
            //                    //Sub_ClearBill();
            //                    //
            //                    //ç°åº¦æäº¤æé®Saver
            //                    document.getElementById("Saver").disabled = false;
            //                }
            //                else {
            //                    layer.msg(data.Message, { icon: 5 });
            //                    //ç°åº¦æäº¤æé®Saver
            //                    document.getElementById("Saver").disabled = false;
            //                }
            //                layer.closeAll("loading");
            //            },
            //            error: function (err) {
            //                layer.msg("éè¯¯:" + err, { icon: 5 });
            //                //ç°åº¦æäº¤æé®Saver
            //                document.getElementById("Saver").disabled = false;
            //            }
            //        });
            //});

            form.on('submit(Saver)', function (data) {//æäº¤
                //ç°åº¦æäº¤æé®Saver
@@ -757,36 +799,47 @@
                var sMain = sMainStr;
                var sSubStr = table.cache['wl-table'];
                var sSourceType = $("#HBillType").val();
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
                        //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        async: true,
                        data: { "oMain": sMain },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                                layer.msg(data.Message , { icon: 1 });
                                //
                                //Sub_ClearBill();
                                //
                if (AllowLoadData(sSubStr) != false)//éç©ºéªè¯
                {
                    layer.load(3);
                    $.ajax(
                        {
                            type: "POST",
                            url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
                            //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                            async: true,
                            data: { "oMain": sMain },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                                    layer.confirm("çæå¶ä»å¥åºå" + data.Message + $("#HBillNo").val(), {
                                        icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
                                        btn2: function () {
                                            //parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
                                            //window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
                                            parent.location.href = "../../../views/index.html"
                                        }//å³é
                                    }, function () { window.location.reload(); });//æ°å¢
                                }
                                else {
                                    layer.msg(data.Message, { icon: 5 });
                                    //ç°åº¦æäº¤æé®Saver
                                    document.getElementById("Saver").disabled = false;
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {
                                layer.msg("éè¯¯:" + err, { icon: 5 });
                                //ç°åº¦æäº¤æé®Saver
                                document.getElementById("Saver").disabled = false;
                            }
                            else {
                                layer.msg(data.Message, { icon: 5 });
                                //ç°åº¦æäº¤æé®Saver
                                document.getElementById("Saver").disabled = false;
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.msg("éè¯¯:" + err, { icon: 5 });
                            //ç°åº¦æäº¤æé®Saver
                            document.getElementById("Saver").disabled = false;
                        }
                    });
                        });
                }
                else {
                    layer.msg("æ°æ®ä¸å®æ´ï¼ä¸åè®¸æäº¤:", { icon: 5 });
                    //ç°åº¦æäº¤æé®Saver
                    document.getElementById("Saver").disabled = false;
                }
            });


@@ -1052,7 +1105,7 @@
                , totalRow: true
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
                    , { field: 'HQty', title: 'éé', width: 150, totalRow: true }
                    , { field: 'HAuxQty', title: 'ç®±æ°', width: 150, totalRow: true }
                    , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_FastList.html

@@ -132,6 +132,29 @@
        //åå§åçé¢
        function set_ClearBill() {
            get_Display();


            table.render({
                elem: '#dj-table'
                , url: GetWEBURL() + '/Web/chanpinruk'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: 'åæ®åç ', width: 80 }
                    , { field: 'HBillNo', title: 'åæ®å·', width: 80 }
                    , { field: 'HMaker', title: 'å¶åäºº', width: 100 }
                    , { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 100 }
                    , { field: 'HQty', title: 'æ°é', width: 100 }
                    , { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
                    , { field: 'HRedBlueFlag', title: 'çº¢èå', width: 100 }
                    , { field: 'HSourceBillType', title: 'æºåç±»å', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            })
            //å·²ä¸ä¼ åè¡¨
            table.render({
                elem: '#yd-table'
@@ -318,86 +341,118 @@
            }
        });
        //æ¥è¯¢
        //form.on('submit(cmdQuery)', function () {
        //    var HBillNo = $("#HBillNo").val();
        //    var HSourceBillNo = $("#HSourceBillNo").val();
        //    //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
        //    $.ajax({
        //        url: GetWEBURL() + '/Gy_Mould/list1',
        //        type: "GET",
        //        data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo},
        //        success: function (data1) {
        //            if (data1.count == 1) {
        //                option.data = data1.data;
        //                table.render(option);
        //                layer.close(index);
        //            } else {
        //                layer.close(index);
        //                layer.alert(data1.code + data1.Message, { icon: 5 });
        //            }
        //        }, error: function () {
        //            layer.close(index);
        //            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
        //        }
        //    });
        //});
        

        form.on('submit(cmdQuery)', function () {
            var HBillNo = $("#HBillNo").val();
            var HSourceBillNo = $("#HSourceBillNo").val();
            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            $.ajax({
                url: GetWEBURL() + '/Gy_Mould/list1',
                type: "GET",
                data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo},
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
            var HSourceBillNo = $("#HSourceBillNo").val();;


            table.render({
                elem: '#sy-table'
                , url: GetWEBURL() + '/ProductInBillList/list1'
                , toolbar: '#toolbarDemo'
                , defaultToolbar: []
                , where: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: 'åæ®åç ', width: 120 }
                    , { field: 'HBillNo', title: 'åæ®å·', width: 150 }
                    , { field: 'HMaker', title: 'å¶åäºº', width: 120 }
                    , { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
                    , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
                    , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
                    , { field: 'HQty', title: 'æ°é', width: 100 }
                    , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                    , { field: 'HOrgID', title: 'ç»ç»', width: 120 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            });
        });
        
       
            })
          });


        //å è½½ç¼ååè¡¨æ°æ®
        function get_Display() {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
                type: "GET",
                data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        //ç»ç©ºçæ°ç»èµå¼
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
        //function get_Display() {
        //    var ajaxLoad = layer.load();
        //    $.ajax({
        //        url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
        //        type: "GET",
        //        data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
        //        success: function (data1) {
        //            if (data1.count == 1) {
        //                var data = [];
        //                //ç»ç©ºçæ°ç»èµå¼
        //                for (var key in data1.list) {
        //                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
        //                }

                        for (var i = 0; i < data.length; i++) {
                            if (data[i].name == 'åæ®åç ' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                }
                            }
                        }
        //                for (var i = 0; i < data.length; i++) {
        //                    if (data[i].name == 'åæ®åç ' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
        //                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
        //                    }
        //                    else {
        //                        switch (data[i].Type) {
        //                            //int
        //                            case 'DateTime':
        //                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
        //                                break;
        //                            default:
        //                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
        //                        }
        //                    }
        //                }

                        //å¨ææ¾ç¤ºåå
                        table.render({
                            elem: '#dj-table'
                            , cols: [col]
                            , data: data1.data
                            , height: 550
                            , page: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                        });
        //                //å¨ææ¾ç¤ºåå
        //                table.render({
        //                    elem: '#dj-table'
        //                    , cols: [col]
        //                    , data: data1.data
        //                    , height: 550
        //                    , page: true
        //                    , cellMinWidth: 90
        //                    , limit: 50
        //                    , limits: [50, 500, 5000, 20000]
        //                });

                        layer.close(ajaxLoad);
                        //layer.alert("æ¥è¯¢æå", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }
            });
        }
        //                layer.close(ajaxLoad);
        //                //layer.alert("æ¥è¯¢æå", { icon: 1 });
        //            } else {
        //                layer.close(ajaxLoad);
        //                layer.alert(data1.code + data1.Message, { icon: 5 });
        //            }
        //        }, error: function () {
        //            layer.close(ajaxLoad);
        //            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
        //        }
        //    });
        //}

        //å·æ°æç»é¡µç¾
        table.render({

			@@ -7,7 +7,7 @@
			//var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			@@ -17,6 +17,7 @@
			//var WEBURL = "http://192.168.0.214/API/"; //çä¸ç¥ºæå¡å¨
			//var WEBURL = "http://192.168.10.66/API/"; //æ£®æ¥·æå¡å¨
			//var WEBURL = "http://localhost/API/";
			var WEBURL = "http://60.191.27.141:8090/API/";
			return WEBURL
			}

			@@ -870,7 +870,7 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.confirm(data.Message , {
			layer.confirm("çæè°æ¨å" + data.Message + $("#HBillNo").val(), {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			@@ -1031,6 +1031,8 @@
			var sMaker = $("#HMaker").val();//å¶åäºº
			var HOrgID = $("#HOrgID").val();//ç»ç»
			var HBillType = '1207';
			var sMouldManagerCtl = 'N'
			var sFIFOCtl = 'N'
			var sSourceBillNo = $("#HSourceBillNo").val();//æºåå·
			if (sSourceBillNo == null) {
			sSourceBillNo = "";
			@@ -1138,6 +1140,7 @@
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": HBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": WhID, "SPID": SPID, "HSCWhID": HSCWhID, "HSCSPID": HSCSPID, "sQty": sQty, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sHSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle},
			success: function (result) {
			if (result.count == 1) {
			sessionStorage["SourceFlag"] = true;
			element.tabChange('tab-MoveStockBill', '3');
			//$("#HWHNAME").attr("readOnly", "true");//è°å¥ä»åºä¸å¯å
			//$("#HWHID-BT").attr("disabled", "true");
			@@ -1148,37 +1151,68 @@
			//$("#HOutStockPlaceName").attr("readOnly", "true");//è°å¥ä»ä½ä¸å¯å
			//$("#HOSpID-BT").attr("disabled", "true");
			layer.load(3)
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, totalRow: true
			, where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
			, cols: [[
			{ type: 'radio', totalRowText: 'åè®¡' }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'ä»¶æ°', title: 'ä»¶æ°', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HMaterID', title: 'ç©æåç ', width: 150, hide: true }
			, { field: 'HAuxPropID', title: '', width: 150, hide: true }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 150, hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			// , data: [linterid]
			// , page: true
			//, height: 500
			, done: function () {
			//table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// , defaultToolbar: []
			// , totalRow: true
			// , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
			// , cols: [[
			// { type: 'radio', totalRowText: 'åè®¡' }
			// , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			// , { field: 'ä»¶æ°', title: 'ä»¶æ°', width: 150, totalRow: true }
			// , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			// , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			// , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			// , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			// , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			// , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			// , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			// , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			// , { field: 'HMaterID', title: 'ç©æåç ', width: 150, hide: true }
			// , { field: 'HAuxPropID', title: '', width: 150, hide: true }
			// , { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 150, hide: true }
			// , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			// ]]
			// // , data: [linterid]
			// // , page: true
			// //, height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			//});

			$.ajax({
			url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
			type: "GET",
			data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.list;
			table.render(listOption);
			listOption1.data = result.data.list2;
			table.render(listOption1);

			//console.log(result.data.list2);
			var count = 0;
			var count1 = 0;
			for (var i = 0; i < result.data.list.length; i++) {
			count += result.data.list[i].HQty;
			count1 += result.data.list[i].HPieceQty;
			}
			$("#HSumQtys").val(count);
			$("#HBarCodeQtys").val(count1);
			//return;
			}
			else {
			layer.msg(result.Message);
			}
			layer.closeAll("loading");
			}
			});


			playSound1();
			var sSubStr = table.cache['wl-table'];
			}
			@@ -1223,6 +1257,9 @@
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			var HSourceBillType = $("#HBillType").val()
			var sMouldManagerCtl = 'N'
			var sFIFOCtl = 'N'
			var HBillType = '1207'
			$.ajax({
			url: GetWEBURL() + "/MoveStockBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
			type: "GET",
			@@ -1256,33 +1293,63 @@
			//}
			layer.load(3);
			element.tabChange('tab-MoveStockBill', '2');
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, defaultToolbar: []
			, where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true}
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			, done: function () {
			//table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// , totalRow: true
			// , defaultToolbar: []
			// , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			// , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true}
			// , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			// , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			// , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			// , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			// , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			// , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			// , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			// , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			// ]]
			// // , data: [linterid]
			// // , page: true
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			//});

			$.ajax({
			url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
			type: "GET",
			data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.list;
			table.render(listOption);
			listOption1.data = result.data.list2;
			table.render(listOption1);

			//console.log(result.data.list2);
			var count = 0;
			var count1 = 0;
			for (var i = 0; i < result.data.list.length; i++) {
			count += result.data.list[i].HQty;
			count1 += result.data.list[i].HPieceQty;
			}
			$("#HSumQtys").val(count);
			$("#HBarCodeQtys").val(count1);
			//return;
			}
			else {
			layer.msg(result.Message);
			}
			layer.closeAll("loading");
			}
			});

			$("#HSourceBillNo").attr("disabled", "true");
			}
			else {
			@@ -1296,6 +1363,54 @@

			});


			var listOption = {
			elem: '#wl-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, limit: 3000
			, totalRow: true
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true}
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}
			var listOption1 = {
			elem: '#mx-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}

			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			function GetHWHValue(obj) //è¿åè°å¥ä»åº
			{

			@@ -323,28 +323,58 @@

			});
			//æ¥è¯¢
			//form.on('submit(cmdQuery)', function () {
			// var HBillNo = $("#HBillNo").val();
			// var HSourceBillNo = $("#HSourceBillNo").val();
			// //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			// $.ajax({
			// url: GetWEBURL() + '/Gy_Mould/list1',
			// type: "GET",
			// data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
			// success: function (data1) {
			// if (data1.count == 1) {
			// option.data = data1.data;
			// table.render(option);
			// layer.close(index);
			// } else {
			// layer.close(index);
			// layer.alert(data1.code + data1.Message, { icon: 5 });
			// }
			// }, error: function () {
			// layer.close(index);
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			// });
			//});
			form.on('submit(cmdQuery)', function () {
			var HBillNo = $("#HBillNo").val();
			var HSourceBillNo = $("#HSourceBillNo").val();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Gy_Mould/list1',
			type: "GET",
			data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			} else {
			layer.close(index);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			var HSourceBillNo = $("#HSourceBillNo").val();;


			table.render({
			elem: '#sy-table'
			, url: GetWEBURL() + '/ProductInBillList/list1'
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 120 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 150 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 120 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 120 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			})
			});

			@@ -185,6 +185,16 @@
			<input type="hidden" value="false" name="HAutoTrunFlag" id="HAutoTrunFlag">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">å·¥ä½ä¸å¿</label>
			<div class="layui-input-inline">
			<input type="text" name="HWorkCenterName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
			<input type="hidden" name="HWorkCenterID" id="HDeptID" value="0">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkCenterID-BT" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs8 layui-inline">
			@@ -310,7 +320,7 @@
			});

			//éæ©å·¥ä½ä¸å¿æé®
			form.on('submit(HWorkingProcedure-BT)', function () {
			form.on('submit(HWorkCenterID-BT)', function () {
			get_checkWorkCenter();
			});

			@@ -542,8 +552,8 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HCenter").val(checkStatus.data[0].å·¥ä½ä¸å¿);
			$("#HCenterID").val(checkStatus.data[0].HItemID);
			$("#HWorkCenterName").val(checkStatus.data[0].å·¥ä½ä¸å¿);
			$("#HWorkCenterID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }

			@@ -53,6 +53,15 @@
			<input type="hidden" name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ¯å¦è½¬å·¥åº</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 85px;">
			<select name=" HTProcessFlag" id="HTProcessFlag">
			<option value="0">å¦</option>
			<option value="1">æ¯</option>
			</select>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>

			@@ -87,6 +87,20 @@
			</div>
			</div>
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">åè¿ååºä»åº</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HWHNAME_FIFO" id="HWHNAME_FIFO" lay-verify="HWHNAME_FIFO" autocomplete="off" class="layui-input">
			<input type="hidden" name="HWHID_FIFO" id="HWHID_FIFO" lay-verify="HWHID_FIFO" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT">...</button>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			@@ -127,7 +141,7 @@
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" >...</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
			</div>
			</div>
			</div>
			@@ -216,7 +230,7 @@

			<!--ç©ææ¸å-->
			<div class="layui-tab-item">
			<!--<div class="layui-form-item" style="padding:0px;margin:0px">
			<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>
			@@ -225,11 +239,12 @@
			<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>-->
			</div>

			<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
			</div>
			<!--æç»æ¸å-->

			<div class="layui-tab-item">
			<table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
			</div>
			@@ -317,7 +332,7 @@
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element;
			, element = layui.element;



			@@ -443,10 +458,11 @@
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HBillType").val(d.data[0].HSourceBillType);
			$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);
			$("#HSourceBillNo").attr("disabled", "true");
			HSourceFlag = true;
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);

			//$("#HWHID").val(d.data[0].HWhID);
			//$("#HStockPlaceID").val(d.data[0].HSPID);
			//$("#HKeeperID").val(d.data[0].HKeeperID);
			@@ -524,6 +540,35 @@
			layer.closeAll("loading");
			}
			});

			//$.ajax({
			// url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
			// type: "GET",
			// data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			// success: function (result) {
			// if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			// listOption.data = result.data.list;
			// table.render(listOption);
			// listOption1.data = result.data.list2;
			// table.render(listOption1);

			// //console.log(result.data.list2);
			// var count = 0;
			// var count1 = 0;
			// for (var i = 0; i < result.data.list.length; i++) {
			// count += result.data.list[i].HQty;
			// count1 += result.data.list[i].HPieceQty;
			// }
			// $("#HSumQtys").val(count);
			// $("#HBarCodeQtys").val(count1);
			// //return;
			// }
			// else {
			// layer.msg(result.Message);
			// }
			// layer.closeAll("loading");
			// }
			//});
			}

			//å¨æå è½½æºåç±»ååè¡¨ new
			@@ -568,6 +613,21 @@
			, 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_FIFO-BT)', function () {//éæ©åè¿ååºä»åº
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ä»åºåè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -800,61 +860,61 @@

			//å é¤
			form.on('submit(cmdDelete)', function () {//å é¤
			var checkStatus = table.checkStatus('wl-table')
			, data = checkStatus.data;
			// console.log(data);
			var sInterID = $('#HInterID').val()
			var sMaterID = data[0].HMaterID
			var sBillType = '1205'
			var sAuxPropID = data[0].HAuxPropID
			//var sMTONo = data[0].HMTONo
			var sMTONo = ''
			var sSourceInterID = data[0].HSourceInterID
			var sSourceEntryID = data[0].HSourceEntryID
			$.ajax(
			{
			type: "Get",
			//url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/SellOut/Delete_Json",
			async: true,
			data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', 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: 'HWHID', title: 'ck', 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: "æ¸©é¦¨æç¤º" });
			}
			});
			//var checkStatus = table.checkStatus('wl-table')
			//, data = checkStatus.data;
			//// console.log(data);
			//var sInterID = $('#HInterID').val()
			//var sMaterID = data[0].HMaterID
			//var sBillType = '1205'
			//var sAuxPropID = data[0].HAuxPropID
			////var sMTONo = data[0].HMTONo
			//var sMTONo = ''
			//var sSourceInterID = data[0].HSourceInterID
			//var sSourceEntryID = data[0].HSourceEntryID
			//$.ajax(
			// {
			// type: "Get",
			// //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			// url: GetWEBURL() + "/SellOut/Delete_Json",
			// async: true,
			// data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
			// dataType: "json",
			// success: function (data) {
			// if (data.count == 1) { // è¯´æéªè¯æåäº
			// table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			// , cellMinWidth: 80
			// , toolbar: '#toolbarDemo'
			// , defaultToolbar: []
			// , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HQty', title: 'æ°é', width: 80 }
			// , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			// , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
			// , { field: 'HMaterNumber', title: 'ç©æä»£ç ', 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: 'HWHID', title: 'ck', 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: "æ¸©é¦¨æç¤º" });
			// }
			// });
			});


			@@ -1135,6 +1195,8 @@
			var sHWHID = $("#HWHID").val();//ä»åºID
			var sHSPID = $("#HStockPlaceID").val();//ä»ä½ID
			var sQty = $("#HQty").val()//æ°é
			var sMouldManagerCtl = 'N'
			var sFIFOCtl = 'N'
			if (sQty == "") {
			sQty = 0;
			}
			@@ -1319,39 +1381,70 @@
			//$("#HSupName").val(result.data.HSupName);
			//$("#HDeptID").val(result.data.HDeptID);
			//$("#HDeptName").val(result.data.HDeptName);
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			]]
			, height: 500
			, done: function () {


			//table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HSNO', title: 'åºå·', width: 60 }
			// , { field: 'HQty', title: 'æ°é', width: 80 }
			// , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			// , { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			// , { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			// , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			// , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			// , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			// , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			// , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			// , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			// ]]
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			//});

			$.ajax({
			url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
			type: "GET",
			data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.list;
			table.render(listOption);
			listOption1.data = result.data.list2;
			table.render(listOption1);

			//console.log(result.data.list2);
			var count = 0;
			var count1 = 0;
			for (var i = 0; i < result.data.list.length; i++) {
			count += result.data.list[i].HQty;
			count1 += result.data.list[i].HPieceQty;
			}
			$("#HSumQtys").val(count);
			$("#HBarCodeQtys").val(count1);
			//return;
			}
			else {
			layer.msg(result.Message);
			}
			layer.closeAll("loading");
			}
			});

			var count = 0;
			var count1 = 0;
			for (var i = 0; i < result.data.length; i++) {
			count += result.data.HQty;
			count1 += result.data.HPieceQty;
			}
			$("#HSumQtys").val(count);
			$("#HBarCodeQtys").val(count1);
			//var count = 0;
			//var count1 = 0;
			//for (var i = 0; i < result.data.length; i++) {
			// count += result.data.HQty;
			// count1 += result.data.HPieceQty;
			//}
			//$("#HSumQtys").val(count);
			//$("#HBarCodeQtys").val(count1);
			playSound1();
			}
			else {
			@@ -1370,6 +1463,57 @@
			//11
			}
			});
			}
			}




			var listOption = {
			elem: '#wl-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, limit: 3000
			, totalRow: true
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80, totalRow: true }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80, totalRow: true }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}
			var listOption1 = {
			elem: '#mx-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 150 }
			, { field: 'HBarCode', title: 'æ¡ç ç¼å·', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹å·', width: 150 }
			//, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			//, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}
			function playSound() {
			@@ -1393,11 +1537,15 @@
			audio.play();
			}
			//æ«æºå
			function GetMeesageBySourceBillNo(obj) {
			function GetMeesageBySourceBillNo(obj) {
			var HSourceBillNo = $('#HSourceBillNo').val()
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			var HSourceBillType = $("#HBillType").val()
			var HBillType = '1205'
			var HWHID_FIFO = $("#HWHID_FIFO").val();//åè¿ååºä»åºID
			var sMouldManagerCtl = 'N'
			var sFIFOCtl = 'N'
			if (HSourceBillNo == "" \|\| sInterID <= 0) {
			layer.msg("æºåå·ä¸ºç©ºï¼æèåç ä¸åå¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			@@ -1405,7 +1553,7 @@
			$.ajax({
			url: GetWEBURL() + "/SellOut/set_SavePonderationBillMain_Temp_Source_Fast_Json",
			type: "GET",
			data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
			data: { sInterID: sInterID, sBillNo: sBillNo, HBillType: '1205',"HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			//GetSellOutFindSP();
			@@ -1419,27 +1567,56 @@
			// where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			//});

			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			]]
			, height: 500
			, done: function () {
			//table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HSNO', title: 'åºå·', width: 60 }
			// , { field: 'HQty', title: 'æ°é', width: 80 }
			// , { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			// , { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			// , { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			// , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			// , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			// , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			// , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			// , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			// , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			// ]]
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			//});

			$.ajax({
			url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
			type: "GET",
			data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			listOption.data = result.data.list;
			table.render(listOption);
			listOption1.data = result.data.list2;
			table.render(listOption1);

			//console.log(result.data.list2);
			var count = 0;
			var count1 = 0;
			for (var i = 0; i < result.data.list.length; i++) {
			count += result.data.list[i].HQty;
			count1 += result.data.list[i].HPieceQty;
			}
			$("#HSumQtys").val(count);
			$("#HBarCodeQtys").val(count1);
			//return;
			}
			else {
			layer.msg(result.Message);
			}
			layer.closeAll("loading");
			}
			});
			@@ -1454,6 +1631,7 @@

			});


			//ä»¥ä¸ä¸ºlayuiæ¨¡å

			function GetHWHValue(obj) //è¿åä»åº
			@@ -1462,6 +1640,11 @@
			//sessionStorage["HWHID"] = obj[0].HItemID;
			$("#HWHID").val(obj[0].HItemID);
			}
			function GetHFIFOWHNAMEValue(obj) //è¿ååè¿ååºä»åº
			{
			$("#HWHNAME_FIFO").val(obj[0].HName);
			$("#HWHID_FIFO").val(obj[0].HItemID);
			}
			function GetHSpValue(obj) { //è¿åè°å¥ä»ä½
			$("#HStockPlaceName").val(obj[0].HName);
			$("#HStockPlaceID").val(obj[0].HItemID);

			@@ -291,31 +291,60 @@

			});
			//æ¥è¯¢
			//form.on('submit(cmdQuery)', function () {
			// var HBillNo = $("#HBillNo").val();
			// var HSourceBillNo = $("#HSourceBillNo").val();
			// //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			// $.ajax({
			// url: GetWEBURL() + '/Gy_Mould/list1',
			// type: "GET",
			// data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
			// success: function (data1) {
			// if (data1.count == 1) {
			// option.data = data1.data;
			// table.render(option);
			// layer.close(index);
			// } else {
			// layer.close(index);
			// layer.alert(data1.code + data1.Message, { icon: 5 });
			// }
			// }, error: function () {
			// layer.close(index);
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			// });
			//});

			form.on('submit(cmdQuery)', function () {
			var HBillNo = $("#HBillNo").val();
			var HSourceBillNo = $("#HSourceBillNo").val();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Gy_Mould/list1',
			type: "GET",
			data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			} else {
			layer.close(index);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			var HSourceBillNo = $("#HSourceBillNo").val();;


			table.render({
			elem: '#sy-table'
			, url: GetWEBURL() + '/ProductInBillList/list1'
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 120 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 150 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 120 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 120 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			})
			});




			table.render({

			@@ -688,64 +688,106 @@
			});

			form.on('submit(cmdDelete)', function () {//å é¤
			var checkStatus = table.checkStatus('wl-table')
			, data = checkStatus.data;
			// console.log(data);
			var sInterID = $('#HInterID').val()
			var sMaterID = data[0].HMaterID
			var sBillType = '1203'
			var sAuxPropID = data[0].HAuxPropID
			//var sMTONo = data[0].HMTONo
			var sMTONo = ''
			var sSourceInterID = data[0].HSourceInterID
			var sSourceEntryID = data[0].HSourceEntryID
			$.ajax(
			{
			type: "Get",
			//url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/OtherInBill/Delete_Json",
			async: true,
			data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			}
			else {
			layer.msg(data.Message, { icon: 2 });
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			}, function () {
			//do something
			});
			}
			});
			//var checkStatus = table.checkStatus('wl-table')
			// , data = checkStatus.data;
			//// console.log(data);
			//var sInterID = $('#HInterID').val()
			//var sMaterID = data[0].HMaterID
			//var sBillType = '1203'
			//var sAuxPropID = data[0].HAuxPropID
			////var sMTONo = data[0].HMTONo
			//var sMTONo = ''
			//var sSourceInterID = data[0].HSourceInterID
			//var sSourceEntryID = data[0].HSourceEntryID
			//$.ajax(
			// {
			// type: "Get",
			// //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			// url: GetWEBURL() + "/OtherInBill/Delete_Json",
			// async: true,
			// data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
			// dataType: "json",
			// success: function (data) {
			// if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			// table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HQty', title: 'æ°é', width: 150 }
			// , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			// , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			// , { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			// , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			// , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			// , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			// , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			// , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			// ]]
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			// });
			// }
			// else {
			// layer.msg(data.Message, { icon: 2 });
			// }
			// },
			// error: function (err) {
			// layer.msg('éè¯¯' + err, {
			// icon: 5,
			// time: 20000
			// }, function () {
			// //do something
			// });
			// }
			// });
			});

			//form.on('submit(Saver)', function (data) {//æäº¤
			// //ç°åº¦æäº¤æé®Saver
			// document.getElementById("Saver").disabled = true;
			// //debugger;
			// data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//ç»ç»
			// var sMainStr = JSON.stringify(data.field);
			// //var hOrgID = sessionStorage["OrganizationID"];
			// var sMain = sMainStr;
			// var sSubStr = table.cache['wl-table'];
			// var sSourceType = $("#HBillType").val();
			// $.ajax(
			// {
			// type: "POST",
			// url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
			// //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			// async: true,
			// data: { "oMain": sMain },
			// dataType: "json",
			// success: function (data) {
			// if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			// layer.msg(data.Message , { icon: 1 });
			// //
			// //Sub_ClearBill();
			// //
			// //ç°åº¦æäº¤æé®Saver
			// document.getElementById("Saver").disabled = false;
			// }
			// else {
			// layer.msg(data.Message, { icon: 5 });
			// //ç°åº¦æäº¤æé®Saver
			// document.getElementById("Saver").disabled = false;
			// }
			// layer.closeAll("loading");
			// },
			// error: function (err) {
			// layer.msg("éè¯¯:" + err, { icon: 5 });
			// //ç°åº¦æäº¤æé®Saver
			// document.getElementById("Saver").disabled = false;
			// }
			// });
			//});

			form.on('submit(Saver)', function (data) {//æäº¤
			//ç°åº¦æäº¤æé®Saver
			@@ -757,36 +799,47 @@
			var sMain = sMainStr;
			var sSubStr = table.cache['wl-table'];
			var sSourceType = $("#HBillType").val();
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
			//url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMain },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message , { icon: 1 });
			//
			//Sub_ClearBill();
			//
			if (AllowLoadData(sSubStr) != false)//éç©ºéªè¯
			{
			layer.load(3);
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
			//url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMain },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.confirm("çæå¶ä»å¥åºå" + data.Message + $("#HBillNo").val(), {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			//window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			parent.location.href = "../../../views/index.html"
			}//å³é
			}, function () { window.location.reload(); });//æ°å¢
			}
			else {
			layer.msg(data.Message, { icon: 5 });
			//ç°åº¦æäº¤æé®Saver
			document.getElementById("Saver").disabled = false;
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5 });
			//ç°åº¦æäº¤æé®Saver
			document.getElementById("Saver").disabled = false;
			}
			else {
			layer.msg(data.Message, { icon: 5 });
			//ç°åº¦æäº¤æé®Saver
			document.getElementById("Saver").disabled = false;
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5 });
			//ç°åº¦æäº¤æé®Saver
			document.getElementById("Saver").disabled = false;
			}
			});
			});
			}
			else {
			layer.msg("æ°æ®ä¸å®æ´ï¼ä¸åè®¸æäº¤:", { icon: 5 });
			//ç°åº¦æäº¤æé®Saver
			document.getElementById("Saver").disabled = false;
			}
			});


			@@ -1052,7 +1105,7 @@
			, totalRow: true
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true }
			, { field: 'HQty', title: 'éé', width: 150, totalRow: true }
			, { field: 'HAuxQty', title: 'ç®±æ°', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }

			@@ -132,6 +132,29 @@
			//åå§åçé¢
			function set_ClearBill() {
			get_Display();


			table.render({
			elem: '#dj-table'
			, url: GetWEBURL() + '/Web/chanpinruk'
			, toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 80 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 80 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 100 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HRedBlueFlag', title: 'çº¢èå', width: 100 }
			, { field: 'HSourceBillType', title: 'æºåç±»å', width: 100 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			})
			//å·²ä¸ä¼ åè¡¨
			table.render({
			elem: '#yd-table'
			@@ -318,86 +341,118 @@
			}
			});
			//æ¥è¯¢
			//form.on('submit(cmdQuery)', function () {
			// var HBillNo = $("#HBillNo").val();
			// var HSourceBillNo = $("#HSourceBillNo").val();
			// //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			// $.ajax({
			// url: GetWEBURL() + '/Gy_Mould/list1',
			// type: "GET",
			// data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo},
			// success: function (data1) {
			// if (data1.count == 1) {
			// option.data = data1.data;
			// table.render(option);
			// layer.close(index);
			// } else {
			// layer.close(index);
			// layer.alert(data1.code + data1.Message, { icon: 5 });
			// }
			// }, error: function () {
			// layer.close(index);
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			// });
			//});


			form.on('submit(cmdQuery)', function () {
			var HBillNo = $("#HBillNo").val();
			var HSourceBillNo = $("#HSourceBillNo").val();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Gy_Mould/list1',
			type: "GET",
			data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo},
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			} else {
			layer.close(index);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			var HSourceBillNo = $("#HSourceBillNo").val();;


			table.render({
			elem: '#sy-table'
			, url: GetWEBURL() + '/ProductInBillList/list1'
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 120 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 150 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 120 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 120 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			});


			})
			});


			//å è½½ç¼ååè¡¨æ°æ®
			function get_Display() {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
			type: "GET",
			data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//function get_Display() {
			// var ajaxLoad = layer.load();
			// $.ajax({
			// url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
			// type: "GET",
			// data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
			// success: function (data1) {
			// if (data1.count == 1) {
			// var data = [];
			// //ç»ç©ºçæ°ç»èµå¼
			// for (var key in data1.list) {
			// data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			// }

			for (var i = 0; i < data.length; i++) {
			if (data[i].name == 'åæ®åç ' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			// for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'åæ®åç ' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			// col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			// }
			// else {
			// switch (data[i].Type) {
			// //int
			// case 'DateTime':
			// col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			// break;
			// default:
			// col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			// }
			// }
			// }

			//å¨ææ¾ç¤ºåå
			table.render({
			elem: '#dj-table'
			, cols: [col]
			, data: data1.data
			, height: 550
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			});
			// //å¨ææ¾ç¤ºåå
			// table.render({
			// elem: '#dj-table'
			// , cols: [col]
			// , data: data1.data
			// , height: 550
			// , page: true
			// , cellMinWidth: 90
			// , limit: 50
			// , limits: [50, 500, 5000, 20000]
			// });

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			// layer.close(ajaxLoad);
			// //layer.alert("æ¥è¯¢æå", { icon: 1 });
			// } else {
			// layer.close(ajaxLoad);
			// layer.alert(data1.code + data1.Message, { icon: 5 });
			// }
			// }, error: function () {
			// layer.close(ajaxLoad);
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			// });
			//}

			//å·æ°æç»é¡µç¾
			table.render({