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

代码修改

Browse Source
This commit is contained in:
ludj
2022-11-17 16:00:56 +08:00
parent 1091e3cdc5
commit d7c7dc8936
3 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import org.nl.wms.ext.acs.service.AcsToWmsService;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.TaskService;
import org.nl.wms.sch.service.dto.TaskDto;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
@@ -35,17 +36,23 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
* @param jsonObject 条件
* @return
*/
public static void main(String[] args) {
String a="[{\"task_id\":\"335684194ab44558ae87224b3173be6a\",\"task_code\":\"12196\",\"task_status\":\"2\"}]";
JSONArray array = JSONArray.fromObject(a);
System.out.println(array);
}
@Override
public Map<String, Object> receiveTaskStatusAcs(String string) {
JSONArray array = JSONArray.fromObject(string);
//返回处理失败的任务
JSONArray errArr = new JSONArray();
for (int i = 0; i < array.size(); i++) {
JSONObject row = array.getJSONObject(i);
String task_uuid = row.optString("task_uuid");
TaskDto taskDto = taskService.findById(task_uuid);
String processing_class = taskDto.getHandle_class();
WQLObject wo = WQLObject.getWQLObject("sch_base_task");
JSONObject taskObj = wo.query("task_uuid ='" + task_uuid + "'").uniqueResult(0);
String processing_class = taskObj.getString("handle_class");
//1:执行中,2:完成 ,3:acs取消
String acs_task_status = row.optString("task_status");
String message = "";
@@ -62,7 +69,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
Object obj = clz.newInstance();
// 调用每个任务类的forceFinishInst()强制结束方法
Method m = obj.getClass().getDeclaredMethod("updateTaskStatus", JSONObject.class, String.class);
m.invoke(obj, row, status);
m.invoke(obj, taskObj, status);
} catch (InvocationTargetException e) {
e.printStackTrace();
//空指针

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QBASE_POINT.wql
View File

@@ -74,7 +74,7 @@
LEFT JOIN sys_dict_detail d2 ON point.area_type = d2.value and d2.name='sch_area_type'
LEFT JOIN sys_dict_detail d3 ON point.lock_type = d3.value and d3.name='lock_type'
LEFT JOIN sys_dict_detail d4 ON point.point_status = d4.value and d4.name='sch_point_status'
LEFT JOIN st_ivt_structivt structivt ON structivt.vehicle_code = point.vehicle_code
LEFT JOIN st_ivt_structivt structivt ON structivt.struct_uuid = point.point_uuid
LEFT JOIN md_base_material material ON material.material_uuid = structivt.material_uuid
WHERE
point.is_delete = '0'

17
wms/hd/nladmin-system/src/test/java/org/nl/Test2.java
View File

@@ -1,17 +0,0 @@
package org.nl;
import org.nl.modules.system.service.ParamService;
import org.nl.modules.system.service.dto.ParamDto;
import org.nl.modules.system.service.impl.ParamServiceImpl;
public class Test2 extends BaseTest{
@org.junit.Test
public void test() {
ParamDto p = new ParamDto();
p.setCode("99");
ParamService service = new ParamServiceImpl();
service.create(p);
System.out.println("测试结束!");
}
}