From bcfa91c59f4da6c3634539c97e07d126d71f5cb4 Mon Sep 17 00:00:00 2001 From: ludj Date: Tue, 6 Aug 2024 16:10:53 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/controller/AcsToWmsController.java | 7 ++--- .../nl/wms/mes/controller/MesController.java | 26 +++++++++++++++++++ .../sch/task_manage/task/tasks/KJRKTask.java | 7 ----- .../sch/task_manage/task/tasks/POINTTask.java | 2 -- .../task_manage/task/tasks/SSXBKJTask.java | 7 ----- .../sch/task_manage/task/tasks/YCLCKTask.java | 11 ++++---- .../sch/task_manage/task/tasks/YCLRKTask.java | 12 ++++----- .../src/views/wms/hw/detail/index.vue | 4 +-- lms/nladmin-ui/src/views/wms/hw/in/index.vue | 11 +------- lms/nladmin-ui/src/views/wms/hw/out/index.vue | 9 ------- .../views/wms/pdm/workerordertwo/index.vue | 2 +- .../src/views/wms/sch/data/index.vue | 6 ++--- .../src/views/wms/sch/point/index.vue | 2 +- .../src/views/wms/sch/task/index.vue | 20 +++++++------- .../src/views/wms/ycl/detail/index.vue | 6 ++--- lms/nladmin-ui/src/views/wms/ycl/in/index.vue | 2 +- .../src/views/wms/ycl/out/index.vue | 2 +- 17 files changed, 61 insertions(+), 75 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java index 0300796..943e8fb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java @@ -32,15 +32,12 @@ import java.util.Map; @SaIgnore public class AcsToWmsController { - @Autowired - private ISchBasePointService schBasePointService; - @Autowired private AcsToWmsService acsToWmsService; @PostMapping("/apply") - @Log("新增任务管理") - @ApiOperation("新增任务管理") + @Log("ACS向LMS申请任务") + @ApiOperation("ACS向LMS申请任务") //@SaCheckPermission("@el.check('schBaseTask:add')") @SaIgnore public ResponseEntity apply(@RequestBody JSONObject param) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java index 297aadb..bc3c8d0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java @@ -53,6 +53,12 @@ public class MesController { @Autowired private IWorkorderService workorderService; + /** + * MES调用LMS：原材料入原材料库信息 + * 调用时机：货物到达，在MES上录入信息，然后推送到LMS + * @param notice + * @return + */ @PostMapping("/QPMES060") @Log(value = "QPMES060") @ApiOperation("QPMES060") @@ -91,6 +97,12 @@ public class MesController { } } + /** + * 盐城二期粘棒工单: + * 调用时机：随时 + * @param notice + * @return + */ @PostMapping("/QPMES098") @Log(value = "QPMES098") @ApiOperation("QPMES098") @@ -153,6 +165,13 @@ public class MesController { return qpmes098Response; } + /** + * WMS同步AGV晶棒库存 + * 调用时机：随时 + * 范围：原材料库（与回温库） + * @param notice + * @return + */ @PostMapping("/QPMES118") @Log(value = "QPMES118") @ApiOperation("QPMES118") @@ -172,6 +191,13 @@ public class MesController { return qpmes118Response; } + /** + * 以托盘维度进行从晶棒库到回温的出库 + * MES告诉LMS需要出库的托盘信息 + * 调用时机：随时 + * @param notice + * @return + */ @PostMapping("/QPMES155") @Log(value = "QPMES155") @ApiOperation("QPMES155") diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java index 29acfe2..d96c4e1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java @@ -1,7 +1,5 @@ package org.nl.wms.sch.task_manage.task.tasks; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.druid.util.StringUtils; import com.alibaba.fastjson.JSONObject; @@ -11,9 +9,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.wms.ext.service.AcsToWmsService; import org.nl.wms.ext.service.dto.to.BaseResponse; import org.nl.wms.pdm.service.IPdmBdWorkorderService; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; -import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; @@ -21,8 +17,6 @@ import org.nl.wms.sch.task.service.ISchBaseTaskconfigService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; import org.nl.wms.sch.task_manage.AbstractTask; -import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; -import org.nl.wms.sch.task_manage.enums.GroupStatusEnum; import org.nl.wms.sch.task_manage.task.TaskType; import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper; @@ -31,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import java.math.BigDecimal; import java.util.List; /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java index 0cd36c9..5ae5542 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java @@ -28,9 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; /** * @Author: psh diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java index 724215e..8b7e787 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java @@ -1,7 +1,5 @@ package org.nl.wms.sch.task_manage.task.tasks; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.druid.util.StringUtils; import com.alibaba.fastjson.JSONObject; @@ -11,9 +9,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.wms.ext.service.AcsToWmsService; import org.nl.wms.ext.service.dto.to.BaseResponse; import org.nl.wms.pdm.service.IPdmBdWorkorderService; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; -import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; @@ -21,8 +17,6 @@ import org.nl.wms.sch.task.service.ISchBaseTaskconfigService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; import org.nl.wms.sch.task_manage.AbstractTask; -import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; -import org.nl.wms.sch.task_manage.enums.GroupStatusEnum; import org.nl.wms.sch.task_manage.task.TaskType; import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper; @@ -31,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import java.math.BigDecimal; import java.util.List; /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java index 988c0c6..ca23c22 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java @@ -10,14 +10,11 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; -import org.nl.config.MapOf; -import org.nl.wms.ext.service.WmsToAcsService; import org.nl.wms.ext.service.dto.to.BaseResponse; import org.nl.wms.mes.domain.Head; import org.nl.wms.mes.domain.QPMES065Request; import org.nl.wms.mes.domain.QPMES065RequestBody; import org.nl.wms.pdm.service.IPdmBdWorkorderService; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; import org.nl.wms.sch.data.service.dao.mapper.MaterialDataMapper; import org.nl.wms.sch.data.service.dto.MaterialDataDto; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; @@ -33,17 +30,18 @@ import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; import org.nl.wms.sch.task_manage.AbstractTask; import org.nl.wms.sch.task_manage.GeneralDefinition; import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; -import org.nl.wms.sch.task_manage.enums.GroupStatusEnum; import org.nl.wms.sch.task_manage.task.TaskType; import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper; -import org.nl.wms.util.PointUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -236,6 +234,7 @@ public class YCLCKTask extends AbstractTask { .eq(Material::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue())); try { if (ObjectUtil.isNotEmpty(materialList)) { + //自动化领料出库后经由AGV将出库信息同步至MES，从原材料库到回温库完成后自动调用 String url = "http://192.168.9.124/sitAppWebApi/PDSToWMS/Api/QPMES065"; QPMES065Request qpmes065Request = new QPMES065Request(); List qpmes065RequestBodyList=new ArrayList<>(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java index 112d0ae..782c26b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java @@ -31,7 +31,6 @@ import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; import org.nl.wms.sch.task_manage.AbstractTask; import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; import org.nl.wms.sch.task_manage.enums.GroupStatusEnum; -import org.nl.wms.sch.task_manage.enums.PointStatusEnum; import org.nl.wms.sch.task_manage.task.TaskType; import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper; @@ -41,8 +40,10 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -91,7 +92,6 @@ public class YCLRKTask extends AbstractTask { .eq(SchBasePoint::getPoint_code, task.getPoint_code1())); String extGroupData = task.getExt_group_data(); JSONObject jsonObject = JSONObject.parseObject(extGroupData); -// String materialType = jsonObject.getString("material_type"); SchBasePoint point = findNextPoint(jsonObject.getString("sub_tray")); if (ObjectUtil.isEmpty(point)) { task.setRemark("未找到所需点位!"); @@ -110,7 +110,6 @@ public class YCLRKTask extends AbstractTask { //发起任务时先把点位占用，防止发起重复任务 point.setIng_task_code(task.getTask_code()); -// point.setVehicle_type(materialType); pointService.update(point); //下发 @@ -140,7 +139,6 @@ public class YCLRKTask extends AbstractTask { } @Override -// @Transactional(rollbackFor = Exception.class) protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getById(task_code); @@ -211,7 +209,7 @@ public class YCLRKTask extends AbstractTask { taskObj.setGroup_id(ObjectUtil.isNotEmpty(groupEntity)?groupEntity.getGroup_id():null); taskObj.setRemark("任务完成"); try { - //todo 待确认具体传值 + //输送线到原材料库的任务完成，反馈MES接口。逻辑可以去掉。 if(ObjectUtil.isNotEmpty(materialList)) { String url = "http://192.168.9.124/sitAppWebApi/PDSToWMS/Api/QPMES062"; QPMES062Request qpmes062Request = new QPMES062Request(); diff --git a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue index 4505a13..07494ad 100644 --- a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue +++ b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue @@ -246,7 +246,7 @@ - + - +