Merge branch 'fix_bug_2014-01-10' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -323,15 +323,15 @@
         (ldr.reservation_num + ldr.reservation_stock_list_num - lds.received_quantity + receivedin_quantity ) unreceivedQuantity,
          lds.create_time   createTime,
         CASE  WHEN lds.signing_status ='2' THEN '文员签收'
-          WHEN lds.driver_signing ='2' THEN '司机签收'
+          WHEN lds.driver_signing ='2' THEN '已完成'
         ELSE '待签收'
         END signingStatusAll,
         CASE  WHEN lds.signing_status ='2' THEN '文员已审核'
           WHEN lds.signing_status ='1' THEN '文员待审核'
         ELSE '待签收'
         END wenyuanSigningStatus,
-        CASE  WHEN lds.driver_signing ='2' THEN '司机已签收'
+        CASE  WHEN lds.driver_signing ='2' THEN '已完成'
-          WHEN lds.driver_signing ='1' THEN '司机未签收'
+          WHEN lds.driver_signing ='1' THEN '未完成'
         ELSE '待签收'
         END sijiSigningStatus,
         lds.signing_status,

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

@@ -228,7 +228,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			Integer abnormalSigning = distributionLoadscanMapper.selectAbnormalSigningByReservationId(d.getReservationId());
 
 
-			DistributionLoadingNumDTO reservationSigningNum = distributionReservationMapper.selectReservationSigningNum(d.getReservationId());
+//			DistributionLoadingNumDTO reservationSigningNum = distributionReservationMapper.selectReservationSigningNum(d.getReservationId());
 
 			if (d.getDeliveryType().equals(DistributionTypeConstant.shipie.getValue())){
 				List<DisStockListDetailEntity> disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(d.getReservationId());
@@ -429,7 +429,52 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					}
 					break;
 				case 7:
+					List<DistributionLoadscanEntity> abnormalSignPackageLoading = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
+						.eq(DistributionLoadscanEntity::getReservationId, byId.getReservationId())
+						.eq(DistributionLoadscanEntity::getIsAbnormalLoading, 2)
+						.eq(DistributionLoadscanEntity::getIsAbnormalSigning, 2)
+						.eq(DistributionLoadscanEntity::getSignforState, LoadScanSigningStatusConstant.yiqianshou.getValue())
+						.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+					);
 					//异常签收件数
+					if (Func.isNotEmpty(abnormalSignPackageLoading)){
+						Map<Long, DistributionLoadscanEntity> packageLoadingMap = abnormalSignPackageLoading.stream().collect(Collectors.toMap(DistributionLoadscanEntity::getPackageId, Function.identity(), (k1, k2) -> k2));
+						List<Long> packageIds = abnormalSignPackageLoading.stream().distinct().map(DistributionLoadscanEntity::getPackageId).collect(Collectors.toList());
+						List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.listByIds(packageIds);
+						List<DistributionParcelListVO> distributionParcelListVOS = DistributionParcelListWrapper.build().listVO(distributionParcelListEntities);
+						distributionParcelListVOS.forEach(p->{
+							DistributionNumberDetailDTO detailDTO = Func.copy(p, DistributionNumberDetailDTO.class);
+							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);
+						});
+
+					}
 					break;
 			}