From 6a915da8d5ae43cf332572260e28c1cde10d009f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 15 Jan 2024 19:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=AD=BE=E6=94=B6=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E6=8E=A8=E9=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionSignforController.java | 13 ++++++++++++- .../impl/DistributionSignforServiceImpl.java | 16 ++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index b3622a502..83ba58abb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -30,6 +30,7 @@ import com.logpm.distribution.entity.DistributionSignPrintEntity; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.excel.DistributionSignforExcel; import com.logpm.distribution.excel.DistributionSignforOwnExcel; +import com.logpm.distribution.service.IDistributionAsyncService; import com.logpm.distribution.service.IDistributionReservationService; import com.logpm.distribution.service.IDistributionSignforService; import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl; @@ -82,6 +83,8 @@ public class DistributionSignforController extends BladeController { private final IBasicdataWarehouseClient warehouseClient; + private final IDistributionAsyncService distributionAsyncService; + /** * 签收管理 详情 */ @@ -268,9 +271,18 @@ public class DistributionSignforController extends BladeController { @ApiOperation(value = "新增", notes = "传入distributionSignfor") public R oneclick(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { distributionSignfor.setIsClerk(true); + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + R r = distributionSignforService.oneclick(distributionSignfor); List packageCodes = (List)r.getData(); try{ + Map data = (Map) r.getData(); + if (Func.isNotEmpty(data)){ + List packageIds = (List) data.get("packageIds"); + Long signId = (Long) data.get("signId"); + distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId()); + distributionAsyncService.sendReviewFactory(signId,myCurrentWarehouse.getName() ,myCurrentWarehouse.getId()); + } String orderPackageCodes = null; for (String packageCode : packageCodes) { if(StringUtils.isBlank(orderPackageCodes)){ @@ -279,7 +291,6 @@ public class DistributionSignforController extends BladeController { orderPackageCodes = orderPackageCodes + "," +packageCode; } } - BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); }catch (Exception e){ log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}",packageCodes); 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 e535a0b4a..6fc8880f2 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 @@ -2768,6 +2768,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl map = new HashMap<>(); + DistributionDeliverySelfEntity distributionDeliverySelfEntity = null; if (distributionDeliveryListEntity.getKind().equals("1")) { //自主 @@ -3139,11 +3141,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl