zzr99
2022-05-20 5490d96baf0fe2606d63f74e7b52c8dfae916717
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
1个文件已添加
18个文件已修改
942 ■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html 78 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html 68 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html 522 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -863,6 +863,7 @@
    <Content Include="views\生产管理\生产装箱单\QK_PackedBillList.html" />
    <Content Include="views\生产管理\生产装箱单\QK_PackingBill.html" />
    <Content Include="views\生产管理\生产装箱单\Sc_PackUnionBill_Fast.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatFormImport.html" />
    <Content Include="views\生产管理\生产退库单\Sc_ProductionReturnList.html" />
    <Content Include="views\生产管理\组托单编辑\Sc_GroupOrderBillEdit_Fast.html" />
WebTM/views/index.html
@@ -363,7 +363,7 @@
                                        <dd>
                                            <a>生产计划平台</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/生产计划平台/">生产计划平台1</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatForm.html">生产计划平台</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html">导入</a></dd>
                                            </dl>
                                        </dd>
WebTM/views/Éú²ú¹ÜÀí/ÌáÁϼƻ®/JIT_LiftMaterPlaBillnList.html
@@ -172,7 +172,7 @@
                    , { field: 'hmainid', title: 'hmainid', hide: true }
                    , { field: '单据类型', title: '单据类型', width: 120 }
                    , { field: '日期', title: '提料日期' }
                    , { field: '单据号', title: '单据号' }
                    , { field: '单据号', title: '单据号', width: 200 }
                    , { field: '单据状态', title: '单据状态' }
                    , { field: '表头备注', title: '表头备注' }
                    , { field: '退回人', title: '退回人' }
@@ -391,7 +391,7 @@
                , area: ['100%', '100%']
                , title: '提料计划单列表-新增'
                , shift: 0//弹出动画
                , content: '../提料计划/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
                , content: '../提料计划/JIT_LiftMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
                , end: function () {
                    //刷新页面,
                    location.reload();
@@ -406,7 +406,6 @@
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var linterid = data[0].hmainid;
                var linteridSub = data[0].hsubid;
                layer.open({
                    type: 2
@@ -414,7 +413,7 @@
                    , area: ['100%', '100%']
                    , title: '提料计划单列表-编辑'
                    , shift: 0//弹出动画
                    , content: '../提料计划/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                    , content: '../提料计划/JIT_LiftMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    , end: function () {
                        //刷新页面,
                        location.reload();
WebTM/views/Éú²ú¹ÜÀí/ÌáÁϼƻ®/JIT_LiftMaterPlanBillEdit.html
@@ -284,11 +284,9 @@
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«
            //判断是否新增
            if (linterid == null || linterid == -1) {
                linteridSub = -1;
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -303,7 +301,7 @@
                });
            }
            else {//如果修改则走下面 new
                RoadBillMain(linterid, linteridSub);
                RoadBillMain(linterid);
                //RoadBillSub(linterid);
            }
@@ -887,9 +885,9 @@
            }
            //编辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid, linteridSub)//加载表头
            function RoadBillMain(linterid)//加载表头
            {
                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
                var sWhere = " and hmainid='" + linterid + "'";
                $.ajax({
                    url: GetWEBURL() + "/JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList",
                    type: "GET",
@@ -912,42 +910,49 @@
                            , "HExplanation": d.data[0].摘要
                        });
                        //子表  èµ‹å€¼
                        var rowdata = [{
                            "HLaterReason": d.data[0].延迟原因, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].物料代码, "HMaterName": d.data[0].物料名称
                            , "HMaterModel": d.data[0].规格型号, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].计量单位
                            , "HErpClsID": d.data[0].物料属性, "HQty": d.data[0].数量, "HRemark": d.data[0].表体备注, "HPURCHASEORGID": d.data[0].子表采购组织
                            , "HStatus": d.data[0].状态, "HFixleadTime": d.data[0].提前期
                            , "HDayPlanBillNo": d.data[0].日计划工单编号, "HSourceInterID": d.data[0].源单ID, "HSourceEntryID": d.data[0].源单子ID
                            , "HSourceBillNo": d.data[0].源单单号, "HSourceBillType": d.data[0].子源单类型, "HWorkShopID": d.data[0].HWorkShopID
                            , "HWorkShopIDName": d.data[0].车间名称, "HDayPlanDate": Format(new Date(d.data[0].工单生产日期), 'yyyy-MM-dd'), "HRelationQty1": d.data[0].可用采购数量
                            , "HPOOrderInterID": d.data[0].采购订单内码, "HPOOrderEntryID": d.data[0].采购订单子内码, "HPOOrderBillNo": d.data[0].采购订单号
                            , "HPOOrderBillSEQ": d.data[0].采购订单行号, "HWWOrderInterID": d.data[0].委外订单内码, "HWWOrderEntryID": d.data[0].委外订单子内码
                            , "HWWOrderBillNo": d.data[0].委外订单号, "HPurchaseDeptID": d.data[0].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[0].采购部门
                            , "HCloseTypeSub": d.data[0].是否手工关闭 == "1" ? true : false, "HCloseMan": d.data[0].子关闭人, "HEntryCloseDate": Format(new Date(d.data[0].子关闭时间), 'yyyy-MM-dd'), "HSendQty": d.data[0].送货单数量
                            , "HReciveQty": d.data[0].收料数量, "HCloseStatus": d.data[0].关闭状态 == "1" ? true : false, "HRemoveQty": d.data[0].转移数量, "HSeOrderBillNo": d.data[0].销售订单号
                            , "HUnReciveQty": d.data[0].未收料数量, "HPOOrderBillDate": Format(new Date(d.data[0].采购订单单据日期), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[0].采购订单交货日期),'yyyy-MM-dd')
                            , "HPOOrderBillRemark": d.data[0].采购订单摘要, "HPOOrderBillNote": d.data[0].采购订单表体备注
                        }];
                        var rowdata = [];
                        for (var i = 0; i < d.data.length; i++) {
                            //子表  èµ‹å€¼
                            rowdata.push({
                                "HLaterReason": d.data[i].延迟原因, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].物料代码, "HMaterName": d.data[i].物料名称
                                , "HMaterModel": d.data[i].规格型号, "HUnitID": d.data[i].HUnitID, "HUnitIDName": d.data[i].计量单位
                                , "HErpClsID": d.data[i].物料属性, "HQty": d.data[i].数量, "HRemark": d.data[i].表体备注, "HPURCHASEORGID": d.data[i].子表采购组织
                                , "HStatus": d.data[i].状态, "HFixleadTime": d.data[i].提前期
                                , "HDayPlanBillNo": d.data[i].日计划工单编号, "HSourceInterID": d.data[i].源单ID, "HSourceEntryID": d.data[i].源单子ID
                                , "HSourceBillNo": d.data[i].源单单号, "HSourceBillType": d.data[i].子源单类型, "HWorkShopID": d.data[i].HWorkShopID
                                , "HWorkShopIDName": d.data[i].车间名称, "HDayPlanDate": Format(new Date(d.data[i].工单生产日期), 'yyyy-MM-dd'), "HRelationQty1": d.data[i].可用采购数量
                                , "HPOOrderInterID": d.data[i].采购订单内码, "HPOOrderEntryID": d.data[i].采购订单子内码, "HPOOrderBillNo": d.data[i].采购订单号
                                , "HPOOrderBillSEQ": d.data[i].采购订单行号, "HWWOrderInterID": d.data[i].委外订单内码, "HWWOrderEntryID": d.data[i].委外订单子内码
                                , "HWWOrderBillNo": d.data[i].委外订单号, "HPurchaseDeptID": d.data[i].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[i].采购部门
                                , "HCloseTypeSub": d.data[i].是否手工关闭 == "1" ? true : false, "HCloseMan": d.data[i].子关闭人, "HEntryCloseDate": Format(new Date(d.data[i].子关闭时间), 'yyyy-MM-dd'), "HSendQty": d.data[i].送货单数量
                                , "HReciveQty": d.data[i].收料数量, "HCloseStatus": d.data[i].关闭状态 == "1" ? true : false, "HRemoveQty": d.data[i].转移数量, "HSeOrderBillNo": d.data[i].销售订单号
                                , "HUnReciveQty": d.data[i].未收料数量, "HPOOrderBillDate": Format(new Date(d.data[i].采购订单单据日期), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[i].采购订单交货日期), 'yyyy-MM-dd')
                                , "HPOOrderBillRemark": d.data[i].采购订单摘要, "HPOOrderBillNote": d.data[i].采购订单表体备注
                            });
                        }
                        option.data = rowdata;
                        table.render(option);
                        //是否手工关闭
                        if (d.data[0].是否手工关闭=="1") {
                            $('#HCloseTypeSub1').attr("checked", true);
                        }
                        for (var i = 0; i < d.data.length; i++) {
                            //是否手工关闭
                            if (d.data[i].是否手工关闭 == "1") {
                                $('#HCloseTypeSub'+(i+1)).attr("checked", true);
                            }
                        //关闭状态
                        if (d.data[0].关闭状态 == "1") {
                            $('#HCloseStatus1').attr("checked", true);
                            //关闭状态
                            if (d.data[i].关闭状态 == "1") {
                                $('#HCloseStatus' + (i + 1)).attr("checked", true);
                            }
                            //延迟原因
                            $('#HLaterReason' + (i + 1)).find("option[value='" + d.data[i].延迟原因 + "']").attr("selected", true);
                            $('#HErpClsID' + (i + 1)).find("option[value='" + d.data[i].物料属性 + "']").attr("selected", true);
                            $('#HPURCHASEORGIDSub' + (i + 1)).find("option[value='" + d.data[i].子表采购组织 + "']").attr("selected", true);
                            $('#HStatus' + (i + 1)).find("option[value='" + d.data[i].状态 + "']").attr("selected", true);
                        }
                        form.render('checkbox');
                        //延迟原因
                        $('#HLaterReason1').find("option[value='" + d.data[0].延迟原因 + "']").attr("selected", true);
                        $('#HErpClsID1').find("option[value='" + d.data[0].物料属性 + "']").attr("selected", true);
                        $('#HPURCHASEORGIDSub1').find("option[value='" + d.data[0].子表采购组织 + "']").attr("selected", true);
                        $('#HStatus1').find("option[value='" + d.data[0].状态 + "']").attr("selected", true);
                        form.render('select');
                    }
                })
