防错验证增加工序选着,启动点检修改报工台跳转无数据,磨具点检记录单修改有时候保存报错问题

zrg

2024-06-14 75b716f13e8c32a12a66945eafad1a738dea2dd2

防错验证增加工序选着,启动点检修改报工台跳转无数据,磨具点检记录单修改有时候保存报错问题

 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/IpadIndex.html

@@ -1127,7 +1127,7 @@
                        "HMaterID": HMaterID,
                        "HProcID": HProcID,
                        "HSourceID": HSourceID1,
                        "SCOrder": HICMOBillNo
                        "SCOrder": HSourceBillNo
                    });

                    //通过索引获取到当前iframe弹出层
@@ -1156,7 +1156,8 @@
                    var data = [];
                    data.push({
                        "HMaterID": HMaterID,
                        "SCOrder": HICMOBillNo
                        "HProcID": HProcID,                     
                        "SCOrder": HSourceBillNo
                    });

                    //通过索引获取到当前iframe弹出层

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

@@ -411,7 +411,7 @@
                                , "HRemark": data.备注
                                , "HUSEORGID": data.HUSEORGID
                                , "HMacAddr": data.mac地址
                                , "HEmpID": data.HEmpID
                                , "HEmpID": data.HEmpID == undefined ? 0 : data.HEmpID
                                , "HEmpName": data.负责人
                                
                            });

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckBillList.html

@@ -68,7 +68,7 @@
                                                <label class="layui-form-label">产品器具<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -86,7 +86,7 @@
                                                <label class="layui-form-label">点检计划编号<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanInterList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -108,7 +108,7 @@
                                                <label class="layui-form-label" style="width:95px;">器具点检规程<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -897,15 +897,15 @@
                                , "HExplanation": data.摘要
                                , "HRemark": data.备注
                                //, "HPlanNo": data.点检计划编号
                                , "HPlanInterID": data.HPlanInterID
                                , "HPlanInterID": data.HPlanInterID == undefined ? 0 : data.HPlanInterID
                                , "HPlanNo": data.点检计划内码
                                , "HMouldID": data.HMouldID
                                , "HMouldID": data.HMouldID == undefined ? 0 : data.HPlanInterID
                                , "HMouldDotCheckRuleName": data.器具点检规程单据号
                                , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
                                , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID == undefined ? 0 : data.HPlanInterID
                                , "HErrNote": data.异常情况记录 //异常情况记录
                                , "HBigSafeNote": data.重大安全隐患记录 //重大安全隐患记录
                                , "HDotCheckNote": data.点检数据 //点检数据
                                , "HShiftsID": data.HShiftsID //
                                , "HShiftsID": data.HShiftsID == undefined ? 0 : data.HPlanInterID
                                , "HShiftsName": data.班次名称 //班次名称
                            });
                            if (data.最终结论 == "不合格") {

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

@@ -309,7 +309,7 @@
        var HMaterID = "";  //物料
        var HSourceID = ""; //生产资源
        var HProcID = "";  //工序
        var SCOrder = "";//生产订单号
        var SCOrder = "";//工序流转卡号

        var edit = function (data) {
            HMaterID = data[0].HMaterID;

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -140,6 +140,12 @@
                                                <input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">项目编号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">总装图号</label>
                                            <div class="layui-input-inline">
@@ -462,12 +468,12 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                        <!--<div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">项目编号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        </div>-->

                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">委外加工单位</label>
@@ -2274,7 +2280,7 @@


                                , "HName": data.订单等级
                                , "HSplitNo": data.拆分号
                                , "HSplitNo": data.拆分号 == undefined ? 0 : data.拆分号
                                , "HRemark2": data.白坯要求
                                , "HRemark3": data.底部备注
                                , "HEmpID": data.HEmpID
@@ -2282,8 +2288,8 @@
                                , "HCusID": data.HCusID
                                , "HCusNames": data.客户
                                , "HColorRemark": data.染色要求
                                , "HSplitSumQty": data.拆分总量
                                , "HSplitColorQty": data.分缸号
                                , "HSplitSumQty": data.拆分总量 == undefined ? 0 : data.拆分号
                                , "HSplitColorQty": data.分缸号 == undefined ? 0 : data.拆分号

                                , "HProjectNum": data.项目编号
                                , "HVerNum": data.版本
@@ -2300,7 +2306,7 @@
                                , "HWorkShopID": data.HWorkShopID
                                , "textBox2": data.任务单号
                                , "HWorkBillSortNo": data.日计划工单号
                                , "HSupName": data.委外加工单位
                                , "HSupName": data.委外加工单位 == undefined ? 0 : data.拆分号
                                , "HSupID": data.HSupID
                                , "HMaterName": data.子件名称
                                , "HMaterID": data.HMaterID

 WebTM/views/³µ¼ä¹ÜÀí/·À´íÑéÖ¤/Gy_MaterPreventErrMouldBill.html

@@ -62,7 +62,18 @@
                                            </div>
                                        </div>
                                    </div>
                                 
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">工序<label style="color:red"> * </label></label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>                                      
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">备注</label>
@@ -288,6 +299,14 @@
            });
            //#endregion


            //#region é€‰æ‹©å·¥åºæŒ‰é’®
            form.on('submit(btnSearchHProc)', function () {
                get_checkSearchHProc();
            });
            //#endregion


            //#endregion


