From 9b3ef339f87a7eb82c3322c5ec4549ebeb1221ac Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 29 三月 2025 11:19:40 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 48 ++---
src/main/java/com/zy/asrs/controller/OpenController.java | 3
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7
src/main/webapp/views/realtimeWatch/console.html | 6
src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java | 40 ++--
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 53 +-----
src/main/java/com/zy/asrs/controller/CrnController.java | 6
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 47 -----
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 3
src/main/java/com/zy/asrs/task/TaskReportScheduler.java | 4
src/main/webapp/static/wcs/js/console.map.js | 88 +++++++++--
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 74 +-------
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 71 --------
src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java | 2
src/main/java/com/zy/asrs/service/ToWmsService.java | 6
15 files changed, 161 insertions(+), 297 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 7563fbe..2a89e23 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -54,10 +54,6 @@
@RestController
public class CrnController {
- @Value("${wms.url}")
- private String wmsUrl;
- @Value("${wms.movePath}")
- private String movePath;
@Autowired
@@ -68,8 +64,6 @@
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private BasCrnpService basCrnpService;
- @Autowired
- private MainServiceImpl mainService;
@Autowired
private LocMastService locMastService;
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cc090c7..fbc8cb1 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -56,8 +56,7 @@
private LocMastService locMastService;
@Autowired
private BasCrnErrorService basCrnErrorService;
- @Value("${wms.url}")
- private String wmsUrl;
+
public static <T> List<T> convertListMapToListObject(List<HashMap<String, Object>> listMap, Class<T> clazz) throws Exception {
List<T> list = new ArrayList<>();
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 53162ec..caf7270 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -13,15 +12,12 @@
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
-import com.zy.common.utils.HttpHandler;
+import com.zy.asrs.service.ToWmsService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -30,23 +26,17 @@
@Slf4j
public class TaskWrkController extends BaseController {
- @Value("${wms.url}")
- private String wmsUrl;
@Autowired
private TaskWrkService taskWrkService;
- @Autowired
- private CommandInfoService commandInfoService;
@Autowired
private LocMastService locMastService;
- @Value("${wms.taskExecCallback}")
- private String TaskExecCallback;
@Autowired
- private ApiLogService apiLogService;
+ private ToWmsService toWmsService;
public static String getTaskType(Integer paramIoType) {
switch (paramIoType) {
@@ -224,34 +214,7 @@
locMast.setBarcode(taskWrk.getBarcode());
}
- String response = "";
- try {
- HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("TaskNo", taskWrk.getTaskNo());
- headParam.put("Result", 1);
-// headParam.put("reportTime",new Date());
- log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(TaskExecCallback)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
-
- JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms"
- , wmsUrl + TaskExecCallback
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , true
- );
- } catch (Exception e) {
- log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶眥},杩斿洖鍊�={}", taskWrk, response);
-// throw new CoolException(e);
- }
+ toWmsService.addReportLog(taskWrk);
locMastService.updateById(locMast);
taskWrk.setStatus(7);//鎵嬪姩瀹屾垚浠诲姟
taskWrk.setModiTime(new Date());
@@ -300,34 +263,8 @@
} catch (Exception e) {
taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
}
- String response = "";
- try {
- HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("TaskNo", taskWrk.getTaskNo());
- headParam.put("Result", 0);
-// headParam.put("reportTime",new Date());
+ toWmsService.addReportLog(taskWrk);
- log.info("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wm={}", taskWrk);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(TaskExecCallback)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
- , wmsUrl + TaskExecCallback
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , true
- );
- } catch (Exception e) {
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk, response);
-// throw new CoolException(e);
- }
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index 1fd96aa..1e807e6 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -14,6 +14,8 @@
import com.zy.asrs.entity.TaskWrkLog;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.TaskWrkLogService;
+import com.zy.asrs.service.TaskWrkReportService;
+import com.zy.asrs.service.ToWmsService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -27,15 +29,12 @@
@RestController
public class TaskWrkLogController extends BaseController {
- @Value("${wms.url}")
- private String wmsUrl;
- @Value("${wms.taskExecCallback}")
- private String TaskExecCallback;
- @Autowired
- private ApiLogService apiLogService;
@Autowired
private TaskWrkLogService taskWrkLogService;
+
+ @Autowired
+ private ToWmsService toWmsService;
@RequestMapping(value = "/taskWrkLog/{id}/auth")
@ManagerAuth
@@ -141,41 +140,7 @@
public R resubmitTheTask(@RequestParam String taskNo) {
TaskWrkLog taskWrk = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("task_no", taskNo));
if (!Cools.isEmpty(taskWrk)) {
- HashMap<String, Object> headParam = new HashMap<>();
- if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//瀹屾垚
- headParam.put("Result", 1);
- } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- headParam.put("Result", 2);
- }
- String response = "";
- Boolean bool = false;
- try {
- headParam.put("TaskNo", taskWrk.getTaskNo());
- log.info("閲嶆柊涓婃姤浠诲姟瀹岀粨={}", taskWrk);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(TaskExecCallback)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
-
- if (jsonObject.get("ReturnStatus").equals(0)) {
- bool = true;
- }
- } catch (Exception e) {
- log.error("閲嶆柊涓婃姤浠诲姟瀹岀粨澶辫触{},杩斿洖鍊�={}", taskWrk, response);
- } finally {
- apiLogService.save("閲嶆柊涓婃姤浠诲姟瀹岀粨"
- , wmsUrl + TaskExecCallback
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , bool
- );
- }
+ toWmsService.addReportLog(taskWrk);
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java b/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
index c588955..b267cd3 100644
--- a/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
@@ -4,7 +4,7 @@
RECEIVE(1, "鎺ユ敹"),
DISTRIBUTE(2, "娲惧彂"),
- COMPLETE(3, "鍛戒护瀹屾垚"),
+ //COMPLETE(3, "鍛戒护瀹屾垚"),
CANCEL(4, "鍙栨秷"),
OVER(5, "瀹岀粨");
diff --git a/src/main/java/com/zy/asrs/service/ToWmsService.java b/src/main/java/com/zy/asrs/service/ToWmsService.java
index 5a8fc50..85cad3f 100644
--- a/src/main/java/com/zy/asrs/service/ToWmsService.java
+++ b/src/main/java/com/zy/asrs/service/ToWmsService.java
@@ -1,6 +1,8 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.wms.StorageEscalationParam;
import com.zy.asrs.entity.wms.WmsResult;
@@ -8,6 +10,10 @@
void addReportLog(TaskWrk taskWrk);
+ void addReportLog(TaskWrkLog taskWrk);
+
+ void addReportLog(WrkMast wrkMast);
+
TaskWrk getLocNoFromWms(StorageEscalationParam wmsParam);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index c5831e6..d38c79f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -25,10 +25,6 @@
@Slf4j
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
- @Value("${wms.url}")
- private String wmsUrl;
- @Autowired
- private ApiLogService apiLogService;
@Override
public List<Integer> queryDistinctRow(Integer crnNo) {
@@ -104,28 +100,28 @@
param.setContainerTypeCode(locMast.getContainerTypeCode());
}
- try {
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/locationUpdate")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- } catch (Exception e) {
- log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
- }
- JSONObject jsonObject = JSON.parseObject(response);
-
-
- apiLogService.save("Wms鍙樻洿璐т綅鐘舵��"
- , wmsUrl + "wcsManager/wcsInterface/inboundTaskApply"
- , null
- , "127.0.0.1"
- , JSON.toJSONString(param)
- , response
- , true
- );
+// try {
+// response = new HttpHandler.Builder()
+// .setHeaders(map)
+// .setUri(wmsUrl)
+// .setPath("wcsManager/wcsInterface/locationUpdate")
+// .setJson(JSON.toJSONString(param))
+// .build()
+// .doPost();
+// } catch (Exception e) {
+// log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+// }
+// JSONObject jsonObject = JSON.parseObject(response);
+//
+//
+// apiLogService.save("Wms鍙樻洿璐т綅鐘舵��"
+// , wmsUrl + "wcsManager/wcsInterface/inboundTaskApply"
+// , null
+// , "127.0.0.1"
+// , JSON.toJSONString(param)
+// , response
+// , true
+// );
return null;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index c920776..88b7277 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -16,7 +16,6 @@
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
-import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -31,7 +30,6 @@
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.SiemensDevpThread;
-import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -81,17 +79,12 @@
@Autowired
- private CommonService commonService;
-
- @Autowired
private ToWmsService toWmsService;
@Autowired
private CrnController crnController;
- @Autowired
- private ConfigService configService;
public void generateStoreWrkFile1() throws IOException, InterruptedException {
try {
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index 1373172..de36ebd 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -1,7 +1,6 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -13,9 +12,9 @@
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.service.ToWmsService;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
-import com.zy.common.utils.HttpHandler;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
@@ -27,13 +26,11 @@
import com.zy.core.model.protocol.StaProtocol;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
@Slf4j
@@ -42,14 +39,17 @@
@Autowired
private CommonService commonService;
+
@Autowired
private StaDescService staDescService;
- @Value("${wms.url}")
- private String wmsUrl;
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
+
+
@Autowired
private ApiLogService apiLogService;
+
+
+ @Autowired
+ private ToWmsService toWmsService;
@Override
public TaskWrk selectByTaskNo(String taskNo) {
@@ -120,7 +120,7 @@
taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
taskWrk.setModiTime(new Date());
taskWrk.setModiUser(userId);
- updateById(taskWrk);
+ super.updateById(taskWrk);
CrnSlave.CrnStn crnStn = Utils.getCrnStnByStaNo(staDesc.getCrnStn(), true);
if (crnStn == null) {
@@ -143,36 +143,7 @@
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
} else {
- try {
- HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("taskNo", taskWrk.getTaskNo());
- headParam.put("status", taskWrk.getStatus());
- headParam.put("ioType", taskWrk.getIoType());
- headParam.put("barcode", taskWrk.getBarcode());
-// headParam.put("reportTime",new Date());
- String response;
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
-
- JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
- , wmsUrl + taskStatusFeedbackPath
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , true
- );
- } catch (Exception e) {
- log.error("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触", taskWrk);
-// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
- }
-
+ toWmsService.addReportLog(taskWrk);
}
}
@@ -191,7 +162,7 @@
taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
taskWrk.setModiTime(new Date());
taskWrk.setModiUser(userId);
- updateById(taskWrk);
+ super.updateById(taskWrk);
CrnSlave.CrnStn crnStn = Utils.getCrnStnByStaNo(staDesc.getCrnStn(), false);
if (crnStn == null) {
@@ -240,7 +211,7 @@
//taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
taskWrk.setModiTime(new Date());
taskWrk.setModiUser(userId);
- updateById(taskWrk);
+ super.updateById(taskWrk);
}
@Override
diff --git a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
index 94eb972..1ea9d75 100644
--- a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
@@ -5,9 +5,7 @@
import com.core.common.Cools;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.TaskWrkReport;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.wms.StorageEscalationParam;
import com.zy.asrs.entity.wms.WmsResult;
import com.zy.asrs.service.*;
@@ -83,6 +81,23 @@
}
@Override
+ public void addReportLog(TaskWrkLog taskWrk) {
+ TaskWrkReport taskWrkReport = new TaskWrkReport();
+ Synchro.Copy(taskWrk, taskWrkReport);
+ taskWrkReport.setCreateTime(new Date());
+ taskWrkReportService.insert(taskWrkReport);
+ }
+
+
+ @Override
+ public void addReportLog(WrkMast taskWrk) {
+ TaskWrkReport taskWrkReport = new TaskWrkReport();
+ Synchro.Copy(taskWrk, taskWrkReport);
+ taskWrkReport.setCreateTime(new Date());
+ taskWrkReportService.insert(taskWrkReport);
+ }
+
+ @Override
public TaskWrk getLocNoFromWms(StorageEscalationParam wmsParam) {
String response = "";
Boolean success = false;
@@ -96,23 +111,8 @@
if (!Cools.isEmpty(response)) {
JSONObject jsonObject = JSON.parseObject(response);
if (!Cools.isEmpty(jsonObject.get(code)) && jsonObject.get(code).equals(successCode)) {
- //鏈変簺涓夋柟wms绯荤粺涓嶈兘鍙婃椂杩斿洖搴撲綅鍙凤紝杩欐椂鍊欏氨闇�瑕�
- //ZWmsResult result = JSON.parseObject(jsonObject.get(data).toString(), WmsResult.class);
- TaskWrk taskWrk = null;
- int i = 1;
- while (i < 10) {
- taskWrk = taskWrkService.selectByBarcode(wmsParam.getBarcode());
- if (taskWrk != null) {
- break;
- }
- try {
- i++;
- Thread.sleep(500L);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }
- return taskWrk;
+ WmsResult result = JSON.parseObject(jsonObject.get(data).toString(), WmsResult.class);
+ return createInTask(result, wmsParam.getBarcode(), wmsParam.getStationCode());
}
}
} catch (IOException e) {
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 250d305..e9979ab 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -24,26 +24,20 @@
@Autowired
private WrkMastService wrkMastService;
+
@Autowired
private LocMastService locMastService;
- @Autowired
- private WaitPakinService waitPakinService;
+
@Autowired
private WrkMastLogService wrkMastLogService;
+
@Autowired
- private WrkDetlLogService wrkDetlLogService;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private ApiLogService apiLogService;
- @Value("${wms.url}")
- private String wmsUrl;
- @Value("${wms.inboundTaskApplyPath}")
- private String inboundTaskApplyPath;
- @Value("${wms.movePath}")
- private String movePath;
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
+ private ToWmsService toWmsService;
+
+
+
+
+
@Override
@Transactional
@@ -76,31 +70,8 @@
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("TaskNo", wrkMast.getTaskNo());
headParam.put("Result", 0);//瀹屾垚
+ toWmsService.addReportLog(wrkMast);
- try {
- String response;
- log.error("wcs鎵嬪姩瀹岀粨浠诲姟涓婃姤wms={}", wrkMast);
-
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- apiLogService.save("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms"
- , wmsUrl + taskStatusFeedbackPath
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , true
- );
- } catch (Exception e) {
- log.error("wcs鎵嬪姩瀹岀粨浠诲姟涓婃姤wms澶辫触={}", wrkMast);
- log.error("wcs鎵嬪姩瀹岀粨浠诲姟涓婃姤wms澶辫触,鎶ラ敊淇℃伅锛�", e);
-// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
- }
}
@Override
@@ -183,30 +154,7 @@
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("TaskNo", wrkMast.getTaskNo());
headParam.put("Result", 1);//鍙栨秷
+ toWmsService.addReportLog(wrkMast);
- try {
- String response;
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms={}", wrkMast);
-
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
- , wmsUrl + taskStatusFeedbackPath
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , true
- );
- } catch (Exception e) {
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={}", wrkMast);
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触,鎶ラ敊淇℃伅锛�", e);
-// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
- }
}
}
diff --git a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
index 50461f8..a78f278 100644
--- a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -47,9 +47,9 @@
private String TaskExecCallback;
- @Scheduled(cron = "0/3 * * * * ? ")
+ //@Scheduled(cron = "0/3 * * * * ? ")
public void execute() throws IOException {
- Page<TaskWrkReport> taskWrkReportPage = taskWrkReportService.selectPage(new Page<>(0, 100), new EntityWrapper<TaskWrkReport>().orderBy("createTime", true));
+ Page<TaskWrkReport> taskWrkReportPage = taskWrkReportService.selectPage(new Page<>(0, 100), new EntityWrapper<TaskWrkReport>().orderBy("create_time", true));
if (taskWrkReportPage.getRecords() != null) {
//鏂板涓�涓繃婊ゆ満鍒�
for (TaskWrkReport taskWrk : taskWrkReportPage.getRecords()) {
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 300699e..f4456ea 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -72,8 +72,7 @@
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
- @Value("${wms.url}")
- private String wmsUrl;
+
public SiemensCrnThread(CrnSlave slave) {
diff --git a/src/main/webapp/static/wcs/js/console.map.js b/src/main/webapp/static/wcs/js/console.map.js
index ed61194..7975fe6 100644
--- a/src/main/webapp/static/wcs/js/console.map.js
+++ b/src/main/webapp/static/wcs/js/console.map.js
@@ -195,10 +195,18 @@
"height": 706,
"stns": [{
"type": "stn",
+ "id": "site-103",
+ "text": "103",
+ "top": 99,
+ "left": 771,
+ "width": 62,
+ "height": 23
+ },{
+ "type": "stn",
"id": "site-102",
"text": "102",
"top": 99,
- "left": 771,
+ "left": 705,
"width": 62,
"height": 23
},{
@@ -206,7 +214,15 @@
"id": "site-101",
"text": "101",
"top": 99,
- "left": 705,
+ "left": 639,
+ "width": 62,
+ "height": 23
+ },{
+ "type": "stn",
+ "id": "site-106",
+ "text": "106",
+ "top": 160,
+ "left": 771,
"width": 62,
"height": 23
},{
@@ -214,7 +230,7 @@
"id": "site-105",
"text": "105",
"top": 160,
- "left": 771,
+ "left": 705,
"width": 62,
"height": 23
},{
@@ -222,7 +238,15 @@
"id": "site-104",
"text": "104",
"top": 160,
- "left": 705,
+ "left": 639,
+ "width": 62,
+ "height": 23
+ },{
+ "type": "stn",
+ "id": "site-109",
+ "text": "109",
+ "top": 231,
+ "left": 771,
"width": 62,
"height": 23
},{
@@ -230,7 +254,7 @@
"id": "site-108",
"text": "108",
"top": 231,
- "left": 771,
+ "left": 705,
"width": 62,
"height": 23
},{
@@ -238,7 +262,15 @@
"id": "site-107",
"text": "107",
"top": 231,
- "left": 705,
+ "left": 639,
+ "width": 62,
+ "height": 23
+ },{
+ "type": "stn",
+ "id": "site-112",
+ "text": "112",
+ "top": 304,
+ "left": 771,
"width": 62,
"height": 23
},{
@@ -246,7 +278,7 @@
"id": "site-111",
"text": "111",
"top": 304,
- "left": 771,
+ "left": 705,
"width": 62,
"height": 23
},{
@@ -254,7 +286,15 @@
"id": "site-110",
"text": "110",
"top": 304,
- "left": 705,
+ "left": 639,
+ "width": 62,
+ "height": 23
+ },{
+ "type": "stn",
+ "id": "site-115",
+ "text": "115",
+ "top": 460,
+ "left": 771,
"width": 62,
"height": 23
},{
@@ -262,7 +302,7 @@
"id": "site-114",
"text": "114",
"top": 460,
- "left": 771,
+ "left": 705,
"width": 62,
"height": 23
},{
@@ -270,7 +310,7 @@
"id": "site-113",
"text": "113",
"top": 460,
- "left": 705,
+ "left": 639,
"width": 62,
"height": 23
},{
@@ -278,7 +318,7 @@
"id": "site-210",
"text": "210",
"top": 510,
- "left": 1050,
+ "left": 950,
"width": 62,
"height": 23
},{
@@ -286,7 +326,7 @@
"id": "site-211",
"text": "211",
"top": 535,
- "left": 1050,
+ "left": 950,
"width": 62,
"height": 23
},{
@@ -294,7 +334,15 @@
"id": "site-212",
"text": "212",
"top": 560,
- "left": 1050,
+ "left": 950,
+ "width": 62,
+ "height": 23
+ },{
+ "type": "stn",
+ "id": "site-214",
+ "text": "214",
+ "top": 560,
+ "left": 1016,
"width": 62,
"height": 23
},{
@@ -323,10 +371,18 @@
"height": 23
},{
"type": "stn",
+ "id": "site-209",
+ "text": "209",
+ "top": 560,
+ "left": 1216,
+ "width": 62,
+ "height": 23
+ },{
+ "type": "stn",
"id": "site-201",
"text": "201",
"top": 510,
- "left": 1250,
+ "left": 1350,
"width": 62,
"height": 23
},{
@@ -334,7 +390,7 @@
"id": "site-202",
"text": "202",
"top": 535,
- "left": 1250,
+ "left": 1350,
"width": 62,
"height": 23
},{
@@ -342,7 +398,7 @@
"id": "site-203",
"text": "203",
"top": 560,
- "left": 1250,
+ "left": 1350,
"width": 62,
"height": 23
},{
diff --git a/src/main/webapp/views/realtimeWatch/console.html b/src/main/webapp/views/realtimeWatch/console.html
index c33f08f..c841523 100644
--- a/src/main/webapp/views/realtimeWatch/console.html
+++ b/src/main/webapp/views/realtimeWatch/console.html
@@ -12,9 +12,9 @@
<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
<!--鍦板浘json-->
- <script src="../../static/wcs/js/console.map.js"></script>
- <script src="../../static/wcs/js/console.js"></script>
- <script src="../../static/wcs/js/common.js"></script>
+ <script src="../../static/wcs/js/console.map.js?v=1"></script>
+ <script src="../../static/wcs/js/console.js?v=1"></script>
+ <script src="../../static/wcs/js/common.js?v=1"></script>
</head>
<script type="text/html" id="errorTpl">
{{# if( d.error === false ){ }}
--
Gitblit v1.9.1