流转卡下推设备工艺参数点检获取数据,修复休息日出现重复数据不能保存

zrg

2024-07-17 1a83f7eea922c47680ad6bc91c911e239072aac2

流转卡下推设备工艺参数点检获取数据,修复休息日出现重复数据不能保存

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

@@ -77,7 +77,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-SumAdd" id="SumAddButton"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-SumAdd" id="SumAddButton"><i class="layui-icon layui-icon-file-b"></i>批量新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMain.html

@@ -627,6 +627,7 @@
                        , { field: 'HTechParamUnitName', title: '工艺参数单位名称', edit: 'text', event: "HTechParamUnitName" }     //f7
                        , { field: 'HStd', title: '标准值', edit: 'text', totalRow: true }
                        , { field: 'HMax', title: '上限', edit: 'text', totalRow: true }
                        , { field: 'HMin', title: '下限', edit: 'text', totalRow: true }
                        , { field: 'HDataForm', title: '采集来源', templet: '#HDataForm-select' }
                        , { field: 'HDataUnit', title: '采集时间单位', templet: '#HDataUnit-select' }
                        , { field: 'HDataTimes', title: '采集周期频率', edit: 'text', totalRow: true }

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

@@ -93,6 +93,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">源单单号</label>
                                            <div class="layui-input-inline">
                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
@@ -348,6 +349,7 @@
            var params = get_UrlVars();
            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //操作类型（1新增、2编辑）
            var HInterID = params[params[0]] == null ? 0 : params[params[1]];       //单据内码
            var HEntry = params[params[0]] == null ? 0 : params[params[2]];       //单据子内码
            //#endregion

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
@@ -402,6 +404,8 @@
                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                $("#HMaker").val(HMaker);
                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                //工序流转卡页面下推
                set_ProcessBill(HInterID, HEntry);
            }
            else if (OperationType == 2) {  //编辑
                $("#HInterID").val(HInterID);//修改时主表ID
@@ -1302,6 +1306,83 @@

            //#endregion

            //#region (工序流转卡)下推页面初始化
            function set_ProcessBill(HInterID, HEntry) {
                var ajaxLoad = layer.load();

                $.ajax({
                    url: GetWEBURL() + "/LEMS/MES_IF_EquipICMOTechParamList_Json",
                    type: "GET",
                    async: false,
                    data: { "hinterid": HInterID, "HEntryID": HEntry, "user": sessionStorage["HUserName"] },
                    success: function (d) {
                        var result = d;

                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HMaterID": data.HMaterID,
                                "HMaterNumber": data.产品代码,
                                "HMaterName": data.产品名称,
                                "HMaterModel": data.规格型号,
                                "HProcID": data.HProcID,
                                "HProcName": data.工序名称,
                                "HProcNo": data.工序号,
                                "HGroupID": data.HGroupID,
                                "HGroupName": data.班组,
                                "HDeptID": data.HDeptID,
                                "HDeptName": data.加工车间,

                                "HSourceID": data.HSourceID,
                                "HSourceName": data.生产资源,

                                "HICMOInterID": data.hicmointerid,
                                "HICMOEntryID": data.HICMOEntryID,
                                "HICMOBillNo": data.任务单号,

                                "HProcExchInterID": data.hmainid,
                                "HProcExchEntryID": data.HEntryID,
                                "HProcExchBillNo": data.单据号,


                                "HMainSourceInterID": data.hmainid,
                                "HMainSourceEntryID": data.HEntryID,
                                "HMainSourceBillNo": data.单据号,
                                "HMainSourceBillType": data.单据类型,
                            });
                            var rowdata = [];
                            for (var i = 0; i < result.data.length; i++) {
                                rowdata.push(
                                    {
                                        "HTechParamID": result.data[i]["HTechParamID"],
                                        "HTechParamNumber": result.data[i]["工艺参数代码"],
                                        "HTechParamName": result.data[i]["工艺参数名称"],
                                        "HTechParamUnitID": result.data[i]["HTechParamUnitID"],
                                        "HTechParamUnitNumber": result.data[i]["工艺参数单位代码"],
                                        "HTechParamUnitName": result.data[i]["工艺参数单位名称"],
                                        "HVaule": result.data[i]["标准值"],
                                        "HStd": result.data[i]["标准值"],
                                        "HMax": result.data[i]["上限值"],
                                        "HMin": result.data[i]["下限值"],
                                    }
                                );
                            }
                            option.data = rowdata;

                            table.render(option);
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("发生错误!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region åŠŸèƒ½æŽ§ä»¶

            //#region æäº¤

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

@@ -202,7 +202,7 @@
                                        </div>
                                    </div>
                                </div>
                                

                            </div>
                        </div>
                        <!--<div class="layui-tab-item layui-show">-->
@@ -286,6 +286,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Jl" lay-event="get_Jl"><i class="layui-icon layui-icon-file-b"></i>返工记录</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_zlzk" lay-event="get_zlzk"><i class="layui-icon layui-icon-file-b"></i>子流转卡</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessExchange" id="set_ProcessExchange"><i class="layui-icon layui-icon-form"></i>下推生产质量汇报单</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SB_EquipICMOTechParam" id="set_SB_EquipICMOTechParam"><i class="layui-icon layui-icon-form"></i>下推工艺参数点检</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo3">
@@ -485,7 +486,7 @@
                        break;
                    //巡检
                    case 'set_PatrolCheck': set_PatrolCheck();
                        break;                        
                        break;
                };
            });

@@ -543,6 +544,9 @@
                        break
                    //下推生产质量汇报单
                    case 'set_ProcessExchange': set_ProcessExchange();
                        break;
                    //下推生产质量汇报单
                    case 'set_SB_EquipICMOTechParam': set_SB_EquipICMOTechParam();
                        break;
                };
            });
@@ -1017,7 +1021,7 @@
                                $("#HDeptName").val(sessionStorage["HDeptID"]);
                            }
                            form.render('select');
                          

                        }
                        layer.closeAll("loading");
                    }
@@ -1297,15 +1301,15 @@

                //单据号超链接
                if (obj.event == '单据号') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '单据号'。如果等于，则执行if循环
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid   
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({                //使用 layer的open打开弹出 å±‚ 
                    layer.open({                //使用 layer的open打开弹出 å±‚
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '编辑' + HPageTitle  //设置弹出层的名字和变量
                        , closeBtn: 1//显示关闭按钮
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化                       
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../工序流转卡/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType=3772'//设置 iframe çš„ URL，URL ä¸­åŒ…含了查询参数，来调用所需要的值

@@ -2777,7 +2781,7 @@
                    layer.msg('请选择一行数据编辑！');
                }
            }
            

            //工序检
            function set_ProcessCheck() {
                var checkStatus = table.checkStatus('mainTable')
@@ -2806,7 +2810,7 @@
                }
            }

            //巡检            
            //巡检
            function set_PatrolCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
@@ -2834,6 +2838,66 @@
                }
            }

            //生产质量汇报单
            function set_ProcessExchange() {
                var checkStatus = table.checkStatus('mainTable2')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid;
                    var HEntryID = data[0].HEntryID;
                    var HProcID = data[0].HProcID;
                    var OperationType = 5;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '生产质量汇报单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HEntry=0&HProcNo=' + HProcID + '&HEntryID=' + HEntryID + '', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }

            }

            //工艺参数点检 
            function set_SB_EquipICMOTechParam() {
                var checkStatus = table.checkStatus('mainTable2')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid;
                    var HEntryID = data[0].HEntryID;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '设备工艺参数点检-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html?OperationType=1&linterid=' + linterid + '&HEntryID=' + HEntryID + '', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }

            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';