From 04b5ac60dc4908a010f833a87ea8f33a35c60d9c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 14 Nov 2024 11:28:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/biz/enums/LeaseTaskStatusEnum.java | 7 ++++--- .../com/bonus/material/lease/domain/LeaseApplyInfo.java | 6 ++++++ .../lease/service/impl/LeaseApplyInfoServiceImpl.java | 4 ++-- .../mapper/material/lease/LeaseApplyInfoMapper.xml | 9 +++++++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java index 402fc9bd..e8353953 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java @@ -12,9 +12,10 @@ public enum LeaseTaskStatusEnum { LEASE_TASK_TO_PUBLISHED(0, "领料任务--未发布"), LEASE_TASK_PUBLISHED(1, "领料任务--已发布"), - LEASE_TASK_TO_STORE(2, "领料任务--待出库"), - LEASE_TASK_IN_STORE(3, "领料任务--进行中"), - LEASE_TASK_END_STORE(4, "领料任务--已出库完成"); + LEASE_TASK_TO_AUDIT(2, "领料任务--待审核"), + LEASE_TASK_TO_STOCK_OUT(3, "领料任务--待出库"), + LEASE_TASK_IN_STOCK_OUT(4, "领料任务--进行中"), + LEASE_TASK_END_STOCK_OUT(5, "领料任务--已出库完成"); private final Integer status; private final String statusName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java index 4a3f84ec..66ec0338 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java @@ -192,6 +192,9 @@ public class LeaseApplyInfo extends BaseEntity { @ApiModelProperty(value = "预领料合计数") private Integer preCountNum; + @ApiModelProperty(value = "已出库数量") + private Integer alNum; + @ApiModelProperty(value = "开始时间") private String startTime; @@ -201,4 +204,7 @@ public class LeaseApplyInfo extends BaseEntity { @ApiModelProperty(value = "关键字") private String keyWord; + @ApiModelProperty(value = "任务状态列表") + private List statusList; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 9c6fa185..50663d53 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -160,10 +160,10 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { try { int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo); if (result > 0) { - // 同步修改tm_task任务状态 + // 同步修改tm_task任务状态, 如果不需要审核，改成LEASE_TASK_TO_STOCK_OUT， 如果需要审核，改成 LEASE_TASK_TO_AUDIT TmTask tmTask = new TmTask(); tmTask.setTaskId(leaseApplyInfo.getTaskId()); - tmTask.setStatus(String.valueOf(LeaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus())); + tmTask.setStatus(String.valueOf(LeaseTaskStatusEnum.LEASE_TASK_TO_STOCK_OUT.getStatus())); tmTaskMapper.updateTmTask(tmTask); return AjaxResult.success("发布成功"); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index 5ce62056..4672b880 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lai.dept_audit_remark, lai.direct_audit_by, lai.direct_audit_time, lai.direct_audit_remark, lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id, lai.status, lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party, - bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code, tt.task_status, + bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code, tt.task_status as taskStatus, IFNULL(sum(lad.pre_num),0) as preCountNum, IFNULL(sum(lad.al_num),0) as alNum from @@ -75,7 +75,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and lai.direct_audit_time = #{directAuditTime} and lai.direct_audit_remark = #{directAuditRemark} and lai.company_id = #{companyId} - and lai.status = #{status} + + and tt.task_status in + + #{item} + + and lai.direct_id = #{directId} and lai.lease_type = #{leaseType} and lai.estimate_lease_time = #{estimateLeaseTime}