|
|
@ -5716,9 +5716,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
builder.append(distributionSignforEntity.getDriverRemarks()).append(deliverySelfEntity.getDriverName() + ":" + distributionSignfor.getDriverRemarks()); |
|
|
|
builder.append(distributionSignforEntity.getDriverRemarks()).append(deliverySelfEntity.getDriverName() + ":" + distributionSignfor.getDriverRemarks()); |
|
|
|
distributionSignforEntity.setDriverRemarks(builder.toString()); |
|
|
|
distributionSignforEntity.setDriverRemarks(builder.toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (!aaa.isEmpty()){ |
|
|
|
|
|
|
|
trunklinePackageTrackLogClient.addPackageTrackLog(aaa); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if (distributionDeliveryListEntity.getKind().equals("1")){ |
|
|
|
if (distributionDeliveryListEntity.getKind().equals("1")){ |
|
|
|
if (deliverySelfEntity.getIsMaster().equals(1)) { |
|
|
|
if (deliverySelfEntity.getIsMaster().equals(1)) { |
|
|
@ -6174,6 +6172,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); |
|
|
|
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (!aaa.isEmpty()){ |
|
|
|
|
|
|
|
trunklinePackageTrackLogClient.addPackageTrackLog(aaa); |
|
|
|
|
|
|
|
} |
|
|
|
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":reservationId:", distributionSignfor.getReservationId(), 60L); |
|
|
|
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":reservationId:", distributionSignfor.getReservationId(), 60L); |
|
|
|
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildNodeFanoutMsgByOneClick(distributionDeliveryListEntity, reservationEntity, distributionLoadscaninvnEntityLists, distributionLoadscanEntityLists); |
|
|
|
NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildNodeFanoutMsgByOneClick(distributionDeliveryListEntity, reservationEntity, distributionLoadscaninvnEntityLists, distributionLoadscanEntityLists); |
|
|
|
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); |
|
|
|
distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); |
|
|
|