问题处理

yangle

2022-10-12 824bcdc110be5090fe0acf3ae9021d8ccb0c29c7

问题处理

 WebTM/views/Éú²ú¹ÜÀí/¼ðÁÏÅäË͵¥/JIT_ComplementGoodsList.html

@@ -42,28 +42,52 @@
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">物料代码</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                <label class="layui-form-label">拣料状态</label>
                                <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
                                    <select name="HJLStatus" lay-verify="HJLStatus" id="HJLStatus">
                                        <option value="全部">全部</option>
                                        <option value="已拣料">已拣料</option>
                                        <option value="未拣料" selected="selected">未拣料</option>
                                    </select>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                <label class="layui-form-label" style="width: 85px;">拣料日期</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
                                    <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">物料规格型号</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
                                <label class="layui-form-label" style="width: 85px;">—</label>
                                <div class="layui-input-block" style="margin-left: 118px;">
                                    <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                </div>
                            </div>
                            <div class="layui-colla-content" style="padding: 0px; margin-left: 5%;">
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料代码</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
                                            <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料规格型号</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工段</label>
@@ -84,28 +108,6 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 80px;">当前组织</label>
                                        <div class="layui-input-block" style="margin-left: 110px; width: 185px;">
                                            <select name="Organization" id="Organization" lay-verify="Organization">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">拣料日期</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">—</label>
                                        <div class="layui-input-block" style="margin-left: 118px;">
                                            <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">部门</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -117,39 +119,12 @@
                                </div>
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">拣料状态</label>
                                        <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
                                            <select name="HJLStatus" lay-verify="HJLStatus" id="HJLStatus">
                                                <option value="全部">全部</option>
                                                <option value="已拣料">已拣料</option>
                                                <option value="未拣料">未拣料</option>
                                        <label class="layui-form-label" style="width: 80px;">当前组织</label>
                                        <div class="layui-input-block" style="margin-left: 110px; width: 185px;">
                                            <select name="Organization" id="Organization" lay-verify="Organization">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">过滤</label>
                                        <div class="layui-input-block">
                                            <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
                                    </div>
                                </div>
                            </div>
@@ -277,6 +252,7 @@
                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                        }
                        $("#Organization").append(Organization);
                        $("#Organization").val(sessionStorage["OrganizationID"]);
                        form.render('select');
                    }
                    layer.closeAll("loading");
@@ -330,9 +306,6 @@
                        table.render(option);
                        layer.close(ajaxLoad);

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -521,32 +494,6 @@
            var HDeptName = $("#HDeptName").val(); //部门
            var HJLStatus = $("#HJLStatus").val(); //拣料状态
            var user = sessionStorage["HUserName"]; //制单人
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();

            var Arbitrarily = "";
            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;
                }
                Arbitrarily = " and " + ColName + " " + com;
            }

            sWhere = {
                MaterialNumber: MaterialNumber,
@@ -560,7 +507,6 @@
                HDeptName: HDeptName,
                HJLStatus: HJLStatus,
                user: user,
                Arbitrarily: Arbitrarily
            };
            get_Display(JSON.stringify(sWhere));
            sWhere = "";
@@ -749,18 +695,6 @@
            })
        }

        //列明显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
            for (var i = 1; i < option.cols[0].length; i++) {
                if (option.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                }
            }
            $("#ColName").empty();
            $("#ColName").append(Organization);
            form.render('select');
        }

        //#endregion


 WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏƽ̨/JIT_ComplementGoodBillMain.html

@@ -120,33 +120,6 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                        </div>
                    </div>
@@ -358,9 +331,6 @@
                        table.render(option);
                        layer.close(ajaxLoad);

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
@@ -465,33 +435,10 @@
            var CPModel = $("#CPModel").val(); //产品规格型号
            var HICMOBillNo = $("#HICMOBillNo").val(); //生产订单号
            var ps = $("#ps").prop("checked"); //仅显示未完全配送
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();

            var Arbitrarily = "";
            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;
                }
                Arbitrarily = " and " + ColName + " " + com;
            if (DepartmentName=="") {
                return layer.msg("请选择生产车间!");
            }

            if (ps) {
                ps = 1; //仅显示未完全配送
            }
@@ -512,7 +459,6 @@
                HICMOBillNo: HICMOBillNo,
                ps: ps,
                user: user,
                Arbitrarily: Arbitrarily
            };
            get_Display(JSON.stringify(sWhere));
            sWhere = "";
@@ -610,13 +556,11 @@
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                            console.log("Reason" + sMainStr);
                        }
                    });
            }
@@ -933,18 +877,7 @@
            })
        }

        //列明显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
            for (var i = 1; i < option.cols[0].length; i++) {
                if (option.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                }
            }
            $("#ColName").empty();
            $("#ColName").append(Organization);
            form.render('select');
        }
    

        //#endregion


 WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏƽ̨/JIT_HlpBillList.html

