zzr99
2022-03-17 5cfca31e27b527b9a4bf7180f0b77674d07c4b11
墙咔装箱
17个文件已修改
6个文件已添加
5596 ■■■■ 已修改文件
WebTM/App_Data/MssqlReportData.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2143 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/SRM_OpenTmpList.html 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/grf/物料条码.grf 375 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html 69 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsBill.html 395 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html 502 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html 743 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产叫料平台/JIT_HlpBillList.html 217 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNew.html 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/退料申请单/JIT_CallGoodsBackRequestBillList.html 434 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/组装单/Sc_AssemblyBill_Fast.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/叫料管理/Jl_CallGoodsBillMain.html 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 367 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html 69 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/App_Data/MssqlReportData.cs
@@ -18,9 +18,9 @@
    //public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井
    public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public string sServer;
    //public string sDataBase;
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large
WebTM/WebTM.csproj
@@ -795,6 +795,8 @@
    <Content Include="views\生产管理\报工台工序\防错\Sc_MaterToSourceStepBillList.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBindStep.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBind.html" />
    <Content Include="views\生产管理\拣料配送单\JIT_ComplementGoodsBill.html" />
    <Content Include="views\生产管理\拣料配送单\JIT_ComplementGoodsList.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList - å¤åˆ¶.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList.html" />
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList - å¤åˆ¶.html" />
@@ -802,6 +804,8 @@
    <Content Include="views\生产管理\生产停工单\Sc_MESStopWorkBillList.html" />
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBill.html" />
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBillEdit.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_ComplementGoodBillMain.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_HlpBillList.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList - å¤åˆ¶.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList.html" />
    <Content Include="views\生产管理\生产完工单\Sc_MESEndWorkBillList.html" />
@@ -819,6 +823,7 @@
    <Content Include="views\生产管理\组装单\Sc_GroupOrderBillList.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBill.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBillList.html" />
    <Content Include="views\生产管理\退料申请单\JIT_CallGoodsBackRequestBillList.html" />
    <Content Include="views\系统管理\会计期间\Xt_AccountPeriodList.html" />
    <Content Include="views\系统管理\会计期间\Xt_AccountPeriod_Edit.html" />
    <Content Include="views\系统管理\公告\GG_NoticeBillList.html" />
WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -228,41 +228,35 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var OpenTmp = data[0].模板名称;
                console.log(linterid.toString());
                //打开打印模板
                window.open("../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                //根据模块获取WEBAPI链接
                var url = "";
                switch (Type) {
                    case "HBarCodePrint":
                        url = "UpdateBarcodePrintQty"
                    case "HGy_BarCodeBill":  //HBarCodePrint
                        url = "/Sc_BarCode/UpdateBarcodePrintQty"
                        break;
                    case "HPOInStockBill":
                        url = "UpdatePOInStockBillPrintQty"
                        break;
                }
                //更新打印数量
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + url, //方法所在页面和方法名
                        async: true,
                        data: { "msg": MyMsg },
                        dataType: "json",
                        contentType: 'application/json',
                        success: function (data) {
                            //if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            //    layer.msg(data.Message, { icon: 1 });
                            //}
                            //else {
                            //    layer.msg(data.Message, { icon: 5 });
                            //}
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            parent.f_alert("错误:" + err);
                        }
                    });
                //$.ajax(
                //    {
                //        type: "POST",
                //        url: GetWEBURL() + url, //方法所在页面和方法名
                //        async: true,
                //        data: { "msg": MyMsg },
                //        dataType: "json",
                //        contentType: 'application/json',
                //        success: function (data) {
                //            layer.closeAll("loading");
                //        },
                //        error: function (err) {
                //            parent.f_alert("错误:" + err);
                //        }
                //    });
                //关闭当前窗口
                var index = parent.layer.getFrameIndex(window.name);
WebTM/views/grf/ÎïÁÏÌõÂë.grf
New file
@@ -0,0 +1,375 @@
Object Report
    Version='6.8.2.5'
    Title='生产任务单'
    PrintAsDesignPaper=F
    Object Font
        Name='宋体'
        Size=135000,0
        Weight=400
        Charset=134
    End
    Object Printer
        Size=256
        Width=9.75
        Height=6
        LeftMargin=0
        TopMargin=0
        RightMargin=0
        BottomMargin=0
    End
    Object DetailGrid
        CenterView=T
        ShowColLine=F
        ShowRowLine=F
        Object Border
            Styles=[]
        End
        Object Recordset
            Items Field
                Item
                    Name='生产工单号'
                    DBFieldName='源单单号'
                End
                Item
                    Name='物料代码'
                End
                Item
                    Name='物料名称'
                End
                Item
                    Name='规格型号'
                End
                Item
                    Name='数量'
                End
                Item
                    Name='条码编号'
                End
                Item
                    Name='销售订单号'
                End
                Item
                    Name='批号'
                End
                Item
                    Name='日期'
                    Type=DateTime
                    Format='yyyy/MM/dd'
                End
                Item
                    Name='制作人'
                End
                Item
                    Name='客户型号'
                End
                Item
                    Name='计量单位'
                End
                Item
                    Name='源单单号'
                End
                Item
                    Name='供应商'
                End
                    End
    End
    Items Column
        Item
            Name='Column3'
            Width=9.60438
        End
    End
Object ColumnContent
    Height=6.00604
    RowsPerPage=1
    Items ColumnContentCell
        Item
            Column='Column3'
            FreeCell=T
            CanGrow=T
            Items Control
                Item
                    Type=MemoBox
                    Name='凯贝奈特'
                    Left=0.79375
                    Top=0.211667
                    Width=5.3975
                    Height=1.37583
                    Object Font
                        Name='宋体'
                        Size=142500,0
                        Weight=400
                        Charset=134
                    End
                    ShrinkFontToFit=T
                    TextAlign=MiddleCenter
                    CharSpacing=4
                    Text='条码信息'
                End
                Item
                    Type=Barcode
                    Name='Barcode1'
                    Left=6.79979
                    Top=0.211667
                    Width=1.79917
                    Height=1.37583
                    BarcodeType=QRCode
                    CaptionPosition=None
                    Text='[#条码编号#]'
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                End
                Item
                    Type=FreeGrid
                    Name='FreeGrid1'
                    Left=0.132292
                    Top=1.69333
                    Object Border
                        Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
                    End
                    ColumnCount=6
                    Items FreeGridColumn
                        Item[1]
                            Width=1.56104
                        End
                        Item[2]
                            Width=1.85208
                        End
                        Item[3]
                            Width=1.16417
                        End
                        Item[4]
                            Width=1.69333
                        End
                        Item[5]
                            Width=1.00542
                        End
                        Item[6]
                            Width=2.11667
                        End
                                    End
                Items FreeGridRow
                    Item[1]
                        Height=0.820208
                    End
                    Item[2]
                        Height=0.79375
                    End
                    Item[3]
                        Height=0.79375
                    End
                    Item[4]
                        Height=0.820208
                    End
                    Item[5]
                        Height=0.740833
                    End
                            End
            Items FreeGridCell
                Item[1,1]
                    Object Font
                        Name='宋体'
                        Weight=400
                        Charset=134
                    End
                    Text='工单号'
                End
                Item[1,2]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    ShrinkFontToFit=T
                    Text='[#生产工单号#]'
                    ColSpan=2
                End
                Item[1,4]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='供应商'
                End
                Item[1,5]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#供应商#]'
                    ColSpan=2
                End
                Item[2,1]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='物料编码'
                End
                Item[2,2]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#物料代码#]'
                    ColSpan=5
                End
                Item[3,1]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='物料名称'
                End
                Item[3,2]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#物料名称#]'
                    ColSpan=5
                End
                Item[4,1]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='数量'
                    DataName='数量'
                End
                Item[4,2]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#数量#]'
                End
                Item[4,3]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='单位'
                    DataName='单位'
                End
                Item[4,4]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#计量单位#]'
                End
                Item[4,5]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='批号'
                End
                Item[4,6]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#批号#]'
                End
                Item[5,1]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='打印人员'
                    DataName='打印人员'
                End
                Item[5,2]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#制作人#]'
                    ColSpan=2
                End
                Item[5,4]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='打印日期'
                    DataName='打印日期'
                End
                Item[5,5]
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Weight=400
                        Charset=134
                    End
                    Text='[#日期#]'
                    ColSpan=2
                End
                    End
    End
End
End
End
End
Object ColumnTitle
    Height=0
    Items ColumnTitleCell
        Item
            GroupTitle=F
            Column='Column3'
            Text='Column1'
        End
    End
End
End
Items ReportHeader
    Item
        Name='ReportHeader1'
        Height=0
        RepeatOnPage=T
    End
End
Items ReportFooter
    Item
        Name='ReportFooter1'
        Height=0
    End
End
End
WebTM/views/index.html
@@ -295,6 +295,14 @@
                            <a><i class="layui-icon layui-icon-set"></i><cite>生产管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
                                    <a>生产叫料平台</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html">生产叫料平台</a></dd>
                                        <dd><a lay-href="生产管理/拣料配送单/JIT_ComplementGoodsList.html">拣料配送单列表</a></dd>
                                        <dd><a lay-href="生产管理/退料申请单/JIT_CallGoodsBackRequestBillList.html">退料申请单列表</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                    <a>生产订单</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="生产管理/生产任务单/Sc_ICMOBillList.html">生产订单维护</a></dd>
WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html
@@ -40,9 +40,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-input-block">
                                <button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">打印</button>
                                <button type="button" class="layui-btn" id="ToolPreView" lay-submit="" lay-filter="ToolPreView">预览</button>
                                <button type="button" class="layui-btn" id="ToolTryPrint" lay-submit="" lay-filter="ToolTryPrint">试打印</button>
                                <button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">预览打印</button>
                                <button type="button" class="layui-btn" id="ToolCreate" lay-submit="" lay-filter="ToolCreate">生成</button>
                                <button type="button" class="layui-btn" id="ToolReset" lay-submit="" lay-filter="ToolReset">重置</button>
                                <button type="button" class="layui-btn" id="ToolStock" lay-submit="" lay-filter="ToolStock">库存</button>
