Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -1828,6 +1828,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			}
 		});
 		if (!addOrderPackageCodes.isEmpty()) {
+			log.info(">>>>>>>>>>>>>>>>>>>推送新增日志");
 			trunklinePackageTrackLogClient.addPackageTrackLog(addPackageLog);
 		}
 
@@ -1894,18 +1895,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				DistributionStockArticleDTO stockArticleDTO = Func.copy(stockArticleEntity, DistributionStockArticleDTO.class);
 				//维护订单信息
 				distributionStockArticleService.maintenanceOrderInfo(stockArticleDTO.getOrderCode(),myCurrentWarehouse.getId());
-//				distributionAsyncService.changeOrderReservationStatus(stockArticleDTO);
-
-				//这里需要根据包件状态进行订单状态的修改
-				//这里异步查看该订单下的包件信息是否都处于预约状态，如果不是那么为订单预约装填，部分那么订单为部分预约，没有那么订单处于待预约状态
-//			distributionAsyncService.changeOrderReservationStatus(stockArticleDTO);
-//			String status = distributionReservationPackageService.judgmentStatus(stockArticleDTO);
-//			stockArticleEntity.setReservationStatus(status);
-//			reservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue());
 				distributionReservationStockarticleService.updateById(reservationStockarticleEntity);
 			});
 		}
 		if (!cancelOrderPackageCodes.isEmpty()) {
+			log.info(">>>>>>>>>>>>>>>>>>>推送取消日志");
 			trunklinePackageTrackLogClient.addPackageTrackLog(cancelPackageLog);
 		}
 		//库存品修改