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

yangle

2024-07-16 77dafdec8a67e456ec1ee88ae556882be2dc774c

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html

@@ -540,7 +540,7 @@
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus", //方法所在页面和方法名
                    async: true,
                    async: false,
                    data: {
                        "HSourceBill": HSourceBill
                    },
@@ -573,7 +573,7 @@
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_ErrMsgBackType", //方法所在页面和方法名
                        async: true,
                        async: false,
                        data: {
                            "TypeName": HType
                        },
@@ -601,7 +601,7 @@
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_UserSuperiors", //方法所在页面和方法名
                        async: true,
                        async: false,
                        data: {
                            "HName": sessionStorage["HUserName"]
                        },
@@ -609,7 +609,14 @@
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data;
                                $("#HReceiveMan ").val(LoadData[0].用户名称); //接收人
                                if (LoadData[0].职务 == "注塑组员" || LoadData[0].职务 == "后处理组员") {
                                    $("#HSendMan").val(LoadData[0].用户名称);   //发送人
                                    $("#HReceiveMan ").val(sessionStorage["HUserName"]); //接收人
                                } else {
                                    $("#HSendMan").val(sessionStorage["HUserName"]);   //发送人
                                    $("#HReceiveMan ").val(LoadData[0].用户名称); //接收人
                                }
                               
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
@@ -632,8 +639,7 @@
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
                $("#HSendMan").val(sessionStorage["HUserName"]);   //发送人
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人               
                $("#HDeptID").val(sessionStorage["HDeptID"]);  //部门ID
                $("#HDeptName").val(sessionStorage["HDept"]);  //部门
            }
@@ -1127,7 +1133,9 @@
            //报工太异常跳转自动生成内容
            function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {
                // æ‹¼æŽ¥å­—符串
                var result = '单据号为:' + $("#HBillNo").val() + ',制单日期为:' + Datetime + ', ' + Person + '在' + HSourceName + '上生产工单为' + HICMOBillNo + ', å‘生异常类型为:' + HType;
                var result = '异常类型:' + HType + ',订单号:' + HICMOBillNo + ',流转卡号:' + HICMOBillNo
                    + ', äº§å“ç¼–码:' + $("#HMaterNumber").val() + ',产品名称:' + $("#HMaterName").val() + ',规格型号:' + $("#HMaterModel").val()
                    + ',发送人:' + Person + ',发生时间:' + Datetime + ',生产资源:' + HSourceName;
                return result;
            }