From 43fa33896736c2d5a94cd885c6bc4349d0a6d2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Wed, 27 Aug 2025 16:31:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=B4=E4=BF=9D=E5=B7=A5=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=80=80=E5=9B=9E=E5=8A=9F=E8=83=BD=202.=E7=BB=B4?= =?UTF-8?q?=E4=BF=9D=E6=89=A7=E8=A1=8C=E5=A2=9E=E5=8A=A0=20=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E9=80=80=E5=9B=9E=E5=AD=97=E6=AE=B5=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/controller/EamController.java | 8 ++++++++ .../xujie/sys/modules/pms/mapper/EamMapper.java | 4 ++++ .../sys/modules/pms/service/EamService.java | 2 ++ .../pms/service/Impl/EamServiceImpl.java | 12 +++++++++++- src/main/resources/mapper/pms/EamMapper.xml | 17 ++++++++++++++++- 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java index b27fa88e..e5929fe6 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java @@ -1936,6 +1936,14 @@ public class EamController { eamService.checkWorkOrder(data); return R.ok(); } + /** + * 点检工单退回 + **/ + @PostMapping("/returnWorkOrder") + public R returnWorkOrder(@RequestBody EamWorkOrderInData data){ + eamService.returnWorkOrder(data); + return R.ok(); + } /** * 批量审核工单 diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java index 350e899d..219b23e8 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java @@ -503,4 +503,8 @@ public interface EamMapper { List getConfirmButtonOperator(); void cancelDefectOrder(EamWorkOrderInData inData); + + void returnWorkOrder(EamWorkOrderInData data); + + void updateIsReturn2(EamWorkOrderInData inData); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java index 1a9f9128..dac6fee8 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java @@ -1196,4 +1196,6 @@ public interface EamService { List getConfirmButtonOperator(); void cancelDefectOrder(EamWorkOrderInData inData); + + void returnWorkOrder(EamWorkOrderInData data); } 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 43f37daa..201608a8 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 @@ -1846,7 +1846,10 @@ public class EamServiceImpl implements EamService { inData.getItemList().get(i).setPlanID(inData.getPlanID()); inData.getItemList().get(i).setCreatedBy(inData.getMesUser()); inData.getItemList().get(i).setFinishFlag("Y"); - eamMapper.saveWorkOrderItem(inData.getItemList().get(i)); + if (inData.getIsReturn().equals("N")){ + eamMapper.saveWorkOrderItem(inData.getItemList().get(i)); + } + // 如果点检结果不合格，则根据不合格项目生成维修反馈 if ("不合格".equals(inData.getItemList().get(i).getItemResult()) && "A".equals(inData.getFunctionType())) { @@ -1977,6 +1980,8 @@ public class EamServiceImpl implements EamService { } } } + //更新退回状态 + eamMapper.updateIsReturn2(inData); // eamMapper.closePlanWithCheck(inData); if ("B".equals(inData.getFunctionType()) || "A".equals(inData.getFunctionType())) { // 添加维保协同人员 @@ -3972,6 +3977,11 @@ public class EamServiceImpl implements EamService { eamMapper.cancelDefectOrder(inData); } + @Override + public void returnWorkOrder(EamWorkOrderInData data) { + eamMapper.returnWorkOrder(data); + } + /** * 员工考勤vs报工工时 */ diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 2444e35c..085293ee 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -765,7 +765,8 @@ CASE WHEN (DATEDIFF(SECOND, a.CreateDate, a.reach_date) 60) THEN DATEDIFF(SECOND, a.CreateDate, a.reach_date) / 60.0 ELSE DATEDIFF(MINUTE, a.CreateDate, a.reach_date) END AS responseTime, - a.check_type + a.check_type, + a.is_return FROM eam_workOrder a left join eam_object as eo on eo.site = a.site and eo.ObjectID = a.ObjectID and eo.bu_no = a.bu_no left join sys_department as sd ON eo.site = sd.site and eo.dept_id = sd.department_id and eo.bu_no = sd.bu_no @@ -781,6 +782,9 @@ AND dbo.get_bu_desc (a.site, a.bu_no) = #{query.buDesc} + + AND a.is_return = #{query.isReturn} + AND a.OrderNo like '%' + #{query.orderNo} + '%' @@ -3718,6 +3722,11 @@ SET is_return = 'Y' WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo} + + UPDATE eam_workOrder + SET is_return = 'N' + WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo} + update eam_workOrder set Remark = #{remark}, @@ -3733,6 +3742,12 @@ set PlanOperator = #{planOperator} where site = #{site} and bu_no = #{buNo} and feedBackID = #{feedBackID} + + UPDATE eam_workOrder + SET Status = '已到达', + is_return = 'Y' + WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo} +