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:35:01 +08:00
parent 1a0bd08951
commit 4f150811ee
9 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

15
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java → lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java
View File

@@ -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<AcsTaskDto> addTask() {
return null;