From 4f150811ee99b435d336053767648e2998070a42 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Sat, 22 Oct 2022 14:35:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BB=A3=E7=A0=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/acs/service/impl/AcsToWmsServiceImpl.java | 10 ++++++++-- .../tasks/{ => callEmpty}/CallEmpVehicleTask.java | 4 +++- .../{ => callEmpty}/GjxCallEmpVehicleTask.java | 3 ++- .../{ => callEmpty}/YqxCallEmpVehicleTask.java | 4 +++- .../{ => callMaterial}/CallMaterialTask.java | 4 +++- .../{ => sendEmpty}/HtSendEmpVehicleTask.java | 6 +++--- .../tasks/{ => sendEmpty}/SendEmpVehicleTask.java | 4 +++- .../{ => sendEmpty}/YqxSendEmpVehicleTask.java | 3 ++- .../YqxSendMaterialTask.java} | 15 ++++++++++----- 9 files changed, 37 insertions(+), 16 deletions(-) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/{ => callEmpty}/CallEmpVehicleTask.java (99%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/{ => callEmpty}/GjxCallEmpVehicleTask.java (99%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/{ => callEmpty}/YqxCallEmpVehicleTask.java (99%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/{ => callMaterial}/CallMaterialTask.java (99%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/{ => sendEmpty}/HtSendEmpVehicleTask.java (99%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/{ => sendEmpty}/SendEmpVehicleTask.java (99%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/{ => sendEmpty}/YqxSendEmpVehicleTask.java (99%) rename lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/{SendMaterialTask.java => sendMaterial/YqxSendMaterialTask.java} (97%) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index bb2436c..fa982c7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -23,6 +23,12 @@ import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.TaskService; import org.nl.wms.sch.service.dto.TaskDto; import org.nl.wms.sch.tasks.*; +import org.nl.wms.sch.tasks.callEmpty.CallEmpVehicleTask; +import org.nl.wms.sch.tasks.callEmpty.GjxCallEmpVehicleTask; +import org.nl.wms.sch.tasks.callMaterial.CallMaterialTask; +import org.nl.wms.sch.tasks.sendEmpty.HtSendEmpVehicleTask; +import org.nl.wms.sch.tasks.sendEmpty.YqxSendEmpVehicleTask; +import org.nl.wms.sch.tasks.sendMaterial.YqxSendMaterialTask; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -211,7 +217,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { param.put("point_code1", point_code); // 满料位 param.put("task_type", "gjxl"); // 任务类型 - 共挤下料 - SendMaterialTask taskBean = SpringContextHolder.getBean(SendMaterialTask.class); + YqxSendMaterialTask taskBean = SpringContextHolder.getBean(YqxSendMaterialTask.class); String task_id = taskBean.createTask(param); // 创建任务 JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); @@ -320,7 +326,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 8.豪凯自动线下料入库 JSONObject param = new JSONObject(); param.put("point_code1", point_code); - SendMaterialTask taskBean = SpringContextHolder.getBean(SendMaterialTask.class); + YqxSendMaterialTask taskBean = SpringContextHolder.getBean(YqxSendMaterialTask.class); String task_id = taskBean.createTask(param); JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/CallEmpVehicleTask.java similarity index 99% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/CallEmpVehicleTask.java index e6060b3..012f8db 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/CallEmpVehicleTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.tasks; +package org.nl.wms.sch.tasks.callEmpty; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -21,6 +21,8 @@ import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; +import org.nl.wms.sch.tasks.AcsTaskDto; +import org.nl.wms.sch.tasks.RegionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java similarity index 99% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java index 1483eec..38cfed1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.tasks; +package org.nl.wms.sch.tasks.callEmpty; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -15,6 +15,7 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.nl.wms.sch.tasks.AcsTaskDto; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java similarity index 99% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxCallEmpVehicleTask.java rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java index 8416903..98c5697 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.tasks; +package org.nl.wms.sch.tasks.callEmpty; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -21,6 +21,8 @@ import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; +import org.nl.wms.sch.tasks.AcsTaskDto; +import org.nl.wms.sch.tasks.RegionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/CallMaterialTask.java similarity index 99% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/CallMaterialTask.java index 640513e..3f2d946 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/CallMaterialTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.tasks; +package org.nl.wms.sch.tasks.callMaterial; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -18,6 +18,8 @@ import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.sch.service.impl.PointServiceImpl; +import org.nl.wms.sch.tasks.AcsTaskDto; +import org.nl.wms.sch.tasks.RegionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/HtSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java similarity index 99% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/HtSendEmpVehicleTask.java rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java index 6ac4e3a..59ca168 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/HtSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.tasks; +package org.nl.wms.sch.tasks.sendEmpty; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -10,12 +10,12 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.nl.wms.sch.tasks.AcsTaskDto; +import org.nl.wms.sch.tasks.RegionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/SendEmpVehicleTask.java similarity index 99% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/SendEmpVehicleTask.java index bb55cdf..b375615 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/SendEmpVehicleTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.tasks; +package org.nl.wms.sch.tasks.sendEmpty; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -21,6 +21,8 @@ import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; +import org.nl.wms.sch.tasks.AcsTaskDto; +import org.nl.wms.sch.tasks.RegionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java similarity index 99% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxSendEmpVehicleTask.java rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java index b470314..90c5456 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.tasks; +package org.nl.wms.sch.tasks.sendEmpty; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -15,6 +15,7 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.nl.wms.sch.tasks.AcsTaskDto; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java similarity index 97% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java index 6dfaf49..6e23a71 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.tasks; +package org.nl.wms.sch.tasks.sendMaterial; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -20,19 +20,23 @@ import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.sch.service.impl.PointServiceImpl; +import org.nl.wms.sch.tasks.AcsTaskDto; +import org.nl.wms.sch.tasks.RegionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; + +/** + * 油漆线送物料 + */ @Service @RequiredArgsConstructor @Slf4j -public class SendMaterialTask extends AbstractAcsTask { - private final String THIS_CLASS = SendMaterialTask.class.getName(); - - +public class YqxSendMaterialTask extends AbstractAcsTask { + private final String THIS_CLASS = YqxSendMaterialTask.class.getName(); @Override @@ -276,6 +280,7 @@ public class SendMaterialTask extends AbstractAcsTask { resuft.put("point_code2", point_code2); return resuft; } + @Override public List addTask() { return null;