@@ -19,17 +19,18 @@
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px;" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">隐藏列设置</button>
                    </div>
                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                    <!--<div class="layui-tab" lay-filter="tab-POStockInBill">
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
        <div class="layui-tab-content">
            <div class="layui-tab-item layui-show">
                <div class="layui-form-item" style="padding-top: 10px;">

                                </div>
                            </div>
                        </div>
                    </div>-->
                </div>
            </div>
        </div>
    </div>-->
                </form>
            </div>
        </div>
@@ -55,6 +56,7 @@
        var option = [];
        var col = [];
        var HMaker = sessionStorage["HUserName"];
        var HModName = "";
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½  
@@ -69,6 +71,13 @@
                user: HMaker
            }
            sWhere = JSON.stringify(sWhere);
            if (params[params[2]] == 1) {
                HModName = "JIT_HlpBillList_scjl_x";
            } else if (params[params[2]] == 2) {
                HModName = "JIT_HlpBillList_jlps_s";
            } else if (params[params[2]] == 3) {
                HModName = "JIT_HlpBillList_jlps_x";
            }
        }

        //初始化界面
@@ -82,6 +91,11 @@
        form.on('submit(Cancel)', function () {
            Pub_Close(1);
        })

        //隐藏列设置
        form.on('submit(HideColumn)', function () {
            get_HideColumn();
        })
        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法
@@ -94,7 +108,15 @@
        }

        function set_InitGrid() {
          
            //动态显示列名
            option={
                elem: '#mainTable'
                , height: 550
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
            };
        }

        //查询加载数据
@@ -120,27 +142,18 @@
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200});
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120});
                                }
                            }
                        }

                        //动态显示列名
                        table.render({
                            elem: '#mainTable'
                            , cols: [col]
                            , data: data1.data
                            , height: 550
                            , page: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                        });

                        option.cols = [col];
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);
                        DisPlay_HideColumn();
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
@@ -165,6 +178,109 @@
            return vars;
        }

        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.cols[0][i]["title"] + ",";
            }

            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }

        //显示列数据
        function DisPlay_HideColumn() {
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.data.length != 0) {

                        var dataCol = [];//数据库查询出的列数据
                        var titleData = [""];//不需要显示的字段 å¯æ‰©å±•

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

                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["field"], titleData) == -1) {
                                option.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }

                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                    } else {
                        table.render(option);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }

        //#endregion

    });

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

@@ -254,7 +254,14 @@

        //保存
        form.on('submit(btnSave)', function (data) {
            set_AddNew(data);
           var HWorkShopID = $("#HWorkShopID").val();//生产车间
            if (HWorkShopID == 0) {
                return layer.msg("生产车间不能为空!");
            } else if (table.cache["mainTable"].length == 0) {
                return layer.msg("无数据,无法保存!");
            } else {
                set_AddNew(data);
            }
        });

        //物料
@@ -294,12 +301,23 @@

        //锁定
        form.on('submit(btnLock)', function (data) {
            get_btnLock();
            var HWorkShopID = $("#HWorkShopID").val();//生产车间
            if (HWorkShopID == 0) {
                return layer.msg("生产车间不能为空!");
            } else {
                get_btnLock(HWorkShopID);
            }

        })

        //解锁
        form.on('submit(btnUnlock)', function (data) {
            get_btnUnlock();
            var HWorkShopID = $("#HWorkShopID").val();//生产车间
            if (HWorkShopID == 0) {
                return layer.msg("生产车间不能为空!");
            } else {
                get_btnUnlock(HWorkShopID);
            }
        })

        //#endregion
