From ad70c96ff86959f28243c1f9c718bd2735b2ba76 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 23 Feb 2024 10:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=91=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3mq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupplierdeliverRecordMainController.java | 7 +++- .../SupplierdeliverRecordMainCreateReqVO.java | 20 +++++++++- .../labelBarbasic/BarbasicConvert.java | 9 +++-- .../packageMassage/PackageConvert.java | 10 ++--- .../SupplierdeliverRecordDetailConvert.java | 9 +++-- .../packageMassage/PackageServiceImpl.java | 4 +- .../SupplierdeliverRecordMainService.java | 7 ++++ .../SupplierdeliverRecordMainServiceImpl.java | 37 ++++++++++++++++++- ...SupplierdeliverRequestMainServiceImpl.java | 26 ++++++------- .../src/main/resources/application.yaml | 1 + 10 files changed, 98 insertions(+), 32 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java index 81f013084a..8abefcc4f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java +++ b/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 createSupplierdeliverRecordMainMq(@Valid @RequestBody SupplierdeliverRecordMainCreateReqVO createReqVO) { + return success(supplierdeliverRecordMainService.createSupplierdeliverRecordMainMq(createReqVO)); + } @PostMapping("/create") @Operation(summary = "创建供应商发货记录主") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainCreateReqVO.java index a546078153..4ba70654b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainCreateReqVO.java +++ b/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 subList; + + @Schema(description = "包装数据") + private List packageList; + + + @Schema(description = "条码数据") + private List barbasicList; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/labelBarbasic/BarbasicConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/labelBarbasic/BarbasicConvert.java index 0810787b2f..0ae43df3d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/labelBarbasic/BarbasicConvert.java +++ b/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 convertPage(PageResult page); + List convertList01(List list); + List convertList02(List list); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java index fc93bc57ce..995ddf6abd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java +++ b/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 convertList02(List list); PackageCreateReqVO convert01(PackageDO labelExist); + + List convertList01(List list); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/supplierdeliverRecord/SupplierdeliverRecordDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/supplierdeliverRecord/SupplierdeliverRecordDetailConvert.java index dc77d94d95..0791bc737b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/supplierdeliverRecord/SupplierdeliverRecordDetailConvert.java +++ b/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 convertList02(List list); + List convertList03(List list); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java index 49784092f0..3c72d3957e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java +++ b/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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java index ddf434ac78..d2d5e42cbf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java +++ b/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); /** * 创建供应商发货记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java index be3ffc8d1c..e9c468a6f8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java +++ b/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.deliverRequest.DeliverRequestMainDO; +import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; +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 supplierdeliverRecordDetailDOList = SupplierdeliverRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); + for(SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO : supplierdeliverRecordDetailDOList) { + supplierdeliverRecordDetailDO.setId(null); + supplierdeliverRecordDetailDO.setMasterId(supplierdeliverRecordMainDO.getId()); + supplierdeliverRecordDetailMapper.insert(supplierdeliverRecordDetailDO); + } + //包装信息 + //不置空id + List packageDOList = PackageConvert.INSTANCE.convertList01(createReqVO.getPackageList()); + packageMapper.insertBatch(packageDOList); + //条码信息 + List barbasicDOList = BarbasicConvert.INSTANCE.convertList01(createReqVO.getBarbasicList()); + barbasicMapper.insertBatch(barbasicDOList); + // 返回 + return supplierdeliverRecordMainDO.getId(); + } @Override public Long createSupplierdeliverRecordMain(SupplierdeliverRecordMainCreateReqVO createReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java index b21f3e5aa0..7bf1dc9f6d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java +++ b/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 queryWrapper = new QueryWrapper(); + QueryWrapper 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 queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("asn_number", createReqVO.getAsnNumber()); queryWrapper.ne("status", RequestStatusEnum.CLOSED.getCode()); List supplierdeliverRequestMainDOList = supplierdeliverRequestMainMapper.selectList(queryWrapper); @@ -769,12 +767,12 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq Integer result = 0; //--------------------------------------------------生成包装----------------------------------------------------------------------------------------------- //主表 - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id", id); SupplierdeliverRequestMainDO mainDO = supplierdeliverRequestMainMapper.selectOne(queryWrapper); //判断ASN单号 是否重复，如果重复不生成 - QueryWrapper packageDOQueryWrapper = new QueryWrapper(); + QueryWrapper 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 supplierdeliverRequestDetailDOQueryWrapper = new QueryWrapper(); + QueryWrapper supplierdeliverRequestDetailDOQueryWrapper = new QueryWrapper<>(); supplierdeliverRequestDetailDOQueryWrapper.eq("master_id", id); List 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 queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id", id); SupplierdeliverRequestMainDO mainDO = supplierdeliverRequestMainMapper.selectOne(queryWrapper); //判断ASN单号 是否重复，如果重复不生成 - QueryWrapper doQueryWrapper = new QueryWrapper(); + QueryWrapper 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 supplierdeliverRequestDetailDOQueryWrapper = new QueryWrapper(); + QueryWrapper supplierdeliverRequestDetailDOQueryWrapper = new QueryWrapper<>(); supplierdeliverRequestDetailDOQueryWrapper.eq("master_id", id); List detailDOList = supplierdeliverRequestDetailMapper.selectList(supplierdeliverRequestDetailDOQueryWrapper); //跳过任务直接生成记录 @@ -981,7 +979,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq mainDO.setPurchasereceiptRequestFlag(false); for (SupplierdeliverRecordDetailDO detailDO : detailDOList) { //包装 - QueryWrapper packageDOQueryWrapper = new QueryWrapper(); + QueryWrapper packageDOQueryWrapper = new QueryWrapper<>(); packageDOQueryWrapper.eq("request_number", mainDO.getRequestNumber()); packageDOQueryWrapper.eq("asn_number", mainDO.getAsnNumber()); packageDOQueryWrapper.eq("po_number", detailDO.getPoNumber()); diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml index 72345bdd96..182ed0f579 100644 --- a/win-server/src/main/resources/application.yaml +++ b/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