From 860987874e4b4b7532262c0aedb1936eb02fcae9 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Wed, 5 Jun 2024 13:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E5=A4=8F=E8=AF=95=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/TmTaskController.java | 13 ++++++++++ .../sgzb/app/domain/LeaseApplyDetails.java | 1 + .../com/bonus/sgzb/app/domain/TmTask.java | 1 + .../bonus/sgzb/app/mapper/TmTaskMapper.java | 5 ++++ .../bonus/sgzb/app/service/TmTaskService.java | 2 ++ .../app/service/impl/TmTaskServiceImpl.java | 26 ++++++++++++++++++- .../resources/mapper/app/TmTaskMapper.xml | 19 ++++++++++++++ .../domain/RepairTestInputDetailVo.java | 3 +++ .../mapper/material/RepairTestInputMapper.xml | 3 +++ 9 files changed, 72 insertions(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 5103ac09..20dd4e20 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -497,6 +497,19 @@ public class TmTaskController extends BaseController { } } + /** + * 领料出库详情-出库完成 + */ + @PostMapping("/outboundCompleted") + public AjaxResult outboundCompleted(@RequestBody TmTask task) { + int i = tmTaskService.updateLeaseAuditListByOne(task); + if (i == 0) { + return AjaxResult.success(); + } else { + return AjaxResult.error(); + } + } + /** * 导出领料出库列表 * diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java index 6cc26f3d..4b943aad 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java @@ -177,4 +177,5 @@ public class LeaseApplyDetails implements Serializable { private String maStatus; @ApiModelProperty(value="预领数量-已领数量的差值") private Double nums; + private Long taskId; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index d3fbd37e..25d4dadf 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -259,6 +259,7 @@ public class TmTask implements Serializable { private String maCode; private String maId; private String maStatus; + private Integer status; private String typeId; private Double partNum; @ApiModelProperty(value = "预计领料时间（重庆）") diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 907b925c..7d2cfedf 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -146,4 +146,9 @@ public interface TmTaskMapper { int getDeptId(String createBy); List getLeaseOutListByjjbz(TmTask task); + + int updateLeaseAuditListByOne(TmTask task); + + + List getleaseDetailsStatus(TmTask task); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index 319400f2..a1eb8a5e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -110,4 +110,6 @@ public interface TmTaskService{ * @return */ String selectTaskNumByMonths(@Param("date") Date nowDate, @Param("taskType") Integer taskType); + + int updateLeaseAuditListByOne(TmTask task); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 88fac6e6..844b39ad 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -563,7 +563,7 @@ public class TmTaskServiceImpl implements TmTaskService { if (roles.contains("jjbz") || roles.contains("fbz")) { //机具班长和副班长可以出库机具设备 return tmTaskMapper.getLeaseOutListByjjbz(task); - }else { + } else { return tmTaskMapper.getLeaseOutListByUser(task); } } @@ -573,6 +573,30 @@ public class TmTaskServiceImpl implements TmTaskService { return tmTaskMapper.selectTaskNumByMonths(nowDate, taskType); } + @Override + public int updateLeaseAuditListByOne(TmTask task) { + int i = tmTaskMapper.updateLeaseAuditListByOne(task); + if (i > 0) { + int num = 0; + List leaseApplyDetails = tmTaskMapper.getleaseDetailsStatus(task); + if (CollUtil.isNotEmpty(leaseApplyDetails)) { + for (LeaseApplyDetails details : leaseApplyDetails) { + if ("2".equals(details.getStatus())) { + num++; + } + } + if (num == leaseApplyDetails.size()) { + task.setTaskId(leaseApplyDetails.get(0).getTaskId()); + task.setTaskStatus(35); + tmTaskMapper.updateTmTaskAuditStatus(task); + } + } + return 0; + } else { + return 1; + } + } + /** * 获取领料申请列表 diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index e74bf1f4..34c822a9 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -903,6 +903,13 @@ WHERE task_id = #{record.taskId} and company_id is null + + UPDATE lease_apply_details + SET `status` = 2 + WHERE + parennt_id = #{id} + AND type_id = #{typeId} + + diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDetailVo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDetailVo.java index 9f48bf3f..6aabe402 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDetailVo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDetailVo.java @@ -65,4 +65,7 @@ public class RepairTestInputDetailVo { /** 状态*/ @Excel(name = "状态") private String status; + + /** 修试管理入库审核人员*/ + private String userIds; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml index e6435cf4..14731e2d 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml @@ -124,9 +124,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rid.update_by AS updateBy, rid.update_time AS updateTime, rid.remark, + GROUP_CONCAT( mtk.user_id ) AS userIds, CASE rid.`status` WHEN '0' THEN '进行中' WHEN '1' THEN '已入库' WHEN '2' THEN '驳回' ELSE '进行中' END AS `status` FROM repair_input_details rid LEFT JOIN ma_machine mm ON rid.ma_id = mm.ma_id + LEFT JOIN ma_type_keeper mtk ON rid.type_id = mtk.type_id LEFT JOIN ( SELECT mt.type_id AS typeId,mt2.type_id AS typeId2,mt.type_name AS typeName,mt2.type_name AS typeName2,mt.manage_type FROM ma_type mt @@ -148,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.typeId = #{typeId} + GROUP BY rid.type_id ORDER BY rid.create_time DESC