@@ -428,6 +426,11 @@
                    return true;
                }
            }
            //打印
            form.on('submit(ToolPrint)', function (data) {
                get_PrintReport();
            })
            //条码生成
            form.on('submit(ToolCreate)', function (data) {
@@ -1004,6 +1007,32 @@
                    });
            }
            //条码打印
            function get_PrintReport() {
                var checkStatus = table.checkStatus('mainTable2')
                    , data = checkStatus.data;
                if (checkStatus.data.length>0) {
                    var rows = '';
                    for (var i = 0; i < data.length; i++) {
                        rows += data[i].HItemID.toString() + ',';
                    }
                    rows = rows.substring(rows.length - 1, 0);
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('请选择要打印的条码数据!');
                }
            }
            //非空验证
            function AllowLoadData(sSubStr) {
                var Result = true;
@@ -1011,23 +1040,23 @@
                    layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                //if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                //    sSubStr = JSON.parse(sSubStr);
                //    for (var i = 0; i < sSubStr.length; i++) {
                //        if (sSubStr[i].HMaterID == "") {
                //            layer.msg("明细记录第" + (i + 1) + "行,器具信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //            return Result = false;
                //        }
                //        if (sSubStr[i].HUnitID == "") {
                //            layer.msg("明细记录第" + (i + 1) + "行,计量单位为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //            return Result = false;
                //        }
                //        if (sSubStr[i].HWHID == "") {
                //            layer.msg("明细记录第" + (i + 1) + "行,收料仓库为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //            return Result = false;
                //        }
                //    }
                //}
                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HMainID == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,源单信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr[i].HMaterID == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,物料信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr[i].HQty == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,数量为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                    }
                }
                else {
                    return Result = true;
                }
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_HGy_BarCodeBill.aspx
@@ -15,7 +15,7 @@
        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_BarCodeBillList where hmainid=" + Request.Params["linterid"]+ "order by hmainid desc");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_BarCodeBillList where hmainid in(" + Request.Params["linterid"]+ ") order by hmainid desc");
    }
</script>
</head>
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html
@@ -237,7 +237,12 @@
                    case 'btn-view':
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                        if (checkStatus.data.length>0) {
                            var rows = '';
                            for (var i = 0; i < data.length; i++) {
                                rows += data[i].HItemID.toString() + ',';
                            }
                            rows = rows.substring(rows.length - 1, 0);
                            layer.open({
                                type: 2
                                , area: ['50%', '50%']
@@ -245,18 +250,23 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: false //允许全屏最小化
                                , anim: 0 //0-6的动画形式,-1不开启
                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HGy_BarCodeBill', 'yes']
                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
                                , resize: false
                            })
                        }
                        else {
                            layer.msg('请选择一行数据打印!');
                            layer.msg('请选择数据打印!');
                        }
                        break;
                    case 'btn-print':
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                        if (checkStatus.data.length>0) {
                            var rows = '';
                            for (var i = 0; i < data.length; i++) {
                                rows += data[i].HItemID.toString() + ',';
                            }
                            rows = rows.substring(rows.length - 1, 0);
                            layer.open({
                                type: 2
                                , area: ['50%', '50%']
@@ -264,12 +274,12 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: false //允许全屏最小化
                                , anim: 0 //0-6的动画形式,-1不开启
                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HGy_BarCodeBill', 'yes']
                                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
                                , resize: false
                            })
                        }
                        else {
                            layer.msg('请选择一行数据打印!');
                            layer.msg('请选择数据打印!');
                        }
                        break;
                    //刷新
WebTM/views/Éú²ú¹ÜÀí/¼ðÁÏÅäË͵¥/JIT_ComplementGoodsBill.html
New file
@@ -0,0 +1,395 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>配料单列表</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .layui-row .layui-btn layui-btn-normal {
            margin: 0px 10px;
        }
        .layui-inline {
            margin: 0px 80px;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Edit" id="Edit">退出</button>
                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">引出Excel</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Sc" id="Sc">上查</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">下查</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ylan" id="Ylan">预览</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Dyin" id="Dyin">打印</button>-->
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row" style="text-align:center;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 80px;font-size:25px;">配料单</label>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 80px;">拣料配送单号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;">
                                            </div>
                                            <label class="layui-form-label"></label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;">
                                            </div>
                                        </div>
                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ppkc" id="Ppkc">匹配库存</button>
                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ckfl" id="Ckfl">仓库发料</button>
                                    </div>
                                    <div class="layui-tab" lay-filter="">
                                        <ul class="layui-tab-title" lay-filter="tab-all">
                                            <li lay-id="1" style="padding:1px;" class="layui-this">拣料信息</li>
                                            <li lay-id="2" style="padding:1px;" >拣料明细</li>
                                        </ul>
                                        <div class="layui-tab-content">
                                            <!--拣料信息-->
                                            <div class="layui-tab-item layui-show">
                                                <div class="layui-form-item">
                                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                                                </div>
                                            </div>
                                            <!--拣料明细-->
                                            <div class="layui-tab-item">
                                                <div class="layui-form-item">
                                                    <table class="" id="mainTable1" lay-filter="mainTable1"></table>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
        //查询条件
        var sWhere = "";
        var option = [];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //获取页面跳转参数
        var params = get_UrlVars();
        if (typeof (params[params[0]]) != "undefined") {
            sWhere = params[params[0]];
        }
        //初始化界面
        set_ClearBill();
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //过滤查询
        form.on('submit(Cx)', function () {
            get_FastQuery();
        })
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridCellCheck(obj); //行内快捷键筛选
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
        //初始化界面
        function set_ClearBill()
        {
            set_InitGrid();
            get_Display(sWhere);
            //set_InitGrid1();
            //get_Display1(sWhere);
        }
        //#region æ‹£æ–™ä¿¡æ¯
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 350
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cols: [[
                    //{ type: 'checkbox', fixed: 'left' }
                     { field: '销售订单号', title: '销售订单号',width: 150 }
                    , { field: '生产订单号', title: '生产订单号', width: 170}
                    , { field: '产品代码', title: '产品代码', width: 170 }
                    , { field: '产品名称', title: '产品名称', width: 260, }
                    , { field: '产品规格型号', title: '产品规格型号', width: 160 }
                    , { field: '生产车间', title: '生产车间', width: 160 }
                    , { field: '计划开工日期', title: '计划开工日期', width: 160, templet: "<div>{{d.计划开工日期 ==null ?'':layui.util.toDateString(d.计划开工日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '物料代码', title: '物料代码', width: 160 }
                    , { field: '物料名称', title: '物料名称', width: 160 }
                    , { field: '规格型号', title: '规格型号', width: 160 }
                    , { field: '子项单位', title: '子项单位', width: 160 }
                    , { field: '单位用量', title: '单位用量', width: 160}
                    , { field: '计划发料数量', title: '计划发料数量', width: 160 }
                    , { field: '叫料数量', title: '叫料数量', width: 160, edit: 'text'}
                    , { field: '退料数量', title: '退料数量', width: 160, edit: 'text'}
                    , { field: '退料原因', title: '退料原因', width: 160, edit: 'text'}
                    , { field: '已叫料数量', title: '已叫料数量', width: 160}
                    , { field: '已配送数量', title: '已配送数量', width: 160 }
                    , { field: '调出仓库', title: '调出仓库', width: 160, edit: 'text', event: 'Warehouse' }
                    , { field: '调出仓库id', title: '调出仓库id', width: 160, hide: true }
                    , { field: '库存数量', title: '库存数量', width: 160 }
                    , { field: '调出仓库库存数量', title: '调出仓库库存数量', width: 160 }
                    , { field: '调出仓库可用库存数量', title: '调出仓库可用库存数量', width: 160 }
                    , { field: '可用库存', title: '可用库存', width: 160 }
                    , { field: '库存组织', title: '库存组织', width: 160}
                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
                    , { field: '源单主内码', title: '源单主内码', width: 160 }
                    , { field: '源单子内码', title: '源单子内码', width: 160 }
                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
                    , { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
                    , { field: 'HMaterialID', title: 'HMaterialID', hide: true }
                    , { field: 'HWHID', title: 'HWHID', hide: true }
                    , { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
                    , { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
                    , { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                    , { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
                ]]
            };
        }
        //查询加载数据
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_ComplementGoods/ComplementGoodsBill',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);
                        //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 });
                }
            });
        }
        //#endregion
        //#region æ˜Žç»†ä¿¡æ¯
        function get_Display1(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_ComplementGoodBill/ComplementGoodBillList',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        option1.data = data1.data;
                        table.render(option1);
                        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 });
                }
            });
        }
        function set_InitGrid1() {
            option1 = {
                elem: '#mainTable1'
                //, toolbar: '#toolbarDemo'
                , height: 350
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cols: [[
                    //{ type: 'checkbox', fixed: 'left' }
                    { field: '销售订单号', title: '销售订单号', width: 150 }
                    //, { field: '生产订单号', title: '生产订单号', width: 170 }
                    //, { field: '产品代码', title: '产品代码', width: 170 }
                    , { field: '产品名称', title: '产品名称', width: 260, }
                    , { field: '产品规格型号', title: '产品规格型号', width: 160 }
                    , { field: '生产车间', title: '生产车间', width: 160 }
                    , { field: '计划开工日期', title: '计划开工日期', width: 160, templet: "<div>{{d.计划开工日期 ==null ?'':layui.util.toDateString(d.计划开工日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '物料代码', title: '物料代码', width: 160 }
                    , { field: '物料名称', title: '物料名称', width: 160 }
                    , { field: '规格型号', title: '规格型号', width: 160 }
                    , { field: '子项单位', title: '子项单位', width: 160 }
                    , { field: '单位用量', title: '单位用量', width: 160 }
                    , { field: '计划发料数量', title: '计划发料数量', width: 160 }
                    , { field: '叫料数量', title: '叫料数量', width: 160, edit: 'text' }
                    , { field: '退料数量', title: '退料数量', width: 160, edit: 'text' }
                    , { field: '退料原因', title: '退料原因', width: 160, edit: 'text' }
                    , { field: '已叫料数量', title: '已叫料数量', width: 160 }
                    , { field: '已配送数量', title: '已配送数量', width: 160 }
                    , { field: '调出仓库', title: '调出仓库', width: 160, edit: 'text', event: 'Warehouse' }
                    , { field: '调出仓库id', title: '调出仓库id', width: 160, hide: true }
                    , { field: '库存数量', title: '库存数量', width: 160 }
                    , { field: '调出仓库库存数量', title: '调出仓库库存数量', width: 160 }
                    , { field: '调出仓库可用库存数量', title: '调出仓库可用库存数量', width: 160 }
                    , { field: '可用库存', title: '可用库存', width: 160 }
                    , { field: '库存组织', title: '库存组织', width: 160 }
                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
                    , { field: '源单主内码', title: '源单主内码', width: 160 }
                    , { field: '源单子内码', title: '源单子内码', width: 160 }
                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
                    , { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
                    , { field: 'HMaterialID', title: 'HMaterialID', hide: true }
                    , { field: 'HWHID', title: 'HWHID', hide: true }
                    , { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
                    , { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
                    , { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                    , { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
                ]]
            };
        }
        //#endregion
        //快速过滤
        function get_FastQuery() {
            var MaterialNumber = $("#MaterialNumber").val(); //物料代码
            var MaterialName = $("#MaterialName").val(); //物料名称
            var MaterialModel = $("#MaterialModel").val(); //物料规格型号
            var HGD = $("#HGD").val(); //工段
            var HWHName = $("#HWHName").val(); //仓库
            var Organization = $("#Organization").val(); //组织
            var HBeginDate = $("#HBeginDate").val(); //拣料日期
            var HEndDate = $("#HEndDate").val(); //结束日期
            var HDeptName = $("#HDeptName").val(); //部门
            var HJLStatus = $("#HJLStatus").val(); //拣料状态
            var user = sessionStorage["HUserName"]; //制单人
            sWhere = {
                MaterialNumber: MaterialNumber,
                MaterialName: MaterialName,
                MaterialModel: MaterialModel,
                HGD: HGD,
                HWHName: HWHName,
                Organization: Organization,
                HBeginDate: HBeginDate,
                HEndDate: HEndDate,
                HDeptName: HDeptName,
                HJLStatus: HJLStatus,
                user: user
            };
            get_Display(JSON.stringify(sWhere));
            sWhere = "";
        }
        //行内快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    if (obj.event == "Warehouse") {
                        //打开维修项目小窗体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "仓库列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../Baseset/基础资料/Gy_WarehouseList.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "调出仓库": checkStatus.data[0].HName
                                    , "调出仓库id": checkStatus.data[0].HItemID
                                })
                                console.log(checkStatus.data[0].HItemID)
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                }
            })
        }
        //获取传递数据
        function get_UrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
        //#endregion
    });
