报工时添加是否做首件/工序检验单控制;批量出站汇报;生产汇报单添加过滤添加,列设置按钮
7个文件已修改
440 ■■■■ 已修改文件
WebTM/views/Baseset/基础资料/Gy_EmployeeList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/IpadIndex.html 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/过滤方案设置/Xt_FastICScheme.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Gy_ProcessBatchReport.html 268 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_EmployeeList.html
@@ -122,7 +122,7 @@
               , data: []
              , cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 æ–°å¢ž
              , cols: [[
                  { type: 'radio' }
                  { type: 'checkbox', fixed: 'left' }
                , { field: 'HItemID', width: 150, title: '职员ID', hide: true }
                , { field: 'HNumber', width: 150, title: '职员代码' }
                , { field: 'HName', width: 150, title: '职员名称', sort: true }
WebTM/views/IpadIndex.html
@@ -180,21 +180,21 @@
                                html1 += '<h1><span>工单号:</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>产品ID:</span><span id="materid' + (i + 1) + '">' + LoadData1[i].HMaterID + '</span></h1>';
                                html1 += '<h1><span>产品名称:</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName+']</span></h1>';
                                html1 += '<h1><span>产品名称:</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName + ']</span></h1>';
                                html1 += '<h1><span>产品型号:</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
                                html1 += '<h1><span>计划数量:</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">汇报总数:</span><span>' + LoadData1[i].HDateFinishQty + '</span></h1>';
                                switch (LoadData1[i].HICMOStatus) {
                                    case "待生产":
                                        html1 += '<h1><span>当前状态:</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
                                        html1 += '<h1><span>当前状态:</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">领料状态:</span><span>' + LoadData1[i].领料状态 + '</span></h1>';
                                        break;
                                    case "生产中":
                                        html1 += '<h1><span>当前状态:</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
                                        html1 += '<h1><span>当前状态:</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">领料状态:</span><span>' + LoadData1[i].领料状态 + '</span></h1>';
                                        break;
                                    case "挂起":
                                        html1 += '<h1><span>当前状态:</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
                                        html1 += '<h1><span>当前状态:</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">领料状态:</span><span>' + LoadData1[i].领料状态 + '</span></h1>';
                                        break;
                                    case "完工":
                                        html1 += '<h1><span>当前状态:</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
                                        html1 += '<h1><span>当前状态:</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">领料状态:</span><span>' + LoadData1[i].领料状态 + '</span></h1>';
                                        break;
                                    default:
                                }
@@ -379,6 +379,7 @@
            HSourceBillType = $("#st" + i + "").html(); //通过样式ID获取html内容(源单类型)
            HICMOInterID = $("#df" + i + "").html();     //生产订单主内码
            HICMOEntryID = $("#ds" + i + "").html();     //生产订单子内码
            HICMOBillNo = $("#wk" + i + "").html();     //生产订单号
            HMaterName = $("#ptn" + i + "").html();     //产品名称
            HMaterID = $("#materid" + i + "").html();     //产品ID
@@ -648,10 +649,10 @@
                content: '生产管理/作业指导书/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID,
                end: function () {
                },
                },
            });
           /* window.open("../../../views/生产管理/作业指导书/Gy_SOPBill_Video.html?OperationType=5&HMaterID=" + HMaterID + "&HSourceNo=" + workcode + "&HSourceEntryID=" + HSourceEntryID);*/
            /* window.open("../../../views/生产管理/作业指导书/Gy_SOPBill_Video.html?OperationType=5&HMaterID=" + HMaterID + "&HSourceNo=" + workcode + "&HSourceEntryID=" + HSourceEntryID);*/
        }
        //汇报按钮点击事件
