增加不良采集,生产质量汇报单在选择不良原因时,根据当前工序带出对应不良原因,增加字段HNowProcID int //当前工序,优化启动点检编辑时赋值...

zrg

2024-10-23 4ea4e7d7631d0ebe35adaa4a9cb36b0149962b71

增加不良采集,生产质量汇报单在选择不良原因时,根据当前工序带出对应不良原因,增加字段HNowProcID 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>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,7 +8,7 @@
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)

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

@@ -38,6 +38,15 @@
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
                                    </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>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -173,6 +182,7 @@
                , laydate = layui.laydate
            //查询条件
            var sWhere = "";
            var HProcName = "";
            var option = [];
            var HModName = "Gy_BadReason";
            //不需要显示的字段 å¯æ‰©å±•
@@ -192,10 +202,11 @@
            window.HInterID_Choose = 0;

            //#endregion
            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½            
            var params = getUrlVars();
            var Type = params[params[0]];
            HProcName = params[params[1]] == undefined? "": params[params[1]];
            HProcName = decodeURI(HProcName);

            //初始化界面
            set_ClearBill();
@@ -276,7 +287,7 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                get_FastQuery();

                get_DefaultModule();
            }
@@ -386,6 +397,7 @@
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                HProcName = $("#HProcName").val() == "" ? HProcName : $("#HProcName").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
@@ -466,6 +478,9 @@
                if (HName) {
                    sWhere += " and ä¸è‰¯åŽŸå› åç§° like '%" + HName + "%'";
                }
                if (HProcName) {
                    sWhere += " and é»˜è®¤å·¥åº like '%" + HProcName + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -473,6 +488,7 @@
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HProcName").val("");
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
@@ -610,6 +626,43 @@
            }
            //#endregion

            //工序
            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) {

                    }
                });
            });

            //#region åå®¡æ ¸/审核数据
            function set_CheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill_New.html

Diff too large

 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBill.html

@@ -691,6 +691,8 @@
                            $("#HICMOEntryID").val(data.HICMOEntryID);
                            $("#HDeptID").val(data.HDeptID);
                            $("#HDeptName").val(data.HDeptName);
                            $("#HSourceID").val(data.HSourceID);
                            $("#HSourceName").val(data.HSourceName);
                            $("#HUnitID").val(data.HUnitID);
                            $("#HUnitName").val(data.HUnitName);
                            if (HSouceBillType == "3772") {

 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillSumSave.html

@@ -700,6 +700,7 @@
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event == "HBadReasonNumber") {
                            var HProcName = obj.data.HProcName;
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim"                           //加上边框
@@ -708,7 +709,7 @@
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ['../../基础资料/生产基础资料/Gy_BadReason.html', "yes"]
                                , content: ['../../基础资料/生产基础资料/Gy_BadReason.html?Type=BadReason&HProcName=' + HProcName, "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调

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

@@ -49,8 +49,37 @@
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </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>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">批次号</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" readonly>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">项目号</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" readonly>
                                        </div>
                                    </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;">是否量产</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -81,7 +110,7 @@
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                </div>                               
                                </div>
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
@@ -156,6 +185,12 @@
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });

        //#region äº§å“ç¼–码
        form.on('submit(btnHMaterID)', function (data) {
            btnHMaterID();
        });
            //#endregion

        //日期间隔下拉列表监听
        form.on('select(HInitTimeCycle)', function (data) {
@@ -308,14 +343,21 @@
            var HProject = $("#HProject").val();//项目号
            var HBatchWork = $("#HBatchWork").val();//是否量产
            var HDivisionName = $("#HDivisionName").val();//事业部
            var HMaterNumber = $("#HMaterNumber").val();//物料代码
            var HMaterName = $("#HMaterName").val();//物料名称
            var HBatchNo = $("#HBatchNo").val();//批次号
            var HProjectNum = $("#HProjectNum").val();//项目号

           
            sWhere = {
                HBeginDate: HBeginDate
                , HEndDate: HEndDate
                , HProject: HProject
                , HBatchWork: HBatchWork
                , HDivisionName: HDivisionName
                , HMaterNumber: HMaterNumber
                , HMaterName: HMaterName
                , HBatchNo: HBatchNo
                , HProjectNum: HProjectNum
            }
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
@@ -328,7 +370,11 @@
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期
            $("#HProject").val("");
            $("#HBatchWork").val("");
            $("#HDivisionName").val("");          
            $("#HDivisionName").val("");
            $("#HMaterNumber").val("");//物料代码
            $("#HMaterName").val("");//物料名称
            $("#HBatchNo").val("");//批次号
            $("#HProjectNum").val("");//项目号
            form.render('select');

            sWhere = "";
@@ -384,6 +430,32 @@
        }
        //#endregion

        //物料列表
        function btnHMaterID() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '物料列表'//标题
                , shift: 2//弹出动画
                , content: ['../../基础资料/公用基础资料/Gy_Material.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('请选择数据');
                    }
                    //获取数据
                    $("#HMaterNumber").val(checkStatus.data[0].物料代码);
                    $("#HMaterName").val(checkStatus.data[0].物料名称);
                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }



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

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

@@ -822,6 +822,7 @@
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i] != "") {
                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                        table.cache["mainTable"][i].HRelationID == null ? 0 : table.cache["mainTable"][i].HRelationID;
                        num.push(table.cache["mainTable"][i])
                    }
                }
@@ -932,7 +933,7 @@
                                    "HCheckPostID": tableSub[i]["HCheckPostID"],
                                    "HCheckPostName": tableSub[i]["确认者角色"],
                                    "HDotCheckType": tableSub[i]["点检类型"] == null ? "设备" : tableSub[i]["点检类型"],
                                    "HRelationID": tableSub[i]["HRelationID"],
                                    "HRelationID": tableSub[i]["HRelationID"] == null ? "0" : tableSub[i]["HRelationID"],
                                    "HRelationName": relationName,
                                    "HRemark": tableSub[i]["表体备注"]
                                }