@@ -972,8 +977,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
                var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                
                var index = layer.load();
                $.ajax({
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBillList.html
@@ -186,7 +186,7 @@
                    , { field: 'hmainid', title: 'hmainid', hide: true }
                    , { field: '单据类型', title: '单据类型', width: 120 }
                    , { field: '日期', title: '日期' }
                    , { field: '单据号', title: '单据号' }
                    , { field: '单据号', title: '单据号', width: 200 }
                    , { field: '单据状态', title: '单据状态' }
                    //, { field: '表头备注', title: '表头备注' }
                    , { field: '退回人', title: '退回人' }
@@ -398,7 +398,7 @@
                , area: ['100%', '100%']
                , title: '提料计划信息列表-新增'
                , shift: 0//弹出动画
                , content: '../日计划基础资料/Cg_PODemandPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
                , content: '../日计划基础资料/Cg_PODemandPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType='
                , end: function () {
                    //刷新页面,
                    location.reload();
@@ -413,7 +413,6 @@
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var linterid = data[0].hmainid;
                var linteridSub = data[0].hsubid;
                layer.open({
                    type: 2
@@ -421,7 +420,7 @@
                    , area: ['100%', '100%']
                    , title: '提料计划信息列表-编辑'
                    , shift: 0//弹出动画
                    , content: '../日计划基础资料/Cg_PODemandPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                    , content: '../日计划基础资料/Cg_PODemandPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    , end: function () {
                        //刷新页面,
                        location.reload();
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBill_Add.html
@@ -145,11 +145,9 @@
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«
            //判断是否新增
            if (linterid == null || linterid == 0) {
                linteridSub = -1;
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -163,7 +161,7 @@
                });
            }
            else {//如果修改则走下面 new
                RoadBillMain(linterid, linteridSub);
                RoadBillMain(linterid);
                //RoadBillSub(linterid);
            }
@@ -255,7 +253,7 @@
            //退出
            form.on('submit(Cancel)', function () {
                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
                if ((OperationType == 1 ) || OperationType == 3) {
                    Pub_Close(1);
                } else {
                    Pub_Close(2);
@@ -410,9 +408,9 @@
            }
            //编辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid, linteridSub)//加载表头
            function RoadBillMain(linterid)//加载表头
            {
                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
                var sWhere = " and hmainid='" + linterid + "'";
                $.ajax({
                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
                    type: "GET",
@@ -426,15 +424,17 @@
                            , "HPRDORGID": d.data[0].组织
                        });
                        //子表  èµ‹å€¼
                        var rowdata = [{
                            "HSupplierID": d.data[0].HSupplierID, "HSupplierNumber": d.data[0].供应商代码, "HSupplierName": d.data[0].供应商名称, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].物料代码, "HMaterName": d.data[0].物料名称, "HMaterModel": d.data[0].规格型号
                            , "HJITMaterGroup": d.data[0].JIT物料分类, "HJITSafeStock": d.data[0].JIT拉动安全库存量, "HJITMaterDemand": d.data[0].JIT物料需求供货周期, "HJITBatchQty": d.data[0].JIT提货批量, "HDeliveryPeriod": d.data[0].JIT提货批量对应周期
                            , "HLeadTime": d.data[0].JIT供货提前期, "HLeadTime_Sec": d.data[0].JIT到货前置期, "HDeliveryMode": d.data[0].JIT送货方式, "HDeliveryDaysCtrl": d.data[0].JIT送货控制天数, "HRemark": d.data[0].表体备注
                        }];
                        var rowdata = [];
                        for (var i = 0; i < d.data.length; i++) {
                            //子表  èµ‹å€¼
                            rowdata.push({
                                "HSupplierID": d.data[i].HSupplierID, "HSupplierNumber": d.data[i].供应商代码, "HSupplierName": d.data[i].供应商名称, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].物料代码, "HMaterName": d.data[i].物料名称, "HMaterModel": d.data[i].规格型号
                                , "HJITMaterGroup": d.data[i].JIT物料分类, "HJITSafeStock": d.data[i].JIT拉动安全库存量, "HJITMaterDemand": d.data[i].JIT物料需求供货周期, "HJITBatchQty": d.data[i].JIT提货批量, "HDeliveryPeriod": d.data[i].JIT提货批量对应周期
                                , "HLeadTime": d.data[i].JIT供货提前期, "HLeadTime_Sec": d.data[i].JIT到货前置期, "HDeliveryMode": d.data[i].JIT送货方式, "HDeliveryDaysCtrl": d.data[i].JIT送货控制天数, "HRemark": d.data[i].表体备注
                            });
                        }
                        option.data = rowdata;
                        table.render(option);
                        form.render('select');
                    }
                })
            }
@@ -453,8 +453,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
                var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var index = layer.load();
                $.ajax({
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Gy_WorkWarehouseBillList.html
@@ -180,7 +180,7 @@
                    , { field: 'hmainid', title: 'hmainid', hide: true }
                    , { field: '单据类型', title: '单据类型', width: 120 }
                    , { field: '日期', title: '日期' }
                    , { field: '单据号', title: '单据号' }
                    , { field: '单据号', title: '单据号', width: 200 }
                    , { field: '单据状态', title: '单据状态' }
                    //, { field: '表头备注', title: '表头备注' }
                    , { field: '退回人', title: '退回人' }
@@ -340,7 +340,7 @@
                , area: ['100%', '100%']
                , title: '车间仓库对照列表-新增'
                , shift: 0//弹出动画
                , content: '../日计划基础资料/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
                , content: '../日计划基础资料/Gy_WorkWarehouseBill_Add.html?OperationType=1&linterid=&HSouceBillType='
                , end: function () {
                    //刷新页面,
                    location.reload();
@@ -355,7 +355,6 @@
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var linterid = data[0].hmainid;
                var linteridSub = data[0].hsubid;
                layer.open({
                    type: 2
@@ -363,7 +362,7 @@
                    , area: ['100%', '100%']
                    , title: '车间仓库对照列表-编辑'
                    , shift: 0//弹出动画
                    , content: '../日计划基础资料/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                    , content: '../日计划基础资料/Gy_WorkWarehouseBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    , end: function () {
                        //刷新页面,
                        location.reload();
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Gy_WorkWarehouseBill_Add.html
@@ -143,11 +143,9 @@
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«
            //判断是否新增
            if (linterid == null || linterid == 0) {
                linteridSub = -1;
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -161,7 +159,7 @@
                });
            }
            else {//如果修改则走下面 new
                RoadBillMain(linterid, linteridSub);
                RoadBillMain(linterid);
                //RoadBillSub(linterid);
            }
@@ -241,7 +239,7 @@
            //退出
            form.on('submit(Cancel)', function () {
                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
                if ((OperationType == 1) || OperationType == 3) {
                    Pub_Close(1);
                } else {
                    Pub_Close(2);
@@ -250,7 +248,9 @@
            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
                set_AddNew(data);
                if (AllowLoadData()) {
                    set_AddNew(data);
                }
            });
            //监听提交
@@ -272,7 +272,7 @@
            //组织选择页面
            function get_Organ() {
                //获取登录页组织列
                var Organization = '';
                var Organization = '<option  style="color:blue;" value="0">组织</option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
@@ -395,9 +395,9 @@
            }
            //编辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid, linteridSub)//加载表头
            function RoadBillMain(linterid)//加载表头
            {
                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
                var sWhere = " and hmainid='" + linterid + "'";
                $.ajax({
                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/ComplementGoodBillList",
                    type: "GET",
@@ -410,15 +410,16 @@
                            , "HInterID": d.data[0].hmainid
                            , "HPRDORGID": d.data[0].组织
                        });
                        //子表  èµ‹å€¼
                        var rowdata = [{
                            "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].车间代码, "HWorkShopName": d.data[0].车间名称, "HWHID": d.data[0].HWHID
                            , "HWHNumber": d.data[0].仓库代码, "HWHName": d.data[0].仓库名称, "HRemark": d.data[0].表体备注
                        }];
                        option.data = rowdata;
                        table.render(option);
                        form.render('select');
                        var rowdata = [];
                        for (var i = 0; i < d.data.length; i++) {
                            //子表  èµ‹å€¼
                            rowdata.push({
                                "HWorkShopID": d.data[i].HWorkShopID, "HWorkShopNumber": d.data[i].车间代码, "HWorkShopName": d.data[i].车间名称, "HWHID": d.data[i].HWHID
                                , "HWHNumber": d.data[i].仓库代码, "HWHName": d.data[i].仓库名称, "HRemark": d.data[i].表体备注
                            });
                            option.data = rowdata;
                            table.render(option);
                        }
                    }
                })
            }
@@ -437,8 +438,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
                var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var sMainSub = sMainStr + ';' + sSubStr + ';'+ OperationType + ";" + sessionStorage["HUserName"];
                var index = layer.load();
                $.ajax({
@@ -464,6 +464,16 @@
                });
            }
            //非空验证
            function AllowLoadData() {
                if ($("#HPRDORGID").val() == "0") {
                    layer.msg("组织没有选择");
                    return false;
                }
                return true;
            }
            //#endregion
        });
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/JIT_NeedMaterPlanConfigBillList.html
@@ -186,7 +186,7 @@
                    , { field: 'hmainid', title: 'hmainid', hide: true }
                    , { field: '单据类型', title: '单据类型', width: 120 }
                    , { field: '日期', title: '日期' }
                    , { field: '单据号', title: '单据号' }
                    , { field: '单据号', title: '单据号', width: 200 }
                    , { field: '单据状态', title: '单据状态' }
                    //, { field: '表头备注', title: '表头备注' }
                    , { field: '退回人', title: '退回人' }
