root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev: 修改下发功能

Browse Source
This commit is contained in:
liyongde
2023-04-04 10:43:21 +08:00
parent 70a26fc2c5
commit 321c96c573
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java
View File

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

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java
View File

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

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java
View File

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

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java
View File

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