yangle
2023-05-20 aebce9dffc63dd8311ddafdc96c7fea7a5b0a23d
列自适应 工序流转卡 自定义选择
4个文件已修改
177 ■■■■■ 已修改文件
WebTM/views/基础资料/公用基础资料/Gy_Material.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html
@@ -277,6 +277,22 @@
                    //    , { field: 'HParentID', title: 'HParentID', hide: true }
                    //    , { field: 'HUSEORGID', title: 'HUSEORGID', hide: true }
                    //]]
                    , done: function (res, curr, count) {
                        var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                        var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                        var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                        for (var i = 0; i < $data.length; i++) {
                            var l1 = $data.eq(i).find('div').width();
                            var l2 = $head.eq(i).find('div').width();
                            if (l1 > l2) {
                                $head.eq(i).find('div').width(l1);
                                $total.eq(i).find('div').width(l1);
                            } else {
                                $data.eq(i).find('div').width(l2);
                                $total.eq(i).find('div').width(l2);
                            }
                        }
                    }
                };
            }
            //#endregion
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillListQuery.html
@@ -280,59 +280,6 @@
                    //, cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                        , { field: '单据号', title: '单据号', sort: true, width: 165 }
                        , { field: '单据类型', title: '单据类型' }
                        , { field: '工艺名称', title: '工艺名称', width: 170 }
                        //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
                        , { field: '物料代码', title: '物料代码', width: 160 }
                        , { field: '物料名称', title: '物料名称', width: 160 }
                        , { field: '规格型号', title: '规格型号', width: 215 }
                        , { field: '计量单位代码', title: '计量单位代码', width: 115 }
                        , { field: '计量单位', title: '计量单位' }
                        , { field: '默认工艺', title: '默认工艺' }
                        , { field: '表头备注', title: '表头备注' }
                        , { field: '组织', title: '组织' }
                        //, { field: 'hsubid', title: 'hsubid', width: 80 }
                        , { field: '工序号', title: '工序号' }
                        , { field: '委外标记', title: '委外标记' }
                        //, { field: 'hprocid', title: 'hprocid', width: 105 }
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序', title: '工序' }
                        //, { field: 'HSupID', title: 'HSupID', width: 105 }
                        , { field: '供应商代码', title: '供应商代码' }
                        , { field: '供应商', title: '供应商' }
                        //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
                        , { field: '工作中心代码', title: '工作中心代码', width: 115 }
                        , { field: '工作中心名称', title: '工作中心名称', width: 115 }
                        , { field: '时间单位', title: '时间单位' }
                        , { field: '运行时间', title: '运行时间' }
                        , { field: '加工数量', title: '加工数量' }
                        , { field: '准备时间', title: '准备时间' }
                        , { field: '排队时间', title: '排队时间' }
                        , { field: '转移时间', title: '转移时间' }
                        , { field: '良率', title: '良率' }
                        , { field: '累计良率', title: '累计良率' }
                        , { field: '表体备注', title: '表体备注' }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', width: 195 }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', width: 180 }
                        , { field: '修改人', title: '修改人' }
                        , { field: '修改日期', title: '修改日期', width: 180 }
                        , { field: '作废人', title: '作废人' }
                        , { field: '作废日期', title: '作废日期' }
                        //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
                        //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
                        //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
                        //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
                        , { field: '加工单价', title: '加工单价' }
                        //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
                        , { field: '下道流转工序', title: '下道流转工序', width: 150 }
                        , { field: '流转工序', title: '流转工序' }
                    ]]
                };
            }
