root/xiMenZi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:西门子项目优化，新增大小车指定逻辑

Browse Source
This commit is contained in:
郑旭明\73939
2026-03-20 14:57:16 +08:00
parent 633304c7f5
commit 4a134ddb2e
11 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java
View File

@@ -225,7 +225,7 @@ public class FabController {
public ResponseEntity<TableDataInfo<List<LB>>> vehicleType() {
List<LB> result = new ArrayList<>();
for (VehicleTypeEnum value : VehicleTypeEnum.values()) {
result.add(LB.builder().label(value.getVehicleName()).value(value.getVehicleCode()).build());
result.add(LB.builder().label(value.getVehicleCode()).value(value.getVehicleCode()).build());
}
return new ResponseEntity(TableDataInfo.build(result), HttpStatus.OK);
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java
View File

@@ -294,6 +294,7 @@ public class HandheldServiceImpl implements HandheldService {
jo.put("vehicle_type", mdBaseVehicle.getVehicle_type());
jo.put("region_code", RegionEnum.NBGD.getRegion_code());
param.put("region_code", RegionEnum.NBGD.getRegion_code());
jo.put("car_type","start");
jo.put("ext_data", param);
connectorTask.apply(jo);
}
@@ -324,6 +325,7 @@ public class HandheldServiceImpl implements HandheldService {
jo.put("config_code", "EMPTYCAGENEWTask");
jo.put("create_mode", GeneralDefinition.AUTO_CREATION);
jo.put("vehicle_code", vehicle_code);
jo.put("car_type","end");
connectorTask.apply(jo);
}
@@ -350,6 +352,8 @@ public class HandheldServiceImpl implements HandheldService {
jo.put("create_mode", GeneralDefinition.AUTO_CREATION);
jo.put("vehicle_qty", vehicle_list.length);
jo.put("vehicle_code", vehicle);
jo.put("car_type","start");
jo.put("ext_data", param);
connectorTask.apply(jo);
}
@@ -707,6 +711,7 @@ public class HandheldServiceImpl implements HandheldService {
jo.put("config_code", "TOSTOREHOUSETask");
jo.put("create_mode", GeneralDefinition.AUTO_CREATION);
jo.put("vehicle_type", vehicle_type);
jo.put("car_type", "start");
jo.put("ext_data", param);
connectorTask.apply(jo);
iSchBasePointService.update(Wrappers.lambdaUpdate(SchBasePoint.class)
@@ -743,6 +748,7 @@ public class HandheldServiceImpl implements HandheldService {
jo.put("create_mode", GeneralDefinition.AUTO_CREATION);
jo.put("vehicle_code", vehicle_code);
jo.put("vehicle_type", mdBaseVehicle.getVehicle_type());
jo.put("car_type","start");
jo.put("ext_data", param);
connectorTask.apply(jo);
}

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
View File

@@ -285,6 +285,7 @@ public abstract class AbstractTask {
task.setWorkshop_code(taskConfig.getWorkshop_code());
task.setRemark(param.getString("remark"));
task.setAcs_trace_id(param.getString("task_seq"));
task.setCar_type(param.getString("car_type"));
// 设置起/终点
this.setTaskPoint(taskConfig, task, apply_point_code);
task.setRequest_param(JSONObject.toJSONString(param.get("ext_data")));