异常签收BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -503,24 +503,6 @@ public class DistributionStockupAppController extends BladeController {
 	@ApiOperation(value = "零担备货")
 	public R zeroStockUp(@RequestBody StockupZeroDTO stockupDTO) {
 		log.debug("=====零担备货：{}", stockupDTO);
-		if (ObjectUtils.isNull(stockupDTO.getStockupId())) {
-			return R.fail(3002, "备货id不能为空 !");
-		}
-		if (ObjectUtils.isNull(stockupDTO.getStockArticleId())) {
-			return R.fail(3002, "订单ID不能为空 !");
-		}
-		if (ObjectUtils.isNull(stockupDTO.getOrderCode())) {
-			return R.fail(3002, "订单自编号不能为空 !");
-		}
-		if (ObjectUtils.isNull(stockupDTO.getReservationId())) {
-			return R.fail(3002, "预约单号不能为空 !");
-		}
-		if (ObjectUtils.isNull(stockupDTO.getTypeService())) {
-			return R.fail(3002, "备货业务类型不能为空 !");
-		}
-/*		if (ObjectUtils.isNull(stockupDTO.getAllocationId())) {
-			return R.fail(3002, "库位信息不能为空 !");
-		}*/
 		R b = distributionStockupService.zeroStockUp(stockupDTO);
 		return b;
 	}

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

@@ -2854,14 +2854,19 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
 
 			DistributionLoadscanEntity loadscanEntity = null;
-			if (loadscanEntityList.isEmpty()){
+			if (!loadscanEntityList.isEmpty()){
+
+				if (loadscanEntityList.size() == 1){
+					if (loadscanEntityList.get(0).getReservationId().equals(distrilbutionloadingscanDTO.getReservationId())) {
+						loadscanEntity = loadscanEntityList.get(0);
+					}
+				}
+
 				if (loadscanEntityList.size() > 1){
 					log.error("##############异常签收包件在其他车次进行装车reservationId:{}", loadscanEntityList.stream().map(DistributionLoadscanEntity::getReservationId).map(String::valueOf).collect(Collectors.joining(",")));
 					return Resp.scanFail("操作失败", "包件已出库");
 				}
-				if (loadscanEntityList.size() == 1){
-					 loadscanEntity = loadscanEntityList.get(0);
-				}
+
 			}
 
 			if (Func.isNotEmpty(loadscanEntity)) {
@@ -2903,6 +2908,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setReceivedQuantity(parcelListEntity.getQuantity());
 						distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 						distributionLoadscanEntity.setIsSignfor(2);
+						distributionLoadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 						distributionLoadscanEntity.setIsInsert(2);
 						distributionLoadscanEntity.setSignforState(2);
 						distributionLoadscanEntity.setPackageNub(parcelListEntity.getQuantity());