YL
2022-01-21 d41e8cb3cce459dc77651682f069b9465b0dda16
雅琪诺报工台停工单、完工单、开工单列表显示修改
8个文件已修改
350 ■■■■■ 已修改文件
WebTM/views/IpadStepIndex.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList.html 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/停工/Sc_Add_MESStopStepWorkBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/IpadStepIndex.html
@@ -792,7 +792,7 @@
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/上料防错单/Sc_Add_MaterToSourceBillList.html?OperationType=2&linterid=&HSouceBillType=',
                content: '生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
                end: function () {
                },
@@ -828,7 +828,7 @@
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['生产管理/质量汇报单/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                , content: ['生产管理/报工台工序/不良采集/Sc_QualityReportStepBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                , resize: false
                , cancel: function () {
@@ -854,6 +854,7 @@
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=',
                end: function () {
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList.html
@@ -204,8 +204,72 @@
                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
                        , { field: 'HDate', title: '日期', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: 'HBillNo', title: '单据号', width: 200 }
                        , { field: 'HBillType', title: '单据类型', width: 200 }
                        , { field: 'HBillStatus', title: '单据状态', width: 200}
                        , {
                            field: 'HBillType', title: '单据类型', width: 200, templet: function (d) {
                                if (d.单据类型 == "3714") {
                                    return "工序汇报单";
                                }
                            }
                        }
                        , {
                            field: 'HBillStatus', title: '单据状态', width: 200, templet: function (d) {
                                switch (d.HBillStatus) {
                                    case 0:
                                        return "创建"
                                        break;
                                    case 1:
                                        return "未审"
                                        break;
                                    case 2:
                                        return "已审"
                                        break;
                                    case 3:
                                        return "关闭"
                                        break;
                                    case 4:
                                        return "作废"
                                        break;
                                    case 5:
                                        return "审核退回"
                                        break;
                                    case 6:
                                        return "审核中"
                                        break;
                                    case 7:
                                        return "已阅"
                                        break;
                                    case 8:
                                        return "已回复"
                                        break;
                                    case 9:
                                        return "结案"
                                        break;
                                    case 10:
                                        return "验证"
                                        break;
                                    case 11:
                                        return "下达"
                                        break;
                                    case 12:
                                        return "开工"
                                        break;
                                    case 13:
                                        return "申请审批"
                                        break;
                                    case 15:
                                        return "申请检验"
                                        break;
                                    case 16:
                                        return "判定合格"
                                        break;
                                    case 17:
                                        return "判定不合格"
                                        break;
                                    default:
                                        return d.HBillStatus
                                }
                            }
                        }
                        , { field: 'HICMOBillNo', title: '生产订单号', width: 200 }
                        , { field: 'HICMOInterID', title: '生产订单主ID', width: 200, hide: true }
                        , { field: 'HICMOEntryID', title: '生产订单子ID', width: 200, hide: true }
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList_Web.html
@@ -235,8 +235,73 @@
                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
                        , { field: '单据号', title: '单据号', width: 200 }
                        , { field: '日期', title: '日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: '单据类型', title: '单据类型', width: 200 }
                        , { field: 'HBillStatus', title: '单据状态', width: 200 }
                        , {
                            field: '单据类型', title: '单据类型', width: 200, templet: function (d) {
                                if (d.单据类型 == "3714")
                                {
                                    return "工序汇报单";
                                }
                            }
                        }
                        , {
                            field: 'HBillStatus', title: '单据状态', width: 200, templet: function (d) {
                                switch (d.HBillStatus) {
                                    case 0:
                                        return "创建"
                                        break;
                                    case 1:
                                        return "未审"
                                        break;
                                    case 2:
                                        return "已审"
                                        break;
                                    case 3:
                                        return "关闭"
                                        break;
                                    case 4:
                                        return "作废"
                                        break;
                                    case 5:
                                        return "审核退回"
                                        break;
                                    case 6:
                                        return "审核中"
                                        break;
                                    case 7:
                                        return "已阅"
                                        break;
                                    case 8:
                                        return "已回复"
                                        break;
                                    case 9:
                                        return "结案"
                                        break;
                                    case 10:
                                        return "验证"
                                        break;
                                    case 11:
                                        return "下达"
                                        break;
                                    case 12:
                                        return "开工"
                                        break;
                                    case 13:
                                        return "申请审批"
                                        break;
                                    case 15:
                                        return "申请检验"
                                        break;
                                    case 16:
                                        return "判定合格"
                                        break;
                                    case 17:
                                        return "判定不合格"
                                        break;
                                    default:
                                        return d.HBillStatus
                                }
                            }
                        }
                        , { field: 'HMaterID', title: '产品ID', width: 200, hide: true }
                        , { field: '产品代码', title: '产品代码', width: 200 }
                        , { field: '产品名称', title: '产品名称', width: 200 }
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Í£¹¤/Sc_Add_MESStopStepWorkBillList.html
@@ -596,7 +596,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3702' },
                    data: { "HBillType": '3789' },
                    success: function (d) {
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(0);
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Í£¹¤/Sc_MESStopStepWorkBillList.html
@@ -230,8 +230,72 @@
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号' }
                        , { field: '单据类型', title: '单据类型', hide: true }
                        , { field: 'HBillStatus', title: '单据状态', width: 160 }
                        , {
                            field: '单据类型', title: '单据类型', templet: function (d) {
                                if (d.单据类型 == "3789") {
                                    return "停工单";
                                }
                            }
                        }
                        , {
                            field: 'HBillStatus', title: '单据状态', width: 160, templet: function (d) {
                                switch (d.HBillStatus) {
                                    case 0:
                                        return "创建"
                                        break;
                                    case 1:
                                        return "未审"
                                        break;
                                    case 2:
                                        return "已审"
                                        break;
                                    case 3:
                                        return "关闭"
                                        break;
                                    case 4:
                                        return "作废"
                                        break;
                                    case 5:
                                        return "审核退回"
                                        break;
                                    case 6:
                                        return "审核中"
                                        break;
                                    case 7:
                                        return "已阅"
                                        break;
                                    case 8:
                                        return "已回复"
                                        break;
                                    case 9:
                                        return "结案"
                                        break;
                                    case 10:
                                        return "验证"
                                        break;
                                    case 11:
                                        return "下达"
                                        break;
                                    case 12:
                                        return "开工"
                                        break;
                                    case 13:
                                        return "申请审批"
                                        break;
                                    case 15:
                                        return "申请检验"
                                        break;
                                    case 16:
                                        return "判定合格"
                                        break;
                                    case 17:
                                        return "判定不合格"
                                        break;
                                    default:
                                        return d.HBillStatus
                                }
                            }
                        }
                        , { field: '任务单号', title: '任务单号' }
                        , { field: '工序计划单号', title: '工序计划单号' }
                        , { field: '工序流转卡号', title: '工序流转卡号' }
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Í깤/Sc_MESEndStepWorkBillList.html
@@ -250,8 +250,72 @@
                        , { field: 'hmainid', title: '单据ID', hide: true }
                        , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号', width: 160 }
                        , { field: '单据类型', title: '单据类型', width: 160 }
                        , { field: 'HBillStatus', title: '单据状态', width: 160 }
                        , {
                            field: '单据类型', title: '单据类型', width: 160, templet: function (d) {
                                if (d.单据类型 == "3788") {
                                    return "完工单";
                                }
                            }
                        }
                        , {
                            field: 'HBillStatus', title: '单据状态', width: 160, templet: function (d) {
                                switch (d.HBillStatus) {
                                    case 0:
                                        return "创建"
                                        break;
                                    case 1:
                                        return "未审"
                                        break;
                                    case 2:
                                        return "已审"
                                        break;
                                    case 3:
                                        return "关闭"
                                        break;
                                    case 4:
                                        return "作废"
                                        break;
                                    case 5:
                                        return "审核退回"
                                        break;
                                    case 6:
                                        return "审核中"
                                        break;
                                    case 7:
                                        return "已阅"
                                        break;
                                    case 8:
                                        return "已回复"
                                        break;
                                    case 9:
                                        return "结案"
                                        break;
                                    case 10:
                                        return "验证"
                                        break;
                                    case 11:
                                        return "下达"
                                        break;
                                    case 12:
                                        return "开工"
                                        break;
                                    case 13:
                                        return "申请审批"
                                        break;
                                    case 15:
                                        return "申请检验"
                                        break;
                                    case 16:
                                        return "判定合格"
                                        break;
                                    case 17:
                                        return "判定不合格"
                                        break;
                                    default:
                                        return d.HBillStatus
                                }
                            }
                        }
                        , { field: '产品代码', title: '产品代码', width: 115 }
                        , { field: '产品名称', title: '产品名称', width: 115 }
                        , { field: '规格型号', title: '规格型号', width: 115 }
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_MESBeginStepWorkBillList.html
@@ -259,8 +259,72 @@
                        , { field: 'hmainid', title: '单据ID', hide: true }
                        , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号', width: 160 }
                        , { field: '单据类型', title: '单据类型', width: 160 }
                        , { field: 'HBillStatus', title: '单据状态', width: 160 }
                        , {
                            field: '单据类型', title: '单据类型', width: 160, templet: function (d) {
                                if (d.单据类型 == "3787") {
                                    return "开班单";
                                }
                            }
                        }
                        , {
                            field: 'HBillStatus', title: '单据状态', width: 160, templet: function (d) {
                                switch (d.HBillStatus) {
                                    case 0:
                                        return "创建"
                                        break;
                                    case 1:
                                        return "未审"
                                        break;
                                    case 2:
                                        return "已审"
                                        break;
                                    case 3:
                                        return "关闭"
                                        break;
                                    case 4:
                                        return "作废"
                                        break;
                                    case 5:
                                        return "审核退回"
                                        break;
                                    case 6:
                                        return "审核中"
                                        break;
                                    case 7:
                                        return "已阅"
                                        break;
                                    case 8:
                                        return "已回复"
                                        break;
                                    case 9:
                                        return "结案"
                                        break;
                                    case 10:
                                        return "验证"
                                        break;
                                    case 11:
                                        return "下达"
                                        break;
                                    case 12:
                                        return "开工"
                                        break;
                                    case 13:
                                        return "申请审批"
                                        break;
                                    case 15:
                                        return "申请检验"
                                        break;
                                    case 16:
                                        return "判定合格"
                                        break;
                                    case 17:
                                        return "判定不合格"
                                        break;
                                    default:
                                        return d.HBillStatus
                                }
                            }
                        }
                        , { field: '产品代码', title: '产品代码', width: 160 }
                        , { field: '产品名称', title: '产品名称', width: 160 }
                        , { field: '规格型号', title: '规格型号', width: 160 }
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·À´í/Sc_Add_MaterToSourceStepBillList.html
@@ -314,7 +314,7 @@
                                    <div class="layui-tab layui-tab-card" style="margin:10px auto;">
                                        <ul class="layui-tab-title">
                                            <li class="layui-this">配料记录</li>
                                            <li>治具记录</li>
                                            <li style="pointer-events: none; background-color:rgb(0 0 0 / 10%);">治具记录</li>
                                        </ul>
                                        <div class="layui-tab-content" style="height:350px;">
                                            <div class="layui-tab-item layui-show">