生产计划平台下方选生产订单功能，生产汇报单编辑修改，报工时改为勾选一条数据 其余数据由系统自动带出

yusijie

2023-12-28 b22b27bdac918e717def68d5b0bdecb6c953ee61

生产计划平台下方选生产订单功能，生产汇报单编辑修改，报工时改为勾选一条数据 其余数据由系统自动带出

 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html

@@ -368,28 +368,27 @@
            form.on('submit(ProdReport)', function (data) {
                var checkStatus = table.checkStatus('mainTable');
                var TabData = checkStatus.data;
                var HInterID = [];
                var HInterID = TabData[0].HInterID;

                for (let i = 0; i < TabData.length;i++) {
                    HInterID.push(TabData[i].HInterID);
                }
                if (checkStatus.data.length != 1) {
                    layer.alert("请选择一条数据!同一订单的生产数量将由系统判断并自动带出。");
                } else {
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '生产汇报单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../生产汇报单/Sc_Add_ICMOReportBillList.html?OperationType=2&linterid=' + HInterID.toString() + '&HSouceBillType=' + 3724, 'yes']
                        , resize: false
                        , cancel: function () {
                        }
                        , end: function () {

                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '生产汇报单-编辑'
                    , shade: 0.6
                    , maxmin: false
                    , anim: 0
                    , content: ['../生产汇报单/Sc_Add_ICMOReportBillList.html?OperationType=2&linterid=' + HInterID.toString() + '&HSouceBillType=' + 3724, 'yes']
                    , resize: false
                    , cancel: function () {
                    }
                    , end: function () {

                    }
                })
               
                        }
                    })                   
                }                                             
            })
            
            //退出

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -512,7 +512,7 @@
                if (OperationType == 1 || OperationType == 2) {
                    refSav = "Add";
                }
                if (linterid == 3) {
                if (OperationType == 3) {
                    refSav = "Update";
                }
                data.field.HMaker = sessionStorage["HUserName"];//制单人
@@ -913,7 +913,9 @@
                option_prodReport = {
                    id: 'mainTable_prodReport'
                    , elem: '#mainTable_prodReport'
                    , page: false
                    , page: true
                    , limit: 1000
                    , limits: [500,1000,1500,2000,3000]
                    , cellMinWidth: 120
                    , height: 500
                    , cols: [columns_prodReport]
@@ -994,7 +996,7 @@
                                        "HMaterID": data[i].物料ID, "HMaterCode": data[i].物料代码, "HMaterName": data[i].物料名称, "HMaterSpec": data[i].规格型号,
                                        "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": data[i].生产资源ID, "HSourceCode": data[i].生产资源代码,
                                        "HSourceName": data[i].生产资源名称, "HWorkerid": data[i].操作员ID, "HWorkerCode": data[i].操作员代码,
                                        "HWorkerName": data[i].操作员名称, "HQty": data[i].产量, "HBadQty": data[i].不良数量, "HICMOBillNo": data[i].生产订单号,
                                        "HWorkerName": data[i].操作员名称, "HQty": data[i].产量, "HBadQty": data[i].不良数量 == '' ? 0 : data[i].不良数量, "HICMOBillNo": data[i].生产订单号,
                                        "HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": ""
                                    });
                                }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html

@@ -191,25 +191,37 @@
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">开始日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" id="HBeginDate" style="width:120px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">结束日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" id="HEndDate" style="width:120px;">
                                        </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">
                                            <input type="text" class="layui-input" name="HDeptName_ICMO" id="HDeptName_ICMO">
                                        </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">
                                            <input type="text" class="layui-input" name="HMaterName_ICMO" id="HMaterName_ICMO">
                                        </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">
                                            <input type="text" class="layui-input" name="HICMOBillNo_ICMO" id="HICMOBillNo_ICMO">
                                        </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>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch_ICMO" id="btnSearch_ICMO">查询</button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_ICMO" id="btnReSearch_ICMO">重置</button>
                                    <!--待排订单-->
                                    <table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
                                </div>                               
