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

rev: 去除载具类型转换

Browse Source
This commit is contained in:
liyongde
2023-08-23 09:14:53 +08:00
parent df42f09048
commit 61dd3569ff
3 changed files with 4 additions and 4 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/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -756,7 +756,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
} }
// 载具类型不为空，并且不是0的情况，lmsVehicleTypeShift:转成lms的载具类型 // 载具类型不为空，并且不是0的情况，lmsVehicleTypeShift:转成lms的载具类型
if (ObjectUtil.isNotEmpty(vehicleType) && !vehicleType.equals(GeneralDefinition.NO)) { if (ObjectUtil.isNotEmpty(vehicleType) && !vehicleType.equals(GeneralDefinition.NO)) {
schBasePoint.setVehicle_type(TaskUtils.toLmsVehicleTypeShift(vehicleType)); schBasePoint.setVehicle_type(vehicleType);
} }
if (ObjectUtil.isNotEmpty(action)) { if (ObjectUtil.isNotEmpty(action)) {
schBasePoint.setIs_used(action.equals(GeneralDefinition.YES)); schBasePoint.setIs_used(action.equals(GeneralDefinition.YES));

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

@@ -237,7 +237,7 @@ public abstract class AbstractTask {
String apply_point_code = param.getString("device_code"); // 请求点 String apply_point_code = param.getString("device_code"); // 请求点
String config_code = param.getString("config_code"); String config_code = param.getString("config_code");
String requestNo = param.getString("requestNo"); String requestNo = param.getString("requestNo");
String vehicleType = TaskUtils.toAcsVehicleTypeShift(param.getString("vehicle_type")); String vehicleType = param.getString("vehicle_type");
String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code")); String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code"));
// 1、校验数据 // 1、校验数据
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>() SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
View File

@@ -124,7 +124,7 @@ public class TaskUtils {
return list.size() > 0; return list.size() > 0;
} }
/** /**不需要转换
* 转成ACS需要的载具类型 * 转成ACS需要的载具类型
* ACS载具类型：1 2 3 ... * ACS载具类型：1 2 3 ...
* LMS载具类型：3 4 5 ... * LMS载具类型：3 4 5 ...
@@ -144,7 +144,7 @@ public class TaskUtils {
return lmsVehicleType; return lmsVehicleType;
} }
/** /**不需要转换
* 转成LMS需要的载具类型 * 转成LMS需要的载具类型
* ACS载具类型：1 2 3 ... * ACS载具类型：1 2 3 ...
* LMS载具类型：3 4 5 ... * LMS载具类型：3 4 5 ...