Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2024-10-28 07cf94734c36d4eae6ddbc4dd338bf5af81a2193

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

@@ -178,6 +178,61 @@
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -235,7 +290,7 @@
                        <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="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>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>上移</button>
@@ -243,6 +298,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>优先级</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>准备排序</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>选产线</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></i>选操作工</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>工艺路线</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>工厂日历</button>
@@ -275,6 +331,7 @@
</script>
<script>
    var OptionData = [];
    var OptionData_Emp = [];
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
@@ -510,6 +567,10 @@
                case 'set_Souce':
                    set_Souce(data);
                    break;
                //选操作工
                case 'set_Emp':
                    set_Emp(data);
                    break;                    
                //查看工艺路线
                case 'set_Routing':
                    set_Routing();
@@ -781,7 +842,6 @@
            columns.push({ field: '单据号', title: '单据号', hide: true, sort: true });
            columns.push({ field: '销售订单号', title: '销售订单号', width: 150, sort: true });
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;', sort: true });
            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150, sort: true });
            columns.push({ field: '生产组织', title: '生产组织', width: 150, sort: true });
            columns.push({ field: '物料代码', title: '物料编码', width: 150, sort: true });
            columns.push({ field: '物料名称', title: '物料名称', width: 150, sort: true });
@@ -798,6 +858,7 @@
            columns.push({ field: '昨日数量', title: '昨日数量' });
            columns.push({ field: '优先级', title: '优先级', width: 150, edit: 'text', sort: true });
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID" });
            columns.push({ field: '操作工', title: '操作工', width: 150, edit: 'text', event: "HEmpID" });

            columns.push({
                field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
@@ -954,7 +1015,7 @@
                    return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
                }
            })//0

            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150, sort: true });
            columns.push({ field: 'T31', title: 'T31', width: 70 });//0
            columns.push({ field: '订单类型', title: '订单类型', width: 150, sort: true });
            columns.push({ field: '生产订单单据类型', title: '源单订单单据类型', width: 150, sort: true });
@@ -985,6 +1046,7 @@
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
            columns.push({ field: '拆单汇报数量', title: '拆单汇报数量', width: 150, edit: 'text', sort: true });
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });
            option_columns = columns;
@@ -1005,7 +1067,7 @@
                        sWhere = {
                            HORGID: sessionStorage["OrganizationID"]
                            , HBEGINDATE: field
                            , HENDDATE: field                            
                            , HENDDATE: field
                        }
                        get_Display_3(JSON.stringify(sWhere));
                    });
@@ -1024,14 +1086,14 @@
                    //            }
                    //        }
                    //    }
                    //})            
                    //})
                }
            }
        }
 

        //缺料分析表格数据
        function set_InitGrid1(field) {
            var columns = [];         
            var columns = [];
            columns.push({ field: 'HOrgName', title: '采购组织', sort: true });
            columns.push({ field: 'FNUMBER', title: '物料编码', sort: true });
            columns.push({ field: 'HMaterName', title: '物料名称', sort: true });
@@ -1040,7 +1102,7 @@
            columns.push({ field: 'CountHQty', title: '合计', sort: true });
            columns.push({ field: 'FBASEQTY', title: '即时库存数量', sort: true, totalRow: true });
            columns.push({ field: Format(field, 'yyyy-MM-dd'), title: Format(field, 'MM.dd'), width: 70 })
         

            option_columns = columns;
            option3 = {
                elem: '#mainTable_Material'
@@ -1052,7 +1114,7 @@
                , limit: Number.MAX_VALUE//默认显示全部
                , done: function (res, page, count) {
                    soulTable.render(this);
                  

                }
            };
        }
@@ -1381,6 +1443,12 @@
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var ColName1 = $("#ColName1").val();//复选框
            var Comparator1 = $("#Comparator1").val()
            var ColContent1 = $("#ColContent1").val();
            var ColName2 = $("#ColName2").val();//复选框
            var Comparator2 = $("#Comparator2").val()
            var ColContent2 = $("#ColContent2").val();
            var sWheres = "";

            if (ColName != 0 && Comparator != 0) {
@@ -1405,6 +1473,48 @@
                sWheres += " and [" + ColName + "] " + com;
            }

            if (ColName1 != 0 && Comparator1 != 0) {
                var com1 = "";
                switch (Comparator1) {
                    case "7":
                        com1 = "like'%" + ColContent1 + "%'";
                        break;
                    case "8":
                        com1 = "like'%" + ColContent1 + "'";
                        break;
                    case "9":
                        com1 = "like'" + ColContent1 + "%'";
                        break;
                    case "10":
                        com1 = "not like'%" + ColContent1 + "%'";
                        break;
                    default:
                        com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                        break;
                }
                sWhere += " and " + ColName1 + " " + com1;
            }
            if (ColName2 != 0 && Comparator2 != 0) {
                var com2 = "";
                switch (Comparator2) {
                    case "7":
                        com2 = "like'%" + ColContent2 + "%'";
                        break;
                    case "8":
                        com2 = "like'%" + ColContent2 + "'";
                        break;
                    case "9":
                        com2 = "like'" + ColContent2 + "%'";
                        break;
                    case "10":
                        com2 = "not like'%" + ColContent2 + "%'";
                        break;
                    default:
                        com2 = "" + Comparator + "'" + ColContent + "'";
                        break;
                }
                sWhere += " and " + ColName2 + " " + com2;
            }
            sWhere = {
                HPlanBeginDate: HPlanBeginDate
                , HProdORGID: HProdORGID
@@ -1488,6 +1598,12 @@
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            $("#ColContent1").val("");
            $("#ColName1").val("0");
            $("#Comparator1").val("0");
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            form.render('select');
            sWhere = "";
        }
