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

zzr99

2022-01-21 ea1d817407b76a3b800aec3f7ed129c727f05039

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

 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_ProcessPlanList.html

@@ -613,29 +613,6 @@

            //#endregion

            //监听行工具事件
            //table.on('tool(mainTable)', function(obj){
            //  var data = obj.data;
            //  //console.log(obj)
            //  if(obj.event == 'del'){
            //    layer.confirm('真的删除行么', function(index){
            //      obj.del();
            //      layer.close(index);
            //    });
            //  } else if(obj.event == 'edit'){
            //    layer.prompt({
            //      formType: 2
            //      ,value: data.HDate
            //    }, function(value, index){
            //      obj.update({
            //        HDate: value
            //      });
            //      layer.close(index);
            //      });
            //      //layer.alert('我是编辑上');
            //  }
            //});

        });
    </script>


 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">

 WebTM/views/É豸¹ÜÀí/É豸άÐÞÅɹ¤µ¥/Sb_EquipRepairSendWorkBillList.html

@@ -214,8 +214,13 @@
                        }
                        break;
                    //删除
                    case "btn-Delete":
                        set_DeleteBill();
                    case "btn-Delete":set_DeleteBill();
                        break;
                    //审核
                    case "btn-Audit": set_AuditBill();
                        break;
                    //反审核
                    case "btn-DeAudit": set_DeAuditBill();
                        break;
                }
            })
@@ -344,6 +349,84 @@
                }
            }

            //审核
            function set_AuditBill() {
                var CheckStatus = table.checkStatus("mainTable");

                if (CheckStatus.data.length != 1) {
                    return layer.msg("请选择一条数据!");
                } else {
                    var HBillStatus = CheckStatus.data[0].HBillStatus;
                    var HInterID = CheckStatus.data[0].hmainid;

                    if (HBillStatus != 1) {
                        return layer.msg("当前单据不是未审核状态,不能审核!");
                    }
                    else {
                        $.ajax({
                            url: GetWEBURL() + "/Sb_EquipRepairSendWorkBill/EquipAuditBill"
                            , type: "GET"
                            , data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"]}
                            , success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        //获取当前索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前弹窗
                                        layer.close(index);
                                        //刷新页面
                                        set_ClearBill();
                                    })
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        })
                    }
                }
            }

            //反审核
            function set_DeAuditBill() {
                var CheckStatus = table.checkStatus("mainTable");

                if (CheckStatus.data.length != 1) {
                    return layer.msg("请选择一条数据!");
                } else {
                    var HBillStatus = CheckStatus.data[0].HBillStatus;
                    var HInterID = CheckStatus.data[0].hmainid;

                    if (HBillStatus == 1) {
                        return layer.msg("当前单据是未审核状态,不能反审核!");
                    }
                    else {
                        $.ajax({
                            url: GetWEBURL() + "/Sb_EquipRepairSendWorkBill/EquipAuditBill"
                            , type: "GET"
                            , data: { "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] }
                            , success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        //获取当前索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前弹窗
                                        layer.close(index);
                                        //刷新页面
                                        set_ClearBill();
                                    })
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        })
                    }
                }
            }

            // å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HDate = $("#HBeginDate").val();//开始日期