@@ -494,6 +513,33 @@
            }
            //#endregion

            //#region å·¥åºé€‰æ‹©é¡µé¢
            function get_checkSearchHProc() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工序列表'//标题
                    , shift: 2//弹出动画
                    , 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].工序名称);
                        $("#HProcID").val(checkStatus.data[0].HItemID);


                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion

            //#region å­è¡¨ï¼šå¿«æ·é”®(F7)打开弹窗
            function set_GridCellCheck(obj) {
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -627,7 +673,8 @@

                            , "HMaterID": tableMain[0]["HMaterID"]
                            , "HMaterName": tableMain[0]["物料名称"]
                          
                            , "HProcID": tableMain[0]["HProcID"]
                            , "HProcName": tableMain[0]["工序名称"]

                            , "HRemark": tableMain[0]["表头备注"]
                            , "HMaker": tableMain[0]["制单人"]
@@ -742,7 +789,11 @@
            $("#HMaterID").val(obj.HItemID);
            $("#HMaterName").val(obj.物料名称);
        }

        //工序
        function GetProcessValue(obj) {
            $("#HProcName").val(obj[0].工序名称);
            $("#HProcID").val(obj[0].HItemID);
        }
        //防错装置
        function GetPreventErrMouldValue(obj) {
            OptionData = obj;

 WebTM/views/³µ¼ä¹ÜÀí/·À´íÑéÖ¤/Qc_PreventErrMouldCheckBill.html

@@ -253,11 +253,15 @@

    <script>
        var HMaterID = "";  //物料
        var SCOrder = "";//生成订单号
        var HProcID = "";  //工序
        var SCOrder = "";//工序流转卡号

        var edit = function (data) {
            HMaterID = data[0].HMaterID;
            HProcID = data[0].HProcID;
            SCOrder = data[0].SCOrder;
        }


        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -351,7 +355,7 @@
                //初始化子表
                get_InitGrid();
                //获取报工台跳转数据
                RoadBillEdit(HMaterID, SCOrder);
                RoadBillEdit(HMaterID, HProcID, SCOrder);
                //禁用组织选项
                $('#HOrgID').attr("disabled", true);
            }
@@ -928,14 +932,14 @@
             //#endregion

            //#region  æŠ¥å·¥å¹³å°è·³è½¬èµ‹å€¼
            function RoadBillEdit(HMaterID, SCOrder)//加载表头
            function RoadBillEdit(HMaterID, HProcID, SCOrder)//加载表头
            {
                $.ajax({
                    url: GetWEBURL() + "/Qc_PreventErrMouldCheckBill/Qc_PreventErrMouldCheckBillList",
                    type: "GET",
                    async: false,
                    data: {
                        "HMaterID": HMaterID, "SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
                        "HMaterID": HMaterID, "HProcID": HProcID,"SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var tableMain = result.data;
                        var tableSub = result.data;