From f6f61cc03fc90424bd844353b378add3b0353811 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 18 May 2024 02:02:47 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/OldSystemDataPushConfig.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
index 48d4d5077..602b2f48a 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
@@ -84,15 +84,19 @@ public class OldSystemDataPushConfig {
 		//广元仓
 		warehourseIds.add("40");
 
-	}
 
+		//广元仓
+		warehourseIds.add("40");
+
+		//双流金牌基地仓
+		warehourseIds.add("55");
+	}
 
 
-	public static List<String> getWarehourseIdList(){
+	public static List<String> getWarehourseIdList() {
 
 		return warehourseIds;
 	}
 
 
-
 }

From bdb901a5692e4e6d1ee5362b685e0e8bae5a92bb Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 18 May 2024 09:17:59 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DistributionStockupListVO.java         |  2 +-
 .../mapper/DistributionStockupMapper.xml      |  2 +-
 .../impl/DistributionStockupServiceImpl.java  | 68 +++++++++++--------
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupListVO.java
index 8c6b6f5dd..3efc83d9c 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupListVO.java
@@ -8,7 +8,7 @@ import java.io.Serializable;
 public class DistributionStockupListVO implements Serializable {
 
 	private Long id;//预约单id
-	private Long reservationId;//预约单id(自提Id)
+	private String reservationId;//预约单id(自提Id)
 	private String reservation;//预约单id
 
 	private Integer typeService;//服务类型
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index 92eb838d1..47ddf2a77 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -815,7 +815,7 @@
     </select>
 
     <select id="selectStockupPageInfo" resultType="com.logpm.distribution.vo.DistributionStockupListVO">
-        select GROUP_CONCAT(ldsi.reservation_id SEPARATOR ',') reservationId, lds.stockup_code
+        select GROUP_CONCAT(ldsi.reservation_id SEPARATOR ',') reservation, lds.stockup_code
         stockupCode,lds.type_service typeService,
         lds.stockup_status stockupStatus,lds.stockup_area stockupArea
         from logpm_distribution_stockup lds
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 4a5cabf66..b6040918e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -398,13 +398,18 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			map.put("typeServiceStr", vo.getTypeServiceStr());
 			map.put("typeService", vo.getTypeService());
 			map.put("stockupArea", vo.getStockupArea());
-			map.put("reservationId", vo.getReservationId());
 			map.put("reservation", vo.getReservationId());
+			map.put("reservationId", vo.getReservationId());
 			map.put("stockupStatusStr", vo.getStockupStatusStr());
 			//查询客户数据
 			if (vo.getTypeService().equals(3)) {
 				//自
+
+				String[] split = vo.getReservation().split(",");
+
+
 				List<DistributionStockupListVO> list = baseMapper.selectStockupClientInfoSelf(stockupDTO);
+
 				list.forEach(i -> {
 					QueryWrapper<DistributionReservationZeroPackageEntity> queryWrapper = new QueryWrapper<>();
 					//查询有没有零担数据
@@ -419,8 +424,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 						i.setPlanNum(0);
 					}
 					//没有
-					List<DistributionStockPackageVO> list2 = distrilbutionBillStockService.listPackageSelf(i.getReservationId());
-					i.setPlanNum(i.getPlanNum() + list2.size());
+					for (String s : split) {
+						List<DistributionStockPackageVO> list2 = distrilbutionBillStockService.listPackageSelf(Long.parseLong(s));
+						i.setPlanNum(i.getPlanNum() + list2.size());
+					}
 					List<DistributionStockEntity> listStock = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda()
 						.eq(DistributionStockEntity::getBillLadingId, i.getReservationId())
 						.eq(DistributionStockEntity::getStockupId, stockupDTO.getStockupId())
@@ -432,7 +439,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 						i.setStockupNum(0);
 					}
 				});
+
 				map.put("orderList", list);