@@ -777,39 +778,66 @@
            if (wktag == 0) {
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '产量汇报列表',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/产量汇报单/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
                end: function () {
            }
                },
                success: function (dom, index) {
                    var data = [];
                    data.push({
                        "workcode": workcode,
                        "HSourceID": HSourceID1,
                        "HSourceName": HSourceName1,
                        "HICMOInterID": HICMOInterID,
                        "HICMOEntryID": HICMOEntryID,
                        "HMaker": sessionStorage["HUserName"],    //sessionStorage["HUserName"]
                        "Czybm": sessionStorage["Czybm"],
                        //"HEmpID": "0",    //sessionStorage["HEmpID"]
                        "HSourceBillType": HSourceBillType
                    });
            var IsCheck = false;
                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
            //根据系统参数控制,判断生产订单是否做了首件检验单和工序检验单,如果有其中一种检验单没做,则不让做生产汇报单
            $.ajax({
                url: GetWEBURL() + "/ReportPlatForm/IsCheck",
                type: "GET",
                data: { "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HICMOBillNo": HICMOBillNo },
                async: false,
                success: function (data) {
                    if (data.code == 0) {
                        layer.alert(data.Message);
                        return false;
                    } else {
                        IsCheck = true;
                    }
                },
                error: function (err) {
                    layer.alert(data.Message);
                    return false;
                }
            });
            if (IsCheck == true) {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '产量汇报列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '生产管理/产量汇报单/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
                    end: function () {
                    },
                    success: function (dom, index) {
                        var data = [];
                        data.push({
                            "workcode": workcode,
                            "HSourceID": HSourceID1,
                            "HSourceName": HSourceName1,
                            "HICMOInterID": HICMOInterID,
                            "HICMOEntryID": HICMOEntryID,
                            "HMaker": sessionStorage["HUserName"],    //sessionStorage["HUserName"]
                            "Czybm": sessionStorage["Czybm"],
                            //"HEmpID": "0",    //sessionStorage["HEmpID"]
                            "HSourceBillType": HSourceBillType
                        });
                        //通过索引获取到当前iframe弹出层
                        var iframe = window['layui-layer-iframe' + index];
                        //调用iframe弹出层内的方法
                        iframe.edit(data);
                    },
                });
            }
        }
        //上料防错单
WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_Add_ProductReportBillList.html
@@ -891,7 +891,7 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function () {
                            });
                            if (data.Verify == "Y") //自动审核
WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_ICMOReportBillList.html
@@ -276,6 +276,25 @@
                        break;
                };
            });
            //行监听事件
            table.on('row(mainTable)', 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 ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据,前面的只是添加或删除选中未选中样式以及设置背景色,字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
WebTM/views/ϵͳ¹ÜÀí/¹ýÂË·½°¸ÉèÖÃ/Xt_FastICScheme.html
@@ -152,6 +152,9 @@
            //保存
            form.on('submit(Saver)', function (data) {//保存
                //禁用保存按钮
                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                var isUseCheck = document.getElementById("HUseingFlag").checked;
                var isStopCheck = document.getElementById("HStopflag").checked;
                data.field.HUseingFlag = isUseCheck;//将数组合并成字符串
@@ -178,12 +181,15 @@
                                });
                            }
                            else {
                                //启用保存按钮
                                $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);
                                f_alert(data.Message);
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            //启用保存按钮
                            $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);
                            f_alert("错误:" + err);
                        }
                    });
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Gy_ProcessBatchReport.html
@@ -159,8 +159,11 @@
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><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="btn-AddLine"><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="btn_PaddingQty"><i class="layui-icon layui-icon-form"></i>填充数量</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_PaddingEmp"><i class="layui-icon layui-icon-form"></i>填充操作员</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                        </div>
                    </script>
                </form>
@@ -178,6 +181,10 @@
        <option value="false">否</option>
        <option value="true">是</option>
    </select>
</script>
<!--复选框(转下道)-->
<script type="text/html" id="HLastSubProc">
    <input type="checkbox" value="{{d.HLastSubProc}}" lay-skin="primary" id="HLastSubProc{{d.LAY_TABLE_INDEX+1}}" lay-filter="HLastSubProc" {{ d.HLastSubProc == 1 ? 'checked' : '' }} disabled>
