修改流转卡下推设备工艺参数点检查询, pDA设备维修记录单 扫描设备条码 如果一条就直接显示,;两天就打开弹框选着已审核,未关闭的故障

zrg

2024-08-15 32773c624990f39e5df76a379fb6ffea2ff41d45

修改流转卡下推设备工艺参数点检查询,
pDA设备维修记录单 扫描设备条码 如果一条就直接显示,;两天就打开弹框选着已审核,未关闭的故障

 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 />
@@ -16,8 +16,9 @@
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>views/user/login.html</StartPageUrl>
          <StartAction>SpecificPage</StartAction>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>

 WebTM/views/IpadIndex.html

@@ -1238,6 +1238,42 @@
            });
        }

        //工艺参数点检点击事件
        function TechParam(event, obj) {
            if (wktag == 0) {
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '新增工艺参数点检单',
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html?OperationType=4&linterid=&HEntryID=',
                end: function () {

                },
                success: function (dom, index) {
                    var data = [];
                    data.push({
                        "HBillType": HBillType,
                        "HSourceInterID": HSourceInterID,
                        "HSourceEntryID": HSourceEntryID,
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType
                    });

                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
                },
            });
        }

        //退出
        function Esc(event, obj) {
            parent.location.href = "index.html"
@@ -1486,6 +1522,12 @@
                                    <span class="imgtitle">检验取样</span>
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4" onclick="TechParam(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-tabs imgicon"></span>
                                    <span class="imgtitle">工艺参数点检</span>
                                </div>
                            </div>
                        </div>
                                              
                    </div>

 WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldLifeUsePicReport.html

@@ -152,12 +152,10 @@
                            </div>
                        </div>
                        <div>
                            <div style="width:99%;height:calc(100vh);">
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                            <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
                            </div>
                            <div id="histogram1" style="width:99.5%;height:calc(68vh);margin-top:30px;">
                            <div style="width:99%;height:calc(100vh);">
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
@@ -565,7 +563,7 @@
                    // å¡«å……数据
                    for (let i = 0; i < option.data.length; i++) {

                        Life.push(option.data[i].原剩余寿命);
                        Life.push(option.data[i].剩余寿命);
                   
                    }
                }

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

@@ -382,6 +382,12 @@
                                                </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;">
                                                <input type="text" class="layui-input" name="HInitLife" id="HInitLife">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -1719,6 +1725,7 @@
                        $("#HDesignLife").val(d.data[0].初始设计寿命);
                        $("#HUseLife").val(d.data[0].使用寿命);
                        $("#HLeaveLife").val(d.data[0].剩余寿命);
                        $("#HInitLife").val(d.data[0].上线初始化寿命);
                        $("#HCaveQty").val(d.data[0].穴数);
                        $("#HProdQty").val(d.data[0].已生产数量);
                        $("#HProdWeight").val(d.data[0].已生产重量);

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

@@ -584,7 +584,7 @@
                        title: '设备故障登记单',
                        shift: 2,
                        area: ['90%', '90%'],
                        content: ['../设备管理/Sb_EqpConkBookBillList.html', 'yes'],
                        content: ['../设备管理/Sb_EqpConkBookBillList.html?type=2', 'yes'],
                        btn: ['确定', '取消']
                        , btn1: function (index, layero) {
                            //var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };

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

@@ -479,7 +479,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../设备管理/Sb_EqpMaintenanceBillList.html', 'yes'],
                    content: ['../设备管理/Sb_EqpMaintenanceBillList.html?type=2', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {


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

@@ -470,10 +470,17 @@
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                //初始化表格
                set_InitGrid();
              
                //查询
                //get_Display(sWhere);
                if (addSWhereByOpenType()) {          //addSWhereByOpenType()方法判断是否其它页面打开本页面，若是则处理过滤条件，并返回true
                    get_DefaultModule();

                } else {
                    get_DefaultModule();
                }

                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
               
            }

            //进入页面显示的缓存列表
@@ -590,7 +597,7 @@
            });

            //快速过滤
            function get_FastQuery() {
            function get_FastQuery(number) {
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
@@ -868,6 +875,36 @@
                })
            }

            //#region èŽ·å–参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            //#endregion

            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开  
                var HNumber = params[params[1]]; //从参数中获取  è®¾å¤‡ä»£ç   
                if (openType == 2) {
                    sWhere += " and  å®¡æ ¸äºº IS NOT NULL and å®¡æ ¸äºº <> '' and (关闭人 IS NULL OR å…³é—­äºº = '')  ";
                    form.render("select");
                    return true;
                } else if (openType==3) {
                    sWhere += " and  å®¡æ ¸äºº IS NOT NULL and å®¡æ ¸äºº <> '' and (关闭人 IS NULL OR å…³é—­äºº = '') and è®¾å¤‡ä»£ç  like '%" + HNumber+"%'  ";
                    form.render("select");
                    return true;
                }
            }
            //#endregion

            //#region åˆ—明显示下拉框
            function ColFilter() {
@@ -886,6 +923,7 @@
                form.render('select');
            }
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

            //获取当前用户的默认过滤方案
