From 0c1ff60250e5bcd6ee4c14307ad2113be0c09f1e Mon Sep 17 00:00:00 2001 From: wcy <761646706@qq.com> Date: Fri, 23 Aug 2024 16:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=AA=8C=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E5=BA=93=20=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BpmPurchaseStorageController.java | 18 +++++++------ .../purchase/dto/PurchaseStorageDto.java | 3 +++ .../mapper/BpmPurchaseStorageMapper.java | 10 ++++++++ .../service/BpmPurchaseStorageService.java | 9 +++++++ .../impl/BpmPurchaseStorageServiceImpl.java | 25 +++++++++++++++++++ .../mapper/BpmPurchaseStorageMapper.xml | 22 ++++++++++++++++ 6 files changed, 80 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java index 554bb6d..4815d67 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java @@ -1,5 +1,6 @@ package com.bonus.purchase.controller; +import com.bonus.base.api.domain.MaType; import com.bonus.common.core.domain.ResultBean; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -26,7 +27,7 @@ import java.util.List; @RequestMapping("/purchase/store") public class BpmPurchaseStorageController extends BaseController { - + @Autowired private BpmPurchaseStorageService purchaseStorageService; @Autowired @@ -55,19 +56,22 @@ public class BpmPurchaseStorageController extends BaseController { /* * 入库 * */ - @PostMapping(value = "") + @PostMapping public int warehouse(PurchaseStorageDto purchaseStorageDto) { - bpmPurchaseInfoService.updateStatusByIdIn(Integer.valueOf(purchaseStorageDto.getStatus()),purchaseStorageDto.getId()); PurchaseStorageDto purchaseStorageDto1 = purchaseStorageService.selectByPrimaryKey(purchaseStorageDto.getId()); - if (purchaseStorageDto1.getId() == null){ - throw new RuntimeException("未找到对应的数据"); + MaType maType = purchaseStorageService.selectByTypeId(purchaseStorageDto1.getTypeId()); + + if (maType.getManageType() == "1"){ + int status = purchaseStorageService.updateStorageNum(purchaseStorageDto1.getInputNum(),purchaseStorageDto1.getTypeId()); + }else { + int status = purchaseStorageService.insertMaMachine(purchaseStorageDto1); } - return purchaseStorageService.insertWarehouse(purchaseStorageDto1); + return purchaseStorageService.setStatus(); } /* * 入库驳回 * */ - @PutMapping(value = "reject") + @PutMapping(value = "/reject") public int reject(PurchaseStorageDto purchaseStorageDto) { return bpmPurchaseInfoService.updateStatusByIdIn(Integer.valueOf(purchaseStorageDto.getStatus()),purchaseStorageDto.getId()); } diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseStorageDto.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseStorageDto.java index b7d48d5..73a61b0 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseStorageDto.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseStorageDto.java @@ -19,6 +19,9 @@ public class PurchaseStorageDto { @ApiModelProperty(value="供应商id") private Integer supplierId; + @ApiModelProperty(value="入库数量") + private Integer inputNum; + @ApiModelProperty(value = "开始时间") private String startTime; diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseStorageMapper.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseStorageMapper.java index 606bfee..e4332a1 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseStorageMapper.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseStorageMapper.java @@ -1,5 +1,7 @@ package com.bonus.purchase.mapper; +import com.bonus.base.api.domain.MaMachine; +import com.bonus.base.api.domain.MaType; import com.bonus.purchase.domain.PurchaseStorageDto; import com.bonus.purchase.vo.PurchaseVo; @@ -15,5 +17,13 @@ public interface BpmPurchaseStorageMapper { int insertWarehouse(PurchaseStorageDto purchaseStorageDto); + + MaType selectByTypeId(Integer typeId); + + int updateStorageNum(Integer inputNum, Integer typeId); + + int setStatus(); + + int insertmaMachine(MaMachine maMachine); } diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseStorageService.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseStorageService.java index 8abf49f..e5be03b 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseStorageService.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseStorageService.java @@ -1,5 +1,6 @@ package com.bonus.purchase.service; +import com.bonus.base.api.domain.MaType; import com.bonus.purchase.domain.PurchaseStorageDto; import com.bonus.purchase.vo.PurchaseVo; @@ -30,4 +31,12 @@ public interface BpmPurchaseStorageService { int insertWarehouse(PurchaseStorageDto purchaseStorageDto); + + MaType selectByTypeId(Integer typeId); + + int updateStorageNum(Integer inputNum, Integer typeId); + + int setStatus(); + + int insertMaMachine(PurchaseStorageDto purchaseStorageDto1); } diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseStorageServiceImpl.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseStorageServiceImpl.java index 14cd693..a530676 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseStorageServiceImpl.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseStorageServiceImpl.java @@ -1,5 +1,7 @@ package com.bonus.purchase.service.impl; +import com.bonus.base.api.domain.MaMachine; +import com.bonus.base.api.domain.MaType; import com.bonus.purchase.domain.PurchaseStorageDto; import com.bonus.purchase.mapper.BpmPurchaseStorageMapper; import com.bonus.purchase.service.BpmPurchaseStorageService; @@ -37,6 +39,29 @@ public class BpmPurchaseStorageServiceImpl implements BpmPurchaseStorageService return bpmPurchaseStorageMapper.insertWarehouse(purchaseStorageDto); } + @Override + public MaType selectByTypeId(Integer typeId) { + return bpmPurchaseStorageMapper.selectByTypeId(typeId); + } + + @Override + public int updateStorageNum(Integer inputNum, Integer typeId) { + return bpmPurchaseStorageMapper.updateStorageNum(inputNum,typeId); + } + + @Override + public int setStatus() { + return bpmPurchaseStorageMapper.setStatus(); + } + + @Override + public int insertMaMachine(PurchaseStorageDto purchaseStorageDto1) { + MaMachine maMachine = new MaMachine(); + maMachine.setTypeId(purchaseStorageDto1.getTypeId()); + maMachine.setStatus(String.valueOf(61)); + maMachine.setPurchaseId(String.valueOf(purchaseStorageDto1.getId())); + return bpmPurchaseStorageMapper.insertmaMachine(maMachine); + } } diff --git a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseStorageMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseStorageMapper.xml index 60103da..ca10b84 100644 --- a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseStorageMapper.xml +++ b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseStorageMapper.xml @@ -9,6 +9,24 @@ #{id},#{taskId},#{typeId},#{maId},#{manageType},#{creator},#{createTime},#{status},#{inputNum},#{inputType} ) + + INSERT INTO ma_machine( + type_id,purchase_id,ma_code + )VALUES + ( + #{typeId},#{purchaseId},null + ) + + + UPDATE ma_type + SET storage_num = #{inputNum} + storage_num + WHERE + id = #{typeId} + + + update bpm_purchase_info + SET status = '61' + +