From ff0bda2cc9d0d16d0cb2178086655644344d37ec Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Wed, 3 Jan 2024 12:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DistributionStockupListVO.java         |  2 +
 .../vo/DistributionStockupVO.java             |  1 +
 .../mapper/DistributionStockupMapper.xml      |  3 +-
 .../impl/DistributionStockupServiceImpl.java  | 42 ++++++++++++++++++-
 4 files changed, 45 insertions(+), 3 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 3627bf653..8c6b6f5dd 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
@@ -15,6 +15,8 @@ public class DistributionStockupListVO implements Serializable {
 	private String typeServiceStr;
 
 	private Integer stockupStatus;//备货状态
+	private String stockStatus;//备货状态
+	private String stockStatusName;//备货状态名称
 	private String stockupStatusStr; //备货名称
 
 	private String customer;//客户
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java
index 417b7f882..aa4bd36b0 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java
@@ -44,6 +44,7 @@ public class DistributionStockupVO extends DistributionStockupEntity {
 	private String stockupUser;
 	private Long stockupId;
 	private String stockupStatusName;
+	private String stockStatusName;
 	//备货状态
 	private String stockupStatus;
 	private String assignStatusName;
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 da07feae2..3ee1bdfd8 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
@@ -529,6 +529,7 @@
     <select id="selectStockupClientInfo" resultType="com.logpm.distribution.vo.DistributionStockupListVO">
         select DISTINCT ldr.consignee      customer,
                         lds.stockup_status stockupStatus,
+                        ldr.stock_status stockStatus,
                         lds.type_service   typeService,
                         ldr.mall_name  mallName,
                         (
@@ -857,7 +858,7 @@
         from  logpm_distribution_reservation_package ldrp
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id
         where  ldrp.reservation_id = ldsi.reservation_id
-        )  goodsAllocation
+        )  goodsAllocation,ldr.stock_status stockStatus
         from logpm_distribution_reservation ldr
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldr.id = ldsi.reservation_id
         <where>
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 c9839b2ae..02057f6cf 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
@@ -483,6 +483,21 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					stockupDTO.setReservationId(Long.parseLong(split[i]));
 					DistributionStockupListVO distributionStockupListVO = baseMapper.selectStockupClientInfo(stockupDTO);
 					if (ObjectUtils.isNotNull(distributionStockupListVO)) {
+						if(ObjectUtils.isNotNull(distributionStockupListVO.getStockStatus())){
+							switch (distributionStockupListVO.getStockStatus()){
+								case "1":
+									distributionStockupListVO.setStockStatusName("待备货");
+									break;
+								case "2":
+									distributionStockupListVO.setStockStatusName("备货中");
+									break;
+								case "3":
+									distributionStockupListVO.setStockStatusName("已备货");
+									break;
+							}
+						}else{
+							distributionStockupListVO.setStockStatusName("待备货");
+						}
 						QueryWrapper<DistributionReservationZeroPackageEntity> queryWrapper = new QueryWrapper<>();
 						//查询有没有零担数据
 						queryWrapper.eq("reservation_id", stockupDTO.getReservationId());
@@ -957,7 +972,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				list = zeroTrayInfo;
 			}
 		}
-
+		//有货位
 		List<DistributionStockupOrderListVO> collect11 = list.stream().filter(o -> ObjectUtils.isNotNull(o.getAllocationId())).collect(Collectors.toList()); //有货位
 		Set<DistributionStockupOrderListVO> listYou = new HashSet<>(); //
 		collect11.forEach(p -> {
@@ -998,7 +1013,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 							if (ObjectUtils.isNotNull(y.getStockArticleId()) && !y.getStockArticleId().contains(p.getStockArticleId())) {
 								y.setStockArticleId(y.getStockArticleId() + "," + p.getStockArticleId());
 							}
+							if (y.getPlanNum().equals(y.getScanNum())) {
+								y.setCompleteStact(true);
+							} else {
+								y.setCompleteStact(false);
+							}
 						}
+
 					});
 				} else {
 					//没有
@@ -1012,7 +1033,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					listYou.add(p);
 				}
 			} else {
-				//
+				//没有
 				p.setPlanNum(i1);
 				if (ObjectUtils.isNull(p.getStockId())) {
 					p.setScanNum(0);
@@ -1024,6 +1045,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				listYou.add(p);
 			}
 		});
+		//无货位
 		List<DistributionStockupOrderListVO> collect22 = list.stream().filter(o -> ObjectUtils.isNull(o.getAllocationId())).collect(Collectors.toList()); //无货位
 		List<DistributionStockupOrderListVO> listLi = new ArrayList<>(); //历史
 		collect22.forEach(i -> {
@@ -1653,6 +1675,22 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		IPage<DistributionStockupVO> iPage = baseMapper.detailReservationOwn(page, distributionStockupVO);
 		iPage.getRecords().forEach(i -> {
 			i.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS, i.getStockupStatus()));
+
+			if(ObjectUtils.isNotNull(i.getStockStatus())){
+				switch (i.getStockStatus()){
+					case "1":
+						i.setStockStatusName("待备货");
+						break;
+					case "2":
+						i.setStockStatusName("备货中");
+						break;
+					case "3":
+						i.setStockStatusName("已备货");
+						break;
+				}
+			}else{
+				i.setStockStatusName("待备货");
+			}
 		});
 		return iPage;
 	}