@@ -398,7 +398,7 @@
                , area: ['100%', '100%']
                , title: '要料计划信息列表-新增'
                , shift: 0//弹出动画
                , content: '../日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
                , content: '../日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=1&linterid=&HSouceBillType='
                , end: function () {
                    //刷新页面,
                    location.reload();
@@ -413,7 +413,6 @@
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var linterid = data[0].hmainid;
                var linteridSub = data[0].hsubid;
                layer.open({
                    type: 2
@@ -421,7 +420,7 @@
                    , area: ['100%', '100%']
                    , title: '要料计划信息列表-编辑'
                    , shift: 0//弹出动画
                    , content: '../日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                    , content: '../日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    , end: function () {
                        //刷新页面,
                        location.reload();
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/JIT_NeedMaterPlanConfigBill_Add.html
@@ -145,16 +145,14 @@
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«
            //判断是否新增
            if (linterid == null || linterid == 0) {
                linteridSub = -1;
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '4611' },
                    data: { "HBillType": '4615' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
@@ -163,7 +161,7 @@
                });
            }
            else {//如果修改则走下面 new
                RoadBillMain(linterid, linteridSub);
                RoadBillMain(linterid);
                //RoadBillSub(linterid);
            }
@@ -255,7 +253,7 @@
            //退出
            form.on('submit(Cancel)', function () {
                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
                if ((OperationType == 1) || OperationType == 3) {
                    Pub_Close(1);
                } else {
                    Pub_Close(2);
@@ -410,9 +408,9 @@
            }
            //编辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid, linteridSub)//加载表头
            function RoadBillMain(linterid)//加载表头
            {
                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
                var sWhere = " and hmainid='" + linterid + "'";
                $.ajax({
                    url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/NeedMaterPlanConfigBillList",
                    type: "GET",
@@ -425,16 +423,17 @@
                            , "HInterID": d.data[0].hmainid
                            , "HPRDORGID": d.data[0].组织
                        });
                        //子表  èµ‹å€¼
                        var rowdata = [{
                            "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].车间编码, "HWorkShopName": d.data[0].车间名称, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].物料代码, "HMaterName": d.data[0].物料名称, "HMaterModel": d.data[0].规格型号
                            , "HJITMaterGroup": d.data[0].JIT物料分类, "HJITSafeStock": d.data[0].JIT拉动安全库存量, "HJITMaterDemand": d.data[0].JIT物料需求供货周期, "HJITBatchQty": d.data[0].JIT提货批量, "HDeliveryPeriod": d.data[0].JIT提货批量对应周期
                            , "HLeadTime": d.data[0].JIT供货提前期, "HLeadTime_Sec": d.data[0].JIT到货前置期, "HDeliveryMode": d.data[0].JIT送货方式, "HDeliveryDaysCtrl": d.data[0].JIT送货控制天数, "HRemark": d.data[0].表体备注
                        }];
                        var rowdata = [];
                        for (var i = 0; i < d.data.length; i++) {
                            //子表  èµ‹å€¼
                            rowdata.push({
                                "HWorkShopID": d.data[i].HWorkShopID, "HWorkShopNumber": d.data[i].车间编码, "HWorkShopName": d.data[i].车间名称, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].物料代码, "HMaterName": d.data[i].物料名称, "HMaterModel": d.data[i].规格型号
                                , "HJITMaterGroup": d.data[i].JIT物料分类, "HJITSafeStock": d.data[i].JIT拉动安全库存量, "HJITMaterDemand": d.data[i].JIT物料需求供货周期, "HJITBatchQty": d.data[i].JIT提货批量, "HDeliveryPeriod": d.data[i].JIT提货批量对应周期
                                , "HLeadTime": d.data[i].JIT供货提前期, "HLeadTime_Sec": d.data[i].JIT到货前置期, "HDeliveryMode": d.data[i].JIT送货方式, "HDeliveryDaysCtrl": d.data[i].JIT送货控制天数, "HRemark": d.data[i].表体备注
                            });
                        }
                        option.data = rowdata;
                        table.render(option);
                        form.render('select');
                    }
                })
            }
