From 3b5b98a9911e3231cefe5ab4f47a4c9d94e5a2f7 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期二, 28 十一月 2023 16:15:01 +0800 Subject: [PATCH] #将错误码存入备注字段进行展示 --- src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 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..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,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,38 @@ @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; } } -- Gitblit v1.9.1