Merge branch 'dev' into pre-production

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

@@ -1373,26 +1373,26 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		baseMapper.addIncomingNumk(orderId, num);
 	}
 
-	@Override
-	public void updateOrderInfo(String orderCode, Long warehouseId) {
-		DistributionStockArticleEntity stockArticleEntity = findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
+
+
+	public void updateOrderInfoByDistributionStockArticleEntity(DistributionStockArticleEntity stockArticleEntity){
+
 		if (Objects.isNull(stockArticleEntity)) {
-			log.warn("##############updateOrderInfo: 订单信息不存在 orderCode={} warehouseId={}", orderCode, warehouseId);
+			log.warn("##############updateOrderInfoByDistributionStockArticleEntity: 订单信息不存在 orderCode={} warehouseId={}", stockArticleEntity.getOrderCode(), stockArticleEntity.getWarehouseId());
 			throw new CustomerException(405, "订单信息不存在");
 		}
 
 		String isZero = stockArticleEntity.getIsZero();
 		if ("1".equals(isZero)) {
-			log.warn("##############updateOrderInfo: 零担不更新 orderCode={} warehouseId={}", orderCode, warehouseId);
+			log.warn("##############updateOrderInfoByDistributionStockArticleEntity: 零担不更新 orderCode={} warehouseId={}", stockArticleEntity.getOrderCode(), stockArticleEntity.getWarehouseId());
 			return;
 		}
 
-
 		Integer totalNumber = stockArticleEntity.getTotalNumber();
 		//查询入库件数
 		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("order_code", orderCode)
-			.eq("warehouse_id", warehouseId)
+		queryWrapper.eq("order_code", stockArticleEntity.getOrderCode())
+			.eq("warehouse_id", stockArticleEntity.getWarehouseId())
 			.eq("conditions", 1)
 			.eq("is_deleted", 0);
 		List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
@@ -1542,6 +1542,14 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		stockArticleEntity.setIncomingNum(incomingNum);
 		stockArticleEntity.setHandQuantity(handleNum);
 		updateById(stockArticleEntity);
+
+
+	}
+
+	@Override
+	public void updateOrderInfo(String orderCode, Long warehouseId) {
+		DistributionStockArticleEntity stockArticleEntity = findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
+		updateOrderInfoByDistributionStockArticleEntity(stockArticleEntity);
 	}
 
 
@@ -1549,14 +1557,22 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	public void updateOrdersInfo(List<String> orderCodes, Long warehouseId) {
 
 		log.info(">>>>> T updateOrdersInfo start");
+		log.info(">>>>>  updateOrdersInfo orderCodes :{},warehouseId:{}",orderCodes,warehouseId);
+		if(orderCodes.isEmpty()){
+			return ;
+		}
 
 		QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.in("order_code", orderCodes)
-			.eq("warehouse_id", warehouseId)
+		queryWrapper.in("order_code", orderCodes);
+		queryWrapper.eq("warehouse_id", warehouseId);
 //			.eq("is_zero",1)
-			.eq("is_deleted", 0);
+		queryWrapper.eq("is_deleted", 0);
+
 		List<DistributionStockArticleEntity> distributionStockArticleEntities = baseMapper.selectList(queryWrapper);
 
+
+
+
 		for (DistributionStockArticleEntity stockArticleEntity : distributionStockArticleEntities) {
 
 			if (Objects.isNull(stockArticleEntity)) {
@@ -1571,7 +1587,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 			//查询入库件数
 //			updateStockArticleByextracted(warehouseId, stockArticleEntity);
-			updateOrderInfo(stockArticleEntity.getOrderCode(),warehouseId);
+			updateOrderInfoByDistributionStockArticleEntity(stockArticleEntity);
 			log.info(">>>>> T updateOrdersInfo end");
 		}