@@ -453,8 +452,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
                var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var index = layer.load();
                $.ajax({
WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏÆ½Ì¨/JIT_ComplementGoodBillMain.html
@@ -154,7 +154,6 @@
                            <div class="layui-form-item" style="padding-top: 10px;">
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                        </div>
                    </div>
                </form>
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillEdit.html
@@ -582,11 +582,9 @@
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«
            //判断是否新增
            if (linterid == null || linterid == -1) {
                linteridSub = -1;
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -601,7 +599,7 @@
                });
            }
            else {//如果修改则走下面 new
                RoadBillMain(linterid, linteridSub);
                RoadBillMain(linterid);
                //RoadBillSub(linterid);
            }
@@ -1191,7 +1189,7 @@
                    if (table.cache["mainTable"][i] != "") {
                        //初始化关闭时间(空值状态下 èµ‹å€¼)
                        if (table.cache["mainTable"][i].HEntryCloseDate == "") {
                            table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01 00:00:00.000"
                            table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01"
                        }
                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
@@ -1201,8 +1199,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
                var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                
                var index = layer.load();
                $.ajax({
@@ -1229,15 +1226,14 @@
            }
            //编辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid, linteridSub)//加载表头
            function RoadBillMain(linterid)//加载表头
            {
                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
                var sWhere = " and hmainid='" + linterid + "'";
                $.ajax({
                    url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (d) {
                        //主表
                        form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HBillNo": d.data[0].单据号
@@ -1293,7 +1289,7 @@
                            , "HSourceBillNo": d.data[0].源单编号
                            , "HICMOEntryID": d.data[0].生产订单明细内码
                            , "HMainInterID": d.data[0].导入排产ID
                            , "HProdORGID": d.data[0].生产组织
                            , "HProdORGID": d.data[0].HProdORGID
                            , "HLeftPlanQty": d.data[0].未排数量
                            , "HEmpID": d.data[0].HEmpID
                            , "HEmpIDName": d.data[0].职员
@@ -1309,15 +1305,17 @@
                            , "HHangUp": d.data[0].挂起标记 == "0" ? false : true
                        });
                        //子表  èµ‹å€¼
                        var rowdata = [{
                            "HMasterDate": Format(new Date(d.data[0].日计划生产日期), "yyyy-MM-dd"), "HQty": d.data[0].子日计划数量, "HRptFinishQty": d.data[0].汇报完成数量
                            , "HTimes": d.data[0].剩余工时, "HUseTimes": d.data[0].占用工时, "HBTimes": Format(new Date(d.data[0].开始时间), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[0].结束时间), "yyyy-MM-dd")
                            , "HRemark": d.data[0].表体备注, "HDateSub": Format(new Date(d.data[0].排产日期), "yyyy-MM-dd"), "HCloseMan": d.data[0].子关闭人, "HEntryCloseDate":Format(new Date(d.data[0].子关闭时间), "yyyy-MM-dd")
                            , "HCloseTypeSub": d.data[0].是否手工关闭 == 0 ? false : true, "HColumn": d.data[0].Excel列头, "HLockedSub": d.data[0].子锁定标记 == 0 ? false : true, "HComplete": d.data[0].是否齐套
                            , "HStatusTag": d.data[0].状态标记 == 0 ? false : true, "HIsHandModify": d.data[0].手工修改标记 == 0 ? false : true
                        }];
                         //子表  èµ‹å€¼
                        var rowdata = [];
                        for (var i = 0; i < d.data.length; i++) {
                            rowdata.push({
                                "HMasterDate": Format(new Date(d.data[i].日计划生产日期), "yyyy-MM-dd"), "HQty": d.data[i].子日计划数量, "HRptFinishQty": d.data[i].汇报完成数量
                                , "HTimes": d.data[i].剩余工时, "HUseTimes": d.data[i].占用工时, "HBTimes": Format(new Date(d.data[i].开始时间), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[i].结束时间), "yyyy-MM-dd")
                                , "HRemark": d.data[i].表体备注, "HDateSub": Format(new Date(d.data[i].排产日期), "yyyy-MM-dd"), "HCloseMan": d.data[i].子关闭人, "HEntryCloseDate": Format(new Date(d.data[i].子关闭时间), "yyyy-MM-dd")
                                , "HCloseTypeSub": d.data[i].是否手工关闭 == 0 ? false : true, "HColumn": d.data[i].Excel列头, "HLockedSub": d.data[i].子锁定标记 == 0 ? false : true, "HComplete": d.data[i].是否齐套
                                , "HStatusTag": d.data[i].状态标记 == 0 ? false : true, "HIsHandModify": d.data[i].手工修改标记 == 0 ? false : true
                            });
                        }
                        option.data = rowdata;
                        table.render(option);
@@ -1329,25 +1327,27 @@
                        if (d.data[0].挂起标记 == "1") {
                            $("#checkboxHHangUp").attr("checked", true);
                        }
                        for (var i = 0; i < d.data.length; i++) {
                        //是否手工关闭
                        if (d.data[0].是否手工关闭=="1") {
                            $('#HCloseTypeSub1').attr("checked", true);
                        }
                            //是否手工关闭
                            if (d.data[i].是否手工关闭 == "1") {
                                $('#HCloseTypeSub' + (i + 1)).attr("checked", true);
                            }
                        //锁定标记
                        if (d.data[0].子锁定标记 == "1") {
                            $('#HLockedSub1').attr("checked", true);
                        }
                            //锁定标记
                            if (d.data[i].子锁定标记 == "1") {
                                $('#HLockedSub' + (i + 1)).attr("checked", true);
                            }
                         //状态标记
                        if (d.data[0].状态标记 == "1") {
                            $('#HStatusTag1').attr("checked", true);
                        }
                            //状态标记
                            if (d.data[i].状态标记 == "1") {
                                $('#HStatusTag' + (i + 1)).attr("checked", true);
                            }
                        //手工修改标记
                        if (d.data[0].手工修改标记 == "1") {
                            $('#HIsHandModify1').attr("checked", true);
                            //手工修改标记
                            if (d.data[i].手工修改标记 == "1") {
                                $('#HIsHandModify' + (i + 1)).attr("checked", true);
                            }
                        }
                        form.render('checkbox');
                    }
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList.html
@@ -170,7 +170,7 @@
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: 'hmainid', title: 'hmainid', hide: true }
                    , { field: '单据号', title: '单据号' }
                    , { field: '单据号', title: '单据号', width: 200  }
                    , { field: '单据类型', title: '单据类型', width: 120 }
                    , { field: '单据状态', title: '单据状态' }
                    , { field: '日期', title: '日期' }
@@ -401,7 +401,7 @@
                , area: ['100%', '100%']
                , title: '日计划工单列表-新增'
                , shift: 0//弹出动画
                , content: '../生产日计划工单/JIT_DayPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
                , content: '../生产日计划工单/JIT_DayPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
                , end: function () {
                    //刷新页面,
                    location.reload();
@@ -416,7 +416,6 @@
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var linterid = data[0].hmainid;
                var linteridSub = data[0].hsubid;
                layer.open({
                    type: 2
@@ -424,7 +423,7 @@
                    , area: ['100%', '100%']
                    , title: '日计划工单列表-编辑'
                    , shift: 0//弹出动画
                    , content: '../生产日计划工单/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                    , content: '../生产日计划工单/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    , end: function () {
                        //刷新页面,
                        location.reload();
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html
New file
@@ -0,0 +1,522 @@
<!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 style="padding: 10px; ">
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excel导入</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</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="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 75px;">
                                    </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="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
                                            <!--动态渲染组织-->
                                        </select>
                                    </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" id="HSeOrderBillNo">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">查询</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">重置</button>
                                <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;">开工截止日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 75px;">
                                            </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="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" 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="HBillNo" id="HBillNo">
                                            </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" id="HICMOBillNo">
                                            </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="HMaterName" id="HMaterName" 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; width: 185px;">
                                                <select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
                                                    <option value="全部">全部</option>
                                                    <option value="生产用料清单">生产用料清单</option>
                                                    <option value="标准Bom">标准Bom</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:10px;margin-bottom: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="HBillNo" id="HBillNo">
                                            </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="HMaterModel" id="HMaterModel" 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="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" 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_BatchFill"><i class="layui-icon layui-icon-file-b"></i>批量填充</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制行</button>
                                <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>
</body>
</html>
<script>
    var treeCkData = { id: 0 };
    var TagId = "";
    var TagParentId = "";
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
        //#region å…¬ç”¨å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , laydate = layui.laydate
            , excel = layui.excel
            , element = layui.element;
        var sWhere = "";
        var option = [];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //初始化界面
        set_ClearBill();
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //头工具栏事件
        table.on('toolbar(mainTable)', function (obj) {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            switch (obj.event) {
                case 'btn-CopyLine':
                    console.log(JSON.stringify(data))
                    console.log()
                    if (data.length <= 0) {
                        layer.msg("请选择需要复制的一行!");
                    }
                    else if (data.length > 1) {
                        layer.msg("只能选择复制一行!");
                    }
                    else {
                        data[0]["生产资源"] = "";
                        data[0]["HSourceID"] = 0;
                        data[0]["hmainid"] = "";
                        data[0]["单据号"] = "";
                        var copydata = JSON.stringify(data);
                        var copydata2 = copydata.substring(1, copydata.length);//去除首行字符'['
                        var copyrow = copydata2.substring(0, copydata2.length - 1);//去除末尾字符']'
                        table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                        option.data = table.cache["mainTable"];//将数据绑定到data上
                        table.render(option);//将数据渲染到表格上
                    }
                    break;
            }
        });
        //导入
        form.on('submit(ExcelImport)', function () {
            btnExcelImport();
        });
        //保存
        form.on('submit(btnSave)', function (data) {
            set_AddNew(data);
        });
        //物料
        form.on('submit(btnHMaterID)', function (data) {
            btnHMaterID();
        });
        //生产车间
        form.on('submit(btnHWorkShopID)', function (data) {
            btnHWorkShopID();
        });
        //快速过滤
        form.on('submit(btnSearch)', function (data) {
            get_FastQuery();
        });
        //重置
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });
        //#endregion
        //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„æ‰€æœ‰æ–¹æ³•
        //#region åˆå§‹åŒ–界面
        function set_ClearBill() {
            //初始化时间
            $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
            $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            //组织
            Organ();
            //初始化表格
            set_InitGrid();
            get_FastQuery();
        }
         //#endregion
        //获取组织
        function Organ() {
            //获取登录页组织列
            var Organization = '<option  style="color:blue;" value="0">组织</option>';
            $.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>';
                        }
                        $("#HProdORGID").append(Organization);
                        form.render('select');
                    }
                    layer.closeAll("loading");
                }
            })
        }
        //表格数据
        function set_InitGrid() {
            var columns = [];
            var myDate = new Date();
            var yyyy = myDate.getFullYear();
            var MM = myDate.getMonth() + 1;
            var dd = myDate.getDate();
            var SumMonth = 31; //动态两月之差 new Date(yyyy, MM, 0).getDate()
            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: 'hmainid', title: 'hmainid', hide: true });
            columns.push({ field: '单据号', title: '单据号', hide: true });
            columns.push({ field: '销售订单号', title: '销售订单号', width:150 });
            columns.push({ field: '生产订单号', title: '生产订单号', width:150 });
            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150 });
            columns.push({ field: '电压/功率/底板', title: '电压/功率/底板', width: 150 });
            columns.push({ field: '优先级', title: '优先级', width:150 });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ field: '生产组织', title: '生产组织', width:150 });
            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
            columns.push({ field: '物料代码', title: '物料编码', width:150 });
            columns.push({ field: '物料名称', title: '物料名称', width:150 });
            columns.push({ field: '规格型号', title: '规格型号', width:150 });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true});
            columns.push({ field: '计量单位', title: '计量单位', width:150 });
            columns.push({ field: '销售订单数量', title: '销售订单数量', width:150 });//0
            columns.push({ field: '订单需求数量', title: '生产订单数量', width: 150 });//0
            columns.push({ field: '订单可排数量', title: '订单可排数量', width:150 });
            columns.push({ field: '未入库数量', title: '未入库数量', width: 150 });//0
            columns.push({ field: '拆单数量', title: '拆单数量', width: 150 });//0
            columns.push({ field: '日计划数量总量', title: '日计划数量总量', width: 150 });//0
            columns.push({ field: '今日之前日计划数量', title: '今日之前日计划数量', width: 150 });//0
            columns.push({ field: '计划开始日期', title: '预计开工日期', width:150 });
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: '生产车间', title: '生产车间', width:150 });
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide:true });
            columns.push({ field: '生产资源', title: '生产资源', width:150 });
            for (var i = 0; i <= (SumMonth - dd); i++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), edit: 'text',width:120 })//0
            }
            for (var i = 1; i < dd; i++) {
                columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), edit: 'text',width: 120 })//0
            }
            columns.push({ field: 'T31', title: 'T31', width: 150 });//0
            columns.push({ field: '订单类型', title: '订单类型', width: 150 });
            columns.push({ field: '生产订单单据类型', title: '源单订单单据类型', width: 150 });
            columns.push({ field: '业务状态', title: '业务状态', width: 150 });
            columns.push({ field: '产线入库数量', title: '产线入库数量', width: 150 });
            columns.push({ field: '未排数量', title: '可排数量', width: 150 });
            columns.push({ field: '订单等级', title: '订单等级', width: 150 });
            columns.push({ field: '交货日期', title: '交货日期', width: 150 });
            columns.push({ field: '源单主内码', title: '源单主内码', width: 150 });
            columns.push({ field: '源单子内码', title: '源单子内码', width: 150 });
            columns.push({ field: '日计划工单主码', title: '日计划工单主码', width: 150 });
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-120'
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cols: [columns]
            };
        }
        //查询加载数据
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillList',
                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 });
                }
            });
        }
        //Excel导入
        function btnExcelImport() {
            layer.open({
                type: 2
                , skin: 'layui-layer-rim' //加上边框
                , area: ['100%', '100%']
                , title: 'Excel导入'
                , shift: 0//弹出动画
                , content: '../生产计划平台/JIT_DayPlanPlatFormImport.html?OperationType=1'
                , end: function () {
                    //刷新页面,
                    location.reload();
                }
            })
        }
        //物料列表
        function btnHMaterID() {
            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('请选择数据');
                    }
                    //获取数据
                    $("#HMaterID").val(checkStatus.data[0].HItemID);
                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                    $("#HMaterName").val(checkStatus.data[0].HName);
                    $("#HMaterModel").val(checkStatus.data[0].HModel);
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //生产车间列表
        function btnHWorkShopID() {
            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('请选择数据');
                    }
                    //获取数据
                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//车间id
                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//车间名称
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //快速过滤
        function get_FastQuery() {
            var HPlanBeginDate = $("#HPlanBeginDate").val();//开工起始日期
            var HProdORGID = $("#HProdORGID").val();//生产订单组织
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号
            var HPlanEndDate = $("#HPlanEndDate").val();//开工截止日期
            var HMaterID = $("#HMaterID").val();//物料编码id
            var HICMOBillNo = $("#HICMOBillNo").val();//生产订单号
            var HWorkShopID = $("#HWorkShopID").val();//生产车间
            sWhere = {
                HPlanBeginDate: HPlanBeginDate
                , HProdORGID: HProdORGID
                , HSeOrderBillNo: HSeOrderBillNo
                , HPlanEndDate: HPlanEndDate
                , HMaterID: HMaterID
                , HICMOBillNo: HICMOBillNo
                , HWorkShopID: HWorkShopID
            }
            get_Display(JSON.stringify(sWhere));
            sWhere = ""//调用接口后清空sWhere缓存
        }
        //重置
        function set_ClearQuery() {
            $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));//开工起始日期
            $("#HProdORGID").val("0");//生产订单组织
            $("#HSeOrderBillNo").val("");//销售订单号
            $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//开工截止日期
            $("#HMaterID").val("0");//物料编码id
            $("#HMaterNumber").val("");//物料编码
            $("#HMaterName").val("");//物料名称
            $("#HMaterModel").val("0");//规格型号
            $("#HICMOBillNo").val("");//生产订单号
            $("#HWorkShopID").val("0");//生产车间id
            $("#HWorkShopIDName").val("");//生产车间
            sWhere = "";
        }
        //保存
        function set_AddNew(data) {
            //删除子表数据 ä¼šå ç”¨æ•°ç»„的位置,需要重新排一下顺序
            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    num.push(table.cache["mainTable"][i])
                }
            }
            //var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            var sMainSub = sSubStr +";" + sessionStorage["HUserName"];
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
                async: true,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        get_FastQuery();
                        layer.close(index);
                        layer.msg("保存成功");
                    }
                    else {
                        layer.close(index);
                        layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
        }
        //#endregion
        //以上是layui模块
    });