@@ -567,7 +585,7 @@
                success: function (data1) {
                    if (data1.count == 1) {
                        if (data1.data[0]["DayNum"] > 0) {
                            for (var i = 0; i <= data1.data[0]["DayNum"]; i++) {
                            for (var i = 0; i < data1.data[0]["DayNum"]; i++) {
                                option.cols[0][22 + i]["edit"] = "";
                                option.cols[0][22 + i]["style"] = "    background-color: #e6e6e6";
                            }
@@ -772,8 +790,8 @@
        //双击跳转齐套分析明细表
        function btnrowDouble(obj) {

            HMainICMOEntryID = obj["HICMOEntryID"];
            HMainICMOInterID = obj["HICMOInterID"];
            HMainICMOEntryID = obj["源单子内码"];
            HMainICMOInterID = obj["源单主内码"];
            HICMOInterID = obj["HInterID"];

            if (HICMOInterID == "" || HICMOInterID == null) {
@@ -893,7 +911,7 @@
                                    if (data1.data[j]["源单主内码"] == dataPush[i]["源单主内码"] && data1.data[j]["源单子内码"] == dataPush[i]["源单子内码"]) {
                                        layer.close(ajaxLoad);
                                        return layer.alert("生产明细行重复,重复的生产订单号:" + dataPush[i]["生产订单号"] + ",明细行号:" + dataPush[i]["生产订单明细行号"], { icon: 5 });
                                      

                                    }
                                }
                            }
@@ -1003,22 +1021,17 @@
        }

        //锁定
        function get_btnLock() {
        function get_btnLock(HWorkShopID) {
            var data = table.cache["mainTable"];

            if (data.length == 0) {
                return layer.msg("请选择数据进行锁定!")
                return layer.msg("无数据,无法进行锁定!")
            } else {

                var hmainid_s = [];
                for (var i = 0; i < data.length; i++) {
                    hmainid_s.push(data[i]["hmainid"]);
                }
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedDay',
                    type: "GET",
                    data: { "sWhere": hmainid_s.toString(), "HLockedDay": $("#HLockedDay").val() },
                    data: { "HLockedDay": $("#HLockedDay").val(), "HWorkShopID": HWorkShopID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.msg("已锁定");
@@ -1037,22 +1050,16 @@
        }

        //解锁
        function get_btnUnlock() {
        function get_btnUnlock(HWorkShopID) {
            var data = table.cache["mainTable"];

            if (data.length == 0) {
                return layer.msg("请选择数据进行解锁!")
                return layer.msg("无数据,无法进行解锁!")
            } else {
                var hmainid_s = [];
                for (var i = 0; i < data.length; i++) {
                    hmainid_s.push(data[i]["hmainid"]);
                }

                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHUnlockDay',
                    type: "GET",
                    data: { "sWhere": hmainid_s.toString(), "HLockedDay": $("#HLockedDay").val() },
                    data: { "HWorkShopID": HWorkShopID},
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.msg("已解锁");

 WebTM/views/Éú²ú¹ÜÀí/ÍËÁÏÉêÇëµ¥/JIT_CallGoodsBackRequestBillList.html

@@ -93,31 +93,6 @@
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -359,9 +334,6 @@
                $("#MaterialModel").val("");//规格型号
                $("#HDeptName").val("");//生产车间
                $("#ProcMul").val("");//工段
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
                $("#btnSearch").click();//刷新
                sWhere = "";
@@ -381,9 +353,6 @@
                            table.render(option);
                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -408,32 +377,6 @@
                var ProcMul = $("#ProcMul").val();//工段
                var Hmaker = sessionStorage["HUserName"] ;//当前用户
                var HOrgID = sessionStorage["OrganizationID"];//组织
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                var Arbitrarily = "";
                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;
                    }
                    Arbitrarily = " and " + ColName + " " + com;
                }

                sWhere = {
                    HBeginDate: HBeginDate,
@@ -446,7 +389,6 @@
                    ProcMul: ProcMul,
                    Hmaker: Hmaker,
                    HOrgID: HOrgID,
                    Arbitrarily: Arbitrarily
                }

                get_Display(JSON.stringify(sWhere));
@@ -596,18 +538,6 @@
                })
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }
            //#endregion

            //以上是layui模块

 WebTM/views/³µ¼ä¹ÜÀí/½ÐÁϹÜÀí/½ÐÁÏÍËÁϵ¥/Jl_CallGoodsBillBackMain.html

@@ -113,31 +113,6 @@
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -367,9 +342,6 @@
                $("#ProcMul").val("");//工段
                $("#HPZStatus").val("全部");//品质确认
                $("#HCKStatus").val("全部");//仓库接收
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
                $("#btnSearch").click();//刷新
                sWhere = "";
@@ -389,9 +361,6 @@
                            table.render(option);
                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -418,32 +387,6 @@
                var HOrgID = sessionStorage["OrganizationID"];//组织
                var HPZStatus = $("#HPZStatus").val();//品质确认
                var HCKStatus = $("#HCKStatus").val();//仓库接收
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                var Arbitrarily = "";
                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;
                    }
                    Arbitrarily = " and " + ColName + " " + com;
                }

                sWhere = {
                    HBeginDate: HBeginDate,
@@ -458,7 +401,6 @@
                    HOrgID: HOrgID,
                    HPZStatus: HPZStatus,
                    HCKStatus: HCKStatus,
                    Arbitrarily: Arbitrarily
                }

                get_Display(JSON.stringify(sWhere));
@@ -653,18 +595,6 @@
                })
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }

            //#endregion


 WebTM/views/³µ¼ä¹ÜÀí/³µ¼äÊÕÁÏ/JIT_SendGoodsBillList.html

@@ -26,6 +26,16 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">确认状态</label>
                                    <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
                                        <select name="HBillStatus" lay-verify="HBillStatus" id="HBillStatus">
                                            <option value="">全部</option>
                                            <option value="2">已确认</option>
                                            <option value="1" selected="selected">未确认</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
