设备点检记录单pda结果未勾选不允许保存, 取样单增加增加下拉框字段 送测类型 首件,实验,巡检 TestType varchar(50) 设...

zrg

2024-09-27 86adc14df69b6dd9856dff3d9c60d312aa718027

设备点检记录单pda结果未勾选不允许保存,
取样单增加增加下拉框字段  送测类型  首件,实验,巡检  TestType  varchar(50)
设备工艺参数趋势分析图,增加下拉框类型(手动输入,设备采集),人工输入:取设备工艺参数点检

 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 />
@@ -12,5 +12,29 @@
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
  </PropertyGroup>
  <ProjectExtensions />
  <ProjectExtensions>
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>
          <SQLDebugging>False</SQLDebugging>
          <ExternalProgram>
          </ExternalProgram>
          <StartExternalURL>
          </StartExternalURL>
          <StartCmdLineArguments>
          </StartCmdLineArguments>
          <StartWorkingDirectory>
          </StartWorkingDirectory>
          <EnableENC>True</EnableENC>
          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
        </WebProjectProperties>
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
</Project>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldLifeUseBillList.html

@@ -269,8 +269,8 @@
                        , { field: '部门', title: '部门', sort: true, width: 165 }
                        , { field: '设计寿命', title: '设计寿命', sort: true, width: 165, totalRow: true }
                        , { field: '原剩余寿命', title: '原剩余寿命', sort: true, width: 165, totalRow: true }
                        , { field: '本次耗用', title: '上次耗用', sort: true, width: 165, totalRow: true }
                        , { field: '本次剩余寿命', title: '上次剩余寿命', sort: true, width: 165, totalRow: true }
                        , { field: '本次耗用', title: '本次耗用', sort: true, width: 165, totalRow: true }
                        , { field: '本次剩余寿命', title: '本次剩余寿命', sort: true, width: 165, totalRow: true }
                        , { field: '调整原因', title: '调整原因', sort: true, width: 165 }
                        , { field: '摘要', title: '摘要', sort: true, width: 165 }
                        , { field: '表头备注', title: '表头备注' }

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

@@ -410,6 +410,17 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline" style="margin-left:10px;">
                                            <label class="layui-form-label">器具可用状态</label>
                                            <div class="layui-input-block">
                                                <select name="HMouldUseStatus" lay-filter="HMouldUseStatus" id="HMouldUseStatus">
                                                    <option value="正常" selected="selected">正常</option>
                                                    <option value="异常">异常</option>
                                                    <option value="保养">保养</option>
                                                    <option value="ç»´ä¿®">ç»´ä¿®</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -1744,6 +1755,7 @@
                        $("#HNowSPID").val(d.data[0].当前仓位ID);
                        $("#HNowSPName").val(d.data[0].当前仓位);
                        $("#HMouldStatus").val(d.data[0].模具状态);
                        $("#HMouldUseStatus").val(d.data[0].模具可用状态);

                        var HCycleUnit = d.data[0].周期单位;
                        var HCheckCycle = d.data[0].保养周期;

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

@@ -496,7 +496,28 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
                var sMainSub = sMainStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"] + ";" + sSubStr;
                var num = [];
                if (OperationType==3) {
                    //获取子表数据                   
                    for (var i = 0; i < table.cache["mainTable_plan"].length; i++) {
                        if (table.cache["mainTable_plan"][i] != "") {
                            table.cache["mainTable_plan"][i].LAY_TABLE_INDEX = i;
                            if (table.cache["mainTable_plan"][i].HRelationFlag == "未点检") {
                                table.cache["mainTable_plan"][i].HRelationFlag = false
                            } else {
                                table.cache["mainTable_plan"][i].HRelationFlag = true
                            }
                            if (table.cache["mainTable_plan"][i].HSendFlag == "未发送") {
                                table.cache["mainTable_plan"][i].HSendFlag = false
                            } else {
                                table.cache["mainTable_plan"][i].HSendFlag = true
                            }
                            num.push(table.cache["mainTable_plan"][i])
                        }
                    }
                }            
                var sSubStr2 = JSON.stringify(num);
                var sMainSub = sMainStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"] + ";" + sSubStr + ";" +sSubStr2;
                if (AllowLoadData(sSubStr1)) {
                    $.ajax(
                        {
@@ -515,13 +536,12 @@
                                }
                                else {
                                    layer.alert(data.Message, { icon: 5 });
                                    //console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {
                                layer.alert("错误:" + err, { icon: 5 });
                                //console.log("Reason" + sMainStr);

                            }
                        });
                }