</script>
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatFormImport.html
@@ -49,7 +49,7 @@
            <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="btnSave" id="btnSave">导入</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">导入数据</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">文件上传</button>
                    </div>
@@ -92,7 +92,7 @@
                    <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_AddNew"><i class="layui-icon layui-icon-file-b"></i>批量填充</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>批量填充</button>
                        </div>
                    </script>
                </form>
@@ -128,6 +128,9 @@
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        var params = getUrlVars();
        var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
        //初始化界面
        set_ClearBill();
@@ -168,7 +171,12 @@
        //退出
        form.on('submit(Cancel)', function () {
            Pub_Close(2);
            if (OperationType == 1) {
                Pub_Close(1);
            }
            else {
                Pub_Close(2);
            }
        })
        //导入  ä¿å­˜æ•°æ®
@@ -194,18 +202,20 @@
            set_InitGrid();
        }
         //#endregion
        //初始化表格
        function set_InitGrid() {
            var myDate = new Date();
            var yyyy = myDate.getFullYear();
            var MM = myDate.getMonth() + 1;
            var dd = myDate.getDate();
            var SumMonth = new Date(yyyy, MM, 0).getDate();
            var SumMonth = 31; //动态两月之差 new Date(yyyy, MM, 0).getDate()
            var columns = [];
            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: 'hmainid', title: ' hmainid', width: 200, hide: true });
            columns.push({ field: '单据号', title: ' å•据号', width: 200 });
            columns.push({ field: 'hmainid', title: 'hmainid', width: 200, hide: true });
            columns.push({ field: '单据号', title: '单据号', width: 200 });
            columns.push({ field: '生产订单号*', title: '生产订单号' });
            columns.push({ field: '生产订单明细行号*', title: '生产订单明细行号', width: 200 });
            columns.push({ field: '组织编码*', title: '组织编码' });
