From d8cef0a05401284e18fefcfcf51ebc1b0f6da702 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 十一月 2023 13:50:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 8 ++++----
src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java | 1 -
src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java | 20 ++++++++++++++++++--
src/main/resources/mapper/CommandInfoMapper.xml | 4 ----
4 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java b/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
index 931edd5..b26a4bf 100644
--- a/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
@@ -17,5 +17,4 @@
List<CommandInfo> selectByTaskNo(String taskNo);
- int saveToHistory(String taskNo);//灏嗘寚浠よ浆鏃ュ織
}
diff --git a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
index 13a7c0e..ab8300c 100644
--- a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
@@ -1,15 +1,22 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.zy.asrs.entity.CommandInfoLog;
import com.zy.asrs.mapper.CommandInfoMapper;
import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.service.CommandInfoLogService;
import com.zy.asrs.service.CommandInfoService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("commandInfoService")
public class CommandInfoServiceImpl extends ServiceImpl<CommandInfoMapper, CommandInfo> implements CommandInfoService {
+
+ @Autowired
+ private CommandInfoLogService commandInfoLogService;
@Override
public List<CommandInfo> selectByTaskNoAndWrkNo(String taskNo, Integer wrkNo) {
@@ -28,9 +35,18 @@
@Override
public int saveToHistory(String taskNo) {
+ int count = 0;
if (this.selectByTaskNo(taskNo).isEmpty()) {
- return 0;
+ return count;
}
- return this.baseMapper.saveToHistory(taskNo);
+ for (CommandInfo commandInfo : this.baseMapper.selectByTaskNo(taskNo)) {
+ String jsonString = JSON.toJSONString(commandInfo);
+ CommandInfoLog commandInfoLog = JSON.parseObject(jsonString, CommandInfoLog.class);
+ commandInfoLog.setId(null);
+ if (commandInfoLogService.insert(commandInfoLog)) {
+ count++;
+ }
+ }
+ return count;
}
}
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index d547639..129be0a 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,9 +1,9 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.TaskWrkService;
@@ -35,14 +35,14 @@
public void execute() {
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk);
- if (taskWrk.getStatus()==3){
+ if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {//瀹屾垚
taskStatusFeedbackParam.setTaskStatus("done");
new PostMesDataUtils().postMesData("瀹屾垚涓婃姤",wmsUrl,movePath,taskWrk);
- }else {
+ } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
taskStatusFeedbackParam.setTaskStatus("cancelled");
new PostMesDataUtils().postMesData("鍙栨秷浠诲姟瀹屾垚",wmsUrl,movePath,taskWrk);
-
}
+
if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
//浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
commandInfoService.saveToHistory(taskWrk.getTaskNo());
diff --git a/src/main/resources/mapper/CommandInfoMapper.xml b/src/main/resources/mapper/CommandInfoMapper.xml
index 31878fb..230e6b8 100644
--- a/src/main/resources/mapper/CommandInfoMapper.xml
+++ b/src/main/resources/mapper/CommandInfoMapper.xml
@@ -34,8 +34,4 @@
where task_no = #{taskNo}
</select>
- <insert id="saveToHistory">
- insert into wcs_command_info_log select * from wcs_command_info where task_no = #{taskNo}
- </insert>
-
</mapper>
--
Gitblit v1.9.1