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

rev：出入库异常任务

Browse Source
This commit is contained in:
liuxy
2024-03-14 17:50:04 +08:00
parent 7b9c7ea911
commit cabcd9d233
6 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -473,7 +473,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
// 创建任务 // 创建任务
JSONObject jsonTaskParam = new JSONObject(); JSONObject jsonTaskParam = new JSONObject();
jsonTaskParam.put("task_type", "010702"); jsonTaskParam.put("task_type", "010703");
jsonTaskParam.put("start_device_code", pointDto.getPoint_code()); jsonTaskParam.put("start_device_code", pointDto.getPoint_code());
jsonTaskParam.put("next_device_code", jsonDis.getString("struct_code")); jsonTaskParam.put("next_device_code", jsonDis.getString("struct_code"));
jsonTaskParam.put("vehicle_code", jsonDis.getString("box_no")); jsonTaskParam.put("vehicle_code", jsonDis.getString("box_no"));

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

@@ -165,7 +165,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
@Override @Override
@Transactional @Transactional
public void taskExceptionalOut(JSONObject jsonObject) { public String taskExceptionalOut(JSONObject jsonObject) {
// 任务表 // 任务表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
// 仓位表 // 仓位表
@@ -201,9 +201,11 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
taskParam.put("task_type", "010712"); taskParam.put("task_type", "010712");
TwoExcepionalMoveTask taskBean = new TwoExcepionalMoveTask(); TwoExcepionalMoveTask taskBean = new TwoExcepionalMoveTask();
taskBean.createTask(taskParam); String task_id = taskBean.createTask(taskParam);
taskBean.immediateNotifyAcs(null); taskBean.immediateNotifyAcs(null);
return task_id;
} }
/** /**

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

@@ -151,7 +151,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
@Override @Override
@Transactional @Transactional
public void taskExceptionalOut(JSONObject jsonObject) { public String taskExceptionalOut(JSONObject jsonObject) {
// 任务表 // 任务表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
// 仓位表 // 仓位表
@@ -187,8 +187,9 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
taskParam.put("task_type", "010712"); taskParam.put("task_type", "010712");
TwoExcepionalMoveTask taskBean = new TwoExcepionalMoveTask(); TwoExcepionalMoveTask taskBean = new TwoExcepionalMoveTask();
taskBean.createTask(taskParam); String task_id = taskBean.createTask(taskParam);
taskBean.immediateNotifyAcs(null); taskBean.immediateNotifyAcs(null);
return task_id;
} }
/** /**

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBoxManageService.java
View File

@@ -40,6 +40,6 @@ public interface OutBoxManageService {
* task_code : 任务编码 * task_code : 任务编码
* } * }
*/ */
void taskExceptionalOut(JSONObject jsonObject); String taskExceptionalOut(JSONObject jsonObject);
} }

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutVehicleManageService.java
View File

@@ -36,6 +36,6 @@ public interface OutVehicleManageService {
* task_code : 任务编码 * task_code : 任务编码
* } * }
*/ */
void taskExceptionalOut(JSONObject jsonObject); String taskExceptionalOut(JSONObject jsonObject);
} }

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

@@ -177,7 +177,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
} }
// 任务处理类 // 任务处理类
try { try {
Object obj = SpringContextHolder.getBean(Class.forName(processing_class)); Object obj = new Object();
try {
obj = SpringContextHolder.getBean(Class.forName(processing_class));
} catch (Exception e) {
Class<?> clz = Class.forName(processing_class);
obj = clz.newInstance();
}
// 调用每个任务类的forceFinishInst()强制结束方法 // 调用每个任务类的forceFinishInst()强制结束方法
Method m = obj.getClass().getDeclaredMethod("updateTaskStatus", JSONObject.class, String.class); Method m = obj.getClass().getDeclaredMethod("updateTaskStatus", JSONObject.class, String.class);
m.invoke(obj, row, status); m.invoke(obj, row, status);
@@ -2001,7 +2007,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
point_code = outBoxManageService.taskExceptional(whereJson); point_code = outBoxManageService.taskExceptional(whereJson);
} }
if (type.equals("3")) { if (type.equals("3")) {
outBoxManageService.taskExceptionalOut(whereJson); String task_id = outBoxManageService.taskExceptionalOut(whereJson);
result.put("task_id", task_id);
} }
} else if (taskDao.getTask_type().equals(TASKEnum.VEHICLE_TYPE.code("托盘入库"))) { } else if (taskDao.getTask_type().equals(TASKEnum.VEHICLE_TYPE.code("托盘入库"))) {
// 托盘入库：满入、浅货位有货-放货时 // 托盘入库：满入、浅货位有货-放货时
@@ -2014,7 +2021,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
point_code = outVehicleManageService.taskExceptional(whereJson); point_code = outVehicleManageService.taskExceptional(whereJson);
} }
if (type.equals("3")) { if (type.equals("3")) {
outVehicleManageService.taskExceptionalOut(whereJson); String task_id = outVehicleManageService.taskExceptionalOut(whereJson);
result.put("task_id", task_id);
} }
} else if (taskDao.getTask_type().equals(TASKEnum.PROUD_TYPE.code("成品入库"))) { } else if (taskDao.getTask_type().equals(TASKEnum.PROUD_TYPE.code("成品入库"))) {
// 成品入库：满入、浅货位有货-放货时 // 成品入库：满入、浅货位有货-放货时