From 9ed53c9c869142e0117832c164bdb045d0af836e Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 9 Nov 2023 08:59:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...PurchasereceiptRequestMainCreateReqVO.java | 3 +- .../PurchasereceiptRequestMainService.java | 4 +-- ...PurchasereceiptRequestMainServiceImpl.java | 34 +++++++++++++------ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainCreateReqVO.java index 9a86508e..3347b443 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainCreateReqVO.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import javax.validation.Valid; import java.util.List; @Schema(description = "管理后台 - 采购收货申请主创建 Request VO") @@ -16,5 +17,5 @@ public class PurchasereceiptRequestMainCreateReqVO extends PurchasereceiptReques @SubObject @Schema(description = "子表数据") - private List subList; + private List<@Valid PurchasereceiptRequestDetailCreateReqVO> subList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java index 65bdb60c..253ec0f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java @@ -37,14 +37,14 @@ public interface PurchasereceiptRequestMainService { * * @param updateReqVO 更新信息 */ - void updatePurchasereceiptRequestMain(@Valid PurchasereceiptRequestMainUpdateReqVO updateReqVO); + Integer updatePurchasereceiptRequestMain(@Valid PurchasereceiptRequestMainUpdateReqVO updateReqVO); /** * 删除采购收货申请主 * * @param id 编号 */ - void deletePurchasereceiptRequestMain(Long id); + Integer deletePurchasereceiptRequestMain(Long id); /** * 获得采购收货申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index 67cfc4bc..9ae279f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -28,9 +28,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import javax.validation.Validator; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import java.util.*; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASECLAIM_REQUEST_IMPORT_LIST_IS_EMPTY; @@ -65,30 +63,44 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq @Override public Long createPurchasereceiptRequestMain(PurchasereceiptRequestMainCreateReqVO createReqVO) { // 插入 - PurchasereceiptRequestMainDO purchasereceiptRequestMain = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO); - purchasereceiptRequestMainMapper.insert(purchasereceiptRequestMain); + PurchasereceiptRequestMainDO mainDo = PurchasereceiptRequestMainConvert.INSTANCE.convert(createReqVO); + List subDOList = PurchasereceiptRequestDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); + String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode()); + mainDo.setNumber(number); + mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增")); + purchasereceiptRequestMainMapper.insert(mainDo); + for (PurchasereceiptRequestDetailDO detailDO : subDOList) { + detailDO.setMasterId(mainDo.getId()); + detailDO.setNumber(number); + } + purchasereceiptRequestDetailMapper.insertBatch(subDOList); // 返回 - return purchasereceiptRequestMain.getId(); + return mainDo.getId(); } @Override - public void updatePurchasereceiptRequestMain(PurchasereceiptRequestMainUpdateReqVO updateReqVO) { + public Integer updatePurchasereceiptRequestMain(PurchasereceiptRequestMainUpdateReqVO updateReqVO) { // 校验存在 validatePurchasereceiptRequestMainExists(updateReqVO.getId()); // 更新 PurchasereceiptRequestMainDO updateObj = PurchasereceiptRequestMainConvert.INSTANCE.convert(updateReqVO); - purchasereceiptRequestMainMapper.updateById(updateObj); + return purchasereceiptRequestMainMapper.updateById(updateObj); } @Override public PageResult getPurchasereceiptRequestMainSenior(CustomConditions conditions) { return purchasereceiptRequestMainMapper.selectSenior(conditions); } @Override - public void deletePurchasereceiptRequestMain(Long id) { + public Integer deletePurchasereceiptRequestMain(Long id) { // 校验存在 validatePurchasereceiptRequestMainExists(id); - // 删除 - purchasereceiptRequestMainMapper.deleteById(id); + // 删除子表数据 + Map map = new HashMap<>(); + map.put("master_id", id); + //删除子表 + purchasereceiptRequestDetailMapper.deleteByMap(map); + // 删除主表 + return purchasereceiptRequestMainMapper.deleteById(id); } private void validatePurchasereceiptRequestMainExists(Long id) {