+
+
 			} else {
 				//商 ，市
 
@@ -464,7 +474,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 						queryWrapper.in("zero_package_status", "1", "3");
 						List<DistributionReservationZeroPackageEntity> list1 = reservationZeroPackageService.list(queryWrapper);
 						intToStrDistributionStockupListVO(distributionStockupListVO);
-						distributionStockupListVO.setReservationId(Long.parseLong(split[i]));
+						distributionStockupListVO.setReservationId(stockupDTO.getReservationId() + "");
 						distributionStockupListVO.setPlanNum(distributionStockupListVO.getPlanNum() + list1.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum());
 						List<DistributionStockEntity> list2 = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda()
 							.eq(DistributionStockEntity::getReservationId, stockupDTO.getReservationId())
@@ -1839,8 +1849,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	public R addPackTrayList(StockupDTO stockupDTO) {
 		AtomicReference<Boolean> stock = new AtomicReference<>(false);
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-		if (Func.isEmpty(myCurrentWarehouse.getId())){
-			return Resp.scanFail("未授权!!!","未授权");
+		if (Func.isEmpty(myCurrentWarehouse.getId())) {
+			return Resp.scanFail("未授权!!!", "未授权");
 		}
 
 		DistributionStockupInfoEntity one = distributionStockupInfoService.getOne(Wrappers.<DistributionStockupInfoEntity>query().lambda()
@@ -1999,11 +2009,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 				distributionStockService.saveBatch(list1);
 				//备货库位上架
-				if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
+				if (!Func.isEmpty(stockupDTO.getStockupAllocationId())) {
 					JSONObject jsonObject = new JSONObject();
 					jsonObject.put("warehouseId", myCurrentWarehouse.getId());
 					jsonObject.put("code", stockupDTO.getTrayBarCode());
-				    jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
+					jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
 					jsonObject.put("type", 4);
 					jsonObject.put("num", list1.size());
 					warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
@@ -2524,8 +2534,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		if (ObjectUtils.isNull(stockupDTO.getNum())) {
 			log.error(method + "零担备货参数缺失Num", stockupDTO);
 			return Resp.scanFail("请输入备货数量 !", "请输入备货数量 !");
-		}else {
-			if (stockupDTO.getNum()<=0){
+		} else {
+			if (stockupDTO.getNum() <= 0) {
 				return Resp.scanFail("请输入正确备货数量 !", "请输入正确备货数量 !");
 			}
 		}
@@ -2592,7 +2602,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionStockEntity::getStockupId, stockupDTO.getStockupId())
 				.eq(DistributionStockEntity::getStockArticle, stockupDTO.getStockArticleId())
 			);
-			if (!stockEntityList.isEmpty()){
+			if (!stockEntityList.isEmpty()) {
 				stockupNum = stockEntityList.stream().mapToInt(DistributionStockEntity::getStockQuantity).sum();
 			}
 		}
@@ -2613,7 +2623,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			stockEntity.setBillLadingId(stockupDTO.getReservationId());
 			stockEntity.setOutboundType("3");
 		} else {
-				stockEntity.setOutboundType(reservationEntity.getDeliveryType());
+			stockEntity.setOutboundType(reservationEntity.getDeliveryType());
 		}
 		stockEntity.setType(3);
 		stockEntity.setStockQuantity(stockupDTO.getNum());
@@ -2669,7 +2679,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				if (trayList.size() == 1) {
 					//托盘解托
 					WarehouseTrayGoodsEntity trayGoodsEntity = trayList.get(0);
-					log.info(method+"downZeroTrayById>>>>>>>>>>>>>>>trayId:{},orderId:{},warehouseId:{},num:{}",trayGoodsEntity.getTrayId(),stockArticleEntity.getId(), myCurrentWarehouse.getId(), stockupDTO.getNum());
+					log.info(method + "downZeroTrayById>>>>>>>>>>>>>>>trayId:{},orderId:{},warehouseId:{},num:{}", trayGoodsEntity.getTrayId(), stockArticleEntity.getId(), myCurrentWarehouse.getId(), stockupDTO.getNum());
 					List<JSONObject> list = new ArrayList<>();
 					JSONObject jsonObject = new JSONObject();
 					jsonObject.put("warehouseId", myCurrentWarehouse.getId());
@@ -2692,7 +2702,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		} else {
 			log.info(method + "无库位无托盘备货");
 		}
-		if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
+		if (!Func.isEmpty(stockupDTO.getStockupAllocationId())) {
 			JSONObject jsonObject = new JSONObject();
 			jsonObject.put("warehouseId", myCurrentWarehouse.getId());
 			jsonObject.put("code", stockArticleEntity.getOrderCode());
@@ -3216,9 +3226,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			);//预约信息
 			if (!list.isEmpty()) {
 				DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId());
-				if (!Func.isEmpty(byId)){
+				if (!Func.isEmpty(byId)) {
 					BasicdataClientEntity byName = basicdataClientClient.findByName(byId.getMallName());
-					if (!Func.isEmpty(byName)){
+					if (!Func.isEmpty(byName)) {
 						mallId = byId.getMallId();
 						mallName = byId.getMallName();
 					}
@@ -3226,7 +3236,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 
 			}
-			if (Objects.isNull(mallId) || Objects.isNull(mallName)){
+			if (Objects.isNull(mallId) || Objects.isNull(mallName)) {
 				List<DistributionDeliveryDetailsEntity> detailsEntities = distributionDeliveryDetailsService.list(Wrappers.<DistributionDeliveryDetailsEntity>query().lambda()
 					.eq(DistributionDeliveryDetailsEntity::getBillLadingId, reservationId)
 					.ne(DistributionDeliveryDetailsEntity::getInventoryStatus, "2")
@@ -3234,17 +3244,17 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				if (!detailsEntities.isEmpty()) {
 					List<Long> ids = detailsEntities.stream().map(DistributionDeliveryDetailsEntity::getStockListId).distinct().collect(Collectors.toList());
 					List<DistributionStockListEntity> distributionStockListEntities = distributionStockListService.listByIds(ids);
-					if (!distributionStockListEntities.isEmpty()){
+					if (!distributionStockListEntities.isEmpty()) {
 						if (distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketId).distinct().collect(Collectors.toList()).size() == 1 && distributionStockListEntities.stream().map(DistributionStockListEntity::getMallName).distinct().collect(Collectors.toList()).size() == 1) {
 							mallId = distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketId).distinct().collect(Collectors.toList()).get(0);
 							mallName = distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketName).distinct().collect(Collectors.toList()).get(0);
-						}else {
-							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息reservationId:{}",reservationId);
-							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息商场ID:{}",distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketId).distinct().collect(Collectors.toList()));
-							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息商场名称:{}",distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketName).distinct().collect(Collectors.toList()));
+						} else {
+							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息reservationId:{}", reservationId);
+							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息商场ID:{}", distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketId).distinct().collect(Collectors.toList()));
+							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息商场名称:{}", distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketName).distinct().collect(Collectors.toList()));
 						}
-					}else {
-						log.info(">>>>>>>>>>>>>>>>自提单无定制品和库存品   无效字体计划billLadingId:{}",reservationId);
+					} else {
+						log.info(">>>>>>>>>>>>>>>>自提单无定制品和库存品   无效字体计划billLadingId:{}", reservationId);
 					}
 				}
 			}
@@ -3253,14 +3263,14 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		} else {
 			// 查询预约单上的商城
 			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
-			if (!Func.isEmpty(distributionReservationEntity)){
+			if (!Func.isEmpty(distributionReservationEntity)) {
 				BasicdataClientEntity byName = basicdataClientClient.findByName(distributionReservationEntity.getMallName());
-				if (!Func.isEmpty(byName)){
+				if (!Func.isEmpty(byName)) {
 					mallId = distributionReservationEntity.getMallId();
 					mallName = distributionReservationEntity.getMallName();
 				}
-			}else {
-				log.info("查询预约单客户信息失败reservationId:{}",reservationId);
+			} else {
+				log.info("查询预约单客户信息失败reservationId:{}", reservationId);
 			}
 		}
 
@@ -3374,7 +3384,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		//过滤出同物料库存品的ID信息
 		List<Long> stockListIds = distributionStockListEntities.stream().map(DistributionStockListEntity::getId).collect(Collectors.toList());
 		if (stockListIds.isEmpty()) {
-			log.info("###################仓库查询物料信息错误物料编号:{},warehouseId:{}", stockupDTO.getCargoNumber(),myCurrentWarehouse.getId());
+			log.info("###################仓库查询物料信息错误物料编号:{},warehouseId:{}", stockupDTO.getCargoNumber(), myCurrentWarehouse.getId());
 
 			return null;
 		}

From 4504285022b118d43360e2f5e74c3d631d30eb99 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 18 May 2024 11:02:06 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionStockArticleServiceImpl.java  | 157 +++++++++++++++++-
 1 file changed, 156 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index f31dc63a3..734916707 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -1376,6 +1376,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	@Override
 	public void updateOrderInfo(String orderCode, Long warehouseId) {
 
+
+
 		DistributionStockArticleEntity stockArticleEntity = findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
 		if (Objects.isNull(stockArticleEntity)) {
 			log.warn("##############updateOrderInfo: 订单信息不存在 orderCode={} warehouseId={}", orderCode, warehouseId);
@@ -1388,8 +1390,161 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			return;
 		}
 
+
+		Integer totalNumber = stockArticleEntity.getTotalNumber();
 		//查询入库件数
-		updateStockArticleByextracted(warehouseId, stockArticleEntity);
+		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("order_code", orderCode)
+			.eq("warehouse_id", warehouseId)
+			.eq("conditions", 1)
+			.eq("is_deleted", 0);
+		List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
+		Integer incomingNum = 0;
+		Integer handleNum = 0;
+		Integer outNum = 0;
+		Integer signNum = 0;
+		Integer reservationNum = 0;
+		Integer groundingNum = 0;
+
+		Long firstEntryTime = 0L;
+		Long lastEntryTime = 0L;
+		Set<String> waybillNoSet = new TreeSet<>();
+		for (DistributionParcelListEntity parcelListEntity : list) {
+			incomingNum = incomingNum + 1;
+			Date warehouseEntryTimeEnd = parcelListEntity.getWarehouseEntryTimeEnd();
+			if (Objects.isNull(warehouseEntryTimeEnd)) {
+				warehouseEntryTimeEnd = parcelListEntity.getCreateTime();
+			}
+			long time = warehouseEntryTimeEnd.getTime();
+
+			if (firstEntryTime == 0L) {
+				firstEntryTime = time;
+			} else {
+				if (firstEntryTime > time) {
+					firstEntryTime = time;
+				}
+			}
+
+			if (lastEntryTime == 0L) {
+				lastEntryTime = time;
+			} else {
+				if (lastEntryTime < time) {
+					lastEntryTime = time;
+				}
+			}
+
+			Integer conditions = parcelListEntity.getConditions();
+			if (conditions.equals(1)) {
+				String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
+				String orderPackageReservationStatus = parcelListEntity.getOrderPackageReservationStatus();
+				String orderPackageGroundingStatus = parcelListEntity.getOrderPackageGroundingStatus();
+				String waybillNumber = parcelListEntity.getWaybillNumber();
+				if (StringUtils.isNotBlank(waybillNumber)) {
+					waybillNoSet.add(parcelListEntity.getWaybillNumber());
+				}
+
+				if ("20".equals(orderPackageGroundingStatus)) {
+					groundingNum = groundingNum + 1;
+				}
+
+				if ("20".equals(orderPackageReservationStatus)) {
+					reservationNum = reservationNum + 1;
+				}
+
+				if (!"60".equals(orderPackageStatus) && !"70".equals(orderPackageStatus)) {
+					handleNum = handleNum + 1;
+				} else if ("60".equals(orderPackageStatus)) {
+					outNum = outNum + 1;
+				} else if ("70".equals(orderPackageStatus)) {
+					signNum = signNum + 1;
+				}
+			}
+		}
+
+		String orderWaybillNo = null;
+		for (String waybillNo : waybillNoSet) {
+			if (StringUtils.isBlank(orderWaybillNo)) {
+				orderWaybillNo = waybillNo;
+			} else {
+				orderWaybillNo = orderWaybillNo + "," + waybillNo;
+			}
+		}
+
+		stockArticleEntity.setWaybillNumber(orderWaybillNo);
+		stockArticleEntity.setWarehouseEntryTime(new Date(firstEntryTime));
+		stockArticleEntity.setWarehouseEntryTimeEnd(new Date(lastEntryTime));
+
+		if (incomingNum == 0) {
+			stockArticleEntity.setOrderReceiveStatus("10");
+			stockArticleEntity.setCompleteSet(1);
+			stockArticleEntity.setOrderStatus("0");
+			stockArticleEntity.setReservationStatus("10");
+			stockArticleEntity.setGroundingStatus("10");
+		} else if (0 < incomingNum && incomingNum < totalNumber) {
+			stockArticleEntity.setOrderReceiveStatus("20");
+			stockArticleEntity.setCompleteSet(1);
+			if (signNum == 0) {
+				if (handleNum == 0) {
+					stockArticleEntity.setOrderStatus("20");
+				} else if (0 < handleNum && handleNum < totalNumber) {
+					stockArticleEntity.setOrderStatus("20");
+				} else {
+					stockArticleEntity.setOrderStatus("20");
+				}
+			} else {
+				stockArticleEntity.setOrderStatus("70");
+			}
+
+			if (reservationNum == 0) {
+				stockArticleEntity.setReservationStatus("10");
+			} else {
+				stockArticleEntity.setReservationStatus("20");
+			}
+
+			if (groundingNum == 0) {
+				stockArticleEntity.setGroundingStatus("10");
+			} else {
+				stockArticleEntity.setGroundingStatus("20");
+			}
+		} else {
+			stockArticleEntity.setOrderReceiveStatus("30");
+			stockArticleEntity.setCompleteSet(2);
+			if (signNum == 0) {
+				if (handleNum == 0) {
+					stockArticleEntity.setOrderStatus("20");
+				} else if (0 < handleNum && handleNum < totalNumber) {
+					stockArticleEntity.setOrderStatus("20");
+				} else {
+					stockArticleEntity.setOrderStatus("20");
+				}
+			} else {
+				if (signNum.equals(totalNumber)) {
+					stockArticleEntity.setOrderStatus("80");
+				} else {
+					stockArticleEntity.setOrderStatus("70");
+				}
+			}
+
+			if (reservationNum == 0) {
+				stockArticleEntity.setReservationStatus("10");
+			} else if (reservationNum > 0 && reservationNum < totalNumber) {
+				stockArticleEntity.setReservationStatus("20");
+			} else {
+				stockArticleEntity.setReservationStatus("30");
+			}
+
+			if (groundingNum == 0) {
+				stockArticleEntity.setGroundingStatus("10");
+			} else if (groundingNum > 0 && groundingNum < totalNumber) {
+				stockArticleEntity.setGroundingStatus("20");
+			} else {
+				stockArticleEntity.setGroundingStatus("30");
+			}
+		}
+
+		stockArticleEntity.setIncomingNum(incomingNum);
+		stockArticleEntity.setHandQuantity(handleNum);
+		updateById(stockArticleEntity);
 
 	}
 

From 75afe31520b0e8b5c588ba2740e0e283555e6dd7 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 18 May 2024 11:04:59 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockArticleServiceImpl.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index 734916707..efeee1670 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -1375,9 +1375,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	public void updateOrderInfo(String orderCode, Long warehouseId) {
-
-
-
 		DistributionStockArticleEntity stockArticleEntity = findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
 		if (Objects.isNull(stockArticleEntity)) {
 			log.warn("##############updateOrderInfo: 订单信息不存在 orderCode={} warehouseId={}", orderCode, warehouseId);
@@ -1545,7 +1542,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		stockArticleEntity.setIncomingNum(incomingNum);
 		stockArticleEntity.setHandQuantity(handleNum);
 		updateById(stockArticleEntity);
-
 	}
 
 

From b5b81371bdb889318182607716b3f8db93192934 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 18 May 2024 16:24:36 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockArticleServiceImpl.java     | 4 ++--
 .../service/impl/WarehouseUpdownTypeServiceImpl.java          | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index efeee1670..58db31e55 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -1570,8 +1570,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			}
 
 			//查询入库件数
-			updateStockArticleByextracted(warehouseId, stockArticleEntity);
-
+//			updateStockArticleByextracted(warehouseId, stockArticleEntity);
+			updateOrderInfo(stockArticleEntity.getOrderCode(),warehouseId);
 			log.info(">>>>> T updateOrdersInfo end");
 		}
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index b7a318088..6f506edba 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -1679,6 +1679,9 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 //			distributionStockArticleClient.updateOrderInfo(orderCode, warehouseId);
 //		}
 		List<String> orders = new ArrayList<>(orderSet);
+		if(orders.isEmpty()){
+			return Resp.scanSuccess("下架成功", "成功下架" + num + "件");
+		}
 
 		OrderPackageDTO orderPackageDTO1 = new OrderPackageDTO();
 		orderPackageDTO1.setWarehouseId(warehouseId);

From a9c96cb94b53ac9c50689d00ad74dd28e06c30cf Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sun, 19 May 2024 11:05:18 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionStockArticleServiceImpl.java  | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index 58db31e55..9f66ece6f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/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");
 		}