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

fix:混碾叫料维护

Browse Source
This commit is contained in:
zhangzhiqiang
2022-11-16 15:26:17 +08:00
parent d2c32d8e14
commit 9efd593591
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try { try {
Class<?> clz = Class.forName(processing_class); Class<?> clz = Class.forName(processing_class);
Object obj = clz.newInstance(); Object obj = clz.newInstance();
// 调用每个任务类的forceFinishInst()强制结束方法 // 调用每个任务类的updateTaskStatus()强制结束方法
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);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {

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

@@ -2,7 +2,7 @@ package org.nl.wms.sch.manage;
/** /**
* @author: lyd * @author: lyd
* @description: 更新任务状态 * @description: 更新任务状态：ACS回传任务时任务状态
* @Date: 2022/11/15 * @Date: 2022/11/15
*/ */
public enum UpdateTaskStatusEnum { public enum UpdateTaskStatusEnum {

3
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java
View File

@@ -68,6 +68,7 @@ public class HnSendMaterialTask extends AbstractAcsTask {
/** /**
* @param task 代表一条任务对象 * @param task 代表一条任务对象
* @param status 代表wcs任务完成状态： //0：acs,取消，:执行中,2:完成 * @param status 代表wcs任务完成状态： //0：acs,取消，:执行中,2:完成
* @see org.nl.wms.sch.manage.UpdateTaskStatusEnum
* @return * @return
* @discription wcs请求wms任务完成状态反馈接口, 比如agv从a点往b点走。生成任务的时候绑定b的物料信息，任务完成的时候，清除a的物料信息 * @discription wcs请求wms任务完成状态反馈接口, 比如agv从a点往b点走。生成任务的时候绑定b的物料信息，任务完成的时候，清除a的物料信息
* @author ldjun * @author ldjun
@@ -229,7 +230,7 @@ public class HnSendMaterialTask extends AbstractAcsTask {
JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '2'").getResultJSONArray(0); JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '2'").getResultJSONArray(0);
for (int i = 0; i < taskArr.size(); i++) { for (int i = 0; i < taskArr.size(); i++) {
JSONObject taskObj = taskArr.getJSONObject(i); JSONObject taskObj = taskArr.getJSONObject(i);
String vehicle_type = taskObj.getString("vehicle_type"); String vehicle_type = taskObj.getString("vehicle_type");//混碾载具类型新旧料？
JSONObject param1 = new JSONObject(); JSONObject param1 = new JSONObject();
param1.put("flag", "1"); param1.put("flag", "1");
param1.put("region_code", "KLHJ"); param1.put("region_code", "KLHJ");