@@ -1094,14 +1132,7 @@

            //#endregion

            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});


          
            //以上是layui模块
        });


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

@@ -343,9 +343,15 @@
                //初始化表格
                set_InitGrid();
                //查询
                //get_Display(sWhere);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
                if (addSWhereByOpenType()) {          //addSWhereByOpenType()方法判断是否其它页面打开本页面，若是则处理过滤条件，并返回true
                    //查询当前登录用户有没有在当前模块设置默认过滤方案
                    get_DefaultModule();
                } else {
                    //查询当前登录用户有没有在当前模块设置默认过滤方案
                    get_DefaultModule();
                }

              
            }

            //初始化表格
@@ -896,6 +902,32 @@
                })
            }

            //#region èŽ·å–参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            //#endregion

            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = getUrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开  
                if (openType == 2) {
                    sWhere += " and  å®¡æ ¸äºº IS NOT NULL and å®¡æ ¸äºº <> '' and (关闭人 IS NULL OR å…³é—­äºº = '')  ";
                    form.render("select");
                    return true;
                } 
            }
            //#endregion


            //#region åˆ—明显示下拉框
            function ColFilter() {
@@ -914,6 +946,7 @@
                form.render('select');
            }
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

            //获取当前用户的默认过滤方案

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

@@ -238,6 +238,7 @@
                                            <th>设备名称</th>
                                            <td class="bz_td">
                                                <input type="text" name="HBarName" class="layui-input LineHeight" id="HBarName" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                                <input type="hidden" name="HNumber" id="HNumber" value="" autocomplete="off" class="layui-input">
                                                <input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
                                            </td>
                                        </tr>
@@ -690,6 +691,7 @@

            //表头信息选择单据弹窗
            form.on('submit(XDHList)', function () {
                var hnumber = $("HNumber").val()
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -697,7 +699,7 @@
                    title: '设备维修登记单',
                    shift: 2,
                    area: ['90%', '90%'],
                    content: ['../设备管理/Sb_EqpConkBookBillList.html', 'yes'],
                    content: ['../设备管理/Sb_EqpConkBookBillList.html?type=2&HNumber='+hnumber, 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -708,6 +710,10 @@
                        $("#HMainSourceBillNo").val(checkStatus.data[0].单据号);
                        $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
                        $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);

                        $("#HEquipID").val(checkStatus.data[0].hmainid);
                        $("#HNumber").val(checkStatus.data[0].设备代码);
                        $("#HBarName").val(checkStatus.data[0].设备名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -910,6 +916,7 @@
                        if (result.count == 1) {
                            var data = result.data[0];
                            $("#HEquipID").val(data.HInterID);
                            $("#HNumber").val(data.HEquipFileNumber);
                            $("#HBarName").val(data.HName);
                            $("#HBarSpec").val(data.HModel);
                            $("#HBarModel").val(data.HModel2);
@@ -925,6 +932,7 @@

                            HProcExchBillNoFlag = true;
                            layer.close(index);
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                        else {
                            $("#HBarCode").val("");

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

@@ -328,7 +328,33 @@
    </script>

    <script>
        //获取参数
        var OptionData = [];
        var HBillType = "";  //单据类型
        var HSourceInterID = ""; //源单主内码
        var HSourceEntryID = "";  //源单子内码
        var HSourceBillNo = "";   //源单单号
        var HSourceBillType = "";  //源单类型
        var refSav = "";   //提交类型
        //获取页面跳转参数  //单据编辑状态： 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var HInterID = params[params[1]];//单据内码
            var HEntry = params[params[2]];//单据子内码
        }


        var edit = function (data) {           
            HSourceInterID = data[0].HSourceInterID;
            HSourceEntryID = data[0].HSourceEntryID;
            HSourceBillNo = data[0].HSourceBillNo;
            HSourceBillType = data[0].HSourceBillType;

        }
        
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -346,10 +372,7 @@
            var HMaker = sessionStorage["HUserName"]
            var HStockOrgID = sessionStorage["OrganizationID"]  //组织ID
            var option = {};
            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

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
@@ -418,7 +441,12 @@
                $("#HMaker").val(HMaker);
                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                //工序流转卡页面下推
                set_ProcessBill(HInterID, HEntry);
                if (HInterID == "") {    //报工台下推
                    set_ProcessBill(HSourceInterID, HSourceEntryID);
                } else {
                    set_ProcessBill(HInterID, HEntry);
                }
               
                OperationType = 1;
            } 
            else {
@@ -1335,14 +1363,14 @@
            //#endregion

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

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

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

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

@@ -759,7 +759,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../views/基础资料/公用基础资料/Gy_TechnologyParameterList.html', 'yes'],
                    content: ['../../../views/基础资料/公用基础资料/Gy_TechnologyParameterType.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {