异常反馈处理单增加字段 HBadReasonID int //处理原因 取样单根据当前登录人带出换样员 逃逸率报表图表修改 启动点检增加根据上模单带出磨模具

zrg

2024-10-25 64a428fff40f4304a81fcb37a82af2dc0aa60583

异常反馈处理单增加字段 HBadReasonID int //处理原因
取样单根据当前登录人带出换样员
逃逸率报表图表修改
启动点检增加根据上模单带出磨模具

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_BadReason.html

@@ -186,7 +186,7 @@
            var option = [];
            var HModName = "Gy_BadReason";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID"];
            var titleData = ["HItemID","默认工序"];
            //#endregion



 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackHandleBillMain.html

@@ -321,6 +321,16 @@
                                                                </div>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">处理原因:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="text" name="HBadReasonName" id="HBadReasonName" class="layui-input" value="" style="float:left;width:150px;" disabled>
                                                                <input type="hidden" name="HBadReasonID" id="HBadReasonID" class="layui-input" value="0" style="float:left;width:150px;">
                                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HBadReasonList" id="HBadReasonList" style="width:40px;">
                                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                </button>
                                                            </div>
                                                        </div>
                                                    </div>
                                                </div>
                                            <div class="layui-tab-item">
@@ -666,6 +676,8 @@
                                , "HHandleEmpName": data[0]["处理人"]
                                , "HHandleNote": data[0]["处理内容"]
                                , "HHandleDate": data[0]["处理完成时间"]
                                , "HBadReasonID": data[0]["HBadReasonID"]
                                , "HBadReasonName": data[0]["处理原因"]
                             

                                , "HMainSourceInterID": data[0]["源单ID"]                 //源单ID