</script>
WebTM/views/Éú²ú¹ÜÀí/¼ðÁÏÅäË͵¥/JIT_ComplementGoodsList.html
New file
@@ -0,0 +1,502 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>拣料配送单列表</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .layui-row .layui-btn layui-btn-normal {
            margin: 0px 10px;
        }
        .layui-inline {
            margin: 0px 80px;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Edit" id="Edit">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">引出Excel</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Sc" id="Sc">上查</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">下查</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ylan" id="Ylan">预览</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Dyin" id="Dyin">打印</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料规格型号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工段</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HGD" lay-verify="HGD" id="HGD" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGD" id="btnHGD" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">仓库</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HWHName" lay-verify="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHName" id="btnHWHName" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">当前组织</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="Organization" id="Organization" lay-verify="Organization">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">拣料日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;text-align:center;">—</label>
                                            <div class="layui-input-block" style="margin-left: 118px;">
                                                <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">部门</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptName" id="btnHDeptName" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">拣料状态</label>
                                            <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
                                                <select name="HJLStatus" lay-verify="HJLStatus" id="HJLStatus">
                                                    <option value="全部">全部</option>
                                                    <option value="已拣料">已拣料</option>
                                                    <option value="未拣料">未拣料</option>
                                                </select>
                                            </div>
                                        </div>
                                        <!--<div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 90px;">
                                                <input type="checkbox" name="ps" id="ps" lay-skin="primary" lay-filter="ps" title="仅显示未完全配送">
                                            </div>
                                        </div>-->
                                    </div>
                                    <div class="layui-row" style="text-align: center; margin-bottom: 20px;">
                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">查询</button>
                                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jlps" id="Jlps">拣料配送</button>
                                    </div>
                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
        //查询条件
        var sWhere = "";
        var option = [];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //初始化界面
        set_ClearBill();
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //过滤查询
        form.on('submit(Cx)', function () {
            get_FastQuery();
        })
        //物料
        form.on('submit(btnMaterial)', function () {
            btnMaterial();
        })
        //工段
        form.on('submit(btnHGD)', function () {
            btnHGD();
        })
        //仓库
        form.on('submit(btnHWHName)', function () {
            btnHWHName();
        })
        //部门
        form.on('submit(btnHDeptName)', function () {
            btnHDeptName();
        })
        //配送单列表
        form.on('submit(Jlps)', function () {
            btnJlps();
        })
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridCellCheck(obj); //行内快捷键筛选
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
        //初始化界面
        function set_ClearBill()
        {
            set_InitGrid();
            get_Display(sWhere);
            Organ();
            //时间初始化
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
        }
        //获取组织
        function Organ() {
            //获取登录页组织列
            var Organization = '';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Web/GetOrganizations",
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                        }
                        $("#Organization").append(Organization);
                        form.render('select');
                    }
                    layer.closeAll("loading");
                }
            })
        }
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 350
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: '拣料单日期', title: '拣料单日期', width: 150, templet: "<div>{{d.拣料单日期 ==null ?'':layui.util.toDateString(d.拣料单日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '拣料配送单号', title: '生产订单号', width: 170 }
                    , { field: '配送人', title: '配送人', width: 170 }
                    , { field: '制单人', title: '制单人', width: 260, }
                    , { field: '制单日期', title: '制单日期', width: 160, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '物料代码', title: '物料代码', width: 160 }
                    , { field: '物料名称', title: '物料名称', width: 160 }
                    , { field: '规格型号', title: '规格型号', width: 160 }
                    , { field: '拣料数量', title: '拣料数量', width: 160 }
                    , { field: '已调拨数量', title: '已调拨数量', width: 160 }
                    , { field: '计量单位', title: '计量单位', width: 160 }
                    , { field: '车间', title: '车间', width: 160 }
                    , { field: '工段', title: '工段', width: 160 }
                    , { field: '备注', title: '备注', width: 160 }
                    , { field: '调出仓库', title: '调出仓库', width: 160 }
                    , { field: '调出仓位', title: '调出仓位', width: 160 }
                ]]
            };
        }
        //查询加载数据
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_ComplementGoods/ComplementGoodsList',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);
                        //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 });
                }
            });
        }
        //物料
        function btnMaterial() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '物料列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#MaterialID").val(checkStatus.data[0].HItemID);//物料id
                    $("#MaterialName").val(checkStatus.data[0].HName);//物料名称
                    $("#MaterialModel").val(checkStatus.data[0].HModel);//物料规格型号
                    $("#MaterialNumber").val(checkStatus.data[0].HNumber);//物料代码
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //工段 --无表
        function btnHGD() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '产品列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#CPID").val(checkStatus.data[0].HItemID);//产品id
                    $("#CPName").val(checkStatus.data[0].HName);//产品名称
                    $("#CPModel").val(checkStatus.data[0].HModel);//产品规格型号
                    $("#CPNumber").val(checkStatus.data[0].HNumber);//产品代码
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //仓库
        function btnHWHName() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '仓库列表'//标题
                , shift: 2//弹出动画
                , content: ["../../Baseset/基础资料/Gy_WarehouseList.html", "yes"]
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#HWHName").val(checkStatus.data[0].HName);//仓库名称
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //部门
        function btnHDeptName() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '部门列表'//标题
                , shift: 2//弹出动画
                , content: ["../../Baseset/基础资料/Gy_DepartmentList.html", "yes"]
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#HDeptName").val(checkStatus.data[0].HName);//部门名称
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //配送单列表
        function btnJlps() {
            var CheckStatus = table.checkStatus("mainTable");
            if (CheckStatus.data.length != 1) {
                return layer.msg("请选择一条数据");
            }
            else {
                var HBillNo = CheckStatus.data[0].拣料配送单号;
                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , area: ['100%', '100%']//大小
                    , title: '配送单列表'//标题
                    , shift: 2//弹出动画
                    , maxmin: true
                    , content: "../../生产管理/拣料配送单/JIT_ComplementGoodsBill.html?HBillNo=" + HBillNo
                })
            }
        }
        //快速过滤
        function get_FastQuery() {
            var MaterialNumber = $("#MaterialNumber").val(); //物料代码
            var MaterialName = $("#MaterialName").val(); //物料名称
            var MaterialModel = $("#MaterialModel").val(); //物料规格型号
            var HGD = $("#HGD").val(); //工段
            var HWHName = $("#HWHName").val(); //仓库
            var Organization = $("#Organization").val(); //组织
            var HBeginDate = $("#HBeginDate").val(); //拣料日期
            var HEndDate = $("#HEndDate").val(); //结束日期
            var HDeptName = $("#HDeptName").val(); //部门
            var HJLStatus = $("#HJLStatus").val(); //拣料状态
            var user = sessionStorage["HUserName"]; //制单人
            sWhere = {
                MaterialNumber: MaterialNumber,
                MaterialName: MaterialName,
                MaterialModel: MaterialModel,
                HGD: HGD,
                HWHName: HWHName,
                Organization: Organization,
                HBeginDate: HBeginDate,
                HEndDate: HEndDate,
                HDeptName: HDeptName,
                HJLStatus: HJLStatus,
                user: user
            };
            get_Display(JSON.stringify(sWhere));
            sWhere = "";
        }
        //行内快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    if (obj.event == "Warehouse") {
                        //打开维修项目小窗体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "仓库列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../Baseset/基础资料/Gy_WarehouseList.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "调出仓库": checkStatus.data[0].HName
                                    , "调出仓库id": checkStatus.data[0].HItemID
                                })
                                console.log(checkStatus.data[0].HItemID)
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                }
            })
        }
        //#endregion
    });