@@ -232,7 +244,7 @@
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>排产</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layuiiconform"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn_ICMO"><i class="layui-icon layuiiconform"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
@@ -274,6 +286,7 @@
        var HModName = "JIT_DayPlanPlatForm";
        //不需要显示的字段 å¯æ‰©å±•
        var titleData = [];
        var titleData_ICMO = ["hmainid", "HEntryID", "HEmpID", "HPRDORGID", "hsubid", "HMaterID", "HUnitID", "HDeptID", "HEntryCusID", "HCenterID","HSourceID"];
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -364,6 +377,25 @@
            }
            //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
            layui.each(table.cache.mainTable, function (i, l) {
                if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                    l.LAY_CHECKED = flag;
                }
            });
        })

        table.on('row(mainTable_ICMO)', function (obj) {
            //选中行改变颜色
            var flag = !obj.tr.find(':checkbox:first').prop('checked');
            obj.tr.find(':checkbox').prop('checked', flag);
            if (flag) {
                obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
            } else {
                obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
            }
            //mainTable_ICMO ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
            layui.each(table.cache.mainTable_ICMO, function (i, l) {
                if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                    l.LAY_CHECKED = flag;
                }
@@ -475,8 +507,8 @@
                    parent.layui.admin.events.closeThisTabs();
                    break;
                //列设置
                case 'set_HideColumn2':
                    get_HideColumn2();
                case 'set_HideColumn_ICMO':
                    get_HideColumn_ICMO();
                    break;
            };
        });
@@ -513,9 +545,19 @@
            get_FastQuery(2);
        });

        //快速过滤
        form.on('submit(btnSearch_ICMO)', function (data) {
            get_FastQuery_ICMO(2);
        });

        //重置
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });

        //重置
        form.on('submit(btnReSearch_ICMO)', function (data) {
            set_ClearQuery_ICMO();
        });

        //齐套分析