</script>
<script>
    layui.config({
@@ -197,7 +204,8 @@
        var option;
        var StationOutID = [];
        var StationOutBillNo = [];
        var HModName = "Gy_ProcessBatchReport";
        var HEmpNumber_Enter = "";
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -263,7 +271,8 @@
                "HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "",
                "HPlanQty": 0, "HQty": 0, "HWasterQty": 0, "HICMOBillNo": "", "HICMOInterID": 0, "HICMOEntryID": 0,
                "HInterID": 0, "HBillNo": "", "HProcID": 0, "HCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "",
                "HICMOQty": 0, "HPlanQty": 0
                "HICMOQty": 0, "HProcessExchangeQty": 0, "HLastSubProc": true, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": "",
                "NoOutboundHqty":0
            };
            switch (obj.event) {
@@ -295,6 +304,26 @@
                        }
                        form.render('select');
                    }
                    break;
                //填充数量
                case 'btn_PaddingQty':
                    if (data.length != 1) {
                        layer.msg("请勾选一行数据获取需要填充的数量!");
                    }
                    PaddingQty(data, obj);
                    break;
                //填充操作员
                case 'btn_PaddingEmp':
                    if (data.length != 1) {
                        layer.msg("请勾选一行数据获取需要填充的操作员!");
                    }
                    PaddingEmp(data, obj);
                    break;
                //列设置
                case 'set_HideColumn':
                    get_HideColumn();
                    break;
            }
        });
