From b9aa85191e1a5c621904ce7e7d82b51c86d47909 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sat, 8 Feb 2025 14:01:40 +0800 Subject: [PATCH] =?UTF-8?q?2025-02-08=20=E7=BB=B4=E4=BF=AE=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=96=B0=E5=A2=9E=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/data/EamWorkOrderData.java | 24 +++++++++++++++++++ .../pms/service/Impl/EamServiceImpl.java | 12 +++++----- src/main/resources/mapper/pms/EamMapper.xml | 18 ++++++++------ 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java index a13b7db6..1d5b099e 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java @@ -102,6 +102,30 @@ public class EamWorkOrderData extends QueryPage { * 确认次数 */ private Integer confirmCount; + /** + * 维修评估 + */ + private String confirmAssessment; + /** + * 生产维修评估说明 + */ + private String confirmRemark; + + public String getConfirmAssessment() { + return confirmAssessment; + } + + public void setConfirmAssessment(String confirmAssessment) { + this.confirmAssessment = confirmAssessment; + } + + public String getConfirmRemark() { + return confirmRemark; + } + + public void setConfirmRemark(String confirmRemark) { + this.confirmRemark = confirmRemark; + } public Date getConfirmDate() { return confirmDate; diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 19449f5d..2c213600 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -1991,8 +1991,8 @@ public class EamServiceImpl implements EamService { String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】"; try { // 发送短信 - int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); - //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); + //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); + int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); if (code <= 0) { throw new RuntimeException("短信发送失败,code = " + code + " !"); } @@ -2162,8 +2162,8 @@ public class EamServiceImpl implements EamService { String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】"; try { // 发送短信 - int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); - //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); + //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); + int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); if (code <= 0) { throw new RuntimeException("短信发送失败,code = " + code + " !"); } @@ -3013,8 +3013,8 @@ public class EamServiceImpl implements EamService { String content = inData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + inData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】"; try { // 发送短信 - int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); - //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); + //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); + int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); if (code <= 0) { throw new RuntimeException("短信发送失败,code = " + code + " !"); } diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index af407df0..b0d52b01 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -866,10 +866,10 @@ a.fault_reason, a.preventive_measure, a.document_source, - isnull(ewc.partNo,'') core_partNo, - isnull(ps.part_description,'') core_part_description, + isnull(ewc.partNo,'') core_partNo, + isnull(ps.part_description,'') core_part_description, isnull(ewc.oldSerialNo,'') oldSerialNo, - isnull(ewc.newSerialNo,'') newSerialNo + isnull(ewc.newSerialNo,'') newSerialNo FROM eam_workOrder a left join eam_defect_feedBack b on a.site = b.site and a.PlanID = b.feedBackID and a.bu_no = b.bu_no left join eam_defect c on b.DefectID = c.DefectID @@ -878,8 +878,8 @@ left join sys_department as f on e.site = f.site and e.dept_id = f.department_id and e.bu_no = f.bu_no left join Access_dept as ead ON ead.site = f.site and ead.department_id = f.department_id and ead.bu_no = f.bu_no left join sys_user as ea on ead.username = ea.username - left join eam_workOrder_coreComponents as ewc on a.site=ewc.site and a.orderNo=ewc.orderNo and a.bu_no = ewc.bu_no - left join part_spare as ps on ewc.site=ps.site and ewc.partNo=ps.part_no and ewc.bu_no=ps.bu_no + left join eam_workOrder_coreComponents as ewc on a.site=ewc.site and a.orderNo=ewc.orderNo and a.bu_no = ewc.bu_no + left join part_spare as ps on ewc.site=ps.site and ewc.partNo=ps.part_no and ewc.bu_no=ps.bu_no a.site in (select site from eam_access_site where username = #{query.userName}) and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName})) @@ -3228,7 +3228,9 @@ a.confirm_date, a.confirm_by, a.confirm_result, - a.confirm_count + a.confirm_count, + a.confirm_assessment, + a.confirm_remark FROM eam_workOrder as a where a.Site = #{site} and a.bu_no = #{buNo} and a.OrderNo = #{orderNo} and a.FunctionType = #{functionType} @@ -3239,7 +3241,9 @@ confirm_by = #{confirmBy}, confirm_date = getDate(), confirm_result = #{confirmResult}, - confirm_count = #{confirmCount} + confirm_count = #{confirmCount}, + confirm_assessment = #{confirmAssessment}, + confirm_remark = #{confirmRemark} where site = #{site} AND bu_no = #{buNo} AND OrderNo = #{orderNo} and FunctionType = #{functionType}