功能完善

yangle

2022-05-20 16fb2995c39f0b2ee0329530843e3002ab95da8d

功能完善

 WebTM/views/Éú²ú¹ÜÀí/ÌáÁϼƻ®/JIT_LiftMaterPlaBillnList.html

@@ -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

@@ -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

@@ -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

@@ -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_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

@@ -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_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

@@ -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();