@@ -302,6 +312,17 @@
            }
        }
        //获取参数
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
        //#endregion
WebTM/views/Éú²ú¹ÜÀí/ÒªÁϼƻ®/JIT_NeedMaterPlanBillEdit.html
@@ -276,11 +276,9 @@
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
            var linterid = params[params[1]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«
            //判断是否新增
            if (linterid == null || linterid == -1) {
                linteridSub = -1;
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -295,7 +293,7 @@
                });
            }
            else {//如果修改则走下面 new
                RoadBillMain(linterid, linteridSub);
                RoadBillMain(linterid);
                //RoadBillSub(linterid);
            }
@@ -631,7 +629,6 @@
            //多选  åˆ·æ–°è¡¨æ ¼
            function checkRefresh() {
                for (var i = 1; i <= option.data.length; i++) {
                    console.log(JSON.stringify(option.data[i - 1]))
                    //延迟原因
                    $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
                    //物料属性
@@ -838,9 +835,9 @@
            }
            //编辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid, linteridSub)//加载表头
            function RoadBillMain(linterid)//加载表头
            {
                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
                var sWhere = " and hmainid='" + linterid + "'";
                $.ajax({
                    url: GetWEBURL() + "/Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList",
                    type: "GET",
@@ -862,44 +859,52 @@
                            , "HExplanation": d.data[0].摘要
                        });
                        //子表  èµ‹å€¼
                        var rowdata = [{
                            "HLaterReason": d.data[0].延迟原因, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].物料代码, "HMaterName": d.data[0].物料名称
                            , "HMaterModel": d.data[0].规格型号, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].计量单位
                            , "HErpClsID": d.data[0].物料属性, "HQty": d.data[0].数量, "HRemark": d.data[0].表体备注, "HProdORGID": d.data[0].子生产组织
                            , "HStatus": d.data[0].状态, "HFixleadTime": d.data[0].提前期, "HSourceInterID": d.data[0].源单ID, "HSourceEntryID": d.data[0].源单子ID
                            , "HSourceBillNo": d.data[0].源单单号, "HSourceBillType": d.data[0].子源单类型, "HDayPlanDate": Format(new Date(d.data[0].工单生产日期), 'yyyy-MM-dd')
                            , "HRelationQty": d.data[0].关联数量, "HICMOInterID": d.data[0].生产订单内码, "HICMOEntryID": d.data[0].生产订单子内码
                            , "HICMOBillSEQ": d.data[0].生产订单行号, "HCloseMan": d.data[0].子关闭人, "HEntryCloseDate": Format(new Date(d.data[0].子关闭时间), 'yyyy-MM-dd')
                            , "HCloseTypeSub": d.data[0].是否手工关闭 == "1" ? true : false, "HReciveQty": d.data[0].入库数量, "HCloseStatus": d.data[0].关闭状态 == "1" ? true : false
                            , "HRemoveQty": d.data[0].转移数量, "HSeOrderBillNo": d.data[0].销售订单号, "HICMOEmpID": d.data[0].HICMOEmpID, "HICMOEmpIDName": d.data[0].生产订单制单人
                            , "HUnReciveQty": d.data[0].未收料数量, "HICMOBillDate": Format(new Date(d.data[0].生产订单单据日期), 'yyyy-MM-dd')
                            , "HICMOBillDeliveryDate": Format(new Date(d.data[0].生产订单交货日期), 'yyyy-MM-dd'), "HICMOBillRemark": d.data[0].生产订单摘要
                            , "HICMOBillNote": d.data[0].生产订单表体备注
                        }];
                        var rowdata = [];
                        for (var i = 0; i < d.data.length; i++) {
                            //子表  èµ‹å€¼
                            rowdata.push({
                                "HLaterReason": d.data[i].延迟原因, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].物料代码, "HMaterName": d.data[i].物料名称
                                , "HMaterModel": d.data[i].规格型号, "HUnitID": d.data[i].HUnitID, "HUnitIDName": d.data[i].计量单位
                                , "HErpClsID": d.data[i].物料属性, "HQty": d.data[i].数量, "HRemark": d.data[i].表体备注, "HProdORGID": d.data[i].子生产组织
                                , "HStatus": d.data[i].状态, "HFixleadTime": d.data[i].提前期, "HSourceInterID": d.data[i].源单ID, "HSourceEntryID": d.data[i].源单子ID
                                , "HSourceBillNo": d.data[i].源单单号, "HSourceBillType": d.data[i].子源单类型, "HDayPlanDate": Format(new Date(d.data[i].工单生产日期), 'yyyy-MM-dd')
                                , "HRelationQty": d.data[i].关联数量, "HICMOInterID": d.data[i].生产订单内码, "HICMOEntryID": d.data[i].生产订单子内码
                                , "HICMOBillSEQ": d.data[i].生产订单行号, "HCloseMan": d.data[i].子关闭人, "HEntryCloseDate": Format(new Date(d.data[i].子关闭时间), 'yyyy-MM-dd')
                                , "HCloseTypeSub": d.data[i].是否手工关闭 == "1" ? true : false, "HReciveQty": d.data[i].入库数量, "HCloseStatus": d.data[i].关闭状态 == "1" ? true : false
                                , "HRemoveQty": d.data[i].转移数量, "HSeOrderBillNo": d.data[i].销售订单号, "HICMOEmpID": d.data[i].HICMOEmpID, "HICMOEmpIDName": d.data[i].生产订单制单人
                                , "HUnReciveQty": d.data[i].未收料数量, "HICMOBillDate": Format(new Date(d.data[i].生产订单单据日期), 'yyyy-MM-dd')
                                , "HICMOBillDeliveryDate": Format(new Date(d.data[i].生产订单交货日期), 'yyyy-MM-dd'), "HICMOBillRemark": d.data[i].生产订单摘要
                                , "HICMOBillNote": d.data[i].生产订单表体备注
                            });
                        }
                        option.data = rowdata;
                        table.render(option);
                        //是否手工关闭
                        if (d.data[0].是否手工关闭=="1") {
                            $('#HCloseTypeSub1').attr("checked", true);
                        }
                        for (var i = 0; i < d.data.length; i++) {
                            //是否手工关闭
                            if (d.data[i].是否手工关闭 == "1") {
                                $('#HCloseTypeSub' + (i + 1)).attr("checked", true);
                            }
                        //关闭状态
                        if (d.data[0].关闭状态 == "1") {
                            $('#HCloseStatus1').attr("checked", true);
                        }
                        form.render('checkbox');
                            //关闭状态
                            if (d.data[i].关闭状态 == "1") {
                                $('#HCloseStatus' + (i + 1)).attr("checked", true);
                            }
                        //延迟原因
                        $('#HLaterReason1').find("option[value='" + d.data[0].延迟原因 + "']").attr("selected", true);
                        //物料属性
                        $('#HErpClsID1').find("option[value='" + d.data[0].物料属性 + "']").attr("selected", true);
                        //生产组织
                        $('#HProdORGIDSub1').find("option[value='" + d.data[0].子生产组织 + "']").attr("selected", true);
                        //状态
                        $('#HStatus1').find("option[value='" + d.data[0].状态 + "']").attr("selected", true);
                            //延迟原因
                            $('#HLaterReason' + (i + 1)).find("option[value='" + d.data[i].延迟原因 + "']").attr("selected", true);
                            //物料属性
                            $('#HErpClsID' + (i + 1)).find("option[value='" + d.data[i].物料属性 + "']").attr("selected", true);
                            //生产组织
                            $('#HProdORGIDSub' + (i + 1)).find("option[value='" + d.data[i].子生产组织 + "']").attr("selected", true);
                            //状态
                            $('#HStatus' + (i + 1)).find("option[value='" + d.data[i].状态 + "']").attr("selected", true);
                        }
                        form.render('select');
                        form.render('checkbox');
                    }
                })
            }