@@ -341,9 +370,24 @@
                    }
                    $input.val(val.replace(/[^\d]/g, ''));
                });
            } else if (obj.event == 'HEmpNumber') {
                $(obj.tr).find(".layui-table-edit").keyup(function () {
                    var $input = $(this), val = $input.val();
                    if (!val) {
                        val = "0";
                    }
                    if (val.length > 1) {
                        var firstNum = val.substring(0, 1); //截取字符串第一位数,判断是否为0;
                        if (firstNum == 0) { //如果第一位数为0,则删除第一位数
                            val = val.substring(1, val.length);
                        }
                    }
                    //$input.val(val.replace(/[^\d]/g, ''));
                    HEmpNumber_Enter = val;
                });
            }
            //#region [ è¡¨ä½“F7事件 ]
            //#region [ è¡¨ä½“F7,回车事件 ]
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    if (obj.event == 'HSourceCheck') {
@@ -415,6 +459,31 @@
                    obj.event = "";
                    return false;
                }
                if (event.key == "Enter") {
                    if (obj.event == 'HEmpNumber') {
                        $.ajax({
                            url: GetWEBURL() + '/Cj_StationInBill/GetMessageByEmpNumber',
                            type: "GET",
                            data: { "HEmpNumber": HEmpNumber_Enter },
                            success: function (data1) {
                                if (data1.count == 1) {
                                    obj.update({
                                        HEmpName: data1.data[0].HName
                                        , HEmpID: data1.data[0].HItemID
                                        , HEmpNumber: data1.data[0].HNumber
                                    });
                                }
                                else {
                                    layer.alert(data1.code + data1.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                    }
                    obj.event = "";
                    return false;
                }
            })
            //#endregion
@@ -438,6 +507,18 @@
        //打印
        form.on('submit(btn_print)', function (data) {
            get_print(data);
        });
        //转下道
        form.on('checkbox(HLastSubProc)', function (data) {
            //获取下拉框选中的值
            var elem = data.othis.parents('tr');
            var dataindex = elem.attr("data-index");
            $.each(option.data, function (index, value) {
                if (value.LAY_TABLE_INDEX == dataindex) {
                    value.HLastSubProc = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                }
            });
        });
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
@@ -480,8 +561,6 @@
                , { type: 'numbers', title: '序号', totalRow: true }
                , { field: 'lngBillKey', title: '流转卡ID', hide: true }
                , { field: 'lngBillSubKey', title: '流转卡子ID', hide: true }
                , { field: 'HCenterID', title: '工作中心ID', hide: true }
                , { field: 'HWorkCenterName', title: '工作中心名称' }
                , { field: 'HSourceBillType', title: '单据类型', hide: true }
                , { field: 'HProcNo', title: '流水号', width: 80 }
                , { field: 'HICMOQty', title: '任务单数量', hide: true }
@@ -489,25 +568,32 @@
                , { field: 'HProcID', title: '工序ID', hide: true }
                , { field: 'HProcName', title: '工序名称' }
                , { field: 'HMaterID', title: '产品ID', hide: true }
                , { field: 'HMaterNumber', title: '产品代码'}
                , { field: 'HMaterNumber', title: '产品代码' }
                , { field: 'HMaterName', title: '产品名称' }
                , { field: 'HMaterModel', title: '规格型号' }
                , { field: 'HQty', title: '合格数量', edit: 'text', width: 90, event:"inputHQty" }
                , { field: 'HQty', title: '合格数量', edit: 'text', width: 90, event: "inputHQty" }
                , { field: 'HWasterQty', title: '报废数量', edit: 'text', width: 90, event: "inputWasterHQty" }
                , { field: 'HEmpID', title: '操作员ID', hide: true }
                , { field: 'HEmpNumber', title: '操作员代码', edit: 'text', event: "HEmpNumber" }
                , { field: 'HEmpName', title: '操作员名称' }
                , { field: 'HProcExchBillNo', title: '派工单号', width: 150 }
                , { field: 'HPlanQty', title: '流转卡数量', width: 100 }
                , { field: 'HProcExchBillNo', title: '流转卡号', width: 150 }
                , { field: 'HProcessExchangeQty', title: '流转卡数量', width: 100 }
                , { field: 'NoOutboundHqty', title: '未出站数量', width: 100 }
                , { field: 'HInterID', title: '工序汇报ID', hide: true }
                , { field: 'HBillNo', title: '工序汇报单号', width: 195 }
                , { field: 'HWorkCenterNumber', title: '工作中心代码', edit: 'text'}
                , { field: 'HCenterID', title: '工作中心ID', hide: true }
                , { field: 'HWorkCenterNumber', title: '工作中心代码', edit: 'text' }
                , { field: 'HWorkCenterName', title: '工作中心名称' }
                , { field: 'HSourceID', title: '生产资源ID', hide: true }
                , { field: 'HSourceNumber', title: '生产资源代码', edit: 'text', event: "HSourceCheck" }
                , { field: 'HSourceName', title: '生产资源名称' }
                , { field: 'HLastSubProc', title: '转下道', templet: '#HLastSubProc', unresize: false }
                , { field: 'HICMOBillNo', title: '任务单号', hide: true }
                , { field: 'HICMOInterID', title: '任务单ID', hide: true }
                , { field: 'HICMOEntryID', title: '任务单子内码', hide: true }
                , { field: 'HMainSourceInterID', title: '源单内码', hide: true }
                , { field: 'HMainSourceEntryID', title: '源单子内码', hide: true }
                , { field: 'HMainSourceBillNo', title: '源单单号', hide: true }
                //, { fixed: 'right', title: '操作', toolbar: '#barDemo' }
            ];
            option = {
@@ -543,7 +629,8 @@
                "HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "",
                "HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "",
                "HPlanQty": 0, "HQty": 0, "HWasterQty": 0, "HICMOBillNo": "", "HICMOInterID": 0, "HICMOEntryID": 0, "HInterID": 0,
                "HBillNo": "", "HProcID": 0, "HCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HICMOQty": 0, "HPlanQty": 0
                "HBillNo": "", "HProcID": 0, "HCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HICMOQty": 0, "HProcessExchangeQty": 0,
                "HLastSubProc": true, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": "", "NoOutboundHqty": 0
            }];
            table.render(option);
@@ -566,13 +653,16 @@
                                    "lngBillKey": result.data[i]["hmainid"], "lngBillSubKey": result.data[i]["HEntryID"], "HProcExchBillNo": result.data[i]["单据号"], "HSourceBillType": result.data[i]["HBillType"],
                                    "HProcNo": result.data[i]["流水号"], "HProcName": result.data[i]["工序名称"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["产品代码"], "HMaterName": result.data[i]["产品名称"], "HMaterModel": result.data[i]["规格型号"],
                                    "HSourceID": result.data[i]["HSourceID"], "HSourceNumber": result.data[i]["生产资源代码"], "HSourceName": result.data[i]["生产资源"], "HEmpID": result.data[i]["HWorkerID"], "HEmpNumber": result.data[i]["操作工代码"], "HEmpName": result.data[i]["操作工"],
                                    "HPlanQty": result.data[i]["流转卡数量"], "HQty": 0, "HWasterQty": 0, "HICMOBillNo": result.data[i]["任务单号"], "HICMOInterID": result.data[i]["hicmointerid"], "HICMOEntryID": result.data[i]["HICMOEntryID"], "HBillNo": StationOutBillNo[i], "HInterID": StationOutID[i], "HProcID": result.data[i]["HProcID"], "HCenterID": result.data[i]["HCenterID"], "HWorkCenterNumber": result.data[i]["工作中心代码"], "HWorkCenterName": result.data[i]["工作中心"]
                                    "HProcessExchangeQty": result.data[i]["流转卡数量"], "HQty": 0, "HWasterQty": 0, "HICMOBillNo": result.data[i]["任务单号"], "HICMOInterID": result.data[i]["hicmointerid"], "HICMOEntryID": result.data[i]["HICMOEntryID"], "HICMOQty": result.data[i]["生产订单数量"], "HBillNo": StationOutBillNo[i], "HInterID": StationOutID[i], "HProcID": result.data[i]["HProcID"], "HCenterID": result.data[i]["HCenterID"], "HWorkCenterNumber": result.data[i]["工作中心代码"], "HWorkCenterName": result.data[i]["工作中心"], "HLastSubProc": true, "HMainSourceInterID": result.data[i]["源单主内码"], "HMainSourceEntryID": result.data[i]["源单子内码"], "HMainSourceBillNo": result.data[i]["流转卡号"], "NoOutboundHqty": Number(result.data[i]["流转卡数量"]) - Number(result.data[i]["出站报废关联数量"]) - Number(result.data[i]["出站关联数量"])
                                }
                            )
                        }
                        option.data = rowdata;
                        table.render(option);
                        form.render('select');
                        //刷新表格数据
                        DisPlay_HideColumn();
                    } else {
                        layer.msg(result.code + result.Message, { icon: 5 });
                    }
