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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-27 20:10:13 +08:00
parent 168ee247d5
commit 691271930c
12 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,7 +195,7 @@ public class BookTwoConfirmTask extends AbstractAcsTask {
json.put("task_id",IdUtil.getSnowflake(1,1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_type", "05");
json.put("task_status", "01");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("start_pint_code"));
json.put("point_code2", form.getString("end_pint_code"));
json.put("sort_seq", "1");

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

@@ -13,8 +13,6 @@ 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.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.mes.service.LmsToMesService;
import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
import org.nl.wms.sch.AcsTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -287,7 +285,7 @@ public class CoolCutTask extends AbstractAcsTask {
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_type", form.getString("task_type"));
json.put("task_status", "01");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", point_code1);
json.put("point_code2", point_code2);
json.put("point_code3", point_code3);

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

@@ -176,7 +176,7 @@ public class CutConveyorTask extends AbstractAcsTask {
json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_type", form.getString("task_type"));
json.put("task_status", "01");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", point_code1);
json.put("point_code2", point_code2);
json.put("vehicle_code", form.getString("vehicle_code"));

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

@@ -251,7 +251,7 @@ public class CutTrussTask extends AbstractAcsTask {
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));
json.put("vehicle_code2", form.getString("vehicle_code2"));
json.put("task_status", "01");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("point_code1"));
json.put("point_code2", form.getString("point_code2"));
json.put("point_code3", form.getString("point_code3"));

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

@@ -51,7 +51,7 @@ public class EmptyVehicleTask extends AbstractAcsTask {
continue;
}
char dtl_type = json.getString("acs_task_type").charAt(json.getString("acs_task_type").length()-1);
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1);
AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id"))
.task_code(json.getString("task_code"))
@@ -154,7 +154,7 @@ public class EmptyVehicleTask extends AbstractAcsTask {
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));
json.put("task_status", "01");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", point_code1);
json.put("point_code2", point_code2);
json.put("handle_class", this.getClass().getName());

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

@@ -51,7 +51,7 @@ public class InTask extends AbstractAcsTask {
continue;
}
char dtl_type = json.getString("acs_task_type").charAt(json.getString("acs_task_type").length()-1);
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1);
AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id"))
.task_code(json.getString("task_code"))
@@ -77,7 +77,7 @@ public class InTask extends AbstractAcsTask {
HashMap map = new HashMap();
//1:执行中,2:完成 ,3:acs取消
if (status.equals("1")) {
map.put("task_status", "03");
map.put("task_status", TaskStatusEnum.EXECUTING.getCode());
//更新入库单分配任务状态
HashMap dis_map = new HashMap();
dis_map.put("work_status", "02");
@@ -138,7 +138,7 @@ public class InTask extends AbstractAcsTask {
json.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));
json.put("task_status", "01");
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", start_device_code);
json.put("point_code2", next_device_code);
json.put("handle_class", this.getClass().getName());

31
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -60,6 +60,8 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
private final PointService pointService;
private final TaskService taskService;
@Override
public Map<String, Object> pageQuery(Map whereJson, Pageable page) {
@@ -111,6 +113,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
String end_time = (String) whereJson.get("end_time");
String container_name = (String) whereJson.get("container_name");
String package_box_sn = (String) whereJson.get("package_box_sn");
String sap_pcsn = (String) whereJson.get("sap_pcsn");
map.put("flag", "2");
if (StrUtil.isNotEmpty(package_box_sn)) {
map.put("package_box_sn", package_box_sn);
@@ -121,6 +124,9 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
if (StrUtil.isNotEmpty(bill_code)) {
map.put("bill_code", bill_code);
}
if (StrUtil.isNotEmpty(sap_pcsn)) {
map.put("sap_pcsn", sap_pcsn);
}
if (StrUtil.isNotEmpty(material_search)) {
map.put("material_search", "%" + material_search + "%");
}
@@ -1073,33 +1079,26 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
@Override
@Transactional(rollbackFor = Exception.class)
public void reIssueTask(Map whereJson) {
//判断指令状态，只能下发生成、执行中状态的任务
String taskdtl_id = (String) whereJson.get("taskdtl_id");
String task_id = (String) whereJson.get("task_id");
TaskDto taskDto = new TaskDto();
/* if (StrUtil.isNotEmpty(taskdtl_id)) {
taskDto = taskService.findByDtlId(taskdtl_id);
} else {
taskDto = taskService.findById(task_id);
}*/
if (ObjectUtil.isEmpty(taskDto)) {
//判断指令状态，只能下发生成、执行中状态的任务
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_id = '"+task_id+"'").uniqueResult(0);
if (ObjectUtil.isEmpty(task_jo)) {
throw new BadRequestException("请输入正确的任务号！");
}
if (!taskDto.getTask_status().equals("01")) {
throw new BadRequestException("只能修改任务状态为生成的任务！");
if (!task_jo.getString("task_status").equals("04")) {
throw new BadRequestException("只能修改任务状态为未下发的任务！");
}
AbstractAcsTask task = new InTask();
//调用ACS接受任务接口
JSONObject result = null;
JSONObject result = task.immediateNotifyAcs(task_id);
if (ObjectUtil.isNotEmpty(result)) {
String status = result.getString("status");
if ("200".equals(status)) {
HashMap<String, String> map = new HashMap<>();
//更新任务指令为下发
JSONObject task_jo = new JSONObject();
task_jo.put("taskdtl_id", "");
task_jo.put("task_id", taskDto.getTask_id());
task.updateTaskStatus(task_jo, "1");
JSONObject task_map = new JSONObject();
task_map.put("task_id", task_id);
task.updateTaskStatus(task_map, "1");
} else {
throw new BadRequestException("任务下发失败:" + result.getString("message"));
}

2
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
View File

@@ -44,7 +44,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
continue;
}
char dtl_type = json.getString("acs_task_type").charAt(json.getString("acs_task_type").length()-1);
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length()-1);
AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id"))
.task_code(json.getString("task_code"))