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

1

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-08-03 10:52:20 +08:00
parent a1970159be
commit c52eb4a4a8
4 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
View File

@@ -273,9 +273,8 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json);
if (result.getStatus() == 200) {
this.writing(this.mode);
requireSucess = true;
}
requireSucess = true;
return true;
}
}

1
acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql
View File

@@ -72,6 +72,7 @@
WHERE
prod.is_deleted = '0'
and prod.order_status != '2'
and prod.order_status != '3'
OPTION 输入.order_code <> ""
prod.order_code like 输入.order_code
ENDOPTION

9
acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java
View File

@@ -4,7 +4,9 @@ package org.nl.acs.task.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
@@ -75,6 +77,9 @@ public class TaskFeedbackServiceImpl implements TaskFeedbackService {
public TaskFeedbackDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("acs_task_feedback");
JSONObject json = wo.query("task_code ='" + code + "' and is_finished='0' ").uniqueResult(0);
if(ObjectUtil.isEmpty(json)){
return null;
}
final TaskFeedbackDto obj = json.toJavaObject(TaskFeedbackDto.class);
return obj;
}
@@ -166,7 +171,7 @@ public class TaskFeedbackServiceImpl implements TaskFeedbackService {
feed_jo.put("task_code", entity.getTask_code());
feed_jo.put("task_status", entity.getTask_status());
JSONArray ja = new JSONArray();
ja.add(feed_jo);
HttpResponse body = null;
String error_message = null;
try {
@@ -176,7 +181,7 @@ public class TaskFeedbackServiceImpl implements TaskFeedbackService {
e.printStackTrace();
}
int status = body.getStatus();
JSONObject jo = (JSONObject) JSONObject.toJSON(body.body());
JSONObject jo = (JSONObject) JSON.parse(body.body());
dto.setTask_status(entity.getTask_status());
if (status == 200) {

16
acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
View File

@@ -83,22 +83,6 @@ public class AutoCreateInst {
}
}
//特殊任务 起点终点处理
// if (StrUtil.equals("2", acsTask.getTask_type())) {
// next_device_code = acsTask.getNext_device_code();
// if (StrUtil.equals(appService.findDeviceTypeByCode(next_device_code), "storage")) {
// next_point_code = next_device_code + "-" + acsTask.getTo_y() + "-" + acsTask.getTo_z();
// } else {
// next_point_code = next_device_code;
// }
// if(taskserver.querySameTaskByType("2")>0){
// acsTask.setRemark("该任务类型任务暂不允许生成指令");
// log.debug("该任务类型任务暂不允许生成指令");
// taskserver.updateByCodeFromCache(acsTask);
// continue;
// }
// }
/**
* 开始平均分解校验
*/