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

fix:内包间任务异常

Browse Source
This commit is contained in:
zhangzq
2024-12-31 11:16:01 +08:00
parent b8459ca550
commit f173546356
11 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.AcsTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.manage.TaskStatusEnum;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.*; import java.util.*;
@@ -27,6 +28,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode;
/** /**
* Created by Lxy on 2021/12/22. * Created by Lxy on 2021/12/22.
*/ */
@Service
public class TwoOutTask extends AbstractAcsTask { public class TwoOutTask extends AbstractAcsTask {
private final String THIS_CLASS = TwoOutTask.class.getName(); private final String THIS_CLASS = TwoOutTask.class.getName();

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java
View File

@@ -67,7 +67,7 @@ public class ShiftingTask extends AbstractAcsTask {
.priority(r.getPriority()) .priority(r.getPriority())
.remark(r.getRemark()) .remark(r.getRemark())
.product_area(r.getProduct_area()) .product_area(r.getProduct_area())
.agv_action_type(r.getVehicle_code2()) .agv_action_type(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"))
.agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼诺宝任务")) .agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼诺宝任务"))
.build(); .build();
resultList.add(dto); resultList.add(dto);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java
View File

@@ -199,7 +199,7 @@ public class AutoSendDjqToGzq {
} else { } else {
task1.put("task_status", StringUtils.isBlank(pointCode4) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.START_AND_POINT.getCode()); task1.put("task_status", StringUtils.isBlank(pointCode4) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.START_AND_POINT.getCode());
} }
task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"));
task1.put("vehicle_code", shallowIvt.getContainer_name()); task1.put("vehicle_code", shallowIvt.getContainer_name());
task1.put("point_code1", shallowIvt.getPoint_code()); task1.put("point_code1", shallowIvt.getPoint_code());

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java
View File

@@ -159,7 +159,7 @@ public class AutoSendGzqToDjq {
String taskId = djqTask.createTask(task); String taskId = djqTask.createTask(task);
//移库任务 //移库任务
JSONObject task1 = new JSONObject(); JSONObject task1 = new JSONObject();
task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"));
task1.put("vehicle_code", groupIvtList.get(0).getContainer_name()); task1.put("vehicle_code", groupIvtList.get(0).getContainer_name());
task1.put("point_code1", pointCode2); task1.put("point_code1", pointCode2);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java
View File

@@ -128,7 +128,7 @@ public class AutoSendMzToDjq {
String taskId = djqTask.createTask(task); String taskId = djqTask.createTask(task);
//移库任务 //移库任务
JSONObject task1 = new JSONObject(); JSONObject task1 = new JSONObject();
task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"));
task1.put("vehicle_code", groupIvtList.get(0).getContainer_name()); task1.put("vehicle_code", groupIvtList.get(0).getContainer_name());
task1.put("point_code1", pointCode2); task1.put("point_code1", pointCode2);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java
View File

@@ -192,7 +192,7 @@ public class AutoSendVehicleToDjq extends Prun{
taskId = sendGzqKzjTask.createTask(task); taskId = sendGzqKzjTask.createTask(task);
task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务")); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"));
} }
task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
task1.put("vehicle_code", groupIvtList.get(0).getContainer_name()); task1.put("vehicle_code", groupIvtList.get(0).getContainer_name());
task1.put("point_code1", pointCode2); task1.put("point_code1", pointCode2);
task1.put("point_code2", deepPointCode); task1.put("point_code2", deepPointCode);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java
View File

@@ -240,7 +240,7 @@ public class AutoSendVehicleToKzj {
taskType = task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")) ? PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务") : PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"); taskType = task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")) ? PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务") : PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务");
JSONObject task1 = new JSONObject(); JSONObject task1 = new JSONObject();
task1.put("task_type", taskType); task1.put("task_type", taskType);
task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
if (existTask != null) { if (existTask != null) {
task1.put("task_status", StringUtils.isBlank(pointCode4) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.SURE_END.getCode()); task1.put("task_status", StringUtils.isBlank(pointCode4) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.SURE_END.getCode());
} else { } else {

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java
View File

@@ -130,7 +130,7 @@ public class TaskQueue {
JSONObject task1 = new JSONObject(); JSONObject task1 = new JSONObject();
String pointCode2 = packageinfoivtService.getDjqShiftingPoint(shallowIvt, true); String pointCode2 = packageinfoivtService.getDjqShiftingPoint(shallowIvt, true);
task1.put("task_status", StringUtils.isBlank(pointCode2) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.START_AND_POINT.getCode()); task1.put("task_status", StringUtils.isBlank(pointCode2) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.START_AND_POINT.getCode());
task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"));
task1.put("vehicle_code", shallowIvt.getContainer_name()); task1.put("vehicle_code", shallowIvt.getContainer_name());
task1.put("point_code1", shallowIvt.getPoint_code()); task1.put("point_code1", shallowIvt.getPoint_code());

1
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
View File

@@ -105,6 +105,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
.eq("point_code1", whereJson.getString("device_code")) .eq("point_code1", whereJson.getString("device_code"))
.eq("vehicle_code", whereJson.getString("box_no")) .eq("vehicle_code", whereJson.getString("box_no"))
.eq("task_type", "010702") .eq("task_type", "010702")
.eq("is_delete", "0")
.lt("task_status", TaskStatusEnum.FINISHED.getCode())); .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
if (count>0){ if (count>0){
return; return;

1
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java
View File

@@ -74,6 +74,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
.eq("point_code1", whereJson.getString("device_code")) .eq("point_code1", whereJson.getString("device_code"))
.eq("vehicle_code", whereJson.getString("vehicle_code")) .eq("vehicle_code", whereJson.getString("vehicle_code"))
.eq("task_type", "010705") .eq("task_type", "010705")
.eq("is_delete", "0")
.lt("task_status", TaskStatusEnum.EXECUTING.getCode())); .lt("task_status", TaskStatusEnum.EXECUTING.getCode()));
if (count>0){ if (count>0){
return; return;

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

@@ -2040,6 +2040,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.eq("point_code1", whereJson.getString("device_code")) .eq("point_code1", whereJson.getString("device_code"))
.eq("task_type", "010703") .eq("task_type", "010703")
.eq("vehicle_code2", whereJson.getString("vehicle_code")) .eq("vehicle_code2", whereJson.getString("vehicle_code"))
.eq("is_delete", "0")
.lt("task_status", TaskStatusEnum.EXECUTING.getCode())); .lt("task_status", TaskStatusEnum.EXECUTING.getCode()));
if (count>0){ if (count>0){
log.info("acs申请入库任务以存在直接跳过"+whereJson.getString("vehicle_code")); log.info("acs申请入库任务以存在直接跳过"+whereJson.getString("vehicle_code"));