@@ -604,9 +694,9 @@
                        layer.msg("第" + (i + 1) + "行:操作员不能为空!");
                        return false;
                    }
                    //派工单号不为空
                    //流转卡号
                    if (option.data[i]["lngBillKey"] == "0") {
                        layer.msg("第" + (i + 1) + "行:派工单不能为空!");
                        layer.msg("第" + (i + 1) + "行:流转卡不能为空!");
                        return false;
                    }
                    //物料不为空
@@ -636,7 +726,6 @@
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num_1);
            var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + sSubStr + ";" + OperationType;
            var index = layer.load();
            $.ajax({
                type: "POST",
@@ -662,6 +751,30 @@
            });
        }
        //填充汇报数量
        function PaddingQty(data, obj) {
            //获取当前行的索引
            var rowIndex = $(obj.tr).attr("data-index");
            for (let i = 0; i < option.data.length; i++) {
                option.data[i].HQty = data[0].HQty;
                option.data[i].HWasterQty = data[0].HWasterQty;
            }
            table.render(option);
        }
        //填充操作员
        function PaddingEmp(data, obj) {
            for (let i = 0; i < option.data.length; i++) {
                option.data[i].HEmpID = data[0].HEmpID;
                option.data[i].HEmpNumber = data[0].HEmpNumber;
                option.data[i].HEmpName = data[0].HEmpName;
            }
            table.render(option);
        }
        function get_UrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -673,6 +786,127 @@
            return vars;
        }
        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
            for (var i = 0; i < urlLen.length - 4; i++) {
                contentUrl += "../";
            }
            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
            contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "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 = ["单据类型", "任务单数量", "任务单号", "计划数量", "流转卡ID", "流转卡子ID", "工序ID", "产品ID", "操作员ID", "工序汇报ID", "工作中心ID", "任务单ID", "生产资源ID", "源单内码", "源单子内码", "源单单号", "任务单子内码"];//不需要显示的字段 å¯æ‰©å±•
                        dataCol = data1.data[0].HGridString.split(',');
                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                            if (dataCol[i]) {
                                var dataCols = dataCol[i].split('|');
                            }
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            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 (data1.data[0].HColumnWidth != 0) {
                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], 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
    })