</script>
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -177,32 +177,33 @@
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
                        , { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
                        , { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
                        , { field: '日期', title: '日期', sort: true, width: 120 }
                        , { field: '单据号', title: '单据号', sort: true, width: 170 }
                        , { field: '订单跟踪号', title: '订单跟踪号', width: 105 }
                        //, { field: 'HDeptID', title: 'HDeptID' }
                        , { field: 'HDeptID', title: 'HDeptID', hide: true}
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间', width: 115 }
                        //, { field: 'HMaterID', title: 'HMaterID' }
                        , { field: 'HMaterID', title: 'HMaterID' , hide: true}
                        , { field: '产品代码', title: '产品代码', width: 160 }
                        , { field: '产品名称', title: '产品名称', width: 160 }
                        , { field: '规格型号', title: '规格型号', width: 215 }
                        //, { field: 'hunitid', title: 'hunitid' }
                        , { field: 'hunitid', title: 'hunitid' , hide: true}
                        , { field: '计量单位代码', title: '计量单位代码', width: 115 }
                        , { field: '计量单位', title: '计量单位' }
                        //, { field: 'hempid', title: 'hempid' }
                        , { field: 'hempid', title: 'hempid' , hide: true}
                        , { field: '业务员代码', title: '业务员代码', width: 100 }
                        , { field: '业务员', title: '业务员' }
                        , { field: 'hcusid', title: 'hcusid' }
                        , { field: '客户代码', title: '客户代码' }
                        , { field: '客户', title: '客户' }
                        //, { field: 'HCenterID', title: 'HCenterID' }
                        , { field: 'HCenterID', title: 'HCenterID' , hide: true}
                        , { field: '工作中心代码', title: '工作中心代码' }
                        , { field: '工作中心', title: '工作中心' }
                        //, { field: 'hbomid', title: 'hbomid' }
                        , { field: 'hbomid', title: 'hbomid' , hide: true}
                        , { field: 'BOM单编码', title: 'BOM单编码' }
                        //, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
                        , { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
                        , { field: '工艺路线代码', title: '工艺路线代码' }
                        , { field: '工艺路线', title: '工艺路线' }
                        , { field: '计划开工日期', title: '计划开工日期' }
@@ -214,7 +215,7 @@
                        , { field: '关联数量', title: '关联数量' }
                        , { field: '未关联数量', title: '未关联数量' }
                        , { field: '表头备注', title: '表头备注' }
                        //, { field: 'hsubid', title: 'hsubid' }
                        , { field: 'hsubid', title: 'hsubid' , hide: true}
                        , { field: '源单单号', title: '源单单号' }
                        , { field: '源单主内码', title: '源单主内码' }
                        , { field: '源单子内码', title: '源单子内码' }
@@ -323,12 +324,13 @@
                    , data = checkStatus.data;
                if (data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工序流转卡-编辑'
                        , shift: 0//弹出动画
                        , content: '../../车间管理/工序流转卡/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3772'
                        , content: '../../车间管理/工序流转卡/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID+'&HSouceBillType=3772'
                    })
                } else {
                    layer.msg('请选择一行数据下推!');
WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏÆ½Ì¨/JIT_ComplementGoodBillMain.html
New file
@@ -0,0 +1,743 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>生产叫料平台列表</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .layui-row .layui-btn layui-btn-normal {
            margin: 0px 10px;
        }
       /* .layui-inline {
            margin: 0px 80px;
        }*/
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Bzjjl" id="Bzjjl">标准件叫料</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ptjl" id="Ptjl">配套叫料</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Zxbzjl" id="Zxbzjl">最小包装叫料</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">引出Excel</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">下查</button>
                    </div>
                    <div class="layui-collapse">
                        <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">销售订单号</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产车间</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="hidden" class="layui-input" lay-verify="DepartmentID" name="DepartmentID" id="DepartmentID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" lay-verify="DepartmentName" name="DepartmentName" id="DepartmentName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnDepartment" id="btnDepartment" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="Organization" id="Organization" lay-verify="Organization">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                            <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
                                            <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料规格型号</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品代码</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="text" class="layui-input" name="CPNumber" lay-verify="CPNumber" id="CPNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <input type="hidden" name="CPID" id="CPID" lay-verify="CPID" value="0">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCP" id="btnCP" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">产品名称</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="CPName" lay-verify="CPName" id="CPName" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">产品规格型号</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="CPModel" lay-verify="CPModel" id="CPModel" value="" readonly onmouseover="this.title=this.value">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">生产订单号</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" onmouseover="this.title=this.value">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">开始日期</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;text-align:center;">—</label>
                                        <div class="layui-input-block" style="margin-left: 118px;">
                                            <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <div class="layui-input-block" style="margin-left: 90px;">
                                            <input type="checkbox" name="ps" id="ps" lay-skin="primary" lay-filter="ps" title="仅显示未完全配送">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-collapse">
                        <div class="layui-colla-item">
                            <div class="layui-form-item" style="padding-top: 10px;">
                                <div class="layui-row" style="text-align: center; margin-bottom: 20px;">
                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">查询</button>
                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Kcxd" id="Kcxd">库存校对</button>
                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jl" id="Jl">叫料</button>
                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Scjld" id="Scjld">生成拣料单</button>
                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">不良品退申请料</button>
                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">余量退料申请单</button>
                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">报废退料申请单</button>
                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">生成退料单</button>
                                    <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Hbtl" id="Hbtl">合并退料</button>
                                </div>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
        //查询条件
        var sWhere = "";
        var option = [];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //初始化界面
        set_ClearBill();
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //过滤查询
        form.on('submit(Cx)', function () {
            get_FastQuery();
        })
        //选择生产车间
        form.on('submit(btnDepartment)', function () {
            btnDepartment();
        })
        //选择物料
        form.on('submit(btnMaterial)', function () {
            btnMaterial();
        })
        //选择产品
        form.on('submit(btnCP)', function () {
            btnCP();
        })
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridCellCheck(obj); //行内快捷键筛选
        })
        //新增叫料单
        form.on('submit(Jl)', function () {
            set_AddNew_Jl();
        })
        //新增不良品退料申请单
        form.on('submit(Blptl)', function () {
            set_AddNew_Blptl();
        })
        //新增余量退料申请单
        form.on('submit(Yltl)', function () {
            set_AddNew_Yltl();
        })
        //新增报废退料申请单
        form.on('submit(Bftl)', function () {
            set_AddNew_Bftl();
        })
        //新增拣料单
        form.on('submit(Scjld)', function () {
            set_AddNew_Scjld();
        })
        //下查
        form.on('submit(Xc)', function () {
            getXc();
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
        //初始化界面
        function set_ClearBill()
        {
            set_InitGrid();
            get_Display(sWhere);
            Organ();
            //时间初始化
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
        }
        //获取组织
        function Organ() {
            //获取登录页组织列
            var Organization = '';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Web/GetOrganizations",
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                        }
                        $("#Organization").append(Organization);
                        form.render('select');
                    }
                    layer.closeAll("loading");
                }
            })
        }
        //表格数据
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 500
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: '销售订单号', title: '销售订单号',width: 150 }
                    , { field: '生产订单号', title: '生产订单号', width: 170}
                    , { field: '产品代码', title: '产品代码', width: 170 }
                    , { field: '产品名称', title: '产品名称', width: 260, }
                    , { field: '产品规格型号', title: '产品规格型号', width: 160 }
                    , { field: '生产车间', title: '生产车间', width: 160 }
                    , { field: '计划开工日期', title: '计划开工日期', width: 160, templet: "<div>{{d.计划开工日期 ==null ?'':layui.util.toDateString(d.计划开工日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '物料代码', title: '物料代码', width: 160 }
                    , { field: '物料名称', title: '物料名称', width: 160 }
                    , { field: '规格型号', title: '规格型号', width: 160 }
                    , { field: '子项单位', title: '子项单位', width: 160 }
                    , { field: '单位用量', title: '单位用量', width: 160}
                    , { field: '计划发料数量', title: '计划发料数量', width: 160 }
                    , { field: '叫料数量', title: '叫料数量', width: 160, edit: 'text'}
                    , { field: '退料数量', title: '退料数量', width: 160, edit: 'text'}
                    , { field: '退料原因', title: '退料原因', width: 160, edit: 'text'}
                    , { field: '已叫料数量', title: '已叫料数量', width: 160}
                    , { field: '已配送数量', title: '已配送数量', width: 160 }
                    , { field: '调出仓库', title: '调出仓库', width: 160, edit: 'text', event: 'Warehouse' }
                    , { field: '调出仓库id', title: '调出仓库id', width: 160, hide: true }
                    , { field: '库存数量', title: '库存数量', width: 160 }
                    , { field: '调出仓库库存数量', title: '调出仓库库存数量', width: 160 }
                    , { field: '调出仓库可用库存数量', title: '调出仓库可用库存数量', width: 160 }
                    , { field: '可用库存', title: '可用库存', width: 160 }
                    , { field: '库存组织', title: '库存组织', width: 160}
                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', width: 160 }
                    , { field: '源单主内码', title: '源单主内码', width: 160 }
                    , { field: '源单子内码', title: '源单子内码', width: 160 }
                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
                    , { field: 'HDeptNumber', title: 'HDeptNumber', hide: true }
                    , { field: 'HMaterialID', title: 'HMaterialID', hide: true }
                    , { field: 'HWHID', title: 'HWHID', hide: true }
                    , { field: 'HOutOrgID', title: 'HOutOrgID', hide: true }
                    , { field: 'HSouceInterID', title: 'HSouceInterID', hide: true }
                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', hide: true }
                    , { field: 'HSourceBillNo', title: 'HSourceBillNo', hide: true }
                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                    , { field: 'HSTOCKID', title: 'HSTOCKID', hide: true }
                ]]
            };
        }
        //查询加载数据
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_ComplementGoodBill/ComplementGoodBillList',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);
                        //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 });
                }
            });
        }
        //生产车间
        function btnDepartment() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '生产车间列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#DepartmentID").val(checkStatus.data[0].HItemID);//部门id
                    $("#DepartmentName").val(checkStatus.data[0].HName);//部门名称
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //物料
        function btnMaterial() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '物料列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#MaterialID").val(checkStatus.data[0].HItemID);//物料id
                    $("#MaterialName").val(checkStatus.data[0].HName);//物料名称
                    $("#MaterialModel").val(checkStatus.data[0].HModel);//物料规格型号
                    $("#MaterialNumber").val(checkStatus.data[0].HNumber);//物料代码
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //产品
        function btnCP() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '产品列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#CPID").val(checkStatus.data[0].HItemID);//产品id
                    $("#CPName").val(checkStatus.data[0].HName);//产品名称
                    $("#CPModel").val(checkStatus.data[0].HModel);//产品规格型号
                    $("#CPNumber").val(checkStatus.data[0].HNumber);//产品代码
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //快速过滤
        function get_FastQuery() {
            var HSeOrderBillNo = $("#HSeOrderBillNo").val(); //销售订单号
            var DepartmentName = $("#DepartmentName").val(); //生产车间
            var Organization = $("#Organization").val(); //组织
            var MaterialNumber = $("#MaterialNumber").val(); //物料代码
            var MaterialName = $("#MaterialName").val(); //物料名称
            var MaterialModel = $("#MaterialModel").val(); //物料规格型号
            var CPNumber = $("#CPNumber").val(); //产品代码
            var CPName = $("#CPName").val(); //产品名称
            var CPModel = $("#CPModel").val(); //产品规格型号
            var HICMOBillNo = $("#HICMOBillNo").val(); //生产订单号
            var HBeginDate = $("#HBeginDate").val(); //开始日期
            var HEndDate = $("#HEndDate").val(); //结束日期
            var ps = $("#ps").prop("checked"); //仅显示未完全配送
            if (ps) {
                ps = 1; //仅显示未完全配送
            }
            else {
                ps = 0; //全部
            }
            var user = sessionStorage["HUserName"]; //制单人
            sWhere = {
                HSeOrderBillNo: HSeOrderBillNo,
                DepartmentName: DepartmentName,
                Organization: Organization,
                MaterialNumber: MaterialNumber,
                MaterialName: MaterialName,
                MaterialModel: MaterialModel,
                CPNumber: CPNumber,
                CPName: CPName,
                CPModel: CPModel,
                HICMOBillNo: HICMOBillNo,
                HBeginDate: HBeginDate,
                HEndDate: HEndDate,
                ps: ps,
                user: user
            };
            get_Display(JSON.stringify(sWhere));
            sWhere = "";
        }
        //行内快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    if (obj.event == "Warehouse") {
                        //打开维修项目小窗体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "仓库列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../Baseset/基础资料/Gy_WarehouseList.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "调出仓库": checkStatus.data[0].HName
                                    , "调出仓库id": checkStatus.data[0].HItemID
                                })
                                console.log(checkStatus.data[0].HItemID)
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                }
            })
        }
        //新增叫料单
        function set_AddNew_Jl() {
            if (table.cache['mainTable'].length == 0) {
                return layer.msg("无数据,无法叫料!");
            }
            else {
                var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "Sc_ComplementGoodBill/InsertCallGoodsBill", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainStr },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { icon: 1 });
                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                            console.log("Reason" + sMainStr);
                        }
                    });
            }
        }
        //新增不良品退料申请单
        function set_AddNew_Blptl() {
            var CheckStatus = table.checkStatus("mainTable");
            if (CheckStatus.data.length != 1) {
                return layer.msg("请选择一条数据");
            }
            else {
                if (CheckStatus.data[0].退料数量 == "") {
                    return layer.msg("退料数量不能为空!");
                }
                var sMainStr = JSON.stringify(table.checkStatus("mainTable").data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "Sc_ComplementGoodBill/Insert_BLP_ICStockTuiBill", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainStr },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { icon: 1 });
                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                            console.log("Reason" + sMainStr);
                        }
                    });
            }
        }
        //新增余量退料申请单
        function set_AddNew_Yltl() {
            var CheckStatus = table.checkStatus("mainTable");
            if (CheckStatus.data.length != 1) {
                return layer.msg("请选择一条数据");
            }
            else {
                if (CheckStatus.data[0].退料数量 == "") {
                    return layer.msg("退料数量不能为空!");
                }
                var sMainStr = JSON.stringify(table.checkStatus("mainTable").data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "Sc_ComplementGoodBill/Insert_YL_ICStockTuiBill", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainStr },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { icon: 1 });
                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                            console.log("Reason" + sMainStr);
                        }
                    });
            }
        }
        //新增报废退料申请单
        function set_AddNew_Bftl() {
            var CheckStatus = table.checkStatus("mainTable");
            if (CheckStatus.data.length != 1) {
                return layer.msg("请选择一条数据");
            }
            else {
                if (CheckStatus.data[0].退料数量 == "") {
                    return layer.msg("退料数量不能为空!");
                }
                var sMainStr = JSON.stringify(table.checkStatus("mainTable").data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "Sc_ComplementGoodBill/Insert_BF_ICStockTuiBill", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainStr },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { icon: 1 });
                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                            console.log("Reason" + sMainStr);
                        }
                    });
            }
        }
         //新增拣料单
        function set_AddNew_Scjld() {
            if (table.cache['mainTable'].length == 0) {
                return layer.msg("无数据,无法拣料!");
            }
            else {
                layer.confirm('确定要生成拣料单?', {
                    btn: ['确定', '取消'] //按钮
                    , btn1: function () {
                        var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]
                        $.ajax(
                            {
                                type: "POST",
                                url: GetWEBURL() + "Sc_ComplementGoodBill/Insert_JL_ICStockTuiBill", //方法所在页面和方法名
                                async: true,
                                data: { "msg": sMainStr },
                                dataType: "json",
                                success: function (data) {
                                    if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        layer.msg(data.Message, { icon: 1 });
                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                    }
                                    else {
                                        layer.alert(data.Message, { icon: 5 });
                                        console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                                    }
                                    layer.closeAll("loading");
                                },
                                error: function (err) {
                                    layer.alert("错误:" + err, { icon: 5 });
                                    console.log("Reason" + sMainStr);
                                }
                            });
                    }
                })
            }
        }
        //下查
        function getXc() {
            var CheckStatus = table.checkStatus("mainTable");
            if (CheckStatus.data.length != 1) {
                return layer.msg("请选择一条数据");
            }
            else {
                var HSouceInterID = CheckStatus.data[0].HSouceInterID;
                var HSourceEntryID = CheckStatus.data[0].HSourceEntryID;
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '叫料拣料信息查询'
                    , shift: 0//弹出动画
                    , content: '../生产叫料平台/JIT_HlpBillList.html?HSourceInterID=' + HSouceInterID + '&HSourceEntryID=' + HSourceEntryID
                })
            }
        }
        //#endregion
    });
