diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java index a3e07eb..ce4d721 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java @@ -3,6 +3,8 @@ package org.nl.wms.sch.service.dto; import lombok.Data; import java.math.BigDecimal; import java.io.Serializable; +import java.util.List; + import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -51,6 +53,7 @@ public class PointDto implements Serializable { /** 允许的载具类型 */ private String can_vehicle_type; + private List can_vehicle_types; /** 载具类型 */ private String vehicle_type; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 71aa4d8..ae3110a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -27,6 +27,7 @@ import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Consumer; /** * @author ldjun @@ -60,6 +61,9 @@ public class PointServiceImpl implements PointService { JSONArray res = new JSONArray(); for (int i = 0; i < content.size(); i++) { JSONObject object = content.getJSONObject(i); + // 可以存放的载具类型 + String[] can_vehicle_types = object.getString("can_vehicle_type").split(","); + object.put("can_vehicle_types", can_vehicle_types); Long region_id = object.getLong("region_id"); String point_status = object.getString("point_status"); String point_type = object.getString("point_type"); @@ -130,6 +134,10 @@ public class PointServiceImpl implements PointService { if (ObjectUtil.isNotEmpty(byCode)) { throw new BadRequestException("存在相同的点位编码"); } + + String can_vehicle_type = String.join(",", dto.getCan_vehicle_types()); + dto.setCan_vehicle_type(can_vehicle_type); + Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -164,6 +172,9 @@ public class PointServiceImpl implements PointService { Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); + String can_vehicle_type = String.join(",", dto.getCan_vehicle_types()); + dto.setCan_vehicle_type(can_vehicle_type); + String now = DateUtil.now(); dto.setUpdate_time(now); dto.setUpdate_optid(currentUserId); diff --git a/lms/nladmin-ui/src/views/loki/view/index.vue b/lms/nladmin-ui/src/views/loki/view/index.vue index 3b17a95..b36ca57 100644 --- a/lms/nladmin-ui/src/views/loki/view/index.vue +++ b/lms/nladmin-ui/src/views/loki/view/index.vue @@ -5,6 +5,7 @@ + + + + + + + @@ -378,6 +389,7 @@ const defaultForm = { point_status: null, lock_type: '1', vehicle_code: null, + can_vehicle_types: null, source_id: null, remark: null, is_used: null, @@ -391,7 +403,7 @@ const defaultForm = { } export default { name: 'Point', - dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'], + dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL'], components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation, ViewDialog }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() {