1.干线车辆配载装车优化

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -2499,4 +2499,37 @@ public class CarsLoadController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/findZeroList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询零担列表", notes = "传入loadCarsDTO")
+	public R findZeroList(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############findZeroList: ";
+		log.info(method + "请求参数{}", loadCarsDTO);
+		Long loadId = loadCarsDTO.getLoadId();
+		try{
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(405,"多仓权限无法操作，请选择仓库");
+			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+			if(Objects.isNull(loadId)){
+				log.warn(method+"配载id为空 loadId={}",loadId);
+				return R.fail(405,"配载id为空");
+			}
+
+			return carsLoadService.findZeroList(loadCarsDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+
 }

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

@@ -228,4 +228,6 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 	R startCarsBefore(Long loadId, Long warehouseId);
 
 	R findZeroDetailByCarsLoadScanId(Long carsLoadScanId);
+
+	R findZeroList(LoadCarsDTO loadCarsDTO);
 }