Merge remote-tracking branch 'origin/master_hella' into master_hella

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java

@@ -17,7 +17,6 @@ import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRe
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService;
 import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
-import com.win.module.wms.service.supplierdeliverRequest.SupplierdeliverRequestMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -50,6 +49,12 @@ public class SupplierdeliverRecordMainController {
     @Resource
     private DeptApi deptApi;
 
+    @PostMapping("/createMq")
+    @Operation(summary = "创建供应商发货记录主(Mq专用)")
+    @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:create')")
+    public CommonResult<Long> createSupplierdeliverRecordMainMq(@Valid @RequestBody SupplierdeliverRecordMainCreateReqVO createReqVO) {
+        return success(supplierdeliverRecordMainService.createSupplierdeliverRecordMainMq(createReqVO));
+    }
 
     @PostMapping("/create")
     @Operation(summary = "创建供应商发货记录主")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainCreateReqVO.java

@@ -1,7 +1,14 @@
 package com.win.module.wms.controller.supplierdeliverRecord.vo;
 
-import lombok.*;
+import com.win.framework.excel.core.annotations.SubObject;
+import com.win.module.wms.controller.labelBarbasic.vo.BarbasicCreateReqVO;
+import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.util.List;
 
 @Schema(description = "管理后台 - 供应商发货记录主创建 Request VO")
 @Data
@@ -9,4 +16,15 @@ import io.swagger.v3.oas.annotations.media.Schema;
 @ToString(callSuper = true)
 public class SupplierdeliverRecordMainCreateReqVO extends SupplierdeliverRecordMainBaseVO {
 
+    @SubObject
+    @Schema(description = "子表数据")
+    private List<SupplierdeliverRecordDetailCreateReqVO> subList;
+
+    @Schema(description = "包装数据")
+    private List<PackageCreateReqVO> packageList;
+
+
+    @Schema(description = "条码数据")
+    private List<BarbasicCreateReqVO> barbasicList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/labelBarbasic/BarbasicConvert.java

@@ -1,16 +1,15 @@
 package com.win.module.wms.convert.labelBarbasic;
 
-import java.util.*;
-
 import com.win.framework.common.pojo.PageResult;
-
 import com.win.module.wms.controller.labelBarbasic.vo.BarbasicCreateReqVO;
 import com.win.module.wms.controller.labelBarbasic.vo.BarbasicExcelVO;
 import com.win.module.wms.controller.labelBarbasic.vo.BarbasicRespVO;
 import com.win.module.wms.controller.labelBarbasic.vo.BarbasicUpdateReqVO;
+import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO;
+
+import java.util.List;
 
 /**
  * 条码实体基类 Convert
@@ -32,6 +31,8 @@ public interface BarbasicConvert {
 
     PageResult<BarbasicRespVO> convertPage(PageResult<BarbasicDO> page);
 
+    List<BarbasicDO> convertList01(List<BarbasicCreateReqVO> list);
+
     List<BarbasicExcelVO> convertList02(List<BarbasicDO> list);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java

@@ -1,17 +1,15 @@
 package com.win.module.wms.convert.packageMassage;
 
-import java.util.*;
-
 import com.win.framework.common.pojo.PageResult;
-
 import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO;
 import com.win.module.wms.controller.packageMassage.vo.PackageExcelVO;
 import com.win.module.wms.controller.packageMassage.vo.PackageRespVO;
 import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO;
-import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO;
+import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
+
+import java.util.List;
 
 /**
  * 包装 Convert
@@ -36,4 +34,6 @@ public interface PackageConvert {
     List<PackageExcelVO> convertList02(List<PackageDO> list);
 
     PackageCreateReqVO convert01(PackageDO labelExist);
+
+    List<PackageDO> convertList01(List<PackageCreateReqVO> list);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/supplierdeliverRecord/SupplierdeliverRecordDetailConvert.java

@@ -1,16 +1,15 @@
 package com.win.module.wms.convert.supplierdeliverRecord;
 
-import java.util.*;
-
 import com.win.framework.common.pojo.PageResult;
-
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailCreateReqVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailExcelVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailRespVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailUpdateReqVO;
+import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
+
+import java.util.List;
 
 /**
  * 供应商发货记录子 Convert
@@ -34,4 +33,6 @@ public interface SupplierdeliverRecordDetailConvert {
 
     List<SupplierdeliverRecordDetailExcelVO> convertList02(List<SupplierdeliverRecordDetailDO> list);
 
+    List<SupplierdeliverRecordDetailDO> convertList03(List<SupplierdeliverRecordDetailCreateReqVO> list);
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java

@@ -232,7 +232,7 @@ public class PackageServiceImpl implements PackageService {
      */
     @Override
     @Transactional
-    public void generateLabel (PackageDO packageDO) {
+    public void generateLabel(PackageDO packageDO) {
         BarbasicDO barbasicDO = new BarbasicDO();
         // 自动生成流水
         String number = serialNumberApi.generateCode(RuleCodeEnum.LABEL_NUMBER.getCode());
@@ -274,6 +274,8 @@ public class PackageServiceImpl implements PackageService {
             contentStr.append(pChar + subClassObject + separators);
         }
         barbasicDO.setBarcodeString(headerStr + contentStr);
+        //关联号设置为包装号
+        barbasicDO.setRelateNumber(packageDO.getNumber());
         barbasicMapper.insert(barbasicDO);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java

@@ -21,6 +21,13 @@ import java.util.Map;
  */
 public interface SupplierdeliverRecordMainService {
 
+    /**
+     * 创建供应商发货记录主(Mq专用)
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createSupplierdeliverRecordMainMq(@Valid SupplierdeliverRecordMainCreateReqVO createReqVO);
     /**
      * 创建供应商发货记录主
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java

@@ -8,15 +8,21 @@ import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRec
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainUpdateReqVO;
+import com.win.module.wms.convert.labelBarbasic.BarbasicConvert;
+import com.win.module.wms.convert.packageMassage.PackageConvert;
+import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordDetailConvert;
 import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordMainConvert;
-import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO;
+import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO;
-import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO;
+import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
 import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
 import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO;
+import com.win.module.wms.dal.mysql.labelBarbasic.BarbasicMapper;
+import com.win.module.wms.dal.mysql.packageMassage.PackageMapper;
 import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordDetailMapper;
 import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordMainMapper;
 import com.win.module.wms.service.supplierdeliverRequest.SupplierdeliverRequestMainService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -43,7 +49,34 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco
     private SupplierdeliverRecordDetailMapper supplierdeliverRecordDetailMapper;
     @Resource
     private SupplierdeliverRequestMainService supplierdeliverRequestMainService;
+    @Resource
+    private PackageMapper packageMapper;
+    @Resource
+    private BarbasicMapper barbasicMapper;
 
+    @Override
+    @Transactional
+    public Long createSupplierdeliverRecordMainMq(SupplierdeliverRecordMainCreateReqVO createReqVO) {
+        // 插入
+        SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = SupplierdeliverRecordMainConvert.INSTANCE.convert(createReqVO);
+        supplierdeliverRecordMainDO.setId(null);
+        supplierdeliverRecordMainMapper.insert(supplierdeliverRecordMainDO);
+        List<SupplierdeliverRecordDetailDO> supplierdeliverRecordDetailDOList = SupplierdeliverRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList());
+        for(SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO : supplierdeliverRecordDetailDOList) {
+            supplierdeliverRecordDetailDO.setId(null);
+            supplierdeliverRecordDetailDO.setMasterId(supplierdeliverRecordMainDO.getId());
+            supplierdeliverRecordDetailMapper.insert(supplierdeliverRecordDetailDO);
+        }
+        //包装信息
+        //不置空id
+        List<PackageDO> packageDOList = PackageConvert.INSTANCE.convertList01(createReqVO.getPackageList());
+        packageMapper.insertBatch(packageDOList);
+        //条码信息
+        List<BarbasicDO> barbasicDOList = BarbasicConvert.INSTANCE.convertList01(createReqVO.getBarbasicList());
+        barbasicMapper.insertBatch(barbasicDOList);
+        // 返回
+        return supplierdeliverRecordMainDO.getId();
+    }
 
     @Override
     public Long createSupplierdeliverRecordMain(SupplierdeliverRecordMainCreateReqVO createReqVO) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java

@@ -177,12 +177,11 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         validateSupplierdeliverRequestMainExists(updateReqVO.getId());
         // 更新主表
         SupplierdeliverRequestMainDO supplierdeliverRequestMainDO = validatorToUpdate(updateReqVO);
-        if (RequestStatusEnum.HANDLING.getCode().equals(supplierdeliverRequestMainDO.getStatus())) {
+        //if (RequestStatusEnum.HANDLING.getCode().equals(supplierdeliverRequestMainDO.getStatus())) {
-        }
+
+        //}
         trendsApi.createTrends(supplierdeliverRequestMainDO.getId(), "PurchaseclaimRequest", "增加了采购索赔申请", TrendsTypeEnum.CREATE);
         return supplierdeliverRequestMainDO.getId();
-
-
     }
 
     @Override
@@ -444,7 +443,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         this.validatorSupplierItemExist(mainDo.getSupplierCode(), detailDo.getItemCode());
         PurchasePlanDetailDO purchasePlanDetailDO = this.validatorPurchasePlan(mainDo, detailDo);
 
-        QueryWrapper<PurchaseMainDO> queryWrapper = new QueryWrapper();
+        QueryWrapper<PurchaseMainDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("number", purchasePlanDetailDO.getPoNumber());
         PurchaseMainDO purchaseMainDO = purchaseMainMapper.selectOne(queryWrapper);
         if("DISCRETE".equals(purchaseMainDO.getType())){//离散单
@@ -601,7 +600,6 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
      * @param createReqVO
      * @return
      */
-
     @Transactional
     public String validatorSupplierdeliverRequestMainImport(SupplierdeliverRequestMainDO createReqVO) {
         String messageMain = "";
@@ -622,7 +620,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         }
         //校验发货单号是否重复
         if (!createReqVO.getAsnNumber().isEmpty()) {
-            QueryWrapper<SupplierdeliverRequestMainDO> queryWrapper = new QueryWrapper();
+            QueryWrapper<SupplierdeliverRequestMainDO> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("asn_number", createReqVO.getAsnNumber());
             queryWrapper.ne("status", RequestStatusEnum.CLOSED.getCode());
             List<SupplierdeliverRequestMainDO> supplierdeliverRequestMainDOList = supplierdeliverRequestMainMapper.selectList(queryWrapper);
@@ -769,12 +767,12 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         Integer result = 0;
         //--------------------------------------------------生成包装-----------------------------------------------------------------------------------------------
         //主表
-        QueryWrapper<SupplierdeliverRequestMainDO> queryWrapper = new QueryWrapper();
+        QueryWrapper<SupplierdeliverRequestMainDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id", id);
         SupplierdeliverRequestMainDO mainDO = supplierdeliverRequestMainMapper.selectOne(queryWrapper);
 
         //判断ASN单号 是否重复，如果重复不生成
-        QueryWrapper<PackageDO> packageDOQueryWrapper = new QueryWrapper();
+        QueryWrapper<PackageDO> packageDOQueryWrapper = new QueryWrapper<>();
         packageDOQueryWrapper.eq("asn_number", mainDO.getAsnNumber());
         packageDOQueryWrapper.eq("request_number",mainDO.getNumber());
         Long count = packageMapper.selectCount(packageDOQueryWrapper);
@@ -782,7 +780,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
             throw exception(LABLE_AND_PACK_TYPE_NOT_EXISTS);
         }
         //子表
-        QueryWrapper<SupplierdeliverRequestDetailDO> supplierdeliverRequestDetailDOQueryWrapper = new QueryWrapper();
+        QueryWrapper<SupplierdeliverRequestDetailDO> supplierdeliverRequestDetailDOQueryWrapper = new QueryWrapper<>();
         supplierdeliverRequestDetailDOQueryWrapper.eq("master_id", id);
         List<SupplierdeliverRequestDetailDO> detailDOList = supplierdeliverRequestDetailMapper.selectList(supplierdeliverRequestDetailDOQueryWrapper);
         for (SupplierdeliverRequestDetailDO detailDO : detailDOList) {
@@ -892,11 +890,11 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
     public Integer genRecords(String id) {
         Integer result = 0;
         //主表
-        QueryWrapper<SupplierdeliverRequestMainDO> queryWrapper = new QueryWrapper();
+        QueryWrapper<SupplierdeliverRequestMainDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id", id);
         SupplierdeliverRequestMainDO mainDO = supplierdeliverRequestMainMapper.selectOne(queryWrapper);
         //判断ASN单号 是否重复，如果重复不生成
-        QueryWrapper<PackageDO> doQueryWrapper = new QueryWrapper();
+        QueryWrapper<PackageDO> doQueryWrapper = new QueryWrapper<>();
         doQueryWrapper.eq("asn_number", mainDO.getAsnNumber());
         Long count = packageMapper.selectCount(doQueryWrapper);
         if (count == 0) {
@@ -904,7 +902,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         }
 
         //子表
-        QueryWrapper<SupplierdeliverRequestDetailDO> supplierdeliverRequestDetailDOQueryWrapper = new QueryWrapper();
+        QueryWrapper<SupplierdeliverRequestDetailDO> supplierdeliverRequestDetailDOQueryWrapper = new QueryWrapper<>();
         supplierdeliverRequestDetailDOQueryWrapper.eq("master_id", id);
         List<SupplierdeliverRequestDetailDO> detailDOList = supplierdeliverRequestDetailMapper.selectList(supplierdeliverRequestDetailDOQueryWrapper);
         //跳过任务直接生成记录
@@ -981,7 +979,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         mainDO.setPurchasereceiptRequestFlag(false);
         for (SupplierdeliverRecordDetailDO detailDO : detailDOList) {
             //包装
-            QueryWrapper<PackageDO> packageDOQueryWrapper = new QueryWrapper();
+            QueryWrapper<PackageDO> packageDOQueryWrapper = new QueryWrapper<>();
             packageDOQueryWrapper.eq("request_number", mainDO.getRequestNumber());
             packageDOQueryWrapper.eq("asn_number", mainDO.getAsnNumber());
             packageDOQueryWrapper.eq("po_number", detailDO.getPoNumber());

win-server/src/main/resources/application.yaml

@@ -205,6 +205,7 @@ win:
   security:
     permit-all-urls: # 排除权限校验url
       - /admin-ui/** # /resources/admin-ui 目录下的静态资源
+  scp-independence: false #scp是否独立部署
 
 debug: false