From 321c96c57353de8902d9cd63b22c22f3488431cb Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 4 Apr 2023 10:43:21 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E4=BF=AE=E6=94=B9=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java | 8 ++++++-- .../wms/sch/tasks/callMaterial/WrapCallMaterialTask.java | 8 ++++++-- .../nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java | 8 ++++++-- .../sch/tasks/sendMaterial/PlotterSendMaterialTask.java | 9 ++++++--- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java index a2f1a587..2ce74f61 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java @@ -9,13 +9,14 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; -import org.nl.common.utils.AcsUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,6 +29,8 @@ import org.springframework.transaction.annotation.Transactional; @Service public class PlotterCallEmptyTask extends AbstractAcsTask { private static final String OPT_NAME = "刻字机#"; + @Autowired + private WmsToAcsService wms; @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject task, String status) { @@ -135,7 +138,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { pointConfirm(task); JSONArray data = new JSONArray(); data.add(task); - AcsUtil.notifyAcs("api/wms/task", data); + // 下发 + wms.issueTaskToAcs(data); } catch (Exception ex) { // 未找到 task.put("remark", ex.getMessage()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java index fdcbcd1c..c61be5fd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java @@ -9,13 +9,14 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; -import org.nl.common.utils.AcsUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,6 +29,8 @@ import org.springframework.transaction.annotation.Transactional; @Service public class WrapCallMaterialTask extends AbstractAcsTask { private static final String OPT_NAME = "包装机#"; + @Autowired + private WmsToAcsService wms; @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject task, String status) { @@ -131,7 +134,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask { pointConfirm(task); JSONArray data = new JSONArray(); data.add(task); - AcsUtil.notifyAcs("api/wms/task", data); + // 下发 + wms.issueTaskToAcs(data); } catch (Exception ex) { // 未找到 task.put("remark", ex.getMessage()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java index e51e4fa9..780fc415 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java @@ -9,13 +9,14 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; -import org.nl.common.utils.AcsUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,6 +29,8 @@ import org.springframework.transaction.annotation.Transactional; @Service public class WrapSendEmptyTask extends AbstractAcsTask { private static final String OPT_NAME = "包装机#"; + @Autowired + private WmsToAcsService wms; @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject task, String status) { @@ -132,7 +135,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask { pointConfirm(task); JSONArray data = new JSONArray(); data.add(task); - AcsUtil.notifyAcs("api/wms/task", data); + // 下发 + wms.issueTaskToAcs(data); } catch (Exception ex) { // 未找到 task.put("remark", ex.getMessage()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java index d0cfa199..80f0359b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java @@ -9,13 +9,14 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; -import org.nl.common.utils.AcsUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,6 +29,8 @@ import org.springframework.transaction.annotation.Transactional; @Service public class PlotterSendMaterialTask extends AbstractAcsTask { private static final String OPT_NAME = "刻字机#"; + @Autowired + private WmsToAcsService wms; @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject task, String status) { @@ -92,7 +95,6 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { public String createTask(JSONObject param) { WQLObject workOrderTab = WQLObject.getWQLObject("PDM_produce_workOrder"); WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject classTab = WQLObject.getWQLObject("MD_PB_ClassStandard"); String start_point_code = param.getString("point_code"); // todo String workorder = param.getString("workorder_code"); if(StrUtil.isEmpty(start_point_code)) { @@ -136,7 +138,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { pointConfirm(task); JSONArray data = new JSONArray(); data.add(task); - AcsUtil.notifyAcs("api/wms/task", data); + // 下发 + wms.issueTaskToAcs(data); } catch (Exception ex) { // 未找到 task.put("remark", ex.getMessage());