From 91ab527db4f8a782a152b71ac83cde97e5481807 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 11 Sep 2024 18:21:16 +0800 Subject: [PATCH] =?UTF-8?q?add:=201.=E5=A2=9E=E7=AD=BE=E6=94=B6=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=9A=84=E4=BD=9C=E4=B8=9A=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/OperatModeConstant.java | 11 ++ .../common/model/DistributionSignforVO.java | 4 + .../DistributionDeliveryListServiceImpl.java | 157 +++++++++--------- .../impl/DistributionNodeWorkServiceImpl.java | 15 -- .../impl/DistributionSignforServiceImpl.java | 25 ++- 5 files changed, 104 insertions(+), 108 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/OperatModeConstant.java 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 new file mode 100644 index 000000000..f2f4f0248 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OperatModeConstant.java @@ -0,0 +1,11 @@ +package org.springblade.common.constant; + +/** + * 操作方式常量类 + */ +public interface OperatModeConstant { + + public static final String SCAN = "扫描"; + public static final String BATCH = "批量"; + +} diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/DistributionSignforVO.java b/blade-biz-common/src/main/java/org/springblade/common/model/DistributionSignforVO.java index e188d282a..a882f5fd8 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/DistributionSignforVO.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/DistributionSignforVO.java @@ -33,6 +33,10 @@ public class DistributionSignforVO implements Serializable { */ private String reservationCode; + /** + * 操作方式 扫描 | 批量 + */ + private String operatMode; /** * 预约数据列表 * 包含包件 零担 库存破 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 bde2c7432..f11b14656 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 @@ -1053,7 +1053,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl buildNodeFanoutMsgByPackage(DistributionDeliveryListEntity distributionDeliveryListEntity, List pushNodeList) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); @@ -1200,7 +1199,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl buildNodeFanoutMsgByStock(DistributionDeliveryListEntity distributionDeliveryListEntity,DistributionReservationEntity reservationEntity, List ts) { + private NodeFanoutMsg buildNodeFanoutMsgByStock(DistributionDeliveryListEntity distributionDeliveryListEntity, DistributionReservationEntity reservationEntity, List ts) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); nodeFanoutMsg.setNode(WorkNodeEnums.DISTRIBUTION_LOADING); @@ -1259,7 +1258,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildNodeFanoutMsgByStock(deliveryListEntity,reservationEntity, ts); + NodeFanoutMsg nodeFanoutMsg = buildNodeFanoutMsgByStock(deliveryListEntity, reservationEntity, ts); distributionNodeWorkService.nodeLoading(nodeFanoutMsg, AuthUtil.getUser()); String msg = getLoadingMsg(distrilbutionloadingscanDTO); return Resp.scanSuccess("扫描成功", msg); @@ -2685,7 +2684,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map = new HashMap<>(); + Map map = new HashMap<>(); String waybillNumbers = v.stream().map(DistributionStockArticleEntity::getWaybillNumber).distinct().collect(Collectors.joining(",")); String storeCodes = v.stream().map(DistributionStockArticleEntity::getStoreCode).distinct().collect(Collectors.joining(",")); List waybillIds = v.stream().map(DistributionStockArticleEntity::getWaybillId).distinct().collect(Collectors.toList()); @@ -2878,7 +2877,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl nodeFanoutMsg = distributionReservationService.buildNodeFanoutMsgByReservation(reservationEntity,map,BizOperationEnums.ADD); + NodeFanoutMsg nodeFanoutMsg = distributionReservationService.buildNodeFanoutMsgByReservation(reservationEntity, map, BizOperationEnums.ADD); distributionNodeWorkService.planReservation(nodeFanoutMsg, user); deliveryWarehouseName.add(reservationEntity.getWarehouseName()); deliveryPackageTotal.getAndAdd(reservationEntity.getReservationNum()); @@ -3573,7 +3572,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl buildNodeFanoutMsgForPlan(DistributionDeliveryListEntity distributionDeliveryListEntity, BladeUser user, BizOperationEnums bizOperation){ + public NodeFanoutMsg buildNodeFanoutMsgForPlan(DistributionDeliveryListEntity distributionDeliveryListEntity, BladeUser user, BizOperationEnums bizOperation) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(bizOperation); nodeFanoutMsg.setNode(WorkNodeEnums.PLAN_DELIVERY); @@ -3592,25 +3591,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationVOList= distributionDeliveryListService.getDeliveryreBroadcastData(distributionDeliveryListEntity.getId(), distributionDeliveryListEntity.getWarehouseId()); + List reservationVOList = distributionDeliveryListService.getDeliveryreBroadcastData(distributionDeliveryListEntity.getId(), distributionDeliveryListEntity.getWarehouseId()); distributionTaskVO.setReservationVOList(reservationVOList); return distributionTaskVO; } - private boolean checkList(List list, Long id, Long stockArticleId, String orderPackageCode) { return list.stream().anyMatch(e -> e.getStockArticleId().equals(stockArticleId) && e.getPacketBarCode().equals(orderPackageCode) && e.getReservationId().equals(id)); @@ -4605,7 +4604,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", customerException); } //发车日志记录 - handleLoadingStartLog(distributionDeliveryListEntity,user,myCurrentWarehouse,builder.toString()); - NodeFanoutMsg nodeFanoutMsg = builderNodeFanoutMsgByCarStart(distributionDeliveryListEntity,user); - distributionNodeWorkService.carStart(nodeFanoutMsg,user); + handleLoadingStartLog(distributionDeliveryListEntity, user, myCurrentWarehouse, builder.toString()); + NodeFanoutMsg nodeFanoutMsg = builderNodeFanoutMsgByCarStart(distributionDeliveryListEntity, user); + distributionNodeWorkService.carStart(nodeFanoutMsg, user); // 推送数据 return Resp.scanSuccess("发车成功", builder.toString()); @@ -4721,12 +4720,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionParcelListEntities = baseMapper.selectPackageListByDeliveryListId(distributionDeliveryList.getId()); List abnormalEntityList = new ArrayList<>(); if (!distributionParcelListEntities.isEmpty()) { for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { - DistributionLoadscanAbnormalEntity packageLoadscanAbnormalEntity =createdPakcageAbnormal(distributionDeliveryList,distributionParcelListEntity,warehouseEntity); + DistributionLoadscanAbnormalEntity packageLoadscanAbnormalEntity = createdPakcageAbnormal(distributionDeliveryList, distributionParcelListEntity, warehouseEntity); abnormalEntityList.add(packageLoadscanAbnormalEntity); } } List disStockListDetailEntities = baseMapper.selectInventoryListByDeliveryListId(distributionDeliveryList.getId()); if (!disStockListDetailEntities.isEmpty()) { for (DisStockListDetailEntity disStockListDetailEntity : disStockListDetailEntities) { - DistributionLoadscanAbnormalEntity inventoryLoadscanAbnormalEntity = createdInventoryPakcageAbnormal(distributionDeliveryList,disStockListDetailEntity,warehouseEntity); + DistributionLoadscanAbnormalEntity inventoryLoadscanAbnormalEntity = createdInventoryPakcageAbnormal(distributionDeliveryList, disStockListDetailEntity, warehouseEntity); abnormalEntityList.add(inventoryLoadscanAbnormalEntity); } } //零担 List zeroLoadscanAbnormalList = baseMapper.selectZeroListByDeliveryId(distributionDeliveryList.getId()); - if (!zeroLoadscanAbnormalList.isEmpty()){ - abnormalEntityList.addAll(zeroLoadscanAbnormalList); + if (!zeroLoadscanAbnormalList.isEmpty()) { + abnormalEntityList.addAll(zeroLoadscanAbnormalList); } if (!abnormalEntityList.isEmpty()) { //进行装车异常生成 @@ -4812,7 +4812,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl !Objects.isNull(f.getDepartureTime())); + return deliverySelfEntities.stream().allMatch(f -> !Objects.isNull(f.getDepartureTime())); } return false; } @@ -4822,7 +4822,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Objects.isNull(f.getDepartureTime())); + return deliverySelfEntities.stream().allMatch(f -> Objects.isNull(f.getDepartureTime())); } return false; } @@ -5850,7 +5850,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildNodeFanoutMsgByPackage(deliveryListEntity, pushNodeList); distributionNodeWorkService.abnormalLoading(nodeFanoutMsg, AuthUtil.getUser()); } @@ -6229,14 +6229,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildNodeFanoutMsgByZeroOrder(deliveryListEntity, pushNodeList); distributionNodeWorkService.nodeLoading(nodeFanoutMsg, AuthUtil.getUser()); } - return Resp.scanSuccess("装车成功", str.toString()); } @@ -6276,8 +6275,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl data = new ArrayList<>(); for (DistributionLoadscanEntity distributionLoadscanEntity : pushNodeList) { @@ -7969,13 +7966,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl["+distributionDeliveryListEntity.getDriverName()+"]"; + String content = user.getNickName() + "在" + myCurrentWarehouse.getName() + "对配送计划:" + distributionDeliveryListEntity.getTrainNumber() + "取消发车,当前配送司机配置-->[" + distributionDeliveryListEntity.getDriverName() + "]"; DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity(); distributionPlanLogEntity.setContent(content); distributionPlanLogEntity.setRefId(distributionDeliveryListEntity.getId()); @@ -8040,7 +8037,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() - .eq(DistributionLoadscanAbnormalEntity::getDeliveryListId,deliveryId) + .eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, deliveryId) ); } @@ -8390,17 +8387,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl { - DistributionReservationEntity reservationEntity = distributionReservationService.getById(map.get("reservationId").toString()); + DistributionReservationEntity reservationEntity = distributionReservationService.getById(map.get("reservationId").toString()); ReservationVO reservationVO = checkListForReservationVO(data, reservationEntity); List packageDataList = reservationVO.getPackageDataList(); - if(packageDataList==null){ + if (packageDataList == null) { packageDataList = new ArrayList<>(); reservationVO.setPackageDataList(packageDataList); } - PackageData packageData =new PackageData(); + PackageData packageData = new PackageData(); packageData.setPackageCode((String) map.get("packageCode")); PackageTypeEnums type = PackageTypeEnums.CMP; packageData.setPackageType(type); @@ -8416,12 +8413,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl map : broadcastDataByStock) { - DistributionReservationEntity reservationEntity = distributionReservationService.getById(map.get("reservationId").toString()); + DistributionReservationEntity reservationEntity = distributionReservationService.getById(map.get("reservationId").toString()); ReservationVO reservationVO = checkListForReservationVO(data, reservationEntity); List packageDataList = reservationVO.getPackageDataList(); - if(packageDataList==null){ + if (packageDataList == null) { packageDataList = new ArrayList<>(); reservationVO.setPackageDataList(packageDataList); } @@ -8438,12 +8435,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl> broadcastDataByZeroOrder = baseMapper.getBroadcastDataByZeroOrder(id, warehouseId); if (!broadcastDataByZeroOrder.isEmpty()) { broadcastDataByZeroOrder.forEach(map -> { - DistributionReservationEntity reservationEntity = distributionReservationService.getById(map.get("reservationId").toString()); + DistributionReservationEntity reservationEntity = distributionReservationService.getById(map.get("reservationId").toString()); ReservationVO reservationVO = checkListForReservationVO(data, reservationEntity); List packageDataList = reservationVO.getPackageDataList(); - if(packageDataList==null){ + if (packageDataList == null) { packageDataList = new ArrayList<>(); reservationVO.setPackageDataList(packageDataList); } @@ -8482,8 +8479,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl packageLogs = new ArrayList<>(); //查询司机信息 - DistributionDeliverySelfEntity distributionDeliverySelfEntity = getDriver(deliveryListEntity,user,distrilbutionloadingscanDTO,isDriverFlag); - if (Objects.isNull(distributionDeliverySelfEntity)){ + DistributionDeliverySelfEntity distributionDeliverySelfEntity = getDriver(deliveryListEntity, user, distrilbutionloadingscanDTO, isDriverFlag); + if (Objects.isNull(distributionDeliverySelfEntity)) { return Resp.fail("当前操作人不合法"); } switch (type) { @@ -8656,7 +8653,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>packageCode:{},reservationId:{}", distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getReservationId()); - if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())){ + if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())) { return Resp.scanFail("请指定客户进行异常装车", "请指定客户进行异常装车"); } return R.fail(5000, "异常装车"); @@ -8837,9 +8834,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() @@ -9116,13 +9113,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationId.equals(f.getReservationId())); - if (isRepeatFlag){ + if (isRepeatFlag) { //当前客户存在异常装车 - return Resp.scanFail("重复扫描","重复扫描"); - }else { + return Resp.scanFail("重复扫描", "重复扫描"); + } else { //校验是否在其他车次存在异常 String abnormalTrainNumber = loadscanEntityList.stream().map(DistributionLoadscanEntity::getTrainNumber).distinct().collect(Collectors.joining(",")); - return Resp.scanFail("此包件在"+abnormalTrainNumber+"存在异常操作","此包件在"+abnormalTrainNumber+"存在异常操作"); + return Resp.scanFail("此包件在" + abnormalTrainNumber + "存在异常操作", "此包件在" + abnormalTrainNumber + "存在异常操作"); } } BladeUser user = AuthUtil.getUser(); @@ -9131,7 +9128,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(); List aaa = new ArrayList<>(); //查询当前司机信息 - DistributionDeliverySelfEntity distributionDeliverySelfEntity = getDriver(deliveryList,user,distrilbutionloadingscanDTO,isDriverFlag); + DistributionDeliverySelfEntity distributionDeliverySelfEntity = getDriver(deliveryList, user, distrilbutionloadingscanDTO, isDriverFlag); DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); DistributionReservationEntity reservationEntity = null; switch (deliveryList.getType()) { @@ -9161,7 +9158,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Func.isNotEmpty(r.getConsignee()) && r.getConsignee().equals(stockArticleEntity.getCustomerName()) && r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) && r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) && r.getMallName().equals(stockArticleEntity.getMallName()) && r.getId().equals(reservationId)); //存在多个，操作人指定具体客户即可 - if ( flag) { + if (flag) { List reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee()) && r.getConsignee().equals(stockArticleEntity.getCustomerName()) && r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) && r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) && r.getMallName().equals(stockArticleEntity.getMallName()) && r.getId().equals(reservationId)).collect(Collectors.toList()); return true; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java index bb5f51a51..545091668 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java @@ -132,21 +132,6 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer @Override public void signFor(DistributionParcelListEntity parcelListEntity, Long taskId, String operationTime, String destinationWarehouse) { -// log.info(">>>>>>>>>> signFor 签收扫描 {}", parcelListEntity.getOrderPackageCode()); -// BroadcastNodeData broadcastNodeData = new BroadcastNodeData(); -// broadcastNodeData.put("orderPackageCode", parcelListEntity.getOrderPackageCode()); -// broadcastNodeData.put("distributionContactId", taskId); -//// broadcastNodeData.put("distributionContactCode", distributionReservationEntity.getReservationCode()); -// broadcastNodeData.put("destinationWarehouse", destinationWarehouse); -// broadcastNodeData.put("brand", parcelListEntity.getBrandName()); -// broadcastNodeData.setOperationTime(operationTime); -// broadcastNodeData.setUserName(AuthUtil.getUserName()); -// broadcastNodeData.setTenantId(AuthUtil.getTenantId()); -// -// FanoutMsg build = FanoutMsg.builder().msg(broadcastNodeData.toJSONString()) -// .exchange(FanoutConstants.distribution.signfor.EXCHANGE).build(); -// -// sendFanoutMsg(build); try { JSONObject main = new JSONObject(); main.set("boId", taskId.toString()); 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 8b87135c5..4180f297a 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 @@ -61,12 +61,9 @@ import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; -import org.springblade.common.constant.DistributionTypeConstant; +import org.springblade.common.constant.*; import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant; import org.springblade.common.constant.Inventory.InventorySigningStatusConstant; -import org.springblade.common.constant.RabbitConstant; -import org.springblade.common.constant.RedisKeyConstant; -import org.springblade.common.constant.WorkNodeEnums; import org.springblade.common.constant.billLading.BillLadingStatusConstant; import org.springblade.common.constant.common.IsOrNoConstant; import org.springblade.common.constant.delivery.DeliveryLoadingStatusConstant; @@ -2914,7 +2911,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushList); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushList, OperatModeConstant.SCAN); iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -2927,7 +2924,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildDistributionSignforVOByStock(DistributionDeliveryListEntity distributionDeliveryListEntity, List pushList) { + private NodeFanoutMsg buildDistributionSignforVOByStock(DistributionDeliveryListEntity distributionDeliveryListEntity, List pushList,String operatMode) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); @@ -2972,13 +2969,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildDistributionSignforVO(DistributionDeliveryListEntity distributionDeliveryListEntity, DistributionReservationEntity distributionReservationEntity, List pushList) { + private NodeFanoutMsg buildDistributionSignforVO(DistributionDeliveryListEntity distributionDeliveryListEntity, DistributionReservationEntity distributionReservationEntity, List pushList,String operatMode) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); @@ -2997,6 +2995,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl data = new ArrayList<>(); @@ -3358,7 +3357,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushDatas); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushDatas,OperatModeConstant.BATCH); iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -3813,7 +3812,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVO(distributionDeliveryListEntity, reservationEntity, pushList); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(distributionDeliveryListEntity, reservationEntity, pushList,OperatModeConstant.SCAN); iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); return Resp.scanSuccess("操作成功", s); @@ -4196,7 +4195,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList,OperatModeConstant.SCAN); iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -7628,7 +7627,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity,reservationEntity, pushList); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity,reservationEntity, pushList,OperatModeConstant.BATCH); iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); break; case 2: @@ -7951,12 +7950,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushInventoryList); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushInventoryList, OperatModeConstant.SCAN); iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); } if (!pushList.isEmpty()) { // 构建新作业节点回传 - NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity,reservationEntity, pushList); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity,reservationEntity, pushList,OperatModeConstant.SCAN); iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); } if (!orderCodes.isEmpty()) {