From bb87914b329dbaf4e93850fe9c26c075708f13ef Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 24 四月 2025 16:22:13 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
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 768373a..15f2a53 100644
--- a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
@@ -1,9 +1,13 @@
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;
@@ -11,8 +15,54 @@
@Service("commandInfoService")
public class CommandInfoServiceImpl extends ServiceImpl<CommandInfoMapper, CommandInfo> implements CommandInfoService {
+ @Autowired
+ private CommandInfoLogService commandInfoLogService;
+
@Override
- public List<CommandInfo> selectByWmsWrkNoAndWrkNo(Integer wmsWrkNo, Integer wrkNo) {
- return this.baseMapper.selectByWmsWrkNoAndWrkNo(wmsWrkNo, wrkNo);
+ public List<CommandInfo> selectByTaskNoAndWrkNo(String taskNo, Integer wrkNo) {
+ return this.baseMapper.selectByTaskNoAndWrkNo(taskNo, wrkNo);
+ }
+
+ @Override
+ public List<CommandInfo> selectByWrkNo(Integer wrkNo) {
+ return this.baseMapper.selectByWrkNo(wrkNo);
+ }
+
+ @Override
+ public List<CommandInfo> selectByTaskNo(String taskNo) {
+ return this.baseMapper.selectByTaskNo(taskNo);
+ }
+
+ @Override
+ public int saveToHistory(String taskNo) {
+ int count = 0;
+ if (this.selectByTaskNo(taskNo).isEmpty()) {
+ return count;
+ }
+ 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;
+ }
+
+ @Override
+ public boolean saveToHistory(Integer id) {
+ CommandInfo commandInfo = this.baseMapper.selectById(id);
+ String jsonString = JSON.toJSONString(commandInfo);
+ CommandInfoLog commandInfoLog = JSON.parseObject(jsonString, CommandInfoLog.class);
+ commandInfoLog.setId(null);
+ boolean result1 = commandInfoLogService.insert(commandInfoLog);
+ Integer result2 = this.baseMapper.deleteById(id);
+ return result1 && result2 > 0;
+ }
+
+ @Override
+ public List<CommandInfo> selectCompleteManualCommand() {
+ return this.baseMapper.selectCompleteManualCommand();
}
}
--
Gitblit v1.9.1