@@ -410,10 +357,10 @@
                                    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: 120 });
                                            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>"});
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
                                }
                            }
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA_QiaoYi.html
@@ -771,7 +771,7 @@
                                        "Hzfbsl": data.出站数量,
                                        "lngBillSubKey": data.hsubid,
                                        //"NoOutboundHqty": (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量),
                                        "HQty": result.data.length > 1 ? (result.data[0].流转卡数量 < result.data[1].进站关联数量 ? data.流转卡数量 : result.data[1].进站关联数量) : data.流转卡数量,
                                        "HQty": result.data.length > 1 ? (result.data[1].进站关联数量 == 0 ? (result.data[0].出站关联数量 == 0 ? result.data[0].流转卡数量 : result.data[0].出站关联数量):result.data[0].流转卡数量 < result.data[1].进站关联数量 ? data.流转卡数量 : result.data[1].进站关联数量) : data.流转卡数量,
                                    });
                                    //$("#HBarCode").attr("readonly", "readonly");//条形码只读
                                    //$("#HBarCode").css("background-color", "#efefef4d");
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -95,6 +95,33 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 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>
@@ -208,7 +235,7 @@
            //
            var HModName = "Sc_ProcessExchangeBillList";
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆä¸»è¡¨ï¼‰
            var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "生产车间代码", "生产车间", "材质", "成品编号", "版本", "总装图号", "图号版本", "子件代码", "子件名称", "子件规格", "批号", "委外加工单位代码", "委外加工单位", "设备名称", "设备代码", "原料批次", "补料标记", "项目编号", "主要材料", "关键材料", "产品CODE", "销售订单号", "客户简称", "客户要求材料成分", "产品名称2", "客户名称", "生产备注", "重要提示", "原材料编号A", "原材料编号B", "原材料编号C", "原材料编号D", "原材料内码A", "原材料内码B", "原材料内码C", "原材料内码D", "日计划工单号", "客户编码", "芯体规格型号", "芯体物料代码", "源单客户代码", "HEmpID","HCusID"];
            var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid","HICMOInterID", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "生产车间代码", "生产车间", "材质", "成品编号", "版本", "总装图号", "图号版本", "子件代码", "子件名称", "子件规格", "批号", "委外加工单位代码", "委外加工单位", "设备名称", "设备代码", "原料批次", "补料标记", "项目编号", "主要材料", "关键材料", "产品CODE", "销售订单号", "客户简称", "客户要求材料成分", "产品名称2", "客户名称", "生产备注", "重要提示", "原材料编号A", "原材料编号B", "原材料编号C", "原材料编号D", "原材料内码A", "原材料内码B", "原材料内码C", "原材料内码D", "日计划工单号", "客户编码", "芯体规格型号", "芯体物料代码", "源单客户代码", "HEmpID","HCusID"];
             //不需要显示的字段 å¯æ‰©å±• ï¼ˆå·¥è‰ºæµç¨‹ï¼‰
            var titleData2 = ["工序号", "出站报废关联数量", "HProcID", "工序代码", "HBackProc", "加工说明", "模具编号", "HCenterID", "工作中心代码", "HDeptID", "加工车间代码", "加工车间", "HGroupID", "班组代码", "班组", "HWorkerID", "操作工代码f", "操作工", "HSourceID", "生产资源代码", "生产资源", "计划数量", "hmainid", "单据号", "hicmointerid", "任务单号", "HICMOEntryID", "HWorkShopID", "生产车间代码", "生产车间", "HMaterID", "产品代码", "产品名称", "规格型号", "批号", "HUnitID", "单位代码", "单位", "生产数量", "计划开工日期", "计划完工日期", "摘要", "内部单据号", "委外订单内码", "委外订单子内码", "委外订单号", "HSupID", "供应商", "供应商代码", "表头备注", "HBillType", "isEntrust", "时间单位", "工序计划加工时间", "子计划开工日期", "子计划完工日期", "实际开工日期", "实际完工日期", "开工余量天数", "开工余量固数", "上道固定天数", "生产周期", "加工单价", "最后汇报日期", "加工费用金额", "末道工序", "首道工序", "行关闭人", "关闭类型", "流转卡数量", "委外工单数量", "不合格数量", "超额比例", "良率", "累计良率", "图纸编号", "本工序确认记录", "源单主内码", "源单子内码", "源单单号", "源单类型", "汇报数量", "HEntryID", "hsubid", "HPRDORGID", "组织", "HOrderProcNO"];
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆå™¨å…·æ¸…单)
@@ -383,6 +410,10 @@
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#SHname").val("");//物料|子件名称|子件规格
                $("#HBillNo").val("");//单据号
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
                //$("#btnSearch").click();
                sWhere = "";
                get_FastQuery();
@@ -399,15 +430,41 @@
                var SHname = $("#SHname").val();//物料|子件名称|子件规格
                var HBillNo = $("#HBillNo").val();//单据号
                var HErpID = $("#HErpID").val();//唯一ID
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (SHPrintQty) {//判断打印状态
                    if (SHPrintQty == "全部") {
                        sWhere = " and æ‰“印次数 >= 0 ";
                        sWhere += " and æ‰“印次数 >= 0 ";
                    }
                    if (SHPrintQty == "已打印") {
                        sWhere = " and æ‰“印次数 > 0 ";
                        sWhere += " and æ‰“印次数 > 0 ";
                    }
                    if (SHPrintQty == "未打印") {
                        sWhere = " and æ‰“印次数 = 0 ";
                        sWhere += " and æ‰“印次数 = 0 ";
                    }
                }
                if (wybj) {
@@ -897,11 +954,31 @@
                                //, cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                                    var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                                    var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                                    for (var i = 0; i < $data.length; i++) {
                                        var l1 = $data.eq(i).find('div').width();
                                        var l2 = $head.eq(i).find('div').width();
                                        if (l1 > l2) {
                                            $head.eq(i).find('div').width(l1);
                                            $total.eq(i).find('div').width(l1);
                                        } else {
                                            $data.eq(i).find('div').width(l2);
                                            $total.eq(i).find('div').width(l2);
                                        }
                                    }
                                }
                            }
                            table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
                            //DisPlay_HideColumn();
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
@@ -1682,7 +1759,7 @@
                                var args = {
                                    type: "print",
                                    showOptionDlg: false, //如果不显示打印对话框而直接打印,将此行注释去掉即可
                                    report: urlAddRandomNo("../../grf/cs10.grf"),
                                    report: urlAddRandomNo("../../grf/涤纶.grf"),
                                    data: Customer
                                };
                                //var args = {
@@ -1766,6 +1843,19 @@
                }
            }
            //列明显示下拉框
            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');
            }
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();