@@ -617,6 +659,9 @@
            $("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            $("#HMastersDate").val("");

            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            get_ReadConfigFile();
            //组织
            Organ();
@@ -1207,67 +1252,32 @@
            sWhere = ""//调用接口后清空sWhere缓存
        }

        

        //快速过滤
        function get_FastQuery_ICMO(number) {
            var HWorkShopID = 0;
            var HProdORGID = 0;
            HWorkShopID = $("#HWorkShopID").val();//生产车间
            if (number == 2) {
                if (HWorkShopID == 0) {
                    return layer.msg("生产车间不能为空!");
                }
            var HDate = $("#HBeginDate").val();//开始日期
            var HDate1 = $("#HEndDate").val();//结束日期
            var HDeptName_ICMO = $("#HDeptName_ICMO").val();//生产车间
            var HMaterName_ICMO = $("#HMaterName_ICMO").val();//物料名称
            var HICMOBillNo_ICMO = $("#HICMOBillNo_ICMO").val(); //生产订单

                HProdORGID = $("#HProdORGID").val();//生产订单组织
            if (HDate) {
                sWhere_ICMO += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
            }
            if (number == 1) {
                HProdORGID = sessionStorage["OrganizationID"];//生产订单组织
            if (HDate1) {
                sWhere_ICMO += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
            }
            var HPlanBeginDate = $("#HPlanBeginDate").val();//开工起始日期
            var HPlanEndDate = $("#HPlanEndDate").val();//开工截止日期
            var HMastersDate = $("#HMastersDate").val();//排产日期
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号
            var HMaterID = $("#HMaterID").val();//物料编码id
            var HICMOBillNo = $("#HICMOBillNo").val();//生产订单号
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var sWhere_ICMO = "";

            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like''%" + ColContent + "%''";
                        break;
                    case "8":
                        com = "like''%" + ColContent + "''";
                        break;
                    case "9":
                        com = "like''" + ColContent + "%''";
                        break;
                    case "10":
                        com = "not like''%" + ColContent + "%''";
                        break;
                    default:
                        com = "" + Comparator + "''" + ColContent + "''";
                        break;
                }
                sWhere_ICMO += " and [" + ColName + "] " + com;
            if (HDeptName_ICMO) {
                sWhere_ICMO += " and ç”Ÿäº§è½¦é—´ like '%" + HDeptName_ICMO + "%'";
            }
            if (HMaterName_ICMO) {
                sWhere_ICMO += " and concat(产品代码,产品名称,规格型号) like '%" + HMaterName_ICMO + "%'";
            }
            if (HICMOBillNo_ICMO) {
                sWhere_ICMO += " and å•æ®å· like '%" + HICMOBillNo_ICMO + "%'";
            }

            sWhere_ICMO = {
                HPlanBeginDate: HPlanBeginDate
                , HProdORGID: HProdORGID
                , HSeOrderBillNo: HSeOrderBillNo
                , HPlanEndDate: HPlanEndDate
                , HMaterID: HMaterID
                , HICMOBillNo: HICMOBillNo
                , HWorkShopID: HWorkShopID
                , HMastersDate: HMastersDate
                , sWheres: sWheres
            }
            get_Display2(JSON.stringify(sWhere_ICMO));
            get_Display2(sWhere_ICMO);
            sWhere_ICMO = ""//调用接口后清空sWhere缓存
        }

@@ -1313,24 +1323,16 @@
            form.render('select');
            sWhere = "";
        }
        

        //重置
        function set_ClearQuery_ICMO() {
            $("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开工起始日期
            $("#HSeOrderBillNo").val("");//销售订单号
            $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//开工截止日期
            $("#HMastersDate").val("");//排产日期
            $("#HMaterID").val("0");//物料编码id
            $("#HMaterNumber").val("");//物料编码
            $("#HMaterName").val("");//物料名称
            $("#HMaterModel").val("");//规格型号
            $("#HICMOBillNo").val("");//生产订单号
            $("#HWorkShopID").val("0");//生产车间id
            $("#HWorkShopIDName").val("");//生产车间
            $("#HProdORGID").val(sessionStorage["OrganizationID"])//生产订单组织
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            //$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开工起始日期
            //$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//开工截止日期

            $("#HDeptName_ICMO").val("");//生产车间
            $("#HMaterName_ICMO").val("");//物料名称
            $("#HICMOBillNo_ICMO").val(""); //生产订单

            form.render('select');
            sWhere_ICMO = "";
        }
@@ -2559,7 +2561,7 @@
        function get_Display2(sWhere_ICMO) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                url: GetWEBURL() + '/Sc_ICMOBill/NotInDayPlan',
                type: "GET",
                data: { "sWhere": sWhere_ICMO, "user": sessionStorage["HUserName"] },
                success: function (data1) {
@@ -2574,7 +2576,7 @@
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                            if ($.inArray(data[i].name, titleData_ICMO) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
@@ -2597,14 +2599,14 @@
                            , data: data1.data
                            , height: 400
                            , page: true
                            , limits: [50, 500, 5000, 50000]
                            , limits: [200, 500, 5000, 50000]
                            , limit: 200
                            , cellMinWidth: 90
                        }
                        table.render(option2);

                        //刷新表格数据
                        DisPlay_HideColumn2();
                        DisPlay_HideColumn_ICMO();

                        layer.close(ajaxLoad);
                        //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -2627,49 +2629,50 @@
            var checkStatus = table.checkStatus('mainTable_ICMO')
                , data = checkStatus.data;
            if (checkStatus.data.length > 0) {
                console.log(option.data);
                var arr_field = [];
                //获取已排订单列表字段
                for (let i = 0; i < option_columns.length; i++) {
                    if (option_columns[i].field != undefined && option_columns[i].field != null) {
                        arr_field.push(option_columns[i].field);
                    }
                }
                //var arr_field = [];
                ////获取已排订单列表字段
                //for (let i = 0; i < option_columns.length; i++) {
                //    if (option_columns[i].field != undefined && option_columns[i].field != null) {
                //        arr_field.push(option_columns[i].field);
                //    }
                //}
                //把已排订单列表字段存入obj对象中，以便给字段赋值
                var obj = {};
                for (let i = 0; i < arr_field.length; i++) {
                    var key = arr_field[i];
                    var value = '';
                    obj[key] = value;
                }
                //var obj = {};
                //for (let i = 0; i < arr_field.length; i++) {
                //    var key = arr_field[i];
                //    var value = '';
                //    obj[key] = value;
                //}
                //获取勾选上的待排生产订单
                for (var i = 0; i < checkStatus.data.length; i++) {
                    obj.HMaterID = data[i].HMaterID;
                    obj.HProdORGID = data[i].HPRDORGID;
                    obj.HUnitID = data[i].HUnitID;
                    obj.HWorkShopID = data[i].HDeptID;
                    obj.拆单数量 = data[i].生产任务单数量;
                    obj.源单主内码 = data[i].hmainid;
                    obj.源单子内码 = data[i].HEntryID;
                    obj.物料代码 = data[i].产品代码;
                    obj.物料名称 = data[i].产品名称;
                    obj.生产组织 = "智云迈思";
                    obj.生产订单单据类型 = data[i].单据类型;
                    obj.生产订单号 = data[i].单据号;
                    obj.生产订单明细行号 = data[i].HEntryID;
                    obj.生产车间 = data[i].生产车间;
                    obj.规格型号 = data[i].规格型号;
                    obj.计划开始日期 = data[i].计划开工日期;
                    obj.计划数量 = data[i].生产任务单数量;
                    obj.计划结束日期 = data[i].计划完工日期;
                    obj.计量单位 = data[i].计量单位;
                    obj.订单可排数量 = data[i].生产任务单数量;
                    obj.订单等级 = data[i].订单等级;
                    obj.订单类型 = data[i].单据类型;
                    obj.销售订单号 = data[i].销售订单号;
                    obj.销售订单数量 = data[i].销售数量;
                    var newObj = {
                        "HMaterID" : data[i].HMaterID,
                        "HProdORGID" : data[i].HPRDORGID,
                        "HUnitID" : data[i].HUnitID,
                        "HWorkShopID" : data[i].HDeptID,
                        "拆单数量" : data[i].生产任务单数量,
                        "源单主内码" : data[i].hmainid,
                        "源单子内码" : data[i].HEntryID,
                        "物料代码" : data[i].产品代码,
                        "物料名称" : data[i].产品名称,
                        "生产组织": data[i].生产组织,
                        "生产订单单据类型" : data[i].单据类型,
                        "生产订单号" : data[i].单据号,
                        "生产订单明细行号" : data[i].HEntryID,
                        "生产车间" : data[i].生产车间,
                        "规格型号" : data[i].规格型号,
                        "计划开始日期" : data[i].计划开工日期,
                        "计划数量" : data[i].生产任务单数量,
                        "计划结束日期" : data[i].计划完工日期,
                        "计量单位" : data[i].计量单位,
                        "订单可排数量" : data[i].生产任务单数量,
                        "订单等级" : data[i].订单等级,
                        "订单类型" : data[i].单据类型,
                        "销售订单号" : data[i].销售订单号,
                        "销售订单数量" : data[i].销售数量
                    }

                    option.data.push(obj);
                    option.data.push(newObj);
                    table.render(option)
                }

@@ -2843,7 +2846,7 @@
            })
        }

        function get_HideColumn2() {
        function get_HideColumn_ICMO() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option2.cols[0].length; i++) {
@@ -2870,14 +2873,14 @@
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn2();
                    DisPlay_HideColumn_ICMO();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }

        function DisPlay_HideColumn2() {
        function DisPlay_HideColumn_ICMO() {
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
@@ -2887,7 +2890,7 @@


                        var dataCol = [];//数据库查询出的列数据
                        /* var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/
                        /* var titleData_ICMO = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/

                        dataCol = data1.data[0].HGridString.split(',');

@@ -2916,7 +2919,7 @@
                            //    option.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
                            if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData_ICMO) == -1) {
                                option2.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
@@ -2945,7 +2948,7 @@
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
                                if ($.inArray(option2.cols[0][i + 1]["title"], titleData_ICMO) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option2.cols[0][i + 1]["fixed"] = "left";