产品工艺参数列表增加模具字段,设备工艺参数修复页面bug,工序流转卡跳转点检更改产数传入

zrg

2024-07-17 8b038b9226ddefc9f23c2a34ec2ec09292f3d435

产品工艺参数列表增加模具字段,设备工艺参数修复页面bug,工序流转卡跳转点检更改产数传入

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,8 +8,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_MaterialTechParamBillMain.html

@@ -177,11 +177,35 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">模具编码</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HMouldNumber" name="HMouldNumber" id="HMouldNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HMouldID" id="HMouldID" lay-verify="HMouldID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMould" id="btnSearchHMould" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;">模具名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMouldName" lay-verify="HMouldName" id="HMouldName" style="background-color:#efefef4d;" readonly>
                                            </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="HMouldModel" lay-verify="HMouldModel" id="HMouldModel" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <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="HRemark" id="HRemark" lay-verify="HRemark" style=" width: 500px;">
                                            </div>
                                        </div>
                                        </div>                                       
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -459,6 +483,12 @@
            //#region é€‰æ‹©å·¥åºæŒ‰é’®
            form.on('submit(btnSearchHProc)', function () {
                get_checkSearchHProc();
            });
            //#endregion

            //#region é€‰æ‹©æ¨¡å…·æŒ‰é’®
            form.on('submit(btnSearchHMould)', function () {
                get_checkSearchHMould();
            });
            //#endregion

@@ -847,6 +877,34 @@
            }
            //#endregion

            //#region æ¨¡å…·é€‰æ‹©é¡µé¢
            function get_checkSearchHMould() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工序表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../模治具管理/模治具管理/Gy_MouldFileList.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('请选择数据');
                        }
                        //获取数据
                        $("#HMouldID").val(checkStatus.data[0].hmainid);
                        $("#HMouldNumber").val(checkStatus.data[0].模具编号);
                        $("#HMouldName").val(checkStatus.data[0].模具名称);
                        $("#HMouldModel").val(checkStatus.data[0].模具型号);
                        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) {
@@ -1115,6 +1173,10 @@
                                , "HEquipNumber": tableMain[0]["设备代码"]
                                , "HEquipName": tableMain[0]["设备名称"]
                                , "HEquipModel": tableMain[0]["设备型号"]
                                , "HMouldID": tableMain[0]["HMouldID"]
                                , "HMouldNumber": tableMain[0]["模具代码"]
                                , "HMouldName": tableMain[0]["模具名称"]
                                , "HMouldModel": tableMain[0]["模具型号"]
                                , "HDeptID": tableMain[0]["HDeptID"]
                                , "HDeptName": tableMain[0]["部门"]
                                , "HWorkCenterID": tableMain[0]["HWorkCenterID"]

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

@@ -208,7 +208,7 @@
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        </div>                                      
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -403,15 +403,23 @@
                //初始化日期、创建人、创建时间
                $("#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);
                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));              
            }
            else if (OperationType == 2) {  //编辑
                $("#HInterID").val(HInterID);//修改时主表ID
                //编辑状态时，根据内码，获取信息并写入界面
                RoadBillMain(HInterID);
            }
            else if (OperationType == 4) {  //下推
                //获取最大单据号
                get_MAXNum();
                //初始化日期、创建人、创建时间
                $("#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 {
                layer.alert("未知操作类型！", { icon: 5 });
            }
@@ -1360,7 +1368,7 @@
                                        "HTechParamUnitID": result.data[i]["HTechParamUnitID"],
                                        "HTechParamUnitNumber": result.data[i]["工艺参数单位代码"],
                                        "HTechParamUnitName": result.data[i]["工艺参数单位名称"],
                                        "HVaule": result.data[i]["标准值"],
                                        "HVaule": "",
                                        "HStd": result.data[i]["标准值"],
                                        "HMax": result.data[i]["上限值"],
                                        "HMin": result.data[i]["下限值"],

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

@@ -2883,7 +2883,7 @@
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html?OperationType=1&linterid=' + linterid + '&HEntryID=' + HEntryID + '', 'yes']
                        , content: ['../../设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html?OperationType=4&linterid=' + linterid + '&HEntryID=' + HEntryID + '', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();