diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OperatModeConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OperatModeConstant.java index f2f4f0248..0b9767015 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OperatModeConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OperatModeConstant.java @@ -5,7 +5,8 @@ package org.springblade.common.constant; */ public interface OperatModeConstant { - public static final String SCAN = "扫描"; - public static final String BATCH = "批量"; + public static final String SCAN = "司机扫描签收"; + public static final String BATCH = "司机批量签收"; + public static final String CLERK= "文员批量签收"; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanEntity.java index e3615b542..be74f47ca 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanEntity.java @@ -350,7 +350,7 @@ public class DistributionLoadscanEntity extends TenantEntity { /** - * 是否异常装车 1-否 2-是 + * 是否是零担 1 =零单 */ @ApiModelProperty(value = "是否异常装车 1-否 2-是") private Integer isZero; 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 4c99cee01..5f7cf6a04 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 @@ -763,7 +763,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl detailEntities = distributionReservationMapper.selectInventoryListByReservation(distrilbutionloadingscanDTO.getReservationId()); List jsonObjects = new ArrayList<>(); if (Func.isNotEmpty(split)) { + + + List pushList = new ArrayList<>(); + DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId()); for (String s : split) { List inventoryPackage = detailEntities.stream().filter(f -> Func.isNotEmpty(f.getStockPackageCode()) && f.getStockPackageCode().equals(s)).collect(Collectors.toList()); if (Func.isNotEmpty(inventoryPackage) && inventoryPackage.size() == 1) { @@ -938,6 +942,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl().lambda() @@ -1006,6 +1011,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList, OperatModeConstant.CLERK); + iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); + } //维护签收数量 this.maintenanceSignfor(distrilbutionloadingscanDTO.getReservationId()); + return R.status(true); } @@ -1261,6 +1277,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl pushList = new ArrayList<>(); //查询该车次负责司机 for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) { //查询订单 @@ -1351,6 +1370,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList,OperatModeConstant.BATCH); + iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); + + //查询计划和是否进行装车 return R.success("操作成功"); } @@ -3139,14 +3168,30 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushDatas, OperatModeConstant.BATCH); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushDatas, OperatModeConstant.CLERK); iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -6768,7 +6813,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl orderCodes = new ArrayList<>(); List pushList = new ArrayList<>(); BladeUser user = AuthUtil.getUser(); @@ -6978,7 +7023,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList, OperatModeConstant.SCAN); iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -6986,7 +7031,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildDistributionSignforVOByZero(DistributionDeliveryListEntity distributionDeliveryListEntity, List pushList) { + private NodeFanoutMsg buildDistributionSignforVOByZero(DistributionDeliveryListEntity distributionDeliveryListEntity, List pushList,String operatMode) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); @@ -6996,7 +7041,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>> 保存开单推送的已入库包件 {} 保存到新系统", unitNo); - String operationTime = DateUtil.format(new Date(), "yyyy-MM-dd hh:mm:ss"); + String operationTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); oldSystemWaybillClient.handleDataToPlatform(unitNo, operationTime,warehouseId,1); } }