@@ -1613,10 +1729,10 @@
                }
                if (isNaN(data[i]["HSourceID"])) {
                    return layer.msg("选择生产资源!!")
                }               
                }
                HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
            }
           

            $('#HProgressBar').html(`
    <div class="layui-progress" lay-filter="demo-filter-progress">
      <div class="layui-progress-bar" lay-percent="40%"></div>
@@ -1684,7 +1800,7 @@
                                return layer.alert("第" + (i + 1) + '行，小时产能未设置，请核对数据。' + '</br>' + '1.物料未添加工艺路线' + '</br>' + '2.工艺路线中未设置小时产能' + '</br>' + '3.生产资源未设置单班工时' + '</br>' + '4.生产资源中绑定工作中心与工艺路线中设置的工作中心不一致');
                            }
                        }
                        

                    } else {
                        //layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -2617,12 +2733,59 @@
                return layer.msg("请选择数据!")
            }
        }
        
        //选操作工
        function set_Emp(data) {
            if (data != 0) {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "职员列表"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["90%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ["../../基础资料/公用基础资料/Gy_EmployeeList.html?Htype=HEmp", "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                        if (checkStatus.data.length != 1) {
                            return layer.msg("请选择一条数据");
                        }
                        OptionData_Emp[0] = checkStatus.data[0];
                        layer.close(index);//关闭弹窗
                    }
                    , end: function () {
                        if (OptionData_Emp.length > 0) {
                            var num = 0;
                            for (var i = 0; i < option.data.length; i++) {
                                if (num >= data.length) {
                                    break;
                                }
                                if (option.data[i]["LAY_CHECKED"] == true) {
                                    option.data[i]["HEmpID"] = OptionData_Emp[0].HItemID;
                                    option.data[i]["操作工"] = OptionData_Emp[0].职员名称;
                                    num += 1;
                                }
                            }
                            table.render(option);
                        }
                    }
                })
            }
            else {
                return layer.msg("请选择数据!")
            }
        }

        //保存
        function set_AddNew() {

            //删除子表数据 ä¼šå ç”¨æ•°ç»„的位置,需要重新排一下顺序
            var num = [];            
            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) == 0) {
@@ -2634,7 +2797,7 @@
                    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);
@@ -2743,6 +2906,47 @@
                            }
                        })
                    }

                    //操作工
                    if (obj.event == "HEmpID") {
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "员工列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/公用基础资料/Gy_EmployeeList.html?Htype=HEmp", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                OptionData_Emp[0] = checkStatus.data[0];
                                //更新表格缓存的数据
                                obj.update({
                                    "HEmpID": checkStatus.data[0].HItemID
                                    , "操作工": checkStatus.data[0].职员名称
                                })
                                layer.close(index);//关闭弹窗
                            }
                            , end: function () {
                                if (OptionData_Emp.length > 0) {
                                    obj.update({
                                        "HEmpID": OptionData_Emp[0].HItemID
                                        , "操作工": OptionData_Emp[0].职员名称
                                    })
                                    OptionData_Emp = [];
                                }
                            }
                        })
                    }

                    obj.event = "";
                    return false;
                } else if (event.key == "F8") {
@@ -2889,7 +3093,7 @@
                            , data: data1.data
                            , height: 400
                            , page: true
                            , limits: [200, 500, 5000, 50000]
                            , limits: [200, 500, 5000, 20000]
                            , limit: 200
                            , cellMinWidth: 90
                        }
@@ -3036,7 +3240,7 @@
                    item.规格型号 = item.规格型号.replace(/[,]+/g, '，');  // å°†æ¢åˆ†å·æ›¿æ¢ä¸ºç©ºå­—符串
                }
            });
            table.exportFile(ins.config.id, data, "xls"); 
            table.exportFile(ins.config.id, data, "xls");
        }

        //排产功能
@@ -3154,7 +3358,9 @@
                        dataCol = data1.data[0].HGridString.split(',');

                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            if (dataCol[i]) {
                                var dataCols = dataCol[i].split('|');
                            }                           
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
@@ -3383,7 +3589,7 @@


                        var dataCol = [];//数据库查询出的列数据
                       

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

                        for (var i = 0; i < option3.cols[0].length - 1; i++) {
@@ -3404,7 +3610,7 @@
                            } else {
                                option3.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            

                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
@@ -3427,7 +3633,7 @@
                            else {
                                break;
                            }
                        }                      
                        }
                        table.render(option3);
                    } else {
                        table.render(option3);
@@ -3447,7 +3653,9 @@
                }
            }
            $("#ColName").empty();
            $("#ColName").append(Organization);
            $("#ColName").append(Organization);$("#ColName1").empty();
            $("#ColName1").append(Organization);$("#ColName2").empty();
            $("#ColName2").append(Organization);
            form.render('select');
        }
        //#endregion
@@ -3459,4 +3667,9 @@
        OptionData = data
    }

    //双击返回操作工
    function GetHEmpValue(data) {
        OptionData_Emp = data
    }

</script>