@@ -1147,6 +1159,45 @@
                });
            });

            //处理原因
            form.on('submit(HBadReasonList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '处理原因',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_DisposeWayList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HBadReasonName").val(checkStatus.data[0].处理方案名称);
                        $("#HBadReasonID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });


            //处理人
            form.on('submit(HHandleEmpList)', function () {
                //页面层-自定义

 WebTM/views/É豸¹ÜÀí/É豸¹¤ÒÕ²ÎÊý¶©µ¥µã¼ì±í/SB_EquipICMOTechParamBillEdit.html

@@ -1577,7 +1577,7 @@
            form.on('submit(btn_Cancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    //操作类型（OperationType=1新增、OperationType=2编辑）
                    if (OperationType == 2) {
                    if (OperationType == 2 || OperationType == 1) {
                        Pub_Close(1);
                    }
                    else {

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑéÈ¡Ñù»¹Ñùµ¥/QC_Add_BackSampleCheckBill.html

@@ -301,7 +301,8 @@
                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));

                $("#HEmp").val(sessionStorage["HEmpID"]); //根据登录用户带出操作员ID
                $("#HEmpName").val(sessionStorage["HEmpName"]); //根据登录用户带出操作员
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));


 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_BadProductsReport.html

@@ -49,7 +49,16 @@
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>                               
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">工序名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料编码</label>
@@ -79,7 +88,7 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">                                   
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -266,7 +275,6 @@
                    if (data1.count == 1) {
                        var data = [];//列字段数据
                        var col = [];
                        var totalArray = ["数量", "关联数量", "未关联数量", "打印条码数量", "未打印条码数量", "实收数量", "金额"];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
@@ -278,9 +286,7 @@
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else if ($.inArray(data[i].name, totalArray) > -1) { //计算列
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                            } else if (data[i].name == '单据号') {//添加超链接
                            else if (data[i].name == '单据号') {//添加超链接
                                col.push({
                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', templet: function (d) {
                                        return '<span style="color: blue;">' + d.单据号 + '</span>'
@@ -347,6 +353,7 @@
            var HMaterName = $("#HMaterName").val();//物料名称
            var HBatchNo = $("#HBatchNo").val();//批次号
            var HProjectNum = $("#HProjectNum").val();//项目号
            var HProcName = $("#HProcName").val();//工序名称

            sWhere = {
                HBeginDate: HBeginDate
@@ -358,6 +365,7 @@
                , HMaterName: HMaterName
                , HBatchNo: HBatchNo
                , HProjectNum: HProjectNum
                , HProcName: HProcName
            }
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
@@ -375,6 +383,7 @@
            $("#HMaterName").val("");//物料名称
            $("#HBatchNo").val("");//批次号
            $("#HProjectNum").val("");//项目号
            $("#HProcName").val("");//工序名称
            form.render('select');

            sWhere = "";
@@ -456,6 +465,43 @@
        }


        //工序
        form.on('submit(btnHProc)', function () {
            //页面层-自定义
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '工序列表',
                closeBtn: 1,
                shift: 2,
                area: ['90%', '90%'],
                maxmin: true,
                content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                btn: ['确定', '取消']
                , btn1: function (index, layero) {

                    //按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    $("#HProcName").val(checkStatus.data[0].工序名称);
                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) {
                    //按钮【按钮二】的回调
                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                },
                end: function () {

                },
                success: function (layero, index) {

                }
            });
        });


        //隐藏列设置
        function get_HideColumn() {

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_QualityMonthSumReport.html

@@ -69,7 +69,7 @@
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                <div class="layui-inline" style="display:none">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
@@ -704,13 +704,13 @@

                //柱状图绑定数据
                var H_X = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];//X轴标题
                var HAverage = [];      //y轴：质量门逃逸率
                var HAverage = [];      //X轴：质量门逃逸率
                var HTarget = [];       //y轴：上限值
                for (let i = 0; i < option.data.length; i++) {
                    //获取质量门逃逸率行数值
                    if (option.data[i].项目 == '质量门逃逸率') {
                        for (let j = 1; j <= 12; j++) {
                            HAverage.push(option.data[i][j + "月"]);
                            HAverage.push((option.data[i][j + "月"]).replace('%', ''));
                        }
                    }
                    //获取上限值行数值
@@ -737,19 +737,25 @@
                        top: 'bottom',  // å°†å›¾ä¾‹æ”¾ç½®åœ¨å›¾è¡¨çš„下方
                        left: 'center'  // æˆ–者 'right'，根据需要调整水平位置
                    },
                    //toolbox: {                            //工具栏
                    //    show: true,
                    //    orient: 'vertical',
                    //    left: 'right',
                    //    top: 'center',
                    //    feature: {
                    //        mark: { show: true },
                    //        dataView: { show: true, readOnly: false },
                    //        magicType: { show: true, type: ['line', 'bar', 'stack'] },
                    //        restore: { show: true },
                    //        saveAsImage: { show: true }
                    //    }
                    //},
                    tooltip: {
                        trigger: 'axis',
                        axisPointer: {
                            type: 'shadow'
                        },
                        formatter: function (params) {
                            let tooltipHtml = params[0].axisValue + '<br>'; // X轴数值

                            params.forEach(function (item) {
                                if (item.seriesType === 'line') {
                                    let valueToShow = parseFloat(item.value); // å°†å­—符串转换为数值
                                    tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) + '%' + '<br>'; // æŠ˜çº¿å›¾æ•°æ®æ ¼å¼åŒ–为百分比
                                }
                            });

                            return tooltipHtml;
                        }

                    },
                    grid:
                    {
                        left: '5%',
@@ -774,11 +780,7 @@
                                            temp += '\n' + value.slice(i);
                                        }
                                    }

                                    return temp;

                                    // ä½¿ç”¨ '\n' å®žçŽ°æ¢è¡Œ
                                    //return value.length > 5 ? value.slice(0, 5) + '\n' + value.slice(5) : value;
                                },
                                width: 30 // è®¾ç½®åˆ»åº¦æ ‡ç­¾çš„宽度，超过这个宽度会自动换行
                            }
@@ -786,16 +788,23 @@
                    ],
                    yAxis: [                                //设置y轴数据类型
                        {
                            type: 'value'
                            type: 'value',
                            name: '上限值',
                            axisLabel: {
                                formatter: '{value}'
                            }
                        }
                    ],
                    series: [                               //设置y轴数据
                        {
                            name: '质量门逃逸率',
                            type: 'line',
                            barWidth: 30,
                            barWidth: 10,
                            barGap: 0,
                            label: labelOption,
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            emphasis: {
                                focus: 'series'
                            },

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_QualityStatisticsDailyReport.html

@@ -64,7 +64,7 @@
                                </div>                            
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 125px;">
                                    <div class="layui-input-block" style="margin-left: 120px; width: 140px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                            <!--动态渲染年份-->
                                        </select>
@@ -99,6 +99,30 @@
                                            <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">判断结果</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HResult" id="HResult" lay-verify="HResult">
                                                <option value="">请选择</option>
                                                <option value="报废">报废</option>
                                                <option value="返工">返工</option>
                                                <option value="特采">特采</option>
                                                <option value="放行">放行</option>
                                                <option value="工废">工废</option>
                                                <option value="料废">料废</option>
                                                <option value="样件保留">样件保留</option>
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">工序名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                </div>
@@ -257,6 +281,43 @@
            })
        }

        //工序
        form.on('submit(btnHProc)', function () {
            //页面层-自定义
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '工序列表',
                closeBtn: 1,
                shift: 2,
                area: ['90%', '90%'],
                maxmin: true,
                content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                btn: ['确定', '取消']
                , btn1: function (index, layero) {

                    //按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    $("#HProcName").val(checkStatus.data[0].工序名称);
                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) {
                    //按钮【按钮二】的回调
                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                },
                end: function () {

                },
                success: function (layero, index) {

                }
            });
        });

        function set_InitGrid() {

            var columns = [];
@@ -338,6 +399,8 @@
            var HProject = $("#HProject").val();//项目号
            var HBatchWork = $("#HBatchWork").val();//是否量产
            var HDivisionName = $("#HDivisionName").val();//事业部
            var HResult = $("#HResult").val();//判定结果
            var HProcName = $("#HProcName").val();//工序名称
            sWhere = {
                HYear: HYear
                , HMonth: HMonth
@@ -346,6 +409,8 @@
                , HProject: HProject
                , HBatchWork: HBatchWork
                , HDivisionName: HDivisionName
                , HResult: HResult
                , HProcName: HProcName
            }
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
@@ -358,7 +423,9 @@
            $("#HProcExchBillNo").val("");
            $("#HProject").val("");
            $("#HBatchWork").val("0");
            $("#HDivisionName").val("0");           
            $("#HDivisionName").val("0");
            $("#HBatchWork").val("");
            $("#HDivisionName").val("");
            form.render('select');

            sWhere = "";

 WebTM/views/³µ¼ä¹ÜÀí/Æô¶¯µã¼ìµ¥/Sc_WorkBeginDotCheckBill.html

@@ -295,7 +295,7 @@
    <!--删除-->
    <script type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-xs" lay-event="edit">查看</a>
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
        <!--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>-->
    </script>
    <!--行下拉选择(结果)-->
    <script type="text/html" id="HCheckResult">
@@ -425,6 +425,7 @@
                get_InitGrid();
                //获取报工台跳转数据
                RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrder);
                Get_HNowMould(HSourceID);
                //禁用组织选项
                $('#HOrgID').attr("disabled", true);
            }
