From 308f17789a036298147de688b86295e2d81c63dc Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 14 Nov 2024 12:58:07 +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 --- .../biz/enums/MaTypeManageTypeEnum.java | 3 +- .../controller/LeaseApplyInfoController.java | 6 +-- .../lease/service/ILeaseApplyInfoService.java | 2 +- .../service/ILeaseOutDetailsService.java | 3 +- .../impl/LeaseApplyInfoServiceImpl.java | 4 +- .../impl/LeaseOutDetailsServiceImpl.java | 43 ++++++++----------- 6 files changed, 27 insertions(+), 34 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MaTypeManageTypeEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MaTypeManageTypeEnum.java index 22c8fddb..ea7c4d05 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MaTypeManageTypeEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MaTypeManageTypeEnum.java @@ -5,7 +5,8 @@ import lombok.Getter; @Getter public enum MaTypeManageTypeEnum { CODE_DEVICE(0, "编码设备"), - NUMBER_DEVICE(1, "数量设备"),; + NUMBER_DEVICE(1, "数量设备"), + SET_DEVICE(2, "成套设备"); private final Integer typeId; private final String typeName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java index 06fa72e9..79707d89 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java @@ -135,10 +135,10 @@ public class LeaseApplyInfoController extends BaseController { @PreventRepeatSubmit //@RequiresPermissions("lease:info:add") @SysLog(title = "领料出库", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->领料出库") - @PostMapping("/submitOut") - public AjaxResult submitOut(@NotNull(message = "领料出库信息不能为空") @RequestBody LeaseOutRequestVo leaseOutRequestVo) { + @PostMapping("/leaseOut") + public AjaxResult leaseOut(@NotNull(message = "领料出库信息不能为空") @RequestBody LeaseOutRequestVo leaseOutRequestVo) { try { - return leaseApplyInfoService.submitOut(leaseOutRequestVo); + return leaseApplyInfoService.leaseOut(leaseOutRequestVo); } catch (Exception e) { return error("系统错误, " + e.getMessage()); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java index 89e7a2a3..8eed7439 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java @@ -60,7 +60,7 @@ public interface ILeaseApplyInfoService { * @param leaseOutRequestVo 领料：出库 * @return 结果 */ - AjaxResult submitOut(LeaseOutRequestVo leaseOutRequestVo); + AjaxResult leaseOut(LeaseOutRequestVo leaseOutRequestVo); /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java index f348e599..978369f4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java @@ -60,5 +60,6 @@ public interface ILeaseOutDetailsService { */ int deleteLeaseOutDetailsById(Long id); - public AjaxResult submitOut(LeaseOutDetails record); + public AjaxResult leaseOut(LeaseOutDetails record); + } 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 c0e2abf8..b50dcf10 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 @@ -247,9 +247,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { * @return 结果 */ @Override - public AjaxResult submitOut(LeaseOutRequestVo leaseOutRequestVo) { + public AjaxResult leaseOut(LeaseOutRequestVo leaseOutRequestVo) { for (LeaseOutDetails bean : leaseOutRequestVo.getLeaseOutDetailsList()) { - AjaxResult ajaxResult = leaseOutDetailsService.submitOut(bean); + AjaxResult ajaxResult = leaseOutDetailsService.leaseOut(bean); if (ajaxResult.isError()) { return ajaxResult; } 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 b44596fc..e354fda5 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 @@ -1,21 +1,17 @@ package com.bonus.material.lease.service.impl; import java.math.BigDecimal; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Objects; -import com.alibaba.fastjson2.JSONObject; import com.bonus.common.biz.constant.MaterialConstants; -import com.bonus.common.biz.utils.HttpHelper; +import com.bonus.common.biz.enums.MaTypeManageTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.lease.domain.LeaseApplyDetails; import com.bonus.material.lease.mapper.LeaseApplyDetailsMapper; -import com.bonus.material.ma.domain.Machine; import com.bonus.material.ma.domain.Type; import com.bonus.material.settlement.domain.SltAgreementInfo; import com.bonus.material.task.domain.TmTask; @@ -73,7 +69,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { @Override public AjaxResult insertLeaseOutDetails(List leaseOutDetailsList) { for (LeaseOutDetails bean : leaseOutDetailsList) { - AjaxResult ajaxResult = submitOut(bean); + AjaxResult ajaxResult = leaseOut(bean); if (ajaxResult.isError()) { return ajaxResult; } @@ -127,18 +123,19 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { */ @Override @Transactional(rollbackFor = Exception.class) - public AjaxResult submitOut(LeaseOutDetails record) { + public AjaxResult leaseOut(LeaseOutDetails record) { int res = 0; try { - // 1、判断是否重复提交 - res = checkRepeatSubmit(record); + // 1、判断库存是否足够 + boolean isEnough = checkStorageIsEnough(record); //record.setPreStoreNum(getStorageNum(record)); - if (res > 0) { - if ((record.getManageType() == 1 || record.getManageType() == 2) && record.getInputNum() != null) { + if (isEnough) { + if ((record.getManageType() == MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId() || + record.getManageType() == MaTypeManageTypeEnum.SET_DEVICE.getTypeId()) && record.getInputNum() != null) { record.setOutNum(record.getInputNum()); } //2、判断成套机具出库库存是否足够 - if (record.getManageType() == 2) { + if (record.getManageType() == MaTypeManageTypeEnum.SET_DEVICE.getTypeId()) { res = checkStorageNumCt(record); if (res == 0) { throw new RuntimeException("出库失败,库存不足"); @@ -177,29 +174,23 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { return AjaxResult.success("出库成功"); } - private int checkRepeatSubmit(LeaseOutDetails record) { - String maStatus = "15"; - int res = 0; - if (record.getManageType() == 1 || record.getManageType() == 2) { - // 如果是数量出库校验待出库数量 + // 判断库存是否足够 + private boolean checkStorageIsEnough(LeaseOutDetails record) { + String maStatus = "1"; + if (record.getManageType() == MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId() || record.getManageType() == MaTypeManageTypeEnum.SET_DEVICE.getTypeId()) { LeaseApplyDetails details = leaseOutDetailsMapper.getOutboundNum(record); if (details == null) { - return res; - } else { - res = 1; + return false; } - } else { - // 如果是编码出库判断是否在库 + } else if (record.getManageType() == MaTypeManageTypeEnum.CODE_DEVICE.getTypeId()) { if (!(Objects.equals(0, record.getMaId()) || record.getMaId() == null)) { String status = leaseOutDetailsMapper.getMachineStatus(record); if (!maStatus.equals(status)) { - return res; - } else { - res = 1; + return false; } } } - return res; + return true; } private int checkStorageNumCt(LeaseOutDetails record) {