From e8f5d1b2fa47813cce38ca7c39bd5cf9c6de5ea2 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 3 Jun 2025 16:42:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/domain/lease/LeaseOutDetails.java | 2 +- .../common/biz/enums/LeaseTaskStatusEnum.java | 2 +- .../lease/domain/LeaseOutDetailsInfo.java | 27 +++++++++---------- .../impl/LeaseOutDetailsServiceImpl.java | 9 +++++-- .../material/lease/LeaseApplyInfoMapper.xml | 10 +++---- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java index 72139d12..8642a4c3 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java @@ -64,7 +64,7 @@ public class LeaseOutDetails extends BaseEntity { @ApiModelProperty(value = "二维码code") private String qrCode; - @ApiModelProperty(value = "出库方式 0数量，1编码，2二维码，3标准箱") + @ApiModelProperty(value = "出库方式 0 编码，1 数量，2 二维码，3 RFID, 4 OCR") private Integer outType; /** 预领料数 */ 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 a9149599..b06cdc8f 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 @@ -15,7 +15,7 @@ public enum LeaseTaskStatusEnum { LEASE_TASK_TO_PUBLISHED(1, "待出库"), LEASE_TASK_TO_AUDIT(2, "已终止"), LEASE_TASK_IN_PROGRESS(3, "出库进行中"), - LEASE_TASK_FINISHED(4, "出库已完成"), + LEASE_TASK_FINISHED(4, "已提交"), LEASE_AUDIT_ING(6, "审核中"); private final Integer status; private final String statusName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseOutDetailsInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseOutDetailsInfo.java index 478919ab..4407eb05 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseOutDetailsInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseOutDetailsInfo.java @@ -75,16 +75,16 @@ public class LeaseOutDetailsInfo { @ApiModelProperty(value = "计量单位数值") private String unitValue; - /** 预领料数 */ - @Excel(name = "预领数量") - @ApiModelProperty(value = "预领料数") - private BigDecimal preNum; - /** 库存数量 */ @ApiModelProperty(value = "库存数量") @Excel(name = "当前库存") private BigDecimal storageNum; + /** 预领料数 */ + @Excel(name = "预领数量") + @ApiModelProperty(value = "预领料数") + private BigDecimal preNum; + @ApiModelProperty(value = "已发布数量") private BigDecimal publishNum; @@ -98,21 +98,20 @@ public class LeaseOutDetailsInfo { @ApiModelProperty(value = "审批数量") private BigDecimal auditNum; - /** 已领数量 */ - @ApiModelProperty(value = "已领数量") - @Excel(name = "出库数量") - private BigDecimal alNum; - - @ApiModelProperty(name = "装备管理方式") - @Excel(name = "管理模式") - private String manageType; - /** * 此数量是剩余需要出库的数量（preNum - alNum） */ @ApiModelProperty(value = "剩余最大出库数量") + @Excel(name = "出库数量") private BigDecimal outNum; + /** 已领数量 */ + @ApiModelProperty(value = "已领数量") + private BigDecimal alNum; + + @ApiModelProperty(name = "装备管理方式") + private String manageType; + /** 备注 */ @ApiModelProperty(value = "备注") @Excel(name = "备注") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java index 0c2506fe..e5ffc913 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java @@ -176,7 +176,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { // 根据typeId去lease_apply_details表查询设备是否存在 LeaseApplyDetails leaseApplyDetails = leaseApplyDetailsMapper.selectLeaseApplyDetailsByTypeId(record); if (leaseApplyDetails != null) { - return AjaxResult.error("此设备已经申请领料，请勿重复申请"); + return AjaxResult.error("此类型设备在该领料单中已经申请领料，请勿重复申请"); } } record.setPreStoreNum(getStorageNum(record)); @@ -221,6 +221,11 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { if (res == 0) { throw new RuntimeException("出库失败,修改任务状态失败"); }*/ + // 修改任务为待提交状态 + res = updateTaskStatus(record); + if (res == 0) { + throw new RuntimeException("出库失败,修改任务状态失败"); + } // 5、插入结算记录 String taskId = leaseApplyInfoMapper.getTaskId(record.getParentId()); record.setTaskId(taskId); @@ -401,7 +406,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { */ private int updateTaskStatus(LeaseOutDetails record) { String taskId = leaseApplyInfoMapper.getTaskId(record.getParentId()); - return tmTaskMapper.updateTaskStatus(taskId, LeaseTaskStatusEnum.LEASE_TASK_FINISHED.getStatus()); + return tmTaskMapper.updateTaskStatus(taskId, LeaseTaskStatusEnum.LEASE_TASK_SUBMIT.getStatus()); } private int checkStorageNum(LeaseOutDetails record) { 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 7291e0e7..dc1b7a4e 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 @@ -421,11 +421,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"