From 5490fd2e8f5bbb5dda12f2a15ba1c9bc4d2517f2 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 23 Apr 2024 17:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=A5=97=E6=8A=B1=E6=9D=86=E6=9C=BA?= =?UTF-8?q?=E5=85=B7=E9=AA=8C=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/material/domain/MachinePart.java | 1 + .../material/mapper/PurchaseMacodeInfoMapper.java | 3 +++ .../impl/PurchaseMacodeInfoServiceImpl.java | 15 +++++++++++++++ .../mapper/material/PurchaseCheckInfoMapper.xml | 1 + .../mapper/material/PurchaseMacodeInfoMapper.xml | 4 ++++ 5 files changed, 24 insertions(+) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java index 04cb1536..e168051d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java @@ -12,4 +12,5 @@ public class MachinePart { private String unitName; private String typeName; private Integer partNum; + private Integer typeId; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java index 44f617af..37ede482 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java @@ -7,6 +7,7 @@ import com.bonus.sgzb.base.api.domain.MaMachineLabel; import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.material.domain.InputApplyDetails; import com.bonus.sgzb.material.domain.MaInputRecord; +import com.bonus.sgzb.material.domain.MachinePart; import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -277,4 +278,6 @@ public interface PurchaseMacodeInfoMapper { * @return */ int selectPurchaseCheckDetailsStatus(Long taskId); + + int updateMaTypeNum(MachinePart wholeSetDetail); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index f2c31785..bfef04db 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -13,6 +13,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.mapper.*; +import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.material.vo.EquipmentNumberVO; @@ -39,6 +40,9 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService @Resource private TaskMapper taskMapper; + @Autowired + private IPurchaseCheckInfoService purchaseCheckInfoService; + @Resource private BmQrcodeInfoMapper qrcodeInfoMapper; @@ -298,6 +302,17 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService .add(maType.getNum() == null ? new BigDecimal(0) : maType.getNum())); purchaseMacodeInfoMapper.updateTypeByTypeId(maType); + //判断是否是成套机具,是的话配件库存也要增加 + if ("2".equals(maType.getManageType())){ + PurchaseCheckInfo purchaseCheckInfo = new PurchaseCheckInfo(); + purchaseCheckInfo.setPurchaseNum(maInputRecord.getInputNum().toString()); + purchaseCheckInfo.setTypeId(maInputRecord.getTypeId()); + List wholeSetDetails = purchaseCheckInfoService.getWholeSetDetails(purchaseCheckInfo); + for (MachinePart wholeSetDetail : wholeSetDetails) { + purchaseMacodeInfoMapper.updateMaTypeNum(wholeSetDetail); + } + } + BigDecimal inputNum = checkDetailsMapper.selectInputNumByTypeId(taskId, typeId); PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails(); purchaseCheckDetails.setTaskId(taskId); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml index e097c7a1..649bc681 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml @@ -312,6 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"