异常签收维护签收列表审核

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionRecordEntity.java

@@ -106,7 +106,7 @@ public class WarehouseRetentionRecordEntity extends TenantEntity {
 	 * 装车时间
 	 */
 	@ApiModelProperty(value = "装车时间")
-	private Date assembleCarDate;
+	private String assembleCarDate;
 	/**
 	 * 装车人id
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -392,7 +392,7 @@ public class DistributionSignforController extends BladeController {
 
 	@GetMapping("/numberDetail")
 	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "PC下载签收图片", notes = "传入ids")
+	@ApiOperation(value = "待签收数字明细详情", notes = "传入ids")
 	public R getNumberDetail(@RequestParam Long signingId,Integer type) {
 	return 	distributionSignforService.getNumberDetail(signingId,type);
 

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

@@ -294,4 +294,11 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
 	Integer updateSignUser(@Param("deliveryId")Long deliveryId,@Param("reservationId") Long reservationId,@Param("user") BladeUser user);
+
+	/**
+	 * 根据客户查询签收列表
+	 * @param id
+	 * @return
+	 */
+	DistributionSignforEntity getByReservationId(@Param("reservationId") Long id);
 }

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

@@ -1221,4 +1221,7 @@
             AND ldl.scan_status != 1
             AND ldl.signfor_state = 2
     </select>
+    <select id="getByReservationId" resultType="com.logpm.distribution.entity.DistributionSignforEntity">
+        SELECT * FROM logpm_distribution_signfor WHERE reservation_id = #{reservationId}
+    </select>
 </mapper>

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

@@ -333,6 +333,33 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 					}
 
+					break;
+				case 6:
+					//异常装车件数
+					List<DistributionLoadscanEntity> loadscanEntities = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
+						.eq(DistributionLoadscanEntity::getReservationId, byId.getReservationId())
+						.eq(DistributionLoadscanEntity::getIsAbnormalLoading, 2)
+						.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+					);
+					if (Func.isNotEmpty(loadscanEntities)){
+						Map<Long, DistributionLoadscanEntity> packageLoadingMap = loadscanEntities.stream().collect(Collectors.toMap(DistributionLoadscanEntity::getPackageId, Function.identity(), (k1, k2) -> k2));
+						List<Long> packageIds = loadscanEntities.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.setSigningTime(distributionLoadscanEntity.getSigningTime());
+							}
+							detailDTOS.add(detailDTO);
+						});
+
+					}
+					break;
+				case 7:
+					//异常签收件数
 					break;
 			}
 
@@ -1096,6 +1123,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			//查询这个包件是否满足该客户的要求
 			DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distrilbutionloadingscanDTO.getReservationId());
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
+			DistributionSignforEntity signforEntity = distributionSignforMapper.getByReservationId(reservationEntity.getId());
 
 			DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
 			DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfEntity();
@@ -1270,6 +1298,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionLoadscanAbnormalEntity.setPackageId(parcelListEntity.getId());
 				distributionLoadscanAbnormalService.save(distributionLoadscanAbnormalEntity);
 			}
+			//修改对应的签收为可审核
+			signforEntity.setIsHaveAbnormalPackage(2);
+			this.updateById(signforEntity);
 			//修改包件的签收数量
 			distributionParcelListMapper.updateOrderPackageCodeById(parcelListEntity.getId(),OrderPackageStatusConstant.yiqianshou.getValue());
 			//还需要维护包件状态