Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2023-09-25 f0bf3a9c74a87438d5c32e9f0bc6a23d294fbc72

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

@@ -534,15 +534,15 @@
                    //, { field: 'HUnitTime', title: '运行时间', edit: 'text' }
                    , { field: 'HWorkQty', title: '加工数量', edit: 'text' }//默认

                    , { field: 'HQCSchemeID_Fst', title: '首件检验方案ID', hide: true }//f7
                    , { field: 'HQCSchemeNumber_Fst', title: '首件检验方案代码', edit: 'text', event: "HQCSchemeNumber_Fst",width:125 }
                    , { field: 'HQCSchemeName_Fst', title: '首件检验方案名称', width: 125 }//f7
                    , { field: 'HQCSchemeID_Proc', title: '转序检验方案ID', hide: true }//f7
                    , { field: 'HQCSchemeNumber_Proc', title: '转序检验方案代码', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125}
                    , { field: 'HQCSchemeName_Proc', title: '转序检验方案名称', width: 125}//f7
                    , { field: 'HQCSchemeID_Patrol', title: '巡检检验方案ID', hide: true }//f7
                    , { field: 'HQCSchemeNumber_Patrol', title: '巡检检验方案代码', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
                    , { field: 'HQCSchemeName_Patrol', title: '巡检检验方案名称', width: 125}//f7
                    //, { field: 'HQCSchemeID_Fst', title: '首件检验方案ID', hide: true }//f7
                    //, { field: 'HQCSchemeNumber_Fst', title: '首件检验方案代码', edit: 'text', event: "HQCSchemeNumber_Fst",width:125 }
                    //, { field: 'HQCSchemeName_Fst', title: '首件检验方案名称', width: 125 }//f7
                    //, { field: 'HQCSchemeID_Proc', title: '转序检验方案ID', hide: true }//f7
                    //, { field: 'HQCSchemeNumber_Proc', title: '转序检验方案代码', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125}
                    //, { field: 'HQCSchemeName_Proc', title: '转序检验方案名称', width: 125}//f7
                    //, { field: 'HQCSchemeID_Patrol', title: '巡检检验方案ID', hide: true }//f7
                    //, { field: 'HQCSchemeNumber_Patrol', title: '巡检检验方案代码', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
                    //, { field: 'HQCSchemeName_Patrol', title: '巡检检验方案名称', width: 125}//f7
                   
                    //, { field: 'HPassRate', title: '良率', edit: 'text' }//默认
                    //, { field: 'HProcID_S', title: '工段', edit: 'text' }
@@ -622,19 +622,19 @@
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑 4添加子工艺路线
            var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•ç±»åž‹
            var HBillSubType = params[params[2]];  //从单据获取 æºå•ç±»åž‹
            //var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«

            if (HBillSubType == "SUB") {
                //显示工序
                $("#HIDDEN").show();
            }

            //判断是否新增
            if (linterid == null || linterid == 0) {
                //$("#HIDDEN").hide();
                if (OperationType == null) {
                    OperationType = 1;
                } else if (OperationType == 4) {
                    //显示工序
                    $("#HIDDEN").show();
                }
               
                OperationType = 1;

                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
@@ -664,6 +664,7 @@
                });
            }
            else {//如果修改则走下面 new

                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                RoadBillMain(linterid);
@@ -1741,7 +1742,7 @@
                    url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": HBillSubType },
                    success: function (d) {

                        //alert(JSON.stringify(d.data[0]))
@@ -1755,10 +1756,7 @@
                            $("input[name='checkboxHStandard']").prop("checked", false);
                        }

                        if (d.data[0].HBillSubType == "SUB") {
                            //显示工序
                            $("#HIDDEN").show();
                        }
                      
                        //主表
                        form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HBillNo": OperationType == 2 ? "" : d.data[0].单据号
@@ -1868,7 +1866,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
                //var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + HBillSubType;

                var index = layer.load();
                $.ajax({