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

任务代码修改

Browse Source
This commit is contained in:
ldj_willow
2022-10-22 14:30:44 +08:00
parent 24c1c64c95
commit 1a0bd08951
17 changed files with 390 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -224,16 +224,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 回显任务载具类型
jsonTask.put("vehicle_type", json.getString("vehicle_type"));
taskTab.update(jsonTask);
// 下发
JSONObject jsonObject = taskBean.renotifyAcs(task_id);
if (StrUtil.equals(jsonObject.getString("status"), "200")) {
// 成功返回 更新任务状态
jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
taskTab.update(jsonTask);
} else {
throw new BadRequestException(jsonObject.getString("message"));
}
} else if (StrUtil.equals(type, "3")) {
// 3.油漆线申请空盘: 调用空托盘出库处理类创建任务
if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空");
@@ -244,14 +234,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 创建任务
CallEmpVehicleTask taskBean = SpringContextHolder.getBean(CallEmpVehicleTask.class);
String task_id = taskBean.createTask(param);
JSONObject jsonObject = taskBean.renotifyAcs(task_id);
if (StrUtil.equals(jsonObject.getString("status"), "200")) {
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
taskTab.update(jsonTask);
} else {
throw new BadRequestException(jsonObject.getString("message"));
}
} else if (StrUtil.equals(type, "4")) {
// 4.油漆线申请物料: 调用物料出库库处理类创建任务
JSONObject param = new JSONObject();
@@ -277,14 +259,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jsonRegion.put("task_id", Long.valueOf(task_id));
regionTab.update(jsonRegion);
// 下发
JSONObject jsonObject = taskBean.renotifyAcs(task_id);
if (StrUtil.equals(jsonObject.getString("status"), "200")) {
jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
taskTab.update(jsonTask);
} else {
throw new BadRequestException(jsonObject.getString("message"));
}
} else if (StrUtil.equals(type, "5")) {
// 5.油漆线空盘入库: 调用空托盘入库处理类创建任务
if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空");
@@ -322,7 +296,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
if (StrUtil.equals(jsonTask.getString("task_status"), "4")) {
// 起点终点确定则下发
JSONObject jsonObject = taskBean.renotifyAcs(task_id);
// JSONObject jsonObject = taskBean.renotifyAcs(task_id);
JSONObject jsonObject=new JSONObject();
if (StrUtil.equals(jsonObject.getString("status"), "200")) {
// 更新任务状态
jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
@@ -363,14 +338,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jsonTask.put("vehicle_type", json.getString("vehicle_type"));
taskTab.update(jsonTask);
// 下发
JSONObject jsonObject = taskBean.renotifyAcs(task_id);
if (StrUtil.equals(jsonObject.getString("status"), "200")) {
jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
taskTab.update(jsonTask);
} else {
throw new BadRequestException(jsonObject.getString("message"));
}
}
return null;
}

4
lms/nladmin-system/src/main/java/org/nl/wms/ext/auto/AutoQueryTask.java
View File

@@ -101,7 +101,7 @@ public class AutoQueryTask {
jsonTask.put("point_code2", "SSX01A1");
taskTab.update(jsonTask);
// 4.4.下发ACS
JSONObject jsonResultAcs = pointTaskBean.renotifyAcs(jsonTask.getString("task_id"));
JSONObject jsonResultAcs = pointTaskBean.notifyAcs(jsonTask.getString("task_id"));
if (StrUtil.equals(jsonResultAcs.getString("status"), "200")) {
// 4.5.下发成功、更新任务状态
@@ -125,7 +125,7 @@ public class AutoQueryTask {
jsonTask.put("point_code2", "SSX02A1");
taskTab.update(jsonTask);
// 5.4.下发ACS
JSONObject jsonResultAcs = pointTaskBean.renotifyAcs(jsonTask.getString("task_id"));
JSONObject jsonResultAcs = pointTaskBean.notifyAcs(jsonTask.getString("task_id"));
if (StrUtil.equals(jsonResultAcs.getString("status"), "200")) {
// 4.5.下发成功、更新任务状态

175
lms/nladmin-system/src/main/java/org/nl/wms/sch/SchTaskDto.java Normal file
View File

@@ -0,0 +1,175 @@
package org.nl.wms.sch;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Builder;
import lombok.Data;
import java.io.Serializable;
/**
* @author ldjun
* @description /
* @date 2022-10-22
**/
@Data
@Builder
public class SchTaskDto implements Serializable {
/** 任务标识 */
/**
* 防止精度丢失
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long task_id;
/**
* 任务编码
*/
private String task_code;
/**
* 任务类型
*/
private String task_type;
/**
* 任务状态
*/
private String task_status;
/**
* 点位1
*/
private String point_code1;
/**
* 点位2
*/
private String point_code2;
/**
* 点位3
*/
private String point_code3;
/**
* 点位4
*/
private String point_code4;
/**
* 物料标识
*/
private Long material_id;
/**
* 载具类型
*/
private String vehicle_type;
/**
* 载具数量
*/
private Integer vehicle_qty;
/**
* 载具编码
*/
private String vehicle_code;
/**
* 优先级
*/
private String priority;
/**
* 处理类
*/
private String handle_class;
/**
* 任务组标识
*/
private Long task_group_id;
/**
* 任务顺序号
*/
private Integer sort_seq;
/**
* 任务完成类型
*/
private String finished_type;
/**
* acs任务类型
*/
private String acs_task_type;
/**
* 业务表表名
*/
private String table_name;
/**
* 业务表表名主键字段
*/
private String table_fk;
/**
* 业务表表名主键值
*/
private Long table_fk_id;
/**
* 备注
*/
private String remark;
/**
* 备注1
*/
private String remark2;
/**
* 备注2
*/
private String remark3;
/**
* 是否删除
*/
private String is_delete;
/**
* 创建时间
*/
private String create_time;
/**
* 修改时间
*/
private String update_time;
/**
* 车号
*/
private String car_no;
/**
* 是否自动下发
*/
private String is_auto_issue;
/**
* 生成任务的请求参数
*/
private String request_param;
/**
* 下发任务的请求参数
*/
private String response_param;
}

91
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
View File

@@ -1,14 +1,10 @@
package org.nl.wms.sch.manage;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.sch.AcsUtil;
import org.nl.wms.sch.tasks.AcsTaskDto;
import java.util.ArrayList;
import java.util.List;
/**
@@ -21,8 +17,6 @@ import java.util.List;
* @created 2020年6月12日 下午5:53:28
*/
public abstract class AbstractAcsTask {
/**
* @discription 在如果任务无法形成会一直定时刷新判断
* @author ldjun
@@ -40,25 +34,7 @@ public abstract class AbstractAcsTask {
*
* @return
*/
public List<AcsTaskDto> addTask() {
//任务基础表【sch_base_task】
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONArray tasks = taskTab.query("handle_class = '" + this.getClass().getName() + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
List<AcsTaskDto> arr = new ArrayList<>();
for (int i = 0, j = tasks.size(); i < j; i++) {
JSONObject json = tasks.getJSONObject(i);
AcsTaskDto taskDto = new AcsTaskDto();
taskDto.setTask_id(json.getString("task_id"));
taskDto.setTask_code(json.getString("task_code"));
taskDto.setTask_type("1");
taskDto.setRoute_plan_code("normal");
taskDto.setStart_device_code(json.getString("point_code1"));
taskDto.setNext_device_code(json.getString("point_code2"));
taskDto.setVehicle_code(json.getString("vehicle_code"));
arr.add(taskDto);
}
return arr;
}
public abstract List<AcsTaskDto> addTask();
/**
* @param taskObj 代表一条任务对象
@@ -77,7 +53,7 @@ public abstract class AbstractAcsTask {
* @created 2020年6月12日 下午6:01:30
*/
public void findStartPoint(){
public void findStartPoint() {
}
@@ -87,9 +63,11 @@ public abstract class AbstractAcsTask {
* @author ldjun
* @created 2020年6月12日 下午6:01:06
*/
public void findNextPoint(){
public void findNextPoint() {
};
}
;
/**
* @param form 创建任务需要的参数
@@ -104,37 +82,35 @@ public abstract class AbstractAcsTask {
}
/**
* @return WCS的任务集合
* @discription 重新下发给wcs任务
* @discription 下发给wcs任务
* @author ldjun
* @created 2020年6月12日 下午5:52:28
*/
public JSONObject renotifyAcs(String task_id) {
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONArray jsonArray = new JSONArray();
JSONArray arr = taskTab.query("task_id = '" + task_id + "'").getResultJSONArray(0);
for (int i = 0, j = arr.size(); i < j; i++) {
JSONObject json = arr.getJSONObject(i);
AcsTaskDto taskDto = new AcsTaskDto();
taskDto.setTask_id(json.getString("task_id"));
taskDto.setTask_code(json.getString("task_code"));
taskDto.setStart_device_code(json.getString("point_code1"));
taskDto.setNext_device_code(json.getString("point_code2"));
taskDto.setPriority("1");
taskDto.setVehicle_type(json.getString("vehicle_type"));
taskDto.setVehicle_code(json.getString("vehicle_code"));
taskDto.setPriority(json.getString("priority"));
taskDto.setTask_type("1");
taskDto.setRoute_plan_code("normal");
public JSONObject notifyAcs(String task_id) {
return AcsUtil.notifyAcs("api/wms/task", null);
}
jsonArray.add(JSONObject.parse(JSON.toJSONString(taskDto)));
}
/**
* @return WCS的任务集合
* @discription 再次下发给wcs任务
* @author ldjun
* @created 2020年6月12日 下午5:52:28
*/
public JSONObject notifyAcs(JSONArray jsonArray) {
return AcsUtil.notifyAcs("api/wms/task", jsonArray);
}
/**
*
*/
public JSONObject immediateNotifyAcs() {
List<AcsTaskDto> schedule = this.schedule();
JSONArray arr = JSONArray.parseArray(schedule.toString());
return AcsUtil.notifyAcs("api/wms/task", arr);
}
/**
* @param task_id 任务标识
* @return
@@ -145,29 +121,18 @@ public abstract class AbstractAcsTask {
public abstract void forceFinish(String task_id);
/**
* @param task_id
* @return
* @discription 任务搬回原起点。
* @author ldjun
* @created 2020年6月22日 下午8:40:58
*/
public abstract void pullBack(String task_id);
/**
* 取消任务
* 取消任务,货物搬回原点
*
* @param task_id
*/
public abstract void cancel(String task_id);
/**
*
* @param task_id: 任务标识
* @return 二次申请的点位
*/
String againApply(String task_id){
String againApply(String task_id) {
return null;
}
}

4
lms/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateTask.java → lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java
View File

@@ -1,4 +1,4 @@
package org.nl.modules.quartz.task;
package org.nl.wms.sch.manage;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -9,8 +9,6 @@ import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.sch.AcsUtil;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.tasks.AcsTaskDto;
import org.reflections.Reflections;
import org.springframework.stereotype.Component;

13
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpVehicleTask.java
View File

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
@Service
@RequiredArgsConstructor
@@ -32,6 +33,9 @@ import java.math.BigDecimal;
public class CallEmpVehicleTask extends AbstractAcsTask {
private final String THIS_CLASS = CallEmpVehicleTask.class.getName();
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
@@ -166,10 +170,7 @@ public class CallEmpVehicleTask extends AbstractAcsTask {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
@Override
public void pullBack(String task_id) {
}
@Override
public void cancel(String task_id) {
@@ -289,4 +290,10 @@ public class CallEmpVehicleTask extends AbstractAcsTask {
resuft.put("vehicle_type", jsonOrder.getString("vehicle_type"));
return resuft;
}
@Override
public List<AcsTaskDto> addTask() {
return null;
}
}

29
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallMaterialTask.java
View File

@@ -21,7 +21,9 @@ import org.nl.wms.sch.service.impl.PointServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@Service
public class CallMaterialTask extends AbstractAcsTask {
@@ -122,7 +124,6 @@ public class CallMaterialTask extends AbstractAcsTask {
}
@Override
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
@@ -209,14 +210,30 @@ public class CallMaterialTask extends AbstractAcsTask {
}
@Override
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
public List<AcsTaskDto> addTask() {
//任务基础表【sch_base_task】
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONArray tasks = taskTab.query("handle_class = '" + this.getClass().getName() + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
List<AcsTaskDto> arr = new ArrayList<>();
for (int i = 0, j = tasks.size(); i < j; i++) {
JSONObject json = tasks.getJSONObject(i);
AcsTaskDto taskDto = new AcsTaskDto();
taskDto.setTask_id(json.getString("task_id"));
taskDto.setTask_code(json.getString("task_code"));
taskDto.setTask_type("1");
taskDto.setRoute_plan_code("normal");
taskDto.setStart_device_code(json.getString("point_code1"));
taskDto.setNext_device_code(json.getString("point_code2"));
taskDto.setVehicle_code(json.getString("vehicle_code"));
arr.add(taskDto);
}
return arr;
}
@Override
public void pullBack(String task_id) {
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
@Override

34
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java
View File

@@ -18,6 +18,8 @@ import org.nl.wms.sch.manage.TaskStatusEnum;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
@RequiredArgsConstructor
@Slf4j
@@ -27,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
public class GjxCallEmpVehicleTask extends AbstractAcsTask {
private final String THIS_CLASS = GjxCallEmpVehicleTask.class.getName();
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
@@ -69,21 +72,21 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
startPoint.put("update_time", DateUtil.now());
pointTab.update(startPoint, "point_code = '" + start_point_code + "'");
//更新终点点位状态
endPoint.put("point_status","2");
endPoint.put("lock_type","00");
endPoint.put("vehicle_qty",jsonTask.getString("vehicle_qty"));
endPoint.put("vehicle_type",jsonTask.getString("vehicle_type"));
endPoint.put("update_time",DateUtil.now());
endPoint.put("point_status", "2");
endPoint.put("lock_type", "00");
endPoint.put("vehicle_qty", jsonTask.getString("vehicle_qty"));
endPoint.put("vehicle_type", jsonTask.getString("vehicle_type"));
endPoint.put("update_time", DateUtil.now());
pointTab.update(endPoint);
}else {
} else {
JSONObject startPoint = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0);
Integer vehicle_qty = startPoint.getInteger("vehicle_qty");
int after_qty=vehicle_qty-1;
int after_qty = vehicle_qty - 1;
startPoint.put("lock_type", "1");
startPoint.put("vehicle_qty", after_qty);
if (after_qty>0){
if (after_qty > 0) {
startPoint.put("point_status", "2");
}else {
} else {
startPoint.put("point_status", "1");
}
startPoint.put("update_time", DateUtil.now());
@@ -91,6 +94,10 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
}
}
}
@Override
public List<AcsTaskDto> addTask() {
return null;
}
@Override
public void findStartPoint() {
@@ -129,7 +136,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
//去缓存位和养生A区找,生成到叠盘架的任务
JSONObject whereParam = new JSONObject();
whereParam.put("flag", "1");
whereParam.put("vehicle_type", '%'+jsonTask.getString("vehicle_type")+"%");
whereParam.put("vehicle_type", '%' + jsonTask.getString("vehicle_type") + "%");
JSONObject outJsonObj = WQL.getWO("ST_VEHICLE_OUT_01").addParamMap(whereParam).process().uniqueResult(0);
// 空托盘缓存货架或者养生A区------>叠盘架B区
@@ -155,7 +162,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
//锁住起点
outJsonObj.put("lock_type", "2");
pointTab.update(outJsonObj);
this.renotifyAcs(String.valueOf(task_id));
this.notifyAcs(String.valueOf(task_id));
jsonTask.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
@@ -223,11 +230,6 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
@Override
public void pullBack(String task_id) {
}
@Override
public void cancel(String task_id) {

14
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/HtSendEmpVehicleTask.java
View File

@@ -19,12 +19,16 @@ import org.nl.wms.sch.manage.TaskStatusEnum;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
@RequiredArgsConstructor
@Slf4j
public class HtSendEmpVehicleTask extends AbstractAcsTask {
private final String THIS_CLASS = HtSendEmpVehicleTask.class.getName();
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
@@ -298,11 +302,6 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
@Override
public void pullBack(String task_id) {
}
@Override
public void cancel(String task_id) {
@@ -459,5 +458,8 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
return point_code;
}
@Override
public List<AcsTaskDto> addTask() {
return null;
}
}

10
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PointToPointTask.java
View File

@@ -10,11 +10,14 @@ import org.nl.wms.sch.manage.TaskStatusEnum;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 普通点对点任务
*/
@Service
public class PointToPointTask extends AbstractAcsTask {
@Override
@Transactional
public void updateTaskStatus(JSONObject taskObj, String status) {
@@ -62,10 +65,13 @@ public class PointToPointTask extends AbstractAcsTask {
}
@Override
public void pullBack(String task_id) {
public List<AcsTaskDto> addTask() {
return null;
}
@Override
public void cancel(String task_id) {

10
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendEmpVehicleTask.java
View File

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
@Service
@RequiredArgsConstructor
@@ -32,6 +33,8 @@ import java.util.HashMap;
public class SendEmpVehicleTask extends AbstractAcsTask {
private final String THIS_CLASS = SendEmpVehicleTask.class.getName();
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
@@ -155,10 +158,7 @@ public class SendEmpVehicleTask extends AbstractAcsTask {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
@Override
public void pullBack(String task_id) {
}
@Override
public void cancel(String task_id) {
@@ -270,4 +270,8 @@ public class SendEmpVehicleTask extends AbstractAcsTask {
resuft.put("vehicle_type",vehicle_type);
return resuft;
}
@Override
public List<AcsTaskDto> addTask() {
return null;
}
}

13
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java
View File

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
@Service
@RequiredArgsConstructor
@@ -32,6 +33,8 @@ public class SendMaterialTask extends AbstractAcsTask {
private final String THIS_CLASS = SendMaterialTask.class.getName();
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
@@ -229,11 +232,6 @@ public class SendMaterialTask extends AbstractAcsTask {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
@Override
public void pullBack(String task_id) {
}
@Override
public void cancel(String task_id) {
@@ -278,6 +276,9 @@ public class SendMaterialTask extends AbstractAcsTask {
resuft.put("point_code2", point_code2);
return resuft;
}
@Override
public List<AcsTaskDto> addTask() {
return null;
}
}

11
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxCallEmpVehicleTask.java
View File

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
@Service
@RequiredArgsConstructor
@@ -32,6 +33,8 @@ import java.math.BigDecimal;
public class YqxCallEmpVehicleTask extends AbstractAcsTask {
private final String THIS_CLASS = YqxCallEmpVehicleTask.class.getName();
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
@@ -165,10 +168,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
@Override
public void pullBack(String task_id) {
}
@Override
public void cancel(String task_id) {
@@ -288,4 +288,9 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
resuft.put("vehicle_type", jsonOrder.getString("vehicle_type"));
return resuft;
}
@Override
public List<AcsTaskDto> addTask() {
return null;
}
}

10
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/YqxSendEmpVehicleTask.java
View File

@@ -18,12 +18,15 @@ import org.nl.wms.sch.manage.TaskStatusEnum;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
@RequiredArgsConstructor
@Slf4j
public class YqxSendEmpVehicleTask extends AbstractAcsTask {
private final String THIS_CLASS = YqxSendEmpVehicleTask.class.getName();
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
@@ -173,14 +176,15 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
@Override
public void pullBack(String task_id) {
}
@Override
public void cancel(String task_id) {
}
@Override
public List<AcsTaskDto> addTask() {
return null;
}
}

75
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterial.java Normal file
View File

@@ -0,0 +1,75 @@
package org.nl.wms.sch.tasks.sendMaterial;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.sch.SchTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.tasks.AcsTaskDto;
import org.nl.wms.util.IdUtil;
import java.util.List;
/**
* 共挤线送料任务服务
*/
public class GjxSendMaterial extends AbstractAcsTask {
@Override
public void updateTaskStatus(JSONObject taskObj, String status) {
}
@Override
public void findNextPoint() {
}
@Override
public List<AcsTaskDto> addTask() {
return null;
}
@Override
public String createTask(JSONObject whereJson) {
String point_code = whereJson.getString("point_code");
String vehicle_type = whereJson.getString("vehicle_type");
String vehicle_code = whereJson.getString("vehicle_code");
String qty = whereJson.getString("qty");
SchTaskDto dto = SchTaskDto.builder()
.task_id(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode(""))
.task_type("task_type")
.point_code1(point_code)
.vehicle_code("")
.handle_class("")
.create_time(DateUtil.now())
.point_code1("")
.request_param(whereJson.toJSONString())
.build();
//任务表【SCH_BASE_Task】
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
taskTab.insert(json);
//创建好立即下发
this.immediateNotifyAcs();
return String.valueOf(dto.getTask_id());
}
@Override
public void forceFinish(String task_id) {
}
@Override
public void cancel(String task_id) {
}
}

11
lms/nladmin-system/src/main/java/org/nl/wms/util/IdUtil.java Normal file
View File

@@ -0,0 +1,11 @@
package org.nl.wms.util;
public class IdUtil {
public static Long getLongId() {
return cn.hutool.core.util.IdUtil.getSnowflake(1, 1).nextId();
}
public static String getStringId() {
return String.valueOf(IdUtil.getLongId());
}
}

BIN
lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.