@@ -593,6 +613,7 @@
                    , page: false
                    , totalRow: true
                    , cellMinWidth: 120
                    , limit: 500
                    , height: 500
                    , cols: [columns]
                    , done: function (res, curr, count) {
@@ -623,6 +644,7 @@
                    , totalRow: true
                    , page: false
                    , cellMinWidth: 120
                    , limit: 500
                    , height: 500
                    , cols: [columns]
                    , done: function (res, curr, count) {
@@ -646,9 +668,9 @@
                    , { field: 'HRelationFlag', title: '关联标记' }
                    , { field: 'DiffDate', title: '相差间隔' }
                    , { field: 'HSendFlag', title: '发送标记' }
                    , { field: 'HErrBeginQty', title: '预警开始次数' }
                    , { field: 'HUseNowQty', title: '当前使用次数' }
                    , { field: 'HUseEndQty', title: '结束使用次数' }
                    , { field: 'HErrBeginQty', edit: 'text', title: '预警开始次数' }
                    , { field: 'HUseNowQty', edit: 'text', title: '当前使用次数' }
                    , { field: 'HUseEndQty', edit: 'text',  title: '结束使用次数' }
                ];
                option_plan = {
                    id: 'mainTable_plan'

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

@@ -452,6 +452,7 @@
                    , totalRow: true
                    , page: false
                    , cellMinWidth: 120
                    , limit: 500
                    , height: 500
                    , cols: [columns]
                    , done: function (res, curr, count) {

 WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBill_PDA.html

@@ -856,10 +856,12 @@
                            layer.msg("明细记录第" + (i + 1) + "行,负责人代码信息为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }
                        else {
                        if (sSubStr[i].HDotCheckResult != true) {
                            layer.msg("明细记录第" + (i + 1) + "行,结果信息为勾选!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }                       
                    }
                            return true;
                        }
                    }
                }
                else {
                    return true;

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

@@ -1292,9 +1292,9 @@
                    return item;
                });

                layui.table.reload('mainTable', {
                    data: updatedData
                });
                //layui.table.reload('mainTable', {
                //    data: updatedData
                //});
                // å–消编辑状态
                cell.removeAttr('contenteditable');
                //取消冒泡

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

@@ -264,9 +264,14 @@
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">报废内容</label>
                                                        <div class="layui-input-inline" style="width:300px;height:15px">
                                                            <textarea placeholder="请输入报废内容" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
                                                        <label class="layui-form-label">送测类型:</label>
                                                        <div class="layui-input-inline">
                                                            <select name="TestType" lay-filter="TestType" id="TestType">
                                                                <option value="首检">首检</option>
                                                                <option value="巡检">巡检</option>
                                                                <option value="未检">未检</option>
                                                                <option value="实验">实验</option>
                                                            </select>
                                                        </div>
                                                    </div>
                                                </div>
@@ -287,6 +292,12 @@
                                                        <label class="layui-form-label">产品单重3:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HProdWeight3" lay-verify="HProdWeight3" id="HProdWeight3" value="0" autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">报废内容</label>
                                                        <div class="layui-input-inline" style="width:300px;height:15px">
                                                            <textarea placeholder="请输入报废内容" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
                                                        </div>
                                                    </div>
                                                </div>
@@ -626,6 +637,7 @@
                                , "HProdWeight1": data[0]["产品单重1"]           //产品单重1
                                , "HProdWeight2": data[0]["产品单重2"]           //产品单重2
                                , "HProdWeight3": data[0]["产品单重3"]           //产品单重3
                                , "TestType": data[0]["送测类型"]           //送测类型
                                , "HGroupID": data[0]["HGroupID"]                //班组ID
                                , "HGroupName": data[0]["生产班组"]              //班组名称
                                , "HShiftsID": data[0]["HShiftsID"]                //班次ID

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

@@ -55,7 +55,15 @@
                                        </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; width: 185px;">
                                        <select name="HEquipType" id="HEquipType" class=" ForFilteringSchemes" lay-verify="HEquipType">
                                            <option value="手动输入">手动输入</option>
                                            <option value="设备采集">设备采集</option>
                                        </select>
                                    </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>
@@ -82,92 +90,6 @@
                                        <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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -389,97 +311,17 @@
                var HTechParamName = $("#HTechParamName").val();
                var HDate = $("#HDate").val(); //开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                var HEquipType = $("#HEquipType").val();

                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }


                if (HEquipNumber) {
                    sWhere += " and è®¾å¤‡ç¼–码 = '" + HEquipNumber + "'";
                }                             
                if (HTechParamName) {
                    sWhere += " and å·¥è‰ºäº§æ•° = '" + HTechParamName + "'";
                }
                if (HDate) {
                    sWhere += " and CONVERT(date, é‡‡é›†æ—¥æœŸ) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(date, é‡‡é›†æ—¥æœŸ) <= '" + HDate1 + "'";
                }
                if (HEquipNumber != "" || HTechParamName!="") {
                    get_Display(sWhere);
                    sWhere = {
                        HEquipNumber: HEquipNumber
                        , HTechParamName: HTechParamName
                        , HDate: HDate
                        , HDate1: HDate1
                        , HEquipType: HEquipType
                    }
                    get_Display(JSON.stringify(sWhere));
                    sWhere = "";//调用接口后清空sWhere缓存
                }
               
@@ -520,6 +362,9 @@
                //折线图绑定数据
                var H_X = [];//X轴标题
                var HVaule = [];//实际值               
                var HStd = [];//标准值
                var HMax = [];//上线值
                var HMin = [];//下限值
                var HTitle = "设备工艺参数趋势分析图";//图形标题
                if (option.data.length > 0) {
                    for (let i = 0; i < option.data.length ; i++) {
@@ -527,8 +372,14 @@
                    }
                    // å¡«å……数据
                    for (let i = 0; i < option.data.length; i++) {

                        if ($("#HEquipType").val() == "手动输入") {
                            HMax.push(option.data[i].上限值);
                            HMin.push(option.data[i].下限值);
                            HStd.push(option.data[i].标准值);
                            HVaule.push(option.data[i].实际值);
                        } else {
                        HVaule.push(option.data[i].数采值);
                        }
                    }
                }

@@ -545,7 +396,7 @@
                        trigger: 'axis'
                    },
                    legend: {
                        data: ['数采值'],
                        data: ['数采值', '上限值', '下限值', '标准值'],
                        top: 'bottom',
                        left: 'center'
                    },
