点位载具类型可人工修改

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<String> can_vehicle_types;
 
     /** 载具类型 */
     private String vehicle_type;

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);

lms/nladmin-ui/src/views/loki/view/index.vue

@@ -5,6 +5,7 @@
       <el-form :inline="true" class="demo-form-inline" label-suffix=":" label-width="80px">
         <el-form-item label="日志标签">
           <el-cascader
+            filterable
             v-model="labelAndValue"
             :options="labelsOptions"
             placeholder="请选择标签"

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -274,6 +274,17 @@
           <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="载具类型" prop="vehicle_code">
+<!--            <el-input v-model="" clearable style="width: 370px;" />-->
+            <el-select v-model="form.can_vehicle_types" multiple placeholder="请选择">
+              <el-option
+                v-for="item in dict.vehicle_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item v-if="form.point_status === '3'" label="库存数" prop="ivt_qty">
             <el-input-number :controls="false" class="clear-number-input" v-model="form.ivt_qty" type="number" :min="1" :precision="3" :max="99999" label="库存数" size="mini" />
           </el-form-item>
@@ -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() {