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

wtt

2024-12-23 06582aadfbda68c5683dfd19d80449b71ab14afe

 WebTM/views/ÖÊÁ¿¹ÜÀí/³µ¼ä×Լ쵥/QC_Add_Edit_WorkSelfCheckBill.html

@@ -674,6 +674,8 @@
            //公用变量
            var rowdata = [];
            var option = [];
            var HDeptID = "";//部门id èŽ·å–班次
            var HCenterID = "";//工作中心id èŽ·å–班次

            var rowdata_Value = [];
            var option_Value = [];
@@ -723,6 +725,8 @@

                $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]); //根据登录用户带出检验员ID
                $("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]); //根据登录用户带出检验员
                HDeptID = sessionStorage["HDeptID"]; //根据登录用户带出部门ID
                HCenterID = sessionStorage["HWorkCenterID"]; //根据登录用户带出工作中心ID

                //获取最大单据号
                $.ajax({
@@ -737,6 +741,8 @@
                        $("#HMaker").val(sessionStorage["HUserName"]);
                    }
                });
                //获取班次
                get_HWorkShift();
            }
            else if (OperationType == 2) {
                $("#HInterID").val("");
@@ -749,6 +755,9 @@

                $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
                $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);
                HDeptID = sessionStorage["HDeptID"]; //根据登录用户带出部门ID
                HCenterID = sessionStorage["HWorkCenterID"]; //根据登录用户带出工作中心ID

                //获取最大单据号
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -800,6 +809,8 @@
                else {
                    layer.alert("源单类型无效！", { icon: 5 });
                }
                //获取班次
                get_HWorkShift();
            }
            else if (OperationType == 3) {
                RoadBillMain(linterid);
@@ -881,7 +892,10 @@
                            $("#HICMOEntryID").val(data.HICMOEntryID == null ? 0 : data.HICMOEntryID);//
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HProcID").val(data.HProcID);//
                            $("#HProcName").val(data.当前工序);//
                            HDeptID = data.HWorkShopID == null ? sessionStorage["HDeptID"] : data.HWorkShopID;//工作中心id
                            HCenterID = data.HCenterID == null ? sessionStorage["HWorkCenterID"] : data.HCenterID;//工作中心id
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
@@ -2163,7 +2177,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_ShiftsList.html?type=HShifts', 'yes'],
                    content: ['../../基础资料/生产基础资料/Gy_WorkShiftList.html?type=HWorkShifts&OperationType=2', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -2174,7 +2188,7 @@
                            return layer.msg('请选择数据');
                        }
                        $("#HShiftsName").val(checkStatus.data[0].班次名称);
                        $("#HShiftsID").val(checkStatus.data[0].HItemID);
                        $("#HShiftsID").val(checkStatus.data[0].HInterID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -3814,6 +3828,34 @@
                }
            }


            //获取班次
            function get_HWorkShift() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //方法所在页面和方法名
                    data: {
                        "HDeptID": HDeptID,
                        "HCenterID": HCenterID
                    },
                    success: function (data) {
                        if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        {
                            var LoadData = data.data;
                            $("#HShiftsID").val(LoadData[0].HInterID); //当前工序ID
                            $("#HShiftsName").val(LoadData[0].班次); //当前工序
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 });
                    }
                });
            }


            //以上为layui模块
        });

@@ -3852,9 +3894,10 @@
            $("#HQCSchemeName").val(obj[0].检验方案名称);
            get_CheckItem();
        }
        function GetHShiftsValue(obj) {    //生产班次
        //班次
        function GetHWorkShiftsValue(obj) {
            $("#HShiftsName").val(obj[0].班次名称);
            $("#HShiftsID").val(obj[0].HItemID);
            $("#HShiftsID").val(obj[0].HInterID);
        }
    </script>
</body>