@@ -591,6 +442,72 @@
                                }
                            },
                            data: HVaule
                        },
                        {
                            name: '上限值',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: 'red' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºçº¢è‰²
                                    },
                                    color: 'red' // è®¾ç½®æŠ˜çº¿ç‚¹é¢œè‰²ä¸ºçº¢è‰²
                                }
                            },
                            data: HMax
                        },
                        {
                            name: '下限值',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: 'red' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºçº¢è‰²
                                    },
                                    color: 'red' // è®¾ç½®æŠ˜çº¿ç‚¹é¢œè‰²ä¸ºçº¢è‰²
                                }
                            },
                            data: HMin
                        },
                        {
                            name: '标准值',
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: 'green' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºçº¢è‰²
                                    },
                                    color: 'green' // è®¾ç½®æŠ˜çº¿ç‚¹é¢œè‰²ä¸ºçº¢è‰²
                                }
                            },
                            data: HStd
                        }
                    ]
                };

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

@@ -51,14 +51,7 @@
                                        </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; width: 185px;">
                                        <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
                                            åŠ¨æ€æ¸²æŸ“组织
                                        </select>
                                    </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>
@@ -766,7 +759,10 @@
                            type: 'bar',
                            barWidth: 30,
                            barGap: 0,
                            label: labelOption,
                            label: {
                                ...labelOption,
                                color: '#0066CC' // è®¾ç½®æ ‡ç­¾é¢œè‰²ä¸ºè“è‰²
                            },
                            emphasis: {
                                focus: 'series'
                            },
@@ -785,7 +781,10 @@
                            type: 'line',
                            barWidth: 10,
                            barGap: 0,
                            label: labelOption1,
                            label: {
                                ...labelOption,
                                color: '#FF0000' // è®¾ç½®æ ‡ç­¾é¢œè‰²ä¸ºè“è‰²
                            },
                            emphasis: {
                                focus: 'series'
                            },