From 16aedeada79d0e30a9994d2ce21d973d9a6edf87 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 13 Sep 2024 16:22:51 +0800 Subject: [PATCH] =?UTF-8?q?add:=201.=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/model/ReservationVO.java | 6 +- .../springblade/common/model/StockUpVO.java | 12 ++- .../service/IDistributionStockupService.java | 7 +- .../impl/DistributionStockServiceImpl.java | 4 +- .../impl/DistributionStockupServiceImpl.java | 94 ++++++++++++------- 5 files changed, 75 insertions(+), 48 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java b/blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java index a0fd0e0d9..f25547ec7 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java @@ -77,11 +77,7 @@ public class ReservationVO { private String deliveryType; - /** - * 预约数据列表 - * 包含包件 零担 库存破 - */ - private List packageDataList; + diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/StockUpVO.java b/blade-biz-common/src/main/java/org/springblade/common/model/StockUpVO.java index a957dee0b..4c32aa0c6 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/StockUpVO.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/StockUpVO.java @@ -31,9 +31,17 @@ public class StockUpVO implements Serializable { */ private String stockupArea; + /** - * 备货的预约单对象 + * 关联单号 */ - private ReservationVO reservationVO; + private String referenceCode; + + /** + * 预约数据列表 + * 包含包件 零担 库存破 + */ + private List packageDataList; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java index 21d9bf7f4..e009719ca 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java @@ -20,10 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.app.StockConfigInfoVO; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.dto.app.StockupZeroDTO; -import com.logpm.distribution.entity.DistributionParcelListEntity; -import com.logpm.distribution.entity.DistributionReservationEntity; -import com.logpm.distribution.entity.DistributionStockListEntity; -import com.logpm.distribution.entity.DistributionStockupEntity; +import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionCityExcel; import com.logpm.distribution.excel.DistributionMarketExcel; import com.logpm.distribution.excel.DistributionSelfExcel; @@ -320,5 +317,5 @@ public interface IDistributionStockupService extends BaseService buildStockUpNodeData(DistributionStockupEntity distributionStockupEntity, DistributionReservationEntity reservationEntity, List parcelListEntitys); + NodeFanoutMsg buildStockUpNodeData(DistributionStockupEntity distributionStockupEntity, DistributionStockEntity entity ,DistributionParcelListEntity parcelListEntitys); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java index 0b747563d..b924db552 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java @@ -308,9 +308,7 @@ public class DistributionStockServiceImpl extends BaseServiceImpl datas = new ArrayList<>(); - datas.add(byId); - NodeFanoutMsg nodeFanoutMsg = distributionStockupService.buildStockUpNodeData(distributionStockupEntity,reservationEntity, datas); + NodeFanoutMsg nodeFanoutMsg = distributionStockupService.buildStockUpNodeData(distributionStockupEntity, stockEntity,byId); if (ObjectUtils.isNotNull(nodeFanoutMsg)) { distributionNodeWorkService.planStock(nodeFanoutMsg, AuthUtil.getUser()); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 3586d783a..e1df0b87c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -1874,7 +1874,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildStockUpNodeData(distributionStockupEntity,distributionStock, distributionParcelListEntitie); + if (ObjectUtils.isNotNull(nodeFanoutMsg)) { + distributionNodeWorkService.planStock(nodeFanoutMsg, AuthUtil.getUser()); + } } }); if (!fa.get()) { @@ -2026,15 +2033,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl collect = list1.stream().map(DistributionStockEntity::getParcelListId).collect(Collectors.toList()); - List distributionParcelListEntities = distributionParcelListService.listByIds(collect); +// List collect = list1.stream().map(DistributionStockEntity::getParcelListId).collect(Collectors.toList()); +// List distributionParcelListEntities = distributionParcelListService.listByIds(collect); + // 查询预约单、 - DistributionReservationEntity reservationEntity = distributionReservationService.getById(stockupDTO.getReservationId()); - // 备货作业节点 - NodeFanoutMsg nodeFanoutMsg = buildStockUpNodeData(distributionStockupEntity,reservationEntity, distributionParcelListEntities); - if (ObjectUtils.isNotNull(nodeFanoutMsg)) { - distributionNodeWorkService.planStock(nodeFanoutMsg, AuthUtil.getUser()); - } +// DistributionReservationEntity reservationEntity = distributionReservationService.getById(stockupDTO.getReservationId()); + } @@ -3884,11 +3888,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); - ls.add(parcelListEntity); // 备货作业节点 - DistributionReservationEntity reservationEntity = distributionReservationService.getById(stockupDTO.getReservationId()); - NodeFanoutMsg nodeFanoutMsg = buildStockUpNodeData(distributionStockupEntity,reservationEntity, ls); + NodeFanoutMsg nodeFanoutMsg = buildStockUpNodeData(distributionStockupEntity,entity, parcelListEntity); if (ObjectUtils.isNotNull(nodeFanoutMsg)) { distributionNodeWorkService.planStock(nodeFanoutMsg, user); } @@ -4267,22 +4268,27 @@ public class DistributionStockupServiceImpl extends BaseServiceImplupdate().lambda() - .eq(DistributionParcelListEntity::getOrderPackageCode, entity.getCoding()) - .eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) - .eq(DistributionParcelListEntity::getConditions, "2") - .eq(DistributionParcelListEntity::getMaterialId, entity.getMaterialId()) - .eq(entity.getStockArticle() != null, DistributionParcelListEntity::getStockArticleId, entity.getStockArticle()) - .set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.yibeihu.getValue()) - ); + + + DistributionStockListEntity distributionStockListEntity = distributionStockListService.getById(stockupDTO.getStockListId()); + if(distributionStockListEntity!=null && "1".equals(distributionStockListEntity.getSourceType())){ + //这里尝试修改备货库存品包件的备货状态 + boolean update = distributionParcelListService.update(Wrappers.update().lambda() + .eq(DistributionParcelListEntity::getOrderPackageCode, entity.getCoding()) + .eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) + .eq(DistributionParcelListEntity::getConditions, "2") + .eq(DistributionParcelListEntity::getMaterialId, entity.getMaterialId()) + .eq(entity.getStockArticle() != null, DistributionParcelListEntity::getStockArticleId, entity.getStockArticle()) + .set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.yibeihu.getValue()) + ); + } + // todo 这里需要完善 // 备货作业节点 - DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId); - NodeFanoutMsg nodeFanoutMsg = buildStockUpNodeDataByStock(stockupEntity,reservationEntity, entity); + NodeFanoutMsg nodeFanoutMsg = buildStockUpNodeDataByStock(stockupEntity, entity); if (ObjectUtils.isNotNull(nodeFanoutMsg)) { distributionNodeWorkService.planStock(nodeFanoutMsg, AuthUtil.getUser()); } @@ -4340,7 +4346,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl buildStockUpNodeData(DistributionStockupEntity distributionStockupEntity, DistributionReservationEntity reservationEntity, List parcelListEntitys) { + public NodeFanoutMsg buildStockUpNodeData(DistributionStockupEntity distributionStockupEntity, DistributionStockEntity entity ,DistributionParcelListEntity parcelListEntitys) { try { BladeUser user = AuthUtil.getUser(); NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); @@ -4358,11 +4364,23 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl packageDataList = new ArrayList<>(); - parcelListEntitys.forEach(parcelListEntity -> packageDataList.add(getPackageData(parcelListEntity))); - reservationVO.setPackageDataList(packageDataList); - stockUpVO.setReservationVO(reservationVO); + packageDataList.add(getPackageData(parcelListEntitys)); + stockUpVO.setPackageDataList(packageDataList); nodeFanoutMsg.setMain(stockUpVO); nodeFanoutMsg.setTenantId(AuthUtil.getTenantId()); @@ -4408,7 +4426,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl buildStockUpNodeDataByStock(DistributionStockupEntity stockupEntity,DistributionReservationEntity reservationEntity, DistributionStockEntity stockEntity) { + private NodeFanoutMsg buildStockUpNodeDataByStock(DistributionStockupEntity stockupEntity, DistributionStockEntity stockEntity) { try { BladeUser user = AuthUtil.getUser(); NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); @@ -4429,14 +4447,24 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl packageDataList = new ArrayList<>(); PackageData packageData = getPackageDataByStock(stockEntity); packageDataList.add(packageData); - reservationVO.setPackageDataList(packageDataList); + stockUpVO.setPackageDataList(packageDataList); - stockUpVO.setReservationVO(reservationVO); nodeFanoutMsg.setMain(stockUpVO); nodeFanoutMsg.setTenantId(AuthUtil.getTenantId());