From 40093ef24a3f7901557b4e8addae948a3c6f5fd5 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 27 Oct 2023 15:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E9=85=8D=E9=9B=B6?= =?UTF-8?q?=E6=8B=85=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionStockListEntity.java | 5 ++ .../DistributionStockListInfoEntity.java | 7 ++ .../DistributionParcelListController.java | 12 ++++ .../impl/DistributionAsyncServiceImpl.java | 22 ++++--- .../DistributionStockArticleServiceImpl.java | 2 + .../impl/DistributionStockupServiceImpl.java | 9 ++- .../DistrilbutionBillLadingServiceImpl.java | 64 ++++++++++++++++++- .../WarehouseWarehousingEntryServiceImpl.java | 2 + 8 files changed, 108 insertions(+), 15 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java index eb1271086..cd381e7a1 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java @@ -280,6 +280,11 @@ public class DistributionStockListEntity extends TenantEntity { */ @ApiModelProperty(value = "托盘名称") private String trayName; + /** + * 来源 1 订单 2 导入 + */ + @ApiModelProperty(value = "来源 1 订单 2 导入") + private String sourceType; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java index 23b1dad84..b1297bcd1 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java @@ -267,6 +267,13 @@ public class DistributionStockListInfoEntity extends TenantEntity { */ @ApiModelProperty(value = "sku") private String sku; + + /** + * 来源 + */ + @ApiModelProperty(value = "来源 ") + private String sourceType; + /** * 上架时间 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index ae7cc71a5..54ba12e2b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -148,6 +148,18 @@ public class DistributionParcelListController extends BladeController { return R.data(pages); } + +// /** +// * +// */ +// @GetMapping("/zeroMaterial") +// @ApiOperationSupport(order = 2) +// @ApiOperation(value = "查询零担物料数据", notes = "传入distributionParcelList") +// public R> getZeroMaterial(@ApiIgnore @RequestParam Map distributionParcelList, Query query) { +// List pages = distributionParcelListService.getZeroMaterial(distributionParcelList); +// return R.data(pages); +// } + /** * 修改零担在库数量 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 2e030db8c..cfea01f1e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -903,19 +903,24 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } }else{ //商，市 - //查询包件数据 - List packageEntities = distributionReservationPackageMapper.selectList(Wrappers.query().lambda() - .eq(DistributionReservationPackageEntity::getReservationId, stockupDTO.getReservationId()) - .eq(DistributionReservationPackageEntity::getPacketBarStatus, '1') + //查询数据 + List distributionStockupInfoEntities = distributionStockupInfoMapper.selectList(Wrappers.query().lambda() + .eq(DistributionStockupInfoEntity::getStockupId, stockupDTO.getStockupId()) ); - if(!packageEntities.isEmpty()){ + distributionStockupInfoEntities.forEach(v ->{ + //查询包件数据 + List packageEntities = distributionReservationPackageMapper.selectList(Wrappers.query().lambda() + .eq(DistributionReservationPackageEntity::getReservationId, v.getReservationId()) + .eq(DistributionReservationPackageEntity::getPacketBarStatus, '1') + ); packageEntities.forEach( i ->{ - if(getDoneStockUp(i.getStockArticleId(), i.getParceListId(), stockupDTO.getReservationId(), stockupDTO.getTypeService())){ + if(getDoneStockUp(i.getStockArticleId(), i.getParceListId(), v.getReservationId(), stockupDTO.getTypeService())){ //没有扫 s.set(true); } }); - }else{ + }); + if(!s.get()){ //查询有没有库存品 List distributionReservationStocklistEntities = distributionReservationStocklistMapper.selectList(Wrappers.query().lambda() .eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId()) @@ -933,9 +938,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { stockupEntity.setFixTime(new Date()); } } - - - if(s.get()){ stockupEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue()); }else{ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 4f95e3b00..a4b62abac 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -491,6 +491,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl byId.getQuantity()){ return Resp.scanFail(i.getCategoryName()+"备货数量大于待备货数量！",i.getCategoryName()+"备货数量大于待备货数量！"); } + Optional first = stockupDTO.getList().stream().filter(q -> i.getStockArticleId().equals(q.getStockArticleId()) && q.getQuantity() <= i.getQuantity() && q.getQuantity() > 0).findFirst(); if(ObjectUtils.isNotNull(one)){ //修改数量 DistributionStockEntity stockEntity = new DistributionStockEntity(); stockEntity.setId(one.getId()); - stockEntity.setStockQuantity(i.getQuantity()); + stockEntity.setStockQuantity(first.get().getQuantity()); distributionStockService.updateById(stockEntity); }else{ DistributionStockEntity stockEntity = new DistributionStockEntity(); @@ -2197,12 +2198,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl{ + List list = distrilbutionBillPackageService.list(Wrappers.query().lambda() + .eq(DistrilbutionBillPackageEntity::getBillLadingId, distrilbutionBillLading.getId()) + .eq(DistrilbutionBillPackageEntity::getStockArticleId, k) + ); + //没有数据 + if(list.isEmpty()){ + throw new ServiceException("没有包件数据！"); + } + List sc = new ArrayList<>(); + Iterator iterator = v.iterator(); + list.stream().forEach( i ->{ + Boolean cz = false; + while (iterator.hasNext()){ + DistrilbutionBillPackageEntity next = iterator.next(); + if(i.getParceListId().equals(next.getParceListId())){ + //存在 + iterator.remove(); + cz = true; + continue; + } + } + if(!cz){ + //删除 + sc.add(i.getId()); + } + + }); + //新增包件 + if(!v.isEmpty()){ + List packageEntityList = new ArrayList<>(); + v.stream().forEach(i ->{ + DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity(); + BeanUtils.copyProperties(i,billPackageEntity); + billPackageEntity.setBillLadingId(distrilbutionBillLading.getId()); + packageEntityList.add(billPackageEntity); + }); + distrilbutionBillPackageService.saveBatch(packageEntityList); + } + //删除包件 + if(!sc.isEmpty()){ + distrilbutionBillPackageService.deleteLogic(sc); + } + }); + return true; + } + + + /** * 修改零担 * @param distrilbutionBillLadingDTO @@ -1461,7 +1518,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionParcelNumberEntity::getParcelListId, i.getId())); - if(ObjectUtils.isNotNull(one) && i.getQuantity() <= one.getHandQuantity()) { + + int i1 = one.getDeliveryQuantity() + i.getQuantity(); + //全部数据不能大于预约数 + if(ObjectUtils.isNotNull(one) && i1 <= one.getHandQuantity() ) { nu.addAndGet(i.getQuantity()); DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity(); parcelNumberEntity.setId(one.getId()); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java index 88e19bfeb..b406d88b5 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java @@ -328,6 +328,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl