From 70ea2416ada88e83bd06f5b236b2e0a538c4f2ce Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 7 Apr 2024 14:21:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8F=96=E6=B6=88BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistrilbutionBillLadingServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 6af3dd11c..9b8937230 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1034,6 +1034,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl packageIds = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()); //将这些包件还原成可操作状态 Integer num = distributionParcelListService.restorePakcageByIds(packageIds); + log.info("######################取消自提单释放包件>>>>>:{}",num); + ids.forEach(id ->{ + //查询自提单存在的零担订单 + List reservationZeroPackageEntities = distributionZeroPackageService.list(Wrappers.query().lambda() + .eq(DistributionReservationZeroPackageEntity::getReservationId, id) + .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "2") + ); + if (Func.isNotEmpty(reservationZeroPackageEntities)){ + List collect = reservationZeroPackageEntities.stream().map(DistributionReservationZeroPackageEntity::getStockArticleId).distinct().collect(Collectors.toList()); + //释放零担资源 + distributionZeroPackageService.recoverZeroPackage(id,collect); + } + }); //维护订单状态 String orderCodes = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderCode).distinct().collect(Collectors.joining(",")); distributionStockArticleService.maintenanceOrderInfo(orderCodes, myCurrentWarehouse.getId()); @@ -1058,7 +1071,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.lambda() - .set(DistributionDeliveryDetailsEntity::getInventoryStatus, 3) + .set(DistributionDeliveryDetailsEntity::getInventoryStatus, 2) .set(DistributionDeliveryDetailsEntity::getQuantity, 0) .in(DistributionDeliveryDetailsEntity::getBillLadingId, ids); distributionDeliveryDetailsService.update(updateWrapper); From 53bbaf4d3c187349d2ca0c4deb00e896bb0e9388 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 7 Apr 2024 15:25:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=85=8D=E9=80=81=E4=B8=8B=E6=9E=B6BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IWarehouseUpdownTypeClient.java | 5 +++-- .../OrderPackageStatusDataHandler.java | 6 +++++- .../DistributionDeliveryListServiceImpl.java | 20 +++++++++++++++---- .../impl/DistributionSignforServiceImpl.java | 6 +++++- .../jobhandle/DistributionDatarepair.java | 6 +++++- .../feign/WarehouseUpdownTypeClient.java | 7 +++++-- 6 files changed, 39 insertions(+), 11 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java index 6b8b0eb22..70fc1e00d 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; +import java.util.Map; /** * 上下架 Feign接口类 @@ -45,8 +46,8 @@ public interface IWarehouseUpdownTypeClient { R downPackage(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId,@RequestParam("remark") String remark); - @GetMapping(TOP + "/downDeliveryPackage") - R downDeliveryPackage(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId); + @PostMapping(TOP + "/downDeliveryPackage") + R downDeliveryPackage(@RequestBody Map map); @PostMapping(TOP + "/downZeroOrder") R downZeroOrder(@RequestBody List zeroOrders); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/OrderPackageStatusDataHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/OrderPackageStatusDataHandler.java index 12aa4f6c1..1ea760d3d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/OrderPackageStatusDataHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/OrderPackageStatusDataHandler.java @@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import java.util.HashMap; import java.util.Map; @Slf4j @@ -61,8 +62,11 @@ public class OrderPackageStatusDataHandler { DistributionReservationEntity reservationEntity = JSONObject.parseObject(reservationEntityJson,DistributionReservationEntity.class); + Map downMap = new HashMap<>(); + downMap.put("orderPackageCode",parcelListEntity.getOrderPackageCode()); + downMap.put("warehouseId",myCurrentWarehouseId); //包件配送下架 - warehouseUpdownTypeClient.downDeliveryPackage(parcelListEntity.getOrderPackageCode(), myCurrentWarehouseId); + warehouseUpdownTypeClient.downDeliveryPackage(downMap); //维护订单的信息 distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(), myCurrentWarehouseId); //维护预约的信息 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index d793a6695..3ea6ff745 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -846,7 +846,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map = new HashMap<>(); + map.put("orderPackageCode",orderPackages); + map.put("warehouseId",myCurrentWarehouse.getId()); + warehouseUpdownTypeClient.downDeliveryPackage(map); } //维护预约的信息 distributionReservationService.maintenanceReservationInfo(distrilbutionloadingscanDTO.getReservationId()); @@ -875,8 +878,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map = new HashMap<>(); + map.put("orderPackageCode",parcelListEntity.getOrderPackageCode()); + map.put("warehouseId",, myCurrentWarehouse.getId()); //包件配送下架 - warehouseUpdownTypeClient.downDeliveryPackage(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); + warehouseUpdownTypeClient.downDeliveryPackage(map); //维护订单的信息 distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(), myCurrentWarehouse.getId()); //维护预约的信息 @@ -1834,7 +1840,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map = new HashMap<>(); + map.put("orderPackageCode",updownrOderPackages); + map.put("warehouseId",myCurrentWarehouse.getId()); + warehouseUpdownTypeClient.downDeliveryPackage(map); } List packageIds = updatePackageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()); if (Func.isNotEmpty(packageIds)) { @@ -5469,8 +5478,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map = new HashMap<>(); + map.put("orderPackageCode",distrilbutionloadingscanDTO.getBarcode()); + map.put("warehouseId",myCurrentWarehouse.getId()); //出库 - warehouseUpdownTypeClient.downDeliveryPackage(distrilbutionloadingscanDTO.getBarcode(), myCurrentWarehouse.getId()); + warehouseUpdownTypeClient.downDeliveryPackage(map); //查询本车次是否第一次扫码,没有则更新上车时间 Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); //更新签收表的装车数量 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index a9843065e..88b7c4b2f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -4513,7 +4513,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl map = new HashMap<>(); + map.put("orderPackageCode",collected); + map.put("warehouseId",myCurrentWarehouse.getId()); + + warehouseUpdownTypeClient.downDeliveryPackage(map); } } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java index 654dd1501..062a8b88d 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java @@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Component; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -64,7 +65,10 @@ public class DistributionDatarepair { packageMap.forEach((k, v) -> { String orderPackageCodes = v.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(",")); stringBuffer.append("仓库:"+k).append("包件下架"+orderPackageCodes);; - warehouseUpdownTypeClient.downDeliveryPackage(orderPackageCodes, k); + Map map = new HashMap<>(); + map.put("orderPackageCode",orderPackageCodes); + map.put("warehouseId",k); + warehouseUpdownTypeClient.downDeliveryPackage(map); }); } log.info("执行包件下架操作>>>>>>>>>>>>>"+stringBuffer.toString()); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java index b59d46fd9..09172d8be 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java @@ -30,6 +30,7 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 上下架记录表 Feign实现类 @@ -62,8 +63,10 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { } @Override - public R downDeliveryPackage(String orderPackageCodes,Long warehouseId) { + public R downDeliveryPackage(Map map) { List upShelfPackageList = new ArrayList<>(); + String orderPackageCodes = (String) map.get("orderPackageCode"); + String warehouseId = (String) map.get("warehouseId"); String[] split = orderPackageCodes.split(","); for(String orderPackageCode:split){ UpShelfPackageDTO dto = new UpShelfPackageDTO(); @@ -71,7 +74,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { upShelfPackageList.add(dto); } if(upShelfPackageList.size() > 0){ - return warehouseUpdownTypeService.downDeliveryPackage(upShelfPackageList,warehouseId); + return warehouseUpdownTypeService.downDeliveryPackage(upShelfPackageList,Long.parseLong(warehouseId)); }else{ return R.fail(403,"处理失败"); } From 894948e71acc35abbbb39494992dbdc7f1f5c296 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sun, 7 Apr 2024 15:57:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E7=94=9F=E6=88=90=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E9=9B=B6=E6=8B=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml index e6c064f82..800b5f835 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml @@ -210,7 +210,7 @@ lwug.allocation_title allocationName, lwt.pallet_code trayCode, lwug.num num, - lwug.allocaation_id allocationId, + lwug.allocation_id allocationId, lwt.id trayId, lwug.position_code positionCode from logpm_warehouse_updown_goods lwug