1.干线-bug修复

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java

@@ -61,6 +61,7 @@ public class LoadCarsDTO implements Serializable {
 	private List<LoadingZeroDTO> zeroList = new ArrayList<>();
 
 	private Long carsLoadScanId;
+	private String carsLoadScanIds;
 	private String arriveDateStr;
 
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java

@@ -250,7 +250,7 @@ public class CarsLoadApiController {
 	public R removeCarsLoadScan(@RequestBody LoadCarsDTO loadCarsDTO) {
 		String method = "############removeCarsLoadScan: ";
 		log.info(method + "请求参数{}", loadCarsDTO);
-		Long carsLoadScanId = loadCarsDTO.getCarsLoadScanId();
+		String carsLoadScanIds = loadCarsDTO.getCarsLoadScanIds();
 		try{
 
 			//当前登录人选择的仓库
@@ -261,12 +261,12 @@ public class CarsLoadApiController {
 			}
 			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
 
-			if(Objects.isNull(carsLoadScanId)){
-				log.warn(method+"配载装车扫描id为空 carsLoadScanId={}",carsLoadScanId);
+			if(StringUtil.isBlank(carsLoadScanIds)){
+				log.warn(method+"配载装车扫描id为空 carsLoadScanIds={}",carsLoadScanIds);
 				return R.fail(405,"配载装车扫描id为空");
 			}
 
-			return carsLoadService.removeCarsLoadScan(carsLoadScanId,myCurrentWarehouse.getId());
+			return carsLoadService.removeCarsLoadScan(carsLoadScanIds,myCurrentWarehouse.getId());
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java

@@ -86,7 +86,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R findCarsLoadingDetail(Long loadId, Long warehouseId);
 
-	R removeCarsLoadScan(Long carsLoadScanId, Long warehouseId);
+	R removeCarsLoadScan(String carsLoadScanIds, Long warehouseId);
 
 	R arriveUnloadPageList(LoadCarsDTO loadCarsDTO);
 

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

@@ -3494,7 +3494,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	}
 
 	@Override
-	public R removeCarsLoadScan(Long carsLoadScanId, Long warehouseId) {
+	public R removeCarsLoadScan(String carsLoadScanIds, Long warehouseId) {
+
+		String[] split = carsLoadScanIds.split(",");
+
+		for (String str : split) {
+			long carsLoadScanId = Long.parseLong(str);
+
 			TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getById(carsLoadScanId);
 			if(Objects.isNull(carsLoadScanEntity)){
 				log.warn("##################removeCarsLoadScan: 配载装车扫描不存在 carsLoadScanId={}",carsLoadScanId);
@@ -3578,6 +3584,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					}
 				}
 			}
+		}
+
+
 //		updateNumByLoadId(loadId);
 
 		return R.success("删除成功");