</script>
WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏÆ½Ì¨/JIT_HlpBillList.html
New file
@@ -0,0 +1,217 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>叫料拣料信息查询</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                    </div>
                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                    <!--<div class="layui-tab" lay-filter="tab-POStockInBill">
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                </div>
                            </div>
                        </div>
                    </div>-->
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
        //查询条件
        var sWhere = "";
        var option = [];
        HSouceInterID = 0;
        HSourceEntryID = 0;
        var HMaker = sessionStorage["HUserName"];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //获取页面跳转参数
        var params = get_UrlVars();
        if (typeof (params[params[0]]) != "undefined") {
            sWhere = {
                HSouceInterID: params[params[0]],
                HSourceEntryID: params[params[1]],
                user: HMaker
            }
            sWhere = JSON.stringify(sWhere);
        }
        //初始化界面
        set_ClearBill();
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //退出
        form.on('submit(Cancel)', function () {
            Pub_Close(1);
        })
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridCellCheck(obj); //行内快捷键筛选
        })
        //新增叫料单
        form.on('submit(Jl)', function () {
            set_AddNew_Jl();
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
        //初始化界面
        function set_ClearBill()
        {
            set_InitGrid();
            get_Display(sWhere);
        }
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 550
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cols: [[
                   /* { type: 'checkbox', fixed: 'left' }*/
                    { field: 'HBillType', title: 'HBillType',width: 150 }
                    , { field: '是否检料', title: '是否检料', width: 170}
                    , { field: '叫料单单号', title: '叫料单单号', width: 170 }
                    , { field: '组织', title: '组织', width: 260, }
                    , { field: '调出组织', title: '调出组织', width: 160 }
                    , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '销售订单', title: '销售订单', width: 160 }
                    , { field: '生产订单', title: '生产订单', width: 160}
                    , { field: '用料清单号', title: '用料清单号', width: 160 }
                    , { field: '物料代码', title: '物料代码', width: 160 }
                    , { field: '物料名称', title: '物料名称', width: 160 }
                    , { field: '叫料数量', title: '叫料数量', width: 160 }
                    , { field: '叫料人', title: '叫料人', width: 160}
                    , { field: '叫料日期', title: '叫料日期', width: 160, templet: "<div>{{d.叫料日期 ==null ?'':layui.util.toDateString(d.叫料日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '部门', title: '部门', width: 160}
                    , { field: '仓库', title: '仓库', width: 160 }
                    , { field: '工段', title: '工段', width: 160}
                ]]
            };
        }
        //查询加载数据
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_ComplementGoodBill/HlpBillList',
                type: "GET",
                data: { "sWhere": sWhere},
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        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 });
                }
            });
        }
        //行内快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    if (obj.event == "Warehouse") {
                        //打开维修项目小窗体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "仓库列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../Baseset/基础资料/Gy_WarehouseList.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "调出仓库": checkStatus.data[0].HName
                                    , "调出仓库id": checkStatus.data[0].HItemID
                                })
                                console.log(checkStatus.data[0].HItemID)
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                }
            })
        }
        //获取传递数据
        function get_UrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
        //#endregion
    });
</script>
WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_ICMOReportBill_FastNew.html
@@ -136,20 +136,6 @@
                                <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="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">...</button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs3">
                                            <label class="layui-form-label" style="width:45px;padding-left:0px;">单据号</label>
                                        </div>
                                        <div class="layui-col-xs6">
