wangs
/
huaYan
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add：新增强制完成接口

master
涂强 5 months ago
parent
aa6fa8af26
commit
66a9c8520b
1 changed files with 38 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 76
      acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java

76
acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@ -811,44 +811,44 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
wo.update(json); wo.update(json);
removeByCodeFromCache(entity.getTask_code()); removeByCodeFromCache(entity.getTask_code());
// 判断是否为WMS下发的任务，如果是反馈任务状态给WMS // 判断是否为WMS下发的任务，如果是反馈任务状态给WMS
// String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue();
// if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
// TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code()); TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code());
// System.out.println(feefbackdto == null); System.out.println(feefbackdto == null);
// JSONObject feed_jo = new JSONObject(); JSONObject feed_jo = new JSONObject();
// feed_jo.put("task_id", entity.getTask_id()); feed_jo.put("task_id", entity.getTask_id());
// feed_jo.put("task_code", entity.getTask_code()); feed_jo.put("task_code", entity.getTask_code());
// feed_jo.put("task_status", entity.getTask_status()); feed_jo.put("task_status", entity.getTask_status());
// JSONArray ja = new JSONArray(); JSONArray ja = new JSONArray();
// ja.add(feed_jo); ja.add(feed_jo);
//
// try { try {
// JSONObject request1 = new JSONObject(); JSONObject request1 = new JSONObject();
// request1.put("REQCODE", entity.getExt_task_id()); request1.put("REQCODE", entity.getExt_task_id());
// request1.put("TASKCODE", entity.getTask_code()); request1.put("TASKCODE", entity.getTask_code());
// request1.put("PODCODE", entity.getVehicle_code()); request1.put("PODCODE", entity.getVehicle_code());
// request1.put("TASKTYPE", entity.getTask_type()); request1.put("TASKTYPE", entity.getTask_type());
// request1.put("METHOD", "3"); request1.put("METHOD", "3");
// request1.put("REQTIME", DateUtil.now()); request1.put("REQTIME", DateUtil.now());
// log.info("atrAgvCallback 请求参数:" + request1.toString()); log.info("atrAgvCallback 请求参数:" + request1.toString());
// String str1 = new RTMSAGVSERVICE().getBasicHttpBindingIRTMSAGVSERVICE().atrAgvCallback(request1.toJSONString()); String str1 = new RTMSAGVSERVICE().getBasicHttpBindingIRTMSAGVSERVICE().atrAgvCallback(request1.toJSONString());
// log.info("atrAgvCallback 返回参数:" + str1); log.info("atrAgvCallback 返回参数:" + str1);
//
// JSONObject request = new JSONObject(); JSONObject request = new JSONObject();
// request.put("REQCODE", entity.getExt_task_id()); request.put("REQCODE", entity.getExt_task_id());
// request.put("TASKCODE", entity.getTask_code()); request.put("TASKCODE", entity.getTask_code());
// request.put("PODCODE", entity.getVehicle_code()); request.put("PODCODE", entity.getVehicle_code());
// request.put("TASKTYPE", entity.getTask_type()); request.put("TASKTYPE", entity.getTask_type());
// request.put("METHOD", "5"); request.put("METHOD", "5");
// request.put("REQTIME", DateUtil.now()); request.put("REQTIME", DateUtil.now());
// log.info("atrAgvCallback 请求参数:" + request.toString()); log.info("atrAgvCallback 请求参数:" + request.toString());
// String str = new RTMSAGVSERVICE().getBasicHttpBindingIRTMSAGVSERVICE().atrAgvCallback(request.toJSONString()); String str = new RTMSAGVSERVICE().getBasicHttpBindingIRTMSAGVSERVICE().atrAgvCallback(request.toJSONString());
// log.info("atrAgvCallback 返回参数:" + str); log.info("atrAgvCallback 返回参数:" + str);
// } catch (Exception e) { } catch (Exception e) {
// e.printStackTrace(); e.printStackTrace();
// throw new BadRequestException(e.getMessage()); throw new BadRequestException(e.getMessage());
// } }
// } }
// 如果属于先知AGV，关闭运单序列 // 如果属于先知AGV，关闭运单序列
if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) {
try { try {

Write Preview
Loading…
Cancel
Save