1.干线bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -10756,6 +10756,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						int totalNum = realNum + 1;
 						if(totalNum > planNum){
 							carsOrderEntity.setRealNum(totalNum);
+
 						}else{
 							carsOrderEntity.setRealNum(totalNum);
 							flag = 1;
@@ -10764,7 +10765,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				}
 
 				if(flag == 0){
-					noPlanPackageList.add(orderPackageCode);
+					log.warn("##################loadingTrayPackageList: 存在不在计划的包件 orderCode={}", orderCode);
+					throw new CustomerException(405, orderCode+"不在计划中");
+//					noPlanPackageList.add(orderPackageCode);
 				}
 			}
 			if(CollUtil.isNotEmpty(noPlanPackageList)){
@@ -12279,7 +12282,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //		}
 
 		if (isData == 0) {
-			return Resp.fail(4005,"系统无编码");
+			return Resp.scanFail(4005,"系统无编码","系统无编码");
 		}
 		return Resp.scanSuccess("卸车成功", audio.toString());
 	}
@@ -13940,20 +13943,54 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		//查询该节点有没有该托盘的信息
 		List<TrunklineCarsLoadScanEntity> list = trunklineCarsLoadScanService.findUnloadTrayGoodsList(loadId, warehouseId, trayCode);
-		Set<String> set = new TreeSet<>();
-		for (TrunklineCarsLoadScanEntity carsLoadScanEntity : list) {
-			Integer type = carsLoadScanEntity.getType();
-			String scanCode = carsLoadScanEntity.getScanCode();
+		//把list通过type进行分组
+		Map<Integer, List<TrunklineCarsLoadScanEntity>> map = list.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getType));
+		map.keySet().forEach(type -> {
+			List<TrunklineCarsLoadScanEntity> trunklineCarsLoadScanEntities = map.get(type);
+
 			if (type == 1) {
-				//包件
-				unloadPackage(loadId, scanCode, warehouseId, 0, "托盘正常卸车", incomingType,palletName,trayCode);
-			} else if (type == 2) {
-				String waybillNo = carsLoadScanEntity.getWaybillNo();
-				Integer num = carsLoadScanEntity.getNum();
-				String orderCode = carsLoadScanEntity.getOrderCode();
-				unloadZeroWithTray(loadId, waybillNo, num, warehouseId, 0, trayCode, orderCode, "托盘零担正常卸车",palletName,trayCode);
+				//把trunklineCarsLoadScanEntities中所有元素的id放入一个List
+				List<Long> scanIds = trunklineCarsLoadScanEntities.stream()
+					.map(TrunklineCarsLoadScanEntity::getId)
+					.collect(Collectors.toList());
+
+				BatchUnloadDTO batchUnloadDTO = new BatchUnloadDTO();
+				batchUnloadDTO.setWarehouseId(warehouseId);
+				batchUnloadDTO.setLoadId(loadId);
+				batchUnloadDTO.setIncomingType(incomingType);
+				List<UnloadPackageDTO> unloadPackageList = new ArrayList<>();
+				trunklineCarsLoadScanEntities.forEach(carsLoadScanEntity -> {
+					UnloadPackageDTO unloadPackageDTO = new UnloadPackageDTO();
+					unloadPackageDTO.setCarsLoadScanId(carsLoadScanEntity.getId());
+					unloadPackageList.add(unloadPackageDTO);
+				});
+				batchUnloadDTO.setUnloadPackageList(unloadPackageList);
+				List<UnloadZeroDTO> unloadZeroList = new ArrayList<>();
+				batchUnloadDTO.setUnloadZeroList(unloadZeroList);
+				batchUnload(batchUnloadDTO);
+			}else{
+				trunklineCarsLoadScanEntities.forEach(carsLoadScanEntity -> {
+					String waybillNo = carsLoadScanEntity.getWaybillNo();
+					Integer num = carsLoadScanEntity.getNum();
+					String orderCode = carsLoadScanEntity.getOrderCode();
+					unloadZeroWithTray(loadId, waybillNo, num, warehouseId, 0, trayCode, orderCode, "托盘零担正常卸车",palletName,trayCode);
+				});
 			}
-		}
+		});
+
+//		for (TrunklineCarsLoadScanEntity carsLoadScanEntity : list) {
+//			Integer type = carsLoadScanEntity.getType();
+//			String scanCode = carsLoadScanEntity.getScanCode();
+//			if (type == 1) {
+//				//包件
+//				unloadPackage(loadId, scanCode, warehouseId, 0, "托盘正常卸车", incomingType,palletName,trayCode);
+//			} else if (type == 2) {
+//				String waybillNo = carsLoadScanEntity.getWaybillNo();
+//				Integer num = carsLoadScanEntity.getNum();
+//				String orderCode = carsLoadScanEntity.getOrderCode();
+//				unloadZeroWithTray(loadId, waybillNo, num, warehouseId, 0, trayCode, orderCode, "托盘零担正常卸车",palletName,trayCode);
+//			}
+//		}
 
 		//处理托盘的入库和货物的入库
 		trayTypeClient.changeTrayWarehouseInfo(trayCode, warehouseId);