@@ -923,8 +928,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
                var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                
                var index = layer.load();
                $.ajax({
WebTM/views/Éú²ú¹ÜÀí/ÒªÁϼƻ®/JIT_NeedMaterPlanBillList.html
@@ -172,7 +172,7 @@
                    , { field: 'hmainid', title: 'hmainid', hide: true }
                    , { field: '单据类型', title: '单据类型', width: 120 }
                    , { field: '日期', title: '要料日期' }
                    , { field: '单据号', title: '单据号' }
                    , { field: '单据号', title: '单据号', width: 200 }
                    , { field: '单据状态', title: '单据状态' }
                    , { field: '表头备注', title: '表头备注' }
                    , { field: '退回人', title: '退回人' }
@@ -391,7 +391,7 @@
                , area: ['100%', '100%']
                , title: '要料计划单列表-新增'
                , shift: 0//弹出动画
                , content: '../要料计划/JIT_NeedMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType=&linteridSub=-1'
                , content: '../要料计划/JIT_NeedMaterPlanBillEdit.html?OperationType=1&linterid=-1&HSouceBillType='
                , end: function () {
                    //刷新页面,
                    location.reload();
@@ -406,7 +406,6 @@
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var linterid = data[0].hmainid;
                var linteridSub = data[0].hsubid;
                layer.open({
                    type: 2
@@ -414,7 +413,7 @@
                    , area: ['100%', '100%']
                    , title: '要料计划单列表-编辑'
                    , shift: 0//弹出动画
                    , content: '../要料计划/JIT_NeedMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                    , content: '../要料计划/JIT_NeedMaterPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    , end: function () {
                        //刷新页面,
                        location.reload();
WebTM/views/²É¹º¹ÜÀí/ίÍâ¶©µ¥/WW_EntrustOrderBillList.html
@@ -141,6 +141,7 @@
                                        <label class="layui-form-label">完成状态</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HFinishStatus" lay-filter="HFinishStatus">
                                                <option value="" selected>全部</option>
                                                <option value="未完成" selected>未完成</option>
                                                <option value="已完成">已完成</option>
                                            </select>
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html
@@ -148,6 +148,7 @@
                                        <label class="layui-form-label">完成状态</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HFinishStatus" lay-filter="HFinishStatus">
                                                <option value="" selected>全部</option>
                                                <option value="未完成" selected>未完成</option>
                                                <option value="已完成">已完成</option>
                                            </select>