Browse Source

rev: 去除载具类型转换

master
李永德 1 year ago
parent
commit
61dd3569ff
  1. 2
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
  2. 2
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
  3. 4
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

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

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

@ -237,7 +237,7 @@ public abstract class AbstractTask {
String apply_point_code = param.getString("device_code"); // 请求点
String config_code = param.getString("config_code");
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"));
// 1、校验数据
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()

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

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

Loading…
Cancel
Save