From 14822542ceb8d5a650f6c76ff960f5b806adff2c Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Thu, 25 Apr 2024 16:43:56 +0800 Subject: [PATCH] =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/TmTaskController.java | 20 +++++++++++++++---- .../app/mapper/LeaseOutDetailsMapper.java | 2 ++ .../impl/LeaseOutDetailsServiceImpl.java | 2 ++ .../bonus/sgzb/base/service/ITypeService.java | 1 - .../mapper/app/LeaseOutDetailsMapper.xml | 8 ++++++++ .../material/PurchaseMacodeInfoMapper.xml | 2 +- 6 files changed, 29 insertions(+), 6 deletions(-) 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 ba9a7a61..d4abd8bc 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 @@ -4,10 +4,9 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.PhoneUtil; import com.bonus.sgzb.app.domain.*; -import com.bonus.sgzb.app.service.LeaseApplyDetailsService; -import com.bonus.sgzb.app.service.LeaseApplyInfoService; -import com.bonus.sgzb.app.service.LeaseUserBookService; -import com.bonus.sgzb.app.service.TmTaskService; +import com.bonus.sgzb.app.service.*; +import com.bonus.sgzb.base.api.domain.MaType; +import com.bonus.sgzb.base.service.ITypeService; import com.bonus.sgzb.common.core.utils.ListPagingUtil; import com.bonus.sgzb.common.core.utils.ServletUtils; import com.bonus.sgzb.common.core.utils.StringUtils; @@ -25,6 +24,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -59,6 +59,9 @@ public class TmTaskController extends BaseController { @Autowired private LeaseUserBookService leaseUserBookService; + @Resource + private ITypeService iTypeService; + private final static String STRING_ADMIN = "admin"; /** @@ -245,6 +248,15 @@ public class TmTaskController extends BaseController { } } } + //修改库存 + List leaseApplyDetailsList = task.getLeaseApplyDetails(); + MaType maType = new MaType(); + for (LeaseApplyDetails leaseApplyDetails : leaseApplyDetailsList) { + maType.setTypeId(Long.valueOf(leaseApplyDetails.getTypeId())); + maType.setNum(BigDecimal.valueOf(leaseApplyDetails.getNum()-leaseApplyDetails.getPreNum())); + iTypeService.updateMaType(maType); + } + if (StringUtils.isEmpty(taskId)) { return AjaxResult.error("任务编号为空,创建失败"); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index 89e7e4dc..6dceec1d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java @@ -101,4 +101,6 @@ public interface LeaseOutDetailsMapper { int updateMaTypeStockNumCt(TmTask record); int getmaChineByCt(LeaseOutDetails record); + + void updateMaTypeNum(LeaseApplyDetails leaseApplyDetails); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index e8182fdb..83f26814 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -216,6 +216,8 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { MachinePart machinePart = leaseOutDetailsMapper.getMachineParts(typeId); machinePart.setPartNum((int) (typeId.getPartNum() * record.getOutNum())); typeId.setNum(machinePart.getNum() - machinePart.getPartNum()); + + res = leaseOutDetailsMapper.updateMaTypeStockNumCt(typeId); } } else { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java index 6e662b89..6eff718d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java @@ -69,5 +69,4 @@ public interface ITypeService { List getEquipmentType(Long typeId, String typeName); - } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index e476aa13..fd1ad9dd 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -307,6 +307,14 @@ WHERE type_id = #{typeId} + + UPDATE + ma_type + SET + num = #{num} ,update_time = NOW() + WHERE + type_id = #{typeId} + insert into tm_task_agreement diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index 05a64e5b..e9526d6e 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"