</script>
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeIssueBillList.html
@@ -161,8 +161,8 @@
            //
            var HModName = "Sc_ProcessExchangeIssueBillList";
            //初始化界面
            set_ClearBill();
            set_ClearBill();
            //#endregion
            //#region å¤´å·¥å…·æ äº‹ä»¶
@@ -218,7 +218,7 @@
                        break;
                    //批量汇报
                    case 'set_BatchReport': set_BatchReport();
                        break;
                        break;
                };
            });
@@ -379,6 +379,7 @@
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序名称', title: '工序名称' }
                        , { field: '流转卡数量', title: '流转卡数量', width: 100 }
                        , { field: '未出站数量', title: '未出站数量', width: 100 }
                        , {
                            field: '计划开工日期', title: '计划开工日期', width: 120, sort: true, templet: "<div>{{d.计划开工日期 ==null ?'':layui.util.toDateString(d.计划开工日期, 'yyyy-MM-dd')}}</div>"
                        }
@@ -675,7 +676,7 @@
                var interid = [];
                var ieid = [];
                for (let i = 0; i < data.length; i++) {
                    array.push(checkStatus.data[i]["HEntryID"]);   //获取流转卡子表ID
                    array.push(checkStatus.data[i]["HEntryID"]);   //获取流转卡子表ID
                    interid.push(checkStatus.data[i]["hmainid"]);
                    ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
                }
@@ -694,13 +695,13 @@
                            , area: ["100%", "100%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ['../../车间管理/工序流转卡/Gy_ProcessBatchReport.html?OperationType=1&linterid=' + HInterID.toString() + '&HEntryID=' + HEntryID.toString() + '&HIeID=' + HIeID + '&HReportNum=' + HReportNum, "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //刷新表格数据
                                DisPlay_HideColumn();
                                //更新表格缓存的数据
                                layer.close(index);//关闭弹窗
                            }
                            //, btn: ["确定", "取消"]
                            //, btn1: function (index, laero) {
                            //    //刷新表格数据
                            //    DisPlay_HideColumn();
                            //    //更新表格缓存的数据
                            //    layer.close(index);//关闭弹窗
                            //}
                        })
                    } else {
                        layer.msg('汇报工序不能是转工序!');
@@ -807,15 +808,15 @@
                var interid = [];
                var ieid = [];
                for (let i = 0; i < data.length; i++) {
                    array.push(checkStatus.data[i]["HEntryID"]);   //获取流转卡子表ID
                    array.push(checkStatus.data[i]["HEntryID"]);   //获取流转卡子表ID
                    interid.push(checkStatus.data[i]["hmainid"]);
                    ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
                    ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
                    //判断单据号是否相同
                    //if (checkStatus.data[0]["单据号"] != checkStatus.data[i]["单据号"]) {
                    //    layer.msg("勾选了不同流转卡号,请确认");
                    //    return;
                    //}
                }
                    //}
                }
                var HEntryID = array.join(",");//用逗号分割数组
                var HInterID = interid.join(",");
                var HIeID = ieid.join(",");
@@ -844,7 +845,7 @@
                } else {
                    layer.msg('请选择数据编辑!');
                }
            }
            }
            //工序委外派工
            function set_WWSendWork() {
@@ -854,14 +855,14 @@
                var interid = [];
                var ieid = [];
                for (let i = 0; i < data.length; i++) {
                    array.push(checkStatus.data[i]["HEntryID"]);   //获取流转卡子表ID
                    array.push(checkStatus.data[i]["HEntryID"]);   //获取流转卡子表ID
                    interid.push(checkStatus.data[i]["hmainid"]);
                    ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
                    //判断单据号是否相同
                    //if (checkStatus.data[0]["单据号"] != checkStatus.data[i]["单据号"]) {
                    //    layer.msg("勾选了不同流转卡号,请确认");
                    //    return;
                    //}
                    //}
                }
                var HEntryID = array.join(",");//用逗号分割数组
                var HInterID = interid.join(",");
@@ -891,8 +892,8 @@
                } else {
                    layer.msg('请选择数据编辑!');
                }
            }
            }
            //#region æŒ‡æ´¾æ—¥æœŸ
            function set_PlanDate() {
                var checkStatus = table.checkStatus('mainTable')