签收扫描预约状态bug修复

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

@@ -523,14 +523,18 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 			if (loadingNum == reservationTotal){
 				r.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
-			}else {
+			}else if (reservationTotal> loadingNum && loadingNum > 0){
 				r.setLoadingStatus(ReservationLoadingStatusConstant.bufenzhuangche.getValue());
+			}else {
+				r.setLoadingStatus(ReservationLoadingStatusConstant.daizhuangche.getValue());
 			}
 
 			if (signNum == reservationTotal){
 				r.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
-			}else {
+			}else if (reservationTotal> signNum && signNum > 0){
 				r.setSigningStatus(ReservationSigningStatusConstant.bufenqianshou.getValue());
+			}else {
+				r.setSigningStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
 			}
 //			//查询预约下的所有包件信息
 //			List<DistributionParcelListEntity> parcelListEntities = distributionReservationMapper.selectPackageListByReservationId(r.getId());

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

@@ -351,7 +351,29 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							if (Func.isNotEmpty(packageLoadingMap.get(p.getId()))){
 								DistributionLoadscanEntity distributionLoadscanEntity = packageLoadingMap.get(p.getId());
 								detailDTO.setLoadingTime(distributionLoadscanEntity.getScanTime());
+								detailDTO.setLoadingStatusName(OrderPackageLoadingStatusConstant.weizhuancghe.getName());
+								if (distributionLoadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())){
+									//签收
 									detailDTO.setSigningTime(distributionLoadscanEntity.getSigningTime());
+									detailDTO.setSigningStatusName(OrderPackageStatusConstant.yiqianshou.getName());
+								}
+							}
+							detailDTO.setStockupStatusName(p.getOrderPackageStockupStatusName());
+							DistributionStockEntity distributionStockEntity = distributionStockMapper.selectOne(Wrappers.<DistributionStockEntity>query().lambda()
+								.eq(DistributionStockEntity::getConditions, p.getConditions())
+								.eq(DistributionStockEntity::getStockArticle, p.getStockArticleId())
+								.eq(DistributionStockEntity::getParcelListId, p.getId())
+							);
+							if (Func.isNotEmpty(distributionStockEntity)){
+								detailDTO.setStockupTime(distributionStockEntity.getCreateTime());
+							}
+							detailDTO.setStockupStatusName(p.getOrderPackageStockupStatusName());
+							if (detailDTO.getConditions().equals(1)){
+								detailDTO.setConditionsName("订制品");
+							}else if (detailDTO.getConditions().equals(2)){
+								detailDTO.setConditionsName("库存品");
+							}else {
+								detailDTO.setConditionsName("零担");
 							}
 							detailDTOS.add(detailDTO);
 						});