@@ -35,12 +45,6 @@
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">收料单号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -83,29 +87,10 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <label class="layui-form-label">收料单号</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
@@ -120,8 +105,10 @@
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SendGood_check"><i class="layui-icon layui-icon-delete"></i>确认收料</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SendGood_check"><i class="layui-icon layui-icon-file-b"></i>确认收料</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SendGood_revoke"><i class="layui-icon layui-icon-file-b"></i>撤销确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                            </div>
                        </script>
                    </form>
@@ -169,7 +156,7 @@
                    ////编辑
                    //case 'set_ShowBill': set_ShowBill();
                    //    break;
                    //删除
                    //确认
                    case 'set_SendGood_check': set_SendGood_check();
                        break;
                    ////刷新
@@ -181,6 +168,12 @@
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //撤销确认
                    case 'set_SendGood_revoke': set_SendGood_revoke();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                };
            });
@@ -238,6 +231,7 @@
                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                        , { field: '单据号', title: '单据号', sort: true, width: 165 }
                        , { field: '日期', title: '日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据状态', title: '单据状态', width: 170 }
                        , { field: '源单单号', title: '源单单号', width: 170 }
                        , { field: '部门代码', title: '部门代码', width: 170 }
                        , { field: '部门名称', title: '部门名称', width: 170 }
@@ -292,9 +286,7 @@
                $("#MaterialID").val("");//物料id
                $("#MaterialModel").val("");//规格型号
                $("#HDeptName").val("");//生产车间
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#HBillStatus").val("");//确认状态
                form.render('select');
                $("#btnSearch").click();//刷新
                sWhere = "";
@@ -314,9 +306,6 @@
                            table.render(option);
                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -337,34 +326,9 @@
                var HDeptName = $("#HDeptName").val();//生产车间
                var MaterialCode = $("#MaterialCode").val();//物料代码
                var MaterialName =$("#MaterialName").val();//物料名称
                var HBillStatus = $("#HBillStatus").val();//确认状态
                var MaterialModel = $("#MaterialModel").val();//规格型号
                var HOrgID = sessionStorage["OrganizationID"];//当前组织id
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                var Arbitrarily = "";
                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;
                    }
                    Arbitrarily = " and " + ColName + " " + com;
                }

                sWhere = {
                    HBeginDate: HBeginDate,
@@ -375,7 +339,7 @@
                    MaterialName: MaterialName,
                    MaterialModel: MaterialModel,
                    HOrgID: HOrgID,
                    Arbitrarily: Arbitrarily
                    HBillStatus: HBillStatus
                }
                get_Display(JSON.stringify(sWhere));
                sWhere = "";//调用接口后清空sWhere缓存
@@ -397,6 +361,84 @@

                            $.ajax({
                                url: GetWEBURL() + '/Cj_SendGoodsBill/DeptCheckGoodsBillList_Check'
                                , type: "GET"
                                , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
                                , success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                            ////重载tree
                                            //tree.reload('treeDepartment', {});
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                }
                            })
                        }
                    })
                }
            }

            //撤销确认收料
            function set_SendGood_revoke() {
                var CheckStatus = table.checkStatus("mainTable");

                if (CheckStatus.data.length != 1) {
                    return layer.msg("请选择一条数据!")
                } else {
                    layer.confirm('是否撤销确认收料？', {
                        btn: ['确定', '取消'] //按钮
                        , btn1: function () {
                            var HInterID = CheckStatus.data[0].hmainid; //获取编号
                            var HEntryID = CheckStatus.data[0].hsubid; //获取第几条子数据

                            $.ajax({
                                url: GetWEBURL() + '/Cj_SendGoodsBill/DeptCheckGoodsBillList_revoke'
                                , type: "GET"
                                , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
                                , success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                            ////重载tree
                                            //tree.reload('treeDepartment', {});
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                }
                            })
                        }
                    })
                }
            }

            //删除
            function set_DeleteBill() {
                var CheckStatus = table.checkStatus("mainTable");

                if (CheckStatus.data.length != 1) {
                    return layer.msg("请选择一条数据!")
                } else {
                    layer.confirm('是否确认删除？', {
                        btn: ['确定', '取消'] //按钮
                        , btn1: function () {
                            var HInterID = CheckStatus.data[0].hmainid; //获取编号
                            var HEntryID = CheckStatus.data[0].hsubid; //获取子表

                            $.ajax({
                                url: GetWEBURL() + '/Cj_SendGoodsBill/DeleteBill'
                                , type: "GET"
                                , data: { "HInterID": HInterID, "HEntryID": HEntryID, "User": sessionStorage["HUserName"] }
                                , success: function (result) {
@@ -575,18 +617,6 @@
                })
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }
            //#endregion

            //以上是layui模块