From e0ce49ec06c62ff404e97c79669feb24d7a1fa49 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 05 九月 2025 14:27:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 108 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 86 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 327ca4c..f6cf40e 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -51,35 +51,99 @@
private String wmsUrl;
@Value("${wms.movePath}")
private String movePath;
+ @Value("${wms.inboundTaskApplyPath}")
+ private String inboundTaskApplyPath;
+ @Value("${wms.taskLeave}")
+ private String taskLeave;
+ @Value("${wms.taskStatusFeedbackPath}")
+ private String taskStatusFeedbackPath;
+ /**
+ * 鍏ュ嚭搴撲换鍔¤浆鍘嗗彶妗�
+ * @throws IOException
+ */
@Scheduled(cron = "0/3 * * * * ? ")
public void execute() throws IOException {
- for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
- TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk);
- if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//瀹屾垚
- //鍖哄垎鍏ュ嚭搴�
- TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
- if(!wrkLogService.insert(taskWrkLog)){
- throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
+ //鍏ュ簱7杞巻鍙叉。,绉诲簱7杞巻鍙叉。,鍑哄簱18杞�
+ List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>()
+ .in("wrk_sts", 7,17)
+ .or()
+ .in("status",5,7));//鍙栨秷鎴栬�呭畬缁�
+ if(taskWrkList.size() == 0){
+ return;
+ }
+ for (TaskWrk taskWrk : taskWrkList) {
+ TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+ if(taskWrkLog.getIoType().equals(1)){
+ taskWrkLog.setWrkSts(8);
+ taskWrkLog.setModiTime(new Date());
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }else if(taskWrkLog.getIoType().equals(2)){
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("wrk_no",taskWrk.getWrkNo()));
+ if(taskWrk.getWrkNo()>=3001&&taskWrk.getWrkNo()<=6000){
+ taskWrkLog.setWrkSts(18);
+ taskWrkLog.setModiTime(new Date());
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
}
- if(!taskWrkService.deleteById(taskWrk)){
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�"+taskWrkLog);
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
}
- } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- taskStatusFeedbackParam.setTaskStatus("cancelled");
- //new PostMesDataUtils().postMesData("鍙栨秷浠诲姟瀹屾垚",wmsUrl,movePath,taskWrk);
+ }
+ if(basDevp==null){
+ HashMap<Object, Object> headParam = new HashMap<>();
+ String response = "";
+ Boolean bool = false;
+ try {
+ headParam.put("TaskNo", taskWrk.getTaskNo());
+ log.info("wcs"+"鍑哄簱鎼浠诲姟涓婃姤wms={}", taskWrk);
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskLeave)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if(jsonObject.get("ReturnStatus").equals(0)){
+ taskWrkLog.setWrkSts(18);
+ taskWrkLog.setModiTime(new Date());
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }
+ } catch (Exception e){
+ log.error("wcs鎼鍑哄簱缁檞ms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+ }finally {
+ apiLogService.save("wcs鎼鍑哄簱缁檞ms"
+ , wmsUrl + taskLeave
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , bool
+ );
+ }
+ taskWrkLog.setWrkSts(19);
+ taskWrkLog.setModiTime(new Date());
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }
+
}
- if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
- //浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
- commandInfoService.saveToHistory(taskWrk.getTaskNo());
-
- //鍒犻櫎浠诲姟
- taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
- //鍒犻櫎鎸囦护
- commandInfoService.delete(new EntityWrapper<CommandInfo>().eq("task_no", taskWrk.getTaskNo()));
- }
}
}
-
}
--
Gitblit v1.9.1