修改备货查询不正确

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;//客户

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;

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>

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;
 	}