bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
jjLv 2024-11-14 11:37:08 +08:00
parent bd38078080 5ecc873663
commit ead0bac1a4
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java
View File

@ -12,9 +12,10 @@ public enum LeaseTaskStatusEnum {
LEASE_TASK_TO_PUBLISHED(0, "领料任务--未发布"), LEASE_TASK_TO_PUBLISHED(0, "领料任务--未发布"),
LEASE_TASK_PUBLISHED(1, "领料任务--已发布"), LEASE_TASK_PUBLISHED(1, "领料任务--已发布"),
LEASE_TASK_TO_STORE(2, "领料任务--待出库"), LEASE_TASK_TO_AUDIT(2, "领料任务--待审核"),
LEASE_TASK_IN_STORE(3, "领料任务--进行中"), LEASE_TASK_TO_STOCK_OUT(3, "领料任务--待出库"),
LEASE_TASK_END_STORE(4, "领料任务--已出库完成"); LEASE_TASK_IN_STOCK_OUT(4, "领料任务--进行中"),
LEASE_TASK_END_STOCK_OUT(5, "领料任务--已出库完成");
private final Integer status; private final Integer status;
private final String statusName; private final String statusName;

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java
View File

@ -192,6 +192,9 @@ public class LeaseApplyInfo extends BaseEntity {
@ApiModelProperty(value = "预领料合计数") @ApiModelProperty(value = "预领料合计数")
private Integer preCountNum; private Integer preCountNum;
@ApiModelProperty(value = "已出库数量")
private Integer alNum;
@ApiModelProperty(value = "开始时间") @ApiModelProperty(value = "开始时间")
private String startTime; private String startTime;
@ -201,4 +204,7 @@ public class LeaseApplyInfo extends BaseEntity {
@ApiModelProperty(value = "关键字") @ApiModelProperty(value = "关键字")
private String keyWord; private String keyWord;
@ApiModelProperty(value = "任务状态列表")
private List<Integer> statusList;
} }

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -156,14 +156,14 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
} }
leaseApplyInfo.setUpdateTime(DateUtils.getNowDate()); leaseApplyInfo.setUpdateTime(DateUtils.getNowDate());
leaseApplyInfo.setStatus(String.valueOf(LeaseTaskStatusEnum.LEASE_TASK_PUBLISHED.getStatus())); leaseApplyInfo.setStatus(String.valueOf(LeaseTaskStatusEnum.LEASE_TASK_TO_STOCK_OUT.getStatus()));
try { try {
int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo); int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo);
if (result > 0) { if (result > 0) {
// 同步修改tm_task任务状态 // 同步修改tm_task任务状态, 如果不需要审核，改成LEASE_TASK_TO_STOCK_OUT， 如果需要审核，改成 LEASE_TASK_TO_AUDIT
TmTask tmTask = new TmTask(); TmTask tmTask = new TmTask();
tmTask.setTaskId(leaseApplyInfo.getTaskId()); 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); tmTaskMapper.updateTmTask(tmTask);
return AjaxResult.success("发布成功"); return AjaxResult.success("发布成功");
} }

9
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
View File

@ -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.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.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, 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.pre_num),0) as preCountNum,
IFNULL(sum(lad.al_num),0) as alNum IFNULL(sum(lad.al_num),0) as alNum
from from
@ -75,7 +75,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="directAuditTime != null "> and lai.direct_audit_time = #{directAuditTime}</if> <if test="directAuditTime != null "> and lai.direct_audit_time = #{directAuditTime}</if>
<if test="directAuditRemark != null and directAuditRemark != ''"> and lai.direct_audit_remark = #{directAuditRemark}</if> <if test="directAuditRemark != null and directAuditRemark != ''"> and lai.direct_audit_remark = #{directAuditRemark}</if>
<if test="companyId != null "> and lai.company_id = #{companyId}</if> <if test="companyId != null "> and lai.company_id = #{companyId}</if>
<if test="status != null and status != ''"> and lai.status = #{status}</if> <if test="statusList != null and statusList.size() > 0">
and tt.task_status in
<foreach item="item" collection="statusList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="directId != null "> and lai.direct_id = #{directId}</if> <if test="directId != null "> and lai.direct_id = #{directId}</if>
<if test="leaseType != null and leaseType != ''"> and lai.lease_type = #{leaseType}</if> <if test="leaseType != null and leaseType != ''"> and lai.lease_type = #{leaseType}</if>
<if test="estimateLeaseTime != null "> and lai.estimate_lease_time = #{estimateLeaseTime}</if> <if test="estimateLeaseTime != null "> and lai.estimate_lease_time = #{estimateLeaseTime}</if>