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

wtt

2024-07-22 e8d4624ec2f88964b09ba19de5c04f047e6019e0

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

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

@@ -478,13 +478,15 @@
            }
            else if (OperationType == 4) {
                set_AddFNew();
                var EquipNumber = "";
                set_Sc_ICMOBillStatus();//获取工单的 ç‰©æ–™ æ•°é‡
                set_ErrMsgBackType();   //获取异常类型
                set_UserSuperiors();    //获取当前登录人的上级
                set_EquipFile();        //获取设备的设备编码
                var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
                var Person = sessionStorage["HUserName"];
                //报工台跳转页面自动生成内容
                $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType));
                $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber));
                $("#HContext").val(HType);//主题
            }
            else if (OperationType == 5) {  //查看
@@ -629,6 +631,32 @@
                    });
            }

            //获取报工台跳转 èŽ·å– è®¾å¤‡ç¼–码
            function set_EquipFile() {
                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_ErrMsgBackType", //方法所在页面和方法名
                        async: false,
                        data: {
                            "HSourceName": HSourceName  
                        },
                        success: function (data) {
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data;
                               EquipNumber=LoadData[0].设备编码; //产品名称
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });

                            }
                        },
                        error: function (err) {
                            layer.alert(err, { icon: 5 });
                        }
                    });
            }
            //#endregion


@@ -1131,11 +1159,11 @@


            //报工太异常跳转自动生成内容
            function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {
            function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber) {
                // æ‹¼æŽ¥å­—符串
                var result = '异常类型:' + HType + ',订单号:' + HICMOBillNo + ',流转卡号:' + HICMOBillNo
                    + ', äº§å“ç¼–码:' + $("#HMaterNumber").val() + ',产品名称:' + $("#HMaterName").val() + ',规格型号:' + $("#HMaterModel").val()
                    + ',发送人:' + Person + ',发生时间:' + Datetime + ',生产资源:' + HSourceName;
                    + ',发送人:' + Person + ',发生时间:' + Datetime + ',生产资源:' + HSourceName + ',设备编码:' + EquipNumber;
                return result;
            }