From a3f2c69f32f067d0f820c9aa9f49d4e683774cae Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Mon, 29 Sep 2025 16:34:54 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E7=8E=B0=E5=9C=BA=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/mnt/websocket/WebSocketServer.java | 2 + .../acs/service/impl/AcsToWmsServiceImpl.java | 6 +-- .../task/service/impl/PdaTaskServiceImpl.java | 12 +++++- .../dao/mapper/SchBasePointMapper.java | 2 + .../service/dao/mapper/SchBasePointMapper.xml | 25 +++++++++++ .../service/impl/SchBasePointServiceImpl.java | 13 +++--- .../sch/task/service/ISchBaseTaskService.java | 1 + .../service/impl/SchBaseTaskServiceImpl.java | 1 + .../task/TestWebSoctetConnect.java | 33 ++++++++++++++ .../org/nl/wms/sch/tasks/netsl/NETSLTask.java | 37 ++++++++-------- .../org/nl/wms/sch/tasks/netxl/NETXLTask.java | 17 +++++--- .../org/nl/wms/sch/tasks/thxl/THXLTask.java | 43 +++++++++++-------- nladmin-ui/src/views/wms/sch/point/index.vue | 8 +++- 13 files changed, 145 insertions(+), 55 deletions(-) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TestWebSoctetConnect.java diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java index 5604438..438d0ff 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java @@ -114,6 +114,8 @@ public class WebSocketServer { item.sendMessage(message); }else if(item.sid.equals(sid)){ item.sendMessage(message); + }else { + item.sendMessage(message); } } catch (IOException ignored) { } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 2d3becc..9651088 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -45,6 +45,7 @@ import javax.annotation.PostConstruct; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -154,12 +155,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { SchBasePoint newPoint = null; String taskPointType = null; //执行中的任务 + List status = Arrays.asList(TaskStatus.EXECUTING.getCode(), TaskStatusEnum.PICK_UP_COMPLETED.getCode()); SchBaseTask baseTask = taskService.getOne(new LambdaQueryWrapper() .eq(SchBaseTask::getTask_code, taskCode) .eq(SchBaseTask::getIs_delete, PackageInfoIvtEnum.IS_SEND.code("否")) - .eq(SchBaseTask::getTask_status, TaskStatus.EXECUTING.getCode()) - .or() - .eq(SchBaseTask::getTask_status, TaskStatusEnum.PICK_UP_COMPLETED.getCode())); + .in(SchBaseTask::getTask_status, status)); if (baseTask == null) { throw new BadRequestException("该任务未执行或不存在！"); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java index ccce659..e6d52c2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java @@ -224,6 +224,10 @@ public class PdaTaskServiceImpl implements PdaTaskService { if (ObjectUtil.isEmpty(point)) { throw new BadRequestException("点位" + point_code + "不存在!"); } + List list = taskService.findTaskByPoint(point_code); + if (list.size()>0){ + throw new BadRequestException("点位" + point_code + "已经存在agv任务!"); + } JSONObject jo = data.getJSONObject(0); String material_code = jo.getString("material_code"); MdMeMaterialbase mdMeMaterialbase = mdMeMaterialbaseMapper.selectOne(new LambdaQueryWrapper().eq(MdMeMaterialbase::getMaterial_code, material_code)); @@ -419,7 +423,13 @@ public class PdaTaskServiceImpl implements PdaTaskService { @Override public JSONObject getPointnByRegion(JSONObject whereJson) { - List list = pointMapper.selectList(new LambdaQueryWrapper().eq(SchBasePoint::getRegion_code, whereJson.getString("region_code"))); + String region_code = whereJson.getString("region_code"); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SchBasePoint::getRegion_code, whereJson.getString("region_code")); + if ("L1".equals(region_code)||"L2".equals(region_code)){ + wrapper.eq(SchBasePoint::getPoint_type, "4"); + } + List list = pointMapper.selectList(wrapper); List arr = new ArrayList<>(); JSONObject ret = new JSONObject(); if (ObjectUtil.isNotEmpty(list)) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java index 1d0eae3..bb7c3d9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.java @@ -52,4 +52,6 @@ public interface SchBasePointMapper extends BaseMapper { List selectSameRowPoints(@Param("point") SchBasePoint point); List getNewEndBasePoints(@Param("point_code2") String point_code2, @Param("region_code") String region_code); + + List getSamePoints(@Param("regionCode") String regionCode, @Param("material_code") String material_code); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml index a5ea8a7..61e46aa 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml @@ -150,6 +150,7 @@ AND is_delete = '0' ) AND point_type = '1' + AND point_status = '1' AND is_used = 1 ORDER BY col_num DESC @@ -209,6 +210,8 @@ OR point_code3 = p.point_code OR point_code4 = p.point_code ) + AND task_status '5' + AND is_delete = '0' ) AND p.point_code != #{point.point_code} AND p.row_num = #{point.row_num} @@ -225,4 +228,26 @@ AND point_status = "1" ORDER BY in_order_seq asc + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index e1dd761..59e0968 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -208,12 +208,13 @@ public class SchBasePointServiceImpl extends ServiceImpl getSamePoints(String regionCode, String material_code) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(SchBasePoint::getRegion_code, regionCode) - .eq(SchBasePoint::getPoint_status, "2") - .eq(SchBasePoint::getMaterial_code, material_code) - .orderByAsc(SchBasePoint::getIn_order_seq); - List list = pointMapper.selectList(queryWrapper); +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() +// .eq(SchBasePoint::getRegion_code, regionCode) +// .eq(SchBasePoint::getPoint_status, "2") +// .eq(SchBasePoint::getMaterial_code, material_code) +// .orderByAsc(SchBasePoint::getIn_order_seq); +// List list = pointMapper.selectList(queryWrapper); + List list = pointMapper.getSamePoints(regionCode,material_code); if (CollUtil.isNotEmpty(list)){ return list; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java index 596dee1..016fc67 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.ext.acs.service.dto.to.BaseRequest; +import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task.service.dto.SchBaseTaskQuery; import org.nl.wms.sch.task_manage.task.core.TaskStatus; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java index cd909e7..80001cd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; +import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskMapper; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TestWebSoctetConnect.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TestWebSoctetConnect.java new file mode 100644 index 0000000..3fa5bf6 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TestWebSoctetConnect.java @@ -0,0 +1,33 @@ +package org.nl.wms.sch.task_manage.task; + +import com.alibaba.fastjson.JSONObject; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.exception.BadRequestException; +import org.nl.common.mnt.websocket.MsgType; +import org.nl.common.mnt.websocket.SocketMsg; +import org.nl.common.mnt.websocket.WebSocketServer; +import org.nl.config.language.LangProcess; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.io.IOException; + +@Slf4j +@Component +public class TestWebSoctetConnect { + + @Resource + private WebSocketServer webSocketServer; + @SneakyThrows + public void run() { + JSONObject res = new JSONObject(); + res.put("data", "库存不足！"); + SocketMsg messageInfo = new SocketMsg(res, MsgType.INFO); + try { + webSocketServer.sendInfo(messageInfo, "sid"); + } catch (IOException e) { + throw new BadRequestException(LangProcess.msg("error_Send")); + } + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/netsl/NETSLTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/netsl/NETSLTask.java index 91f4111..5a916ad 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/netsl/NETSLTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/netsl/NETSLTask.java @@ -195,6 +195,7 @@ public class NETSLTask extends AbstractTask { @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 + SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1()); SchBasePoint endPointObj = pointService.getById(taskObj.getPoint_code2()); // 起点清空 if (ObjectUtil.isNotEmpty(endPointObj)) { @@ -212,24 +213,24 @@ public class NETSLTask extends AbstractTask { TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); //判断起点区域库存是否小于预警值 -// List samePoints = pointService.getSamePoints(startPointObj.getRegion_code(), taskObj.getMaterial_code()); -// List list = stIvtForewarningmaterialMapper.selectList(new QueryWrapper().eq("material_code", taskObj.getMaterial_code())); -// if (list.size() > 0) { -// StIvtForewarningmaterial stIvtForewarningmaterial = list.get(0); -// StIvtForewarningconfig forewarningconfig = stIvtForewarningconfigMapper.selectOne(new QueryWrapper().eq("id", stIvtForewarningmaterial.getConfig_id())); -// BigDecimal safe_qty_lower_limit = forewarningconfig.getSafe_qty_lower_limit(); -// int low = safe_qty_lower_limit.intValue(); -// if (samePoints.size() < low) { -// String currentUserId = SecurityUtils.getCurrentUserId(); -// SysUser userInfo = sysUserService.getOne(new QueryWrapper().eq("user_id", currentUserId)); -// // 获取权限列表 - 登录查找权限 -// List permissionList = roleService.getPermissionList((JSONObject) JSON.toJSON(userInfo)); -// if (permissionList.contains("dd")) { -// MdMeMaterialbase mdMeMaterialbase = mdMeMaterialbaseMapper.selectOne(new LambdaQueryWrapper().eq(MdMeMaterialbase::getMaterial_code, taskObj.getMaterial_code())); -// noticeService.createNotice(startPointObj.getRegion_name()+"【"+mdMeMaterialbase.getMaterial_name()+"】物料数量低于库存预警值", "库存预警", "dd"); -// } -// } -// } + List samePoints = pointService.getSamePoints(startPointObj.getRegion_code(), taskObj.getMaterial_code()); + List list = stIvtForewarningmaterialMapper.selectList(new QueryWrapper().eq("material_code", taskObj.getMaterial_code())); + if (list.size() > 0) { + StIvtForewarningmaterial stIvtForewarningmaterial = list.get(0); + StIvtForewarningconfig forewarningconfig = stIvtForewarningconfigMapper.selectOne(new QueryWrapper().eq("id", stIvtForewarningmaterial.getConfig_id())); + BigDecimal safe_qty_lower_limit = forewarningconfig.getSafe_qty_lower_limit(); + int low = safe_qty_lower_limit.intValue(); + if (samePoints.size() < low) { + String currentUserId = SecurityUtils.getCurrentUserId(); + SysUser userInfo = sysUserService.getOne(new QueryWrapper().eq("user_id", currentUserId)); + // 获取权限列表 - 登录查找权限 + List permissionList = roleService.getPermissionList((JSONObject) JSON.toJSON(userInfo)); + if (permissionList.contains("dd")) { + MdMeMaterialbase mdMeMaterialbase = mdMeMaterialbaseMapper.selectOne(new LambdaQueryWrapper().eq(MdMeMaterialbase::getMaterial_code, taskObj.getMaterial_code())); + noticeService.createNotice(startPointObj.getRegion_name()+"【"+mdMeMaterialbase.getMaterial_name()+"】物料数量低于库存预警值", "库存预警", "dd"); + } + } + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/netxl/NETXLTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/netxl/NETXLTask.java index 9d25298..319b465 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/netxl/NETXLTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/netxl/NETXLTask.java @@ -159,6 +159,7 @@ public class NETXLTask extends AbstractTask { private SchBasePoint findNextPoint(List nextRegionStr, String regionCode, SchBaseTask task) { // 找到同一个区域下物料相同的所有点位 if ("E2".equals(regionCode)) { + SchBasePoint nextPoint = null; List list = pointService.getSamePoints(regionCode, task.getMaterial_code()); if (!CollectionUtils.isEmpty(list)) { for (int i = 0; i < list.size(); i++) { @@ -167,12 +168,12 @@ public class NETXLTask extends AbstractTask { if (col_num == 1) { continue; } - SchBasePoint newPoint; String newPoint_code = ""; + SchBasePoint newPoint = null; int new_col = col_num - 1; // 校验当前点位相邻的点是否空闲 - for (int j = 0; j < (col_num - 1); j++) { - newPoint_code = forametDevice_code(point.getPoint_code(), new_col); + for (int j = 0; j < new_col; j++) { + newPoint_code = forametDevice_code(point.getPoint_code(), (col_num - 1)); newPoint = pointService.findByCode(newPoint_code); Boolean result = this.checkIsFree(newPoint_code); if (!result) { @@ -180,15 +181,19 @@ public class NETXLTask extends AbstractTask { point = newPoint; continue; } + nextPoint = newPoint; task.setVehicle_code2(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")); - return newPoint; + return nextPoint; } } } - if (CollectionUtils.isEmpty(list)) { + if (ObjectUtil.isEmpty(nextPoint)) { //找一排都是空的点位 //todo: 两台机台有没有生成相同物料 机台速度 //找最大列为空且没有任务的点位 List points = pointService.getPointByMaxCol(regionCode, 3); + if (CollectionUtils.isEmpty(points)) { + return null; + } for (int i = 0; i < points.size(); i++) { SchBasePoint thirdColPoint = points.get(0); String firstColPointCode = thirdColPoint.getPoint_code().substring(0, thirdColPoint.getPoint_code().length() - 1) + "1"; @@ -231,7 +236,7 @@ public class NETXLTask extends AbstractTask { if (newPoint.getPoint_status().equals(PointStatusEnum.EMPTY_VEHICLE.getCode())) { return false; } - List list = taskService.findUnFinishTasksByTaskConfigAndPointCode("NETSLTask", point_code); + List list = taskService.findUnFinishTasksByTaskConfigAndPointCode("NETXLTask", point_code); if (list.size() > 0) { return false; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/thxl/THXLTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/thxl/THXLTask.java index 4456470..710af5c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/thxl/THXLTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/tasks/thxl/THXLTask.java @@ -121,6 +121,7 @@ public class THXLTask extends AbstractTask { private SchBasePoint findNextPoint(List nextRegionStr, String regionCode, SchBaseTask task) { // 找到同一个区域下物料相同的所有点位 + SchBasePoint nextPoint = null; List list = pointService.getSamePoints(regionCode, task.getMaterial_code()); if (!CollectionUtils.isEmpty(list)) { for (int i = 0; i < list.size(); i++) { @@ -129,12 +130,12 @@ public class THXLTask extends AbstractTask { if (col_num == 1) { continue; } - SchBasePoint newPoint; + SchBasePoint newPoint = null; String newPoint_code = ""; int new_col = col_num - 1; // 校验当前点位相邻的点是否空闲 - for (int j = 0; j < (col_num - 1); j++) { - newPoint_code = forametDevice_code(point.getPoint_code(), new_col); + for (int j = 0; j < new_col; j++) { + newPoint_code = forametDevice_code(point.getPoint_code(), (col_num - 1)); newPoint = pointService.findByCode(newPoint_code); Boolean result = this.checkIsFree(newPoint_code); if (!result) { @@ -142,30 +143,34 @@ public class THXLTask extends AbstractTask { point = newPoint; continue; } + nextPoint = newPoint; task.setVehicle_code2(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")); - return point; + return nextPoint; } } } - if (CollectionUtils.isEmpty(list)) { + if (ObjectUtil.isEmpty(nextPoint)) { //找一排都是空的点位 //找最大列为空且没有任务的点位 // if (regionCode.equals("KTP")) { - List points = pointService.getPointByMaxCol(regionCode, 2); - for (int i = 0; i < points.size(); i++) { - SchBasePoint twoColPoint = points.get(0); - String firstColPointCode = twoColPoint.getPoint_code().substring(0, twoColPoint.getPoint_code().length() - 1) + "1"; - // 查询第一列 - SchBasePoint firstColPoint = pointService.findByCode(firstColPointCode); - // 判断第一列否为空且没有任务 - boolean isFirstColFree = checkIsEmpty(firstColPoint); - // 如果第一列为空，则返回这个第二列点位 - if (isFirstColFree) { - task.setVehicle_code2(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")); - return twoColPoint; - } - continue; + List points = pointService.getPointByMaxCol(regionCode, 2); + if (CollectionUtils.isEmpty(points)) { + return null; + } + for (int i = 0; i < points.size(); i++) { + SchBasePoint twoColPoint = points.get(0); + String firstColPointCode = twoColPoint.getPoint_code().substring(0, twoColPoint.getPoint_code().length() - 1) + "1"; + // 查询第一列 + SchBasePoint firstColPoint = pointService.findByCode(firstColPointCode); + // 判断第一列否为空且没有任务 + boolean isFirstColFree = checkIsEmpty(firstColPoint); + // 如果第一列为空，则返回这个第二列点位 + if (isFirstColFree) { + task.setVehicle_code2(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")); + return twoColPoint; } + continue; + } // } // if (regionCode.equals("DKB")){ // //找一排都是空的点位 //todo: 两台机台有没有生成相同物料 机台速度 diff --git a/nladmin-ui/src/views/wms/sch/point/index.vue b/nladmin-ui/src/views/wms/sch/point/index.vue index 562a886..100b3be 100644 --- a/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/nladmin-ui/src/views/wms/sch/point/index.vue @@ -291,7 +291,11 @@ - + + + @@ -404,7 +408,7 @@ const defaultForm = { } export default { name: 'SchBasePoint', - dicts: ['vehicle_type', 'TrueOrFalse'], + dicts: ['vehicle_type', 'TrueOrFalse', 'sch_point_type', 'sch_point_status', 'sch_point_type2'], components: { PointDialog, ViewDialog, pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() {