@@ -1394,6 +1395,36 @@
            }
            //#endregion

            //#region  èŽ·å–最近的一次上模单赋值
            function Get_HNowMould(HSourceID)
            {
                $.ajax({
                    url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/Sc_WorkBeginDotCheckBill_HMould",
                    type: "GET",
                    async: false,
                    data: {  "HSourceID": HSourceID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var tableSub = result.data;
                        //子表  èµ‹å€¼
                       
                        for (var i = 0; i < option.data.length; i++) {
                            if (option.data[i]["HDotCheckType"] == "模具") {
                                option.data[i]["HRelationName"] = tableSub[0]["模具名称"];
                                option.data[i]["HRelationID"] = tableSub[0]["HMouldID"] == null ? "0" : tableSub[0]["HMouldID"];
                            }
                        }                       
                        var tables = option.data;
                        option.data = option.data;
                        table.render(option);
                        for (var i = 0; i < tables.length; i++) {
                            $('#HDotCheckType' + (i + 1)).find("option[value='" + tables[i]["HDotCheckType"] + "']").attr("selected", true);
                        }
                        form.render('select');
                    }
                })
            }
            //#endregion

            //#endregion

        });

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html

@@ -554,7 +554,7 @@
            //#region é€€å‡ºæŒ‰é’®
            form.on('submit(Cancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    if (OperationType == 1) {
                    if (OperationType == 1) {                        
                        Pub_Close(closeType);
                    } else if (OperationType == 3) {
                        Pub_Close(1);