1.设备工艺参数点检增加报工台下推按钮,获取数据, 2.修复物料页面初始化查询报错 3.修改产品对应清单工艺参数大类F7选择不出来

zrg

2024-08-16 81cc9f5877480c72de2aac214586cf454a49c859

1.设备工艺参数点检增加报工台下推按钮,获取数据,
2.修复物料页面初始化查询报错
3.修改产品对应清单工艺参数大类F7选择不出来

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -10,8 +10,8 @@
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    /*var WEBURL = "http://localhost:8082/API/"; */   //张瑞广本地配置
  /*  var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html

@@ -324,7 +324,12 @@

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                if ($("#HProject").val() == "0") {
                    get_FastQuery();
                }
                else {
                    get_FastQuery(2);
                }
            });
            //#endregion

@@ -431,7 +436,13 @@
                Carousel.reload({ autoplay: false })
                //获取项目号
                Get_HProject();
                get_FastQuery();               
                if ($("#HProject").val() == "0") {
                    get_FastQuery();
                }
                else {
                    get_FastQuery(2);
                }
                   
                //if (openType == 2) {
                //    addSWhereByOpenType();
                //    //get_Display(sWhere);
@@ -581,7 +592,7 @@


            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
            function get_FastQuery(number) {
                sWhere = "";
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
@@ -624,8 +635,10 @@
                if (HOrgName) {
                    sWhere += " and ç»„织名称 like '%" + HOrgName + "%'";
                }
                if (HProject) {
                    sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                if (number==2) {
                    if (HProject) {
                        sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                    }
                }
                if (GetDataCols != "") {
                    sWhere += GetDataCols;

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

@@ -1074,7 +1074,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../../views/基础资料/公用基础资料/Gy_TechnologyParameterClass.html', 'yes'],
                                content: ['../../../views/基础资料/公用基础资料/Gy_TechnologyParameterType.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    //按钮【按钮一】的回调
@@ -1085,7 +1085,7 @@
                                    }
                                    obj.update({
                                        "HTechParamClassID": checkStatus.data[0].HItemID,
                                        "HTechParamClassName": checkStatus.data[0].工艺参数大类名称,
                                        "HTechParamClassName": checkStatus.data[0].工艺参数分类名称,

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

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

@@ -1392,6 +1392,9 @@
                                "HSourceID": data.HSourceID,
                                "HSourceName": data.生产资源,

                                "HEquipID": data.HEquipID,
                                "HEquipName": data.设备名称,

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

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

@@ -61,6 +61,12 @@
                                    </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="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="HProcName" id="HProcName">
@@ -380,7 +386,7 @@
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
                var HProcName = $("#HProcName").val();

                var HMaterName = $("#HMaterName").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
@@ -464,6 +470,9 @@
                if (HProcName) {
                    sWhere += " and å·¥åºåç§° like '%" + HProcName + "%'";
                }
                if (HMaterName) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + HMaterName + "%'";
                }
                get_Display(sWhere);
                //加载柱状图
                set_Graphics();
@@ -475,6 +484,7 @@
                $("#HYear").val(new Date().getFullYear());
                $("#HMonth").val(new Date().getMonth() + 1);
                $("#HProcName").val("");
                $("#HMaterName").val("");
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
@@ -520,8 +530,8 @@
                        HQtyNum.push(option.data[i].合格数);
                        HBadCount.push(option.data[i].不良数);
                        HBackWorkQty.push(option.data[i].返工数);
                        FistPass.push((option.data[i].一次合格率).replace('%', ''));
                        Pass.push((option.data[i].合格率).replace('%', ''))                     
                        FistPass.push((option.data[i].一次合格率 == null ? '0.00%' : option.data[i].一次合格率 ).replace('%', ''));
                        Pass.push((option.data[i].合格率 == null ? '0.00%' : option.data[i].合格率).replace('%', ''))

                    }
                }