From 6977fb42d5067f6c938ef3de559a6ad19b542a0b Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 14 六月 2024 11:29:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
index 5a4b62b..716c92a 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
@@ -1,16 +1,13 @@
package com.mes.bigstoragetask.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
-import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import net.bytebuddy.matcher.FilterableList;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -30,15 +27,19 @@
bigStorageCageFeedTask.setId(slotInfo.getId());
bigStorageCageFeedTask.setTaskState(0);
bigStorageCageFeedTask.setLine(plcFeedReqLine);
- bigStorageCageFeedTask.setTragetSlot(slotInfo.getSlot());
bigStorageCageFeedTask.setTaskType(taskType);
baseMapper.insert(bigStorageCageFeedTask);
}
@Override
- public List<BigStorageCageFeedTask> querybigStorageCageFeedTask(int taskState){
- LambdaQueryWrapper<BigStorageCageFeedTask> getFeedTaskWrapper=new LambdaQueryWrapper<>();
- getFeedTaskWrapper.eq(BigStorageCageFeedTask::getTaskState,taskState);
+ public List<BigStorageCageFeedTask> querybigStorageCageFeedTask(int taskState) {
+ LambdaQueryWrapper<BigStorageCageFeedTask> getFeedTaskWrapper = new LambdaQueryWrapper<>();
+ getFeedTaskWrapper.eq(BigStorageCageFeedTask::getTaskState, taskState);
return baseMapper.selectList(getFeedTaskWrapper);
}
+
+ @Override
+ public List<String> querySitToUpGlass() {
+ return baseMapper.querySitToUpGlass();
+ }
}
--
Gitblit v1.8.0