采购收货申请增删改查接口

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<PurchasereceiptRequestDetailCreateReqVO> subList;
+    private List<@Valid PurchasereceiptRequestDetailCreateReqVO> subList;
 }

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);
 
     /**
      * 获得采购收货申请主

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<PurchasereceiptRequestDetailDO> 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<PurchasereceiptRequestMainDO> getPurchasereceiptRequestMainSenior(CustomConditions conditions) {
         return purchasereceiptRequestMainMapper.selectSenior(conditions);
     }
     @Override
-    public void deletePurchasereceiptRequestMain(Long id) {
+    public Integer deletePurchasereceiptRequestMain(Long id) {
         // 校验存在
         validatePurchasereceiptRequestMainExists(id);
-        // 删除
-        purchasereceiptRequestMainMapper.deleteById(id);
+        // 删除子表数据
+        Map<String, Object> map = new HashMap<>();
+        map.put("master_id", id);
+        //删除子表
+        purchasereceiptRequestDetailMapper.deleteByMap(map);
+        // 删除主表
+        return purchasereceiptRequestMainMapper.deleteById(id);
     }
 
     private void validatePurchasereceiptRequestMainExists(Long id) {