|
|
|
@ -1524,6 +1524,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
List<DistributionLoadscaninvnEntity> kucuns = new ArrayList<>(); |
|
|
|
|
List<DistributionLoadscanEntity> dingzhis= new ArrayList<>(); |
|
|
|
|
List<DistributionLoadscanEntity> lingdans = new ArrayList<>(); |
|
|
|
|
List<DistributionParcelListEntity> pushList = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
for (DistributionReservationStockarticleEntity reservationStockarticleEntity : reservationStockarticleEntityList) { |
|
|
|
|
switch (reservationStockarticleEntity.getIsZero()) { |
|
|
|
@ -1600,6 +1601,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
newT.setOrderPackageStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); |
|
|
|
|
|
|
|
|
|
distributionParcelListService.updateById(newT); |
|
|
|
|
pushList.add(newT); |
|
|
|
|
//扣减在库订单的在库数量
|
|
|
|
|
// Integer k = distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
|
|
|
|
|
updatePackageList.add(parcelListEntity); |
|
|
|
@ -1838,7 +1840,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
if(Func.isNotEmpty(lingdans)){ |
|
|
|
|
sendBuildNodeFanoutMsgByZeroOrder(deliveryList,lingdans); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(pushList)) { |
|
|
|
|
for (DistributionParcelListEntity parcelListEntity : pushList) { |
|
|
|
|
List<Object> contents = new ArrayList<>(); |
|
|
|
|
PushData pushData = PushData.builder() |
|
|
|
|
.packageCode(parcelListEntity.getOrderPackageCode()) |
|
|
|
|
.orderCode(parcelListEntity.getOrderCode()) |
|
|
|
|
.warehouseName(myCurrentWarehouse.getName()) |
|
|
|
|
.waybillNumber(parcelListEntity.getWaybillNumber()).build(); |
|
|
|
|
contents.add(pushData); |
|
|
|
|
NodePushMsg msg = new NodePushMsg(); |
|
|
|
|
msg.setNode(WorkNodeEnums.DISTRIBUTION_LOADING); |
|
|
|
|
msg.setBrand(BrandEnums.getByValue(parcelListEntity.getBrandName())); |
|
|
|
|
msg.setOperator(AuthUtil.getNickName()); |
|
|
|
|
msg.setOperatorTime(new Date()); |
|
|
|
|
msg.setContent(contents); |
|
|
|
|
log.info("推送工厂数据:{}", JSONUtil.toJsonStr(msg)); |
|
|
|
|
factoryDataMessageSender.sendNodeDataByBrand(msg); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return Resp.scanSuccess("操作成功", "装车成功"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|