@@ -382,9 +368,8 @@
            $("#HBillNo").val("");
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                //url: GetWEBURL() + "/Web/UpdatePOInStockBillPrintQty", //方法所在页面和方法名
                type: "GET",
                data: { "HBillType": '1201' },
                data: { "HBillType": '3711' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val(d.data[0].HInterID);
@@ -442,21 +427,6 @@
                , maxmin: true //允许全屏最小化
                , anim: 0 //0-6的动画形式,-1不开启
                , content: ['../../../views/Baseset/基础资料/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
                , resize: false
                , cancel: function () {
                    //$(".layui-btn").removeClass("layui-btn-disabled");
                }
            })
        });
        form.on('submit(HSupID-BT)', function () {//选择供应商
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '供应商列表'
                , shade: 0.6 //遮罩透明度
                , maxmin: true //允许全屏最小化
                , anim: 0 //0-6的动画形式,-1不开启
                , content: ['../../../views/Baseset/基础资料/Gy_SupplierList.html', 'yes']
                , resize: false
                , cancel: function () {
                    //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -767,9 +737,9 @@
                //}
                  //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//非空验证
                                $.ajax({
                                    url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
                                    url: GetWEBURL() + "/ICMOReportBill/get_CheckTypeByBarCode_Json1",
                                    type: "GET",
                                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": '3710', "HOWNERID": sessionStorage["OrganizationID"] },
                                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": '3710', "HOWNERID": sessionStorage["OrganizationID"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            if (result.data.HBarType == '仓库条码') {
@@ -801,12 +771,9 @@
                                                $("#HSourceBillNo").val(result.data.HSourceBillNo);
                                                sessionStorage["SourceFlag"] = true;
                                                //获取源单类型、源单单号
                                                if (result.data.HSourceBillType == "1102") {
                                                    $("#HBillType").val("1102");
                                                if (result.data.HSourceBillType == "3710") {
                                                    $("#HBillType").val("3710");
                                                }
                                                else if (result.data.HSourceBillType == "1103") {
                                                    $("#HBillType").val("1103");
                                                }
                                                else {
                                                    $("#HBillType").val("手工录入");
@@ -820,19 +787,16 @@
                                                }
                                                else
                                                {
                                                    $("#HSupName").val(result.data.hSupNameField);
                                                    $("#HSupID").val(result.data.hSupIDField);
                                                    //$("#HSupName").val(result.data.hSupNameField);
                                                    //$("#HSupID").val(result.data.hSupIDField);
                                                    //$("#HDeptName").val(result.data.HDept);
                                                    //$("#HDeptID").val(result.data.HDeptID);
                                                    $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                                    sessionStorage["SourceFlag"] = true;
                                                    //获取源单类型、源单单号
                                                    if (result.data.hSourceBillTypeField == "1102") {
                                                        $("#HBillType").val("1102");
                                                    if (result.data.hSourceBillTypeField == "3710") {
                                                        $("#HBillType").val("3710");
                                                    }
                                                    else if (result.data.hSourceBillTypeField == "1103") {
                                                        $("#HBillType").val("1103");
                                                    }
                                                    else {
                                                        $("#HBillType").val("手工录入");
@@ -848,7 +812,7 @@
                                            layer.load(3)
                                            table.render({
                                                    elem: '#wl-table'
                                                  , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
                                                , url: GetWEBURL() + '/ICMOReportBill/DisBillEntryList_Webs_Json'
                                                  , where: { HBillID: sInterID, HBillType: '3711', sWhere: '' }
                                                  , cellMinWidth : 115
                                                  , cols: [[
@@ -900,8 +864,7 @@
                }
                //
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                    url: GetWEBURL() + "/ICMOReportBill/set_SaveICMOReportBill",
                    url: GetWEBURL() + "/ICMOReportBill/set_SavePonderationBillMain_Temp_Source_Fast_Json_New",
                    type: "GET",
                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                    success: function (result) {
@@ -919,7 +882,7 @@
                              //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
                                , url: GetWEBURL() + '/ICMOReportBill/DisBillEntryList_Webs_Json'
                              //, toolbar: '#toolbarDemo'
                              , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
                              , where: { HBillID: sInterID, HBillType: '3711', sWhere: '' }
                              , cols: [[
                                  { type: 'radio' }
                                , { field: 'HQty', title: '数量', sort: true }
WebTM/views/Éú²ú¹ÜÀí/ÍËÁÏÉêÇëµ¥/JIT_CallGoodsBackRequestBillList.html
New file
@@ -0,0 +1,434 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>退料申请单列表</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">报废单号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="margin-left: 4%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料规格型号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产车间</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工段</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="ProcMul" lay-verify="ProcMul" id="ProcMul" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnProcMul" id="btnProcMul" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
            set_ClearBill();
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on("toolbar(mainTable)", function (obj) {
                switch (obj.event) {
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                };
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            //#endregion
            //选择物料
            form.on('submit(btnMaterial)', function (data) {
                btnMaterial();
            })
            //选择生产车间
            form.on('submit(btnHDept)', function (data) {
                btnHDept();
            })
            //选择工段
            form.on('submit(btnProcMul)', function (data) {
                btnProcMul();
            })
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                //日期初始化
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            }
            //#endregion
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 570
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                        , { field: '单据号', title: '单据号', sort: true, width: 165 }
                        , { field: '日期', title: '日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据类型', title: '单据类型' }
                        , { field: '表头备注', title: '表头备注', width: 170 }
                        , { field: '退回人', title: '退回人', width: 170 }
                        , { field: '退回日期', title: '退回日期', width: 200, templet: "<div>{{d.退回日期 ==null ?'':layui.util.toDateString(d.退回日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '退回原因', title: '退回原因', width: 170 }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', width: 200, templet: "<div>{{d.审核日期 ==null ?'':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '修改人', title: '修改人' }
                        , { field: '修改日期', title: '修改日期', width: 200, templet: "<div>{{d.修改日期 ==null ?'':layui.util.toDateString(d.修改日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '关闭人', title: '关闭人', width: 170 }
                        , { field: '关闭日期', title: '关闭日期', width: 200, templet: "<div>{{d.关闭日期 ==null ?'':layui.util.toDateString(d.关闭日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '关闭类型', title: '关闭类型', width: 170 }
                        , { field: '作废人', title: '作废人' }
                        , { field: '作废日期', title: '作废日期', width: 200, templet: "<div>{{d.作废日期 ==null ?'':layui.util.toDateString(d.作废日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '退料人', title: '退料人', width: 160 }
                        , { field: '搬运人', title: '搬运人', width: 160 }
                        , { field: '验收人', title: '验收人', width: 160 }
                        , { field: '调出组织', title: '调出组织', width: 160 }
                        , { field: '调入组织', title: '调入组织', width: 160 }
                        , { field: '退料模式', title: '退料模式', width: 160 }
                        , { field: '源单单号', title: '源单单号', width: 160 }
                        , { field: '物料代码', title: '物料代码', width: 160 }
                        , { field: '物料名称', title: '物料名称', width: 160 }
                        , { field: '规格型号', title: '规格型号', width: 160 }
                        , { field: '退回数量', title: '退回数量', width: 160 }
                        , { field: '仓库代码', title: '仓库代码', width: 160 }
                        , { field: '调入仓库', title: '调入仓库', width: 160 }
                        , { field: '调入仓位', title: '调入仓位', width: 160 }
                        , { field: '调出仓库', title: '调出仓库', width: 160 }
                        , { field: '调出仓位', title: '调出仓位', width: 160 }
                        , { field: '责任部门代码', title: '责任部门代码', width: 160 }
                        , { field: '责任部门名称', title: '责任部门名称', width: 160 }
                    ]]
                };
            }
            //选择物料
            function btnMaterial() {
                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , area: ['90%', '90%']//大小
                    , title: '物料列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#MaterialName").val(checkStatus.data[0].HName);//物料名称
                        $("#MaterialModel").val(checkStatus.data[0].HModel);//物料规格型号
                        $("#MaterialNumber").val(checkStatus.data[0].HNumber);//物料代码
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //选择生产车间
            function btnHDept() {
                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , area: ['90%', '90%']//大小
                    , title: '生产车间列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HDeptName").val(checkStatus.data[0].HName);//部门名称
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //选择工段  æš‚æ— 
            function btnProcMul() {
                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工段列表'//标题
                    , shift: 2//弹出动画
                    //, content: ['../../Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#ProcMul").val(checkStatus.data[0].HName);//工段名称
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                $("#HBillNo").val("");//报废据号
                $("#MaterialCode").val("");//物料代码
                $("#MaterialName").val("");//物料名称
                $("#MaterialModel").val("");//规格型号
                $("#HDeptName").val("");//生产车间
                $("#ProcMul").val("");//工段
                $("#btnSearch").click();//刷新
                sWhere = "";
            }
            //#endregion
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sc_CallGoodsBackRequestBill/JIT_CallGoodsBackRequestBillList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(ajaxLoad);
                            //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 });
                    }
                });
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HBeginDate =   $("#HBeginDate").val();//开始时间
                var HEndDate = $("#HEndDate").val();//结束时间
                var HBillNo = $("#HBillNo").val();//销售订单号
                var MaterialNumber = $("#MaterialNumber").val();//物料代码
                var MaterialName = $("#MaterialName").val();//物料名称
                var MaterialModel = $("#MaterialModel").val();//规格型号
                var HDeptName = $("#HDeptName").val();//生产车间
                var ProcMul = $("#ProcMul").val();//工段
                var Hmaker = sessionStorage["HUserName"] ;//当前用户
                var HOrgID = sessionStorage["OrganizationID"];//组织
                sWhere = {
                    HBeginDate: HBeginDate,
                    HEndDate: HEndDate,
                    HBillNo: HBillNo,
                    MaterialNumber: MaterialNumber,
                    MaterialName: MaterialName,
                    MaterialModel: MaterialModel,
                    HDeptName: HDeptName,
                    ProcMul: ProcMul,
                    Hmaker: Hmaker,
                    HOrgID: HOrgID
                }
                get_Display(JSON.stringify(sWhere));
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
            //删除
            function set_DeleteBill() {
                var CheckStatus = table.checkStatus("mainTable");
                if (CheckStatus.data.length != 1) {
                    return layer.msg("请选择一条数据!")
                } else {
                    layer.confirm('您确定要删除吗?', {
                        btn: ['确定', '取消'] //按钮
                        , btn1: function () {
                            var HInterID = CheckStatus.data[0].hmainid; //获取编号
                            var HEntryID = CheckStatus.data[0].hsubid; //获取第几条子数据
                            $.ajax({
                                url: GetWEBURL() + '/Sc_CallGoodsBackRequestBill/DelCallGoodsBackRequestBill'
                                , type: "GET"
                                , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
                                , success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                            ////重载tree
                                            //tree.reload('treeDepartment', {});
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                }
                            })
                        }
                    })
                }
            }
            //#endregion
            //以上是layui模块
        });
    </script>
</body>
</html>
WebTM/views/×é×°µ¥/Sc_AssemblyBill_Fast.html
@@ -320,7 +320,6 @@
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
WebTM/views/³µ¼ä¹ÜÀí/½ÐÁϹÜÀí/Jl_CallGoodsBillMain.html
@@ -105,8 +105,6 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                            </div>
                        </script>
@@ -131,7 +129,7 @@
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var sWhere = "";
            var option = [];
            //#endregion
@@ -343,12 +341,44 @@
            }
            //#endregion
            ////#region åˆ·æ–°
            //function get_Refresh() {
            //    set_ClearQuery();
            //    get_Display(sWhere);
            //}
            ////#endregion
            //删除
            function set_DeleteBill() {
                var CheckStatus = table.checkStatus("mainTable");
                if (CheckStatus.data.length != 1) {
                    return layer.msg("请选择一条数据!")
                } else {
                    layer.confirm('您确定要删除吗?', {
                        btn: ['确定', '取消'] //按钮
                        , btn1: function () {
                            var HInterID = CheckStatus.data[0].hmainid; //获取编号
                            var HEntryID = CheckStatus.data[0].hsubid; //获取第几条子数据
                            $.ajax({
                                url: GetWEBURL() + '/Cj_CallGoodsBillMain/DelCallGoodsBill'
                                , type: "GET"
                                , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
                                , success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                            ////重载tree
                                            //tree.reload('treeDepartment', {});
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                }
                            })
                        }
                    })
                }
            }
            //#endregion
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html
@@ -42,6 +42,7 @@
        .layui-form-label {
            width: 25%;
        }
    </style>
</head>
<body>
@@ -67,126 +68,155 @@
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">单据号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
                                                <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID"><!--HSTOCKORGID-->
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">日期</label>
                                            <div class="layui-input-inline">
                                                <input type="date" class="layui-input" name="HDate" id="HDate">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">订单跟踪号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">图号版本</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">产品名称</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="width: 40px;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater2" id="btnSearchMater2" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">产品代码</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterNumber2" id="HMaterNumber2" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">产品规格</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">总装图号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">生产订单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">流转卡数量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HQty" id="HQty">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">单位</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HUnitID" id="HUnitID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">材质</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">计划开工日期</label>
                                            <div class="layui-input-inline">
                                                <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">计划完工日期</label>
                                            <div class="layui-input-inline">
                                                <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">模具设备</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HEquipMentName" id="HEquipMentName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HEquipMentID" id="HEquipMentID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquipMent" id="btnHEquipMent" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">成品编号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">补料原因</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="请输入内容" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">补料标记</label>
                                            <div class="layui-input-inline">
                                                <input type="checkbox" name="checkboxHBLFlag" id="checkboxHBLFlag" lay-skin="primary" lay-filter="checkboxHBLFlag" value="true" title="是否补料">
                                                <input type="hidden" value="false" name="HBLFlag" id="HBLFlag">
                                            <div class="layui-input-block">
                                                <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">项目编号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">备注</label>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">版本</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs6 layui-inline">
                                            <label class="layui-form-label" style="width:12.5%">备注</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="请输入内容" onmouseover="this.title=this.value" style="width:610px;">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">原料批次</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMateOutBatchNo" id="HMateOutBatchNo" style="background-color:#efefef4d;" readonly>
@@ -199,17 +229,17 @@
                            <div class="layui-tab-item">
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">生产车间</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkShopList" id="HWorkShopList" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
@@ -218,83 +248,83 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">委外加工单位</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                </button>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">委外加工单位</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HSupID" id="HSupID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSup" id="btnSearchHSup" 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-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">子件名称</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                </button>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">子件名称</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HMaterID" id="HMaterID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">子件代码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">子件代码</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">子件规格</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">子件规格</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">单位代码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">单位代码</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HUnitNumber" id="HUnitNumber" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">主要材料</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">主要材料</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMainMaterID" id="HMainMaterID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">生产数量</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">生产数量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" value="0" style=" background-color: #efefef4d; width: 90px; float: left; margin-right: 4px;" readonly>
                                                <input type="text" class="layui-input" name="HprocExQty" id="HprocExQty" style="background-color:#efefef4d; width: 90px;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关键材料</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">关键材料</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HKeyMaterID" id="HKeyMaterID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">HICMOEntryID</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">HICMOEntryID</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">流转卡类型</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                </button>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">流转卡类型</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
@@ -516,6 +546,7 @@
                        </div>
                    </script>
                    <input id="HItemID" name="HItemID" type="hidden" />
                    <input id="HEntryID" name="HEntryID" type="hidden" />
                </form>
            </div>
        </div>
@@ -561,7 +592,8 @@
            } else {
                var OperationType = params[params[0]];//操作类型
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
                var HEntryID=params[params[2]];//源单子id
                var HSouceBillType = params[params[3]];//源单类型
            }
            //判断操作类型
            if (OperationType == 1) {//无源单新增
@@ -581,6 +613,7 @@
            }
            else if (OperationType == 2) {//有源单新增
                $("#HItemID").val(linterid);//修改时主表ID
                $("#HEntryID").val(HEntryID);//修改时子表ID
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
@@ -594,15 +627,17 @@
                        $("#HMaker").val(sessionStorage["HUserName"]);
                    }
                });
                GetICMOBillValue(linterid)
                GetICMOBillValue(linterid, HEntryID)
            }
            else if (OperationType == 3) {//编辑
                $("#HItemID").val(linterid);//修改时主表ID
                $("#HEntryID").val(HEntryID);//修改时主表ID
                //编辑状态时,根据内码,获取信息并写入界面
                layer.alert("未知操作类型!", { icon: 5 });
            }
            else if (OperationType == 4) {//浏览
                $("#HItemID").val(linterid);//
                $("#HEntryID").val(HEntryID);//
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(linterid);
                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//保存后加载数据时保存按钮禁用
@@ -685,9 +720,9 @@
            table.render(option);
            //是否默认工艺
            form.on('checkbox(checkboxHBLFlag)', function (data) {
                $("#HBLFlag").val(data.elem.checked);
            });
            //form.on('checkbox(HBLFlag)', function (data) {
            //    $("#HBLFlag").val(data.elem.checked);
            //});
            //是否启用
            form.on('checkbox(checkboxHUseFlag)', function (data) {
                $("#HUseFlag").val(data.elem.checked);
@@ -936,7 +971,9 @@
                        }
                    }
                }
                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//组织
                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                var HBLFlag = document.getElementById("HBLFlag").checked;
                HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//将数组合并成字符串
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
@@ -975,7 +1012,7 @@
            //选择产品弹窗
            form.on('submit(btnSearchMater)', function () {//产品
            form.on('submit(btnSearchMater2)', function () {//产品
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
@@ -988,6 +1025,160 @@
                    , cancel: function (index, layero) {
                    }
                })
            });
            //选择子件弹窗PartInformation.html
            form.on('submit(btnSearchMater)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '子件列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/PartInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HMaterModel").val(checkStatus.data[0].HModel);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        $("#HMaterName").val(checkStatus.data[0].HName);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //模具设备弹窗
            form.on('submit(btnHEquipMent)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '设备列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/EqpInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HEquipMentName").val(checkStatus.data[0].HName);
                        $("#HEquipMentID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //车间弹窗
            form.on('submit(HWorkShopList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '车间列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HWorkShopName").val(checkStatus.data[0].HName);
                        $("#HWorkShopID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //委外加工单位弹窗
            form.on('submit(btnSearchHSup)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '供应商列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/SupplierInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HSupName").val(checkStatus.data[0].HName);
                        $("#HSupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //选择不良原因
@@ -1110,11 +1301,11 @@
            //返回生产任务单
            function GetICMOBillValue(hmainid) {
            function GetICMOBillValue(hmainid, HEntryID) {
                $.ajax({
                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
                    type: "GET",
                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
                    data: { "hmainid": hmainid, "HEntryID": HEntryID, "OrganizationID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[result.data.length - 1];
@@ -1150,6 +1341,12 @@
                            $("#HCusName").val(data.客户名称);
                            $("#HWorkRemark").val(data.生产备注);
                            $("#HImportNote").val(data.重要提示);
                            $("#HPicNumVer").val(data.图号版本);
                            $("#HPicNumAssemble").val(data.总装图号);
                            $("#HMaterTexture").val(data.材质);
                            $("#HProductNum").val(data.成品编号);
                            $("#HVerNum").val(data.版本);
                            $("input[name='HBLFlag']").prop("checked", result.data[0].HBLFlag == 0 ? false : true);//true:选中 false:不选中
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -1157,14 +1354,14 @@
                    }
                })
                //txtHBillNo.Text = sBillNo;
                GetICMOBillDetail(hmainid);
                GetICMOBillDetail(hmainid, HEntryID);
            }
            function GetICMOBillDetail(hmainid) {
            function GetICMOBillDetail(hmainid, HEntryID) {
                $.ajax({
                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
                    type: "GET",
                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
                    data: { "hmainid": hmainid, "HEntryID":HEntryID, "OrganizationID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.data;
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -335,7 +335,7 @@
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        //{ field: 'hmainid', title: 'hmainid', width: 90 }
                        , { field: 'hmainid', title: 'hmainid', width: 90, hide: true}
                        , { field: '打印次数', title: '打印次数' }
                        , { field: '类型', title: '类型' }
                        , {
@@ -348,24 +348,24 @@
                        }
                        , { field: '订单跟踪号', title: '订单跟踪号', width: 120 }
                        , { field: '单据号', title: '单据号', width: 190 }
                        //, { field: 'hicmointerid', title: 'hicmointerid', width: 80 }
                        , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true}
                        , { field: '任务单号', title: '任务单号', width: 140 }
                        //, { field: 'HWorkShopID', title: 'HWorkShopID', width: 80 }
                        //, { field: 'HDeptID', title: 'HDeptID', width: 80 }
                        , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true}
                        , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true}
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间' }
                        , { field: '委外标记', title: '委外标记' }
                        //, { field: 'HMaterID', title: 'HMaterID', width: 80 }
                        , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true}
                        , { field: '子件代码', title: '子件代码' }
                        , { field: '子件名称', title: '子件名称' }
                        , { field: '子件规格', title: '子件规格' }
                        , { field: '批号', title: '批号' }
                        , { field: '原料批次号', title: '原料批次号' }
                        //, { field: 'HMaterID2', title: 'HMaterID2', width: 80 }
                        , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true}
                        , { field: '产品代码', title: '产品代码' }
                        , { field: '产品名称', title: '产品名称' }
                        , { field: '规格型号', title: '规格型号' }
                        //, { field: 'HUnitID', title: 'HUnitID', width: 80 }
                        , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true}
                        , { field: '单位代码', title: '单位代码' }
                        , { field: '单位', title: '单位' }
                        , { field: '设备模具代码', title: '设备模具代码' }
@@ -387,8 +387,8 @@
                        , { field: '关闭日期', title: '关闭日期' }
                        , { field: '作废人', title: '作废人' }
                        , { field: '作废日期', title: '作废日期' }
                        //, { field: 'HBillType', title: 'HBillType', width: 80 }
                        //, { field: 'hsubid', title: 'hsubid', width: 80 }
                        , { field: 'HBillType', title: 'HBillType', width: 80, hide: true}
                        , { field: 'hsubid', title: 'hsubid', width: 80, hide: true}
                        , { field: '拆分数量', title: '拆分数量' }
                    ]]
                };
@@ -407,9 +407,9 @@
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        //{ field: 'hsubid', title: 'hsubid' }
                        { field: '流水号', title: '流水号' }
                        //, { field: 'HProcID', title: 'HProcID' }
                        { field: 'hsubid', title: 'hsubid', hide: true}
                        ,{ field: '流水号', title: '流水号' }
                        , { field: 'HProcID', title: 'HProcID', hide: true}
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序名称', title: '工序名称' }
                        , { field: '返工标记', title: '返工标记' }
@@ -417,20 +417,20 @@
                        , { field: '工作中心代码', title: '工作中心代码', width: 115 }
                        , { field: '工作中心', title: '工作中心' }
                        , { field: '计划数量', title: '计划数量' }
                        //, { field: 'hmainid', title: 'hmainid' }
                        , { field: 'hmainid', title: 'hmainid', hide: true}
                        , { field: '日期', title: '日期', sort: true }
                        , { field: '单据号', title: '单据号' }
                        //, { field: 'hicmointerid', title: 'hicmointerid' }
                        , { field: 'hicmointerid', title: 'hicmointerid', hide: true}
                        , { field: '任务单号', title: '任务单号' }
                        //, { field: 'HWorkShopID', title: 'HWorkShopID' }
                        , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true}
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间' }
                        //, { field: 'HMaterID', title: 'HMaterID' }
                        , { field: 'HMaterID', title: 'HMaterID', hide: true}
                        , { field: '产品代码', title: '产品代码' }
                        , { field: '产品名称', title: '产品名称' }
                        , { field: '规格型号', title: '规格型号' }
                        , { field: '批号', title: '批号' }
                        //, { field: 'HUnitID', title: 'HUnitID' }
                        , { field: 'HUnitID', title: 'HUnitID', hide: true}
                        , { field: '单位代码', title: '单位代码' }
                        , { field: '单位', title: '单位' }
                        , { field: '生产数量', title: '生产数量' }
@@ -438,11 +438,11 @@
                        , { field: '计划完工日期', title: '计划完工日期' }
                        , { field: '摘要', title: '摘要' }
                        , { field: '内部单据号', title: '内部单据号' }
                        //, { field: 'HSupID', title: 'HSupID' }
                        , { field: 'HSupID', title: 'HSupID', hide: true}
                        , { field: '委外加工单位代码', title: '委外加工单位代码' }
                        , { field: '委外加工单位', title: '委外加工单位' }
                        , { field: '表头备注', title: '表头备注' }
                        //, { field: 'HBillType', title: 'HBillType' }
                        , { field: 'HBillType', title: 'HBillType', hide: true}
                        , { field: '流转卡数量', title: '流转卡数量' }
                        , { field: '进站关联数量', title: '进站关联数量' }
                        , { field: '出站关联数量', title: '出站关联数量' }
@@ -500,7 +500,7 @@
                    , area: ['100%', '100%']
                    , title: '生产资源-新增'
                    , shift: 0//弹出动画
                    , content: '../工序流转卡/Sc_ProcessExchangeBill.html?OperationType=1&linterid=&HSouceBillType='
                    , content: '../工序流转卡/Sc_ProcessExchangeBill.html?OperationType=1&linterid=&HEntryID=&HSouceBillType='
                })
            }
            //#endregion
@@ -517,7 +517,7 @@
                        , area: ['100%', '100%']
                        , title: '工序列表-编辑'
                        , shift: 0//弹出动画
                        , content: '../工序流转卡/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , content: '../工序流转卡/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=' + hsubid+'&HSouceBillType='
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
WebTM/views/²É¹º¹ÜÀí/ίÍâ¶©µ¥/WW_EntrustOrderBillList.html
@@ -57,26 +57,16 @@
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>
                                <div class="layui-colla-content">
                                    <!--<div class="layui-inline">
            <div class="layui-inline">
                <span>其他条件></span>
            </div>
        </div>-->
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HBillno" id="HBillno" style="width:190px;">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -137,6 +127,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>-->
                            </div>
                        </script>
@@ -214,10 +205,6 @@
                };
            });
            //重新同步按钮
            form.on('submit(btnResCnz)', function (data) {
                set_ResCnz();
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
@@ -287,17 +274,20 @@
                    , { field: '物料编码', title: '物料编码', width: 100 }
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '规格型号', title: '规格型号', width: 100 }
                    , { field: '批号', title: '批号', width: 100 }
                    , { field: '数量', title: '数量', width: 100 }
                    , { field: '数量', title: '订单数量', width: 100}
                    , { field: '打印条码数量', title: '打印条码数量', width: 120}
                    , { field: '关联数量', title: '已发货数量', width: 120 }
                    , { field: '未关联数量', title: '未已发货数量', width: 120 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: '计量单位代码', title: '计量单位代码', width: 120 }
                    , { field: '计量单位', title: '计量单位', width: 100 }
                    , { field: '源单单号', title: '源单单号', width: 100 }
                    , { field: '供应商代码', title: '供应商代码', width: 120 }
                    , { field: '供应商', title: '供应商', width: 100 }
                    , { field: '业务员代码', title: '业务员代码', width: 100 }
                    , { field: '业务员', title: '业务员', width: 100 }
                    , { field: '规格型号', title: '规格型号', width: 100 }
                    , { field: '批号', title: '批号', width: 100 }
                    , { field: '源单单号', title: '源单单号', width: 100 }
                    , { field: '供应商代码', title: '供应商代码', width: 120, hide: true}
                    , { field: '业务员代码', title: '业务员代码', width: 100, hide: true }
                    , { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
                    , { field: '优先级', title: '优先级', width: 100 }
                    , { field: '交货地点', title: '交货地点', width: 100 }
@@ -1036,35 +1026,6 @@
                sWhere = "";
                get_Display(sWhere);
            }
            //重新同步按钮
            function set_ResCnz() {
                var HBillno2 = $('#HBillno2').val();
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
                    type: "GET",
                    data: { "HBillNo": HBillno2, "HBillType": 1601 },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //刷新
            function set_Refresh() {
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html
@@ -71,7 +71,7 @@
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HBillno" id="HBillno" style="width:190px;">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -283,17 +283,22 @@
                    , { field: '物料编码', title: '物料编码', width: 100 }
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '数量', title: '订单数量', width: 100 }
                    , { field: '打印条码数量', title: '打印条码数量', width: 120 }
                    , { field: '关联数量', title: '已发货数量', width: 120 }
                    , { field: '未关联数量', title: '未已发货数量', width: 120 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: '规格型号', title: '规格型号', width: 100 }
                    , { field: '批号', title: '批号', width: 100 }
                    , { field: '数量', title: '数量', width: 100 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: '计量单位代码', title: '计量单位代码', width: 120 }
                    , { field: '计量单位', title: '计量单位', width: 100 }
                    , { field: '源单单号', title: '源单单号', width: 100 }
                    , { field: '供应商代码', title: '供应商代码', width: 120}
                    , { field: '供应商', title: '供应商', width: 100 }
                    , { field: '业务员代码', title: '业务员代码', width: 100 }
                    , { field: '业务员', title: '业务员', width: 100 }
                    , { field: '批号', title: '批号', width: 100 }
                    , { field: '数量', title: '数量', width: 100 }
                    , { field: '源单单号', title: '源单单号', width: 100 }
                    , { field: '供应商代码', title: '供应商代码', width: 120, hide: true}
                    , { field: '业务员代码', title: '业务员代码', width: 100, hide: true}
                    , { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
                    , { field: '优先级', title: '优先级', width: 100 }
                    , { field: '交货地点', title: '交货地点', width: 100}
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_Fast.html
@@ -928,6 +928,12 @@
                var sHWHID = $("#HWHID").val()
                var sHSPID = $("#HStockPlaceID").val()
                var sSourceBillNo = $("#HSourceBillNo").val()
                var sMouldManagerCtl = "N";  //是否启用器具管理
                var sFIFOCtl = "N";          //是否启用先进先出管理
                if (sQty == "") {
                    sQty = 0;
                }
                //判断条码是否为空  new
                if (sBarCode == '') {
@@ -1021,7 +1027,7 @@
                            $.ajax({
                                url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
                                type: "GET",
                                data: { HBillID: sInterID, HBillType: '1201', sWhere: '' },
                                data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                success: function (result) {
                                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        listOption.data = result.data.list;