From 41173fc2dfd848b08a217ab725033a412868a31c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 06 八月 2024 10:59:01 +0800
Subject: [PATCH] 修改磨边界面显示数据为磨边队列表的数据
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 88 ++++++++++++---------
UI-Project/src/views/StockBasicData/stockBasicData.vue | 38 ++++-----
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 4
UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue | 38 ++++-----
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 15 +++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java | 6 +
UI-Project/src/lang/zh.js | 1
7 files changed, 108 insertions(+), 82 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index d2c352b..edceed9 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -237,6 +237,7 @@
takemessage:'鏄惁鎷胯蛋璇ユ潯淇℃伅锛�',
breakage:'鐮存崯',
takeout:'鎷胯蛋',
+ glasstype:'鐜荤拑绫诲瀷',
},
processCard:{
intofurnace:'杩涚倝涓�',
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 5135e96..3292ded 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -20,20 +20,20 @@
const requestData = {
line: 2001
};
-request.post("/cacheGlass/taskCache/selectEdgTask",{
- ...requestData,
+// request.post("/cacheGlass/taskCache/selectEdgTask",{
+// ...requestData,
-}).then((res) => {
- if (res.code == 200) {
+// }).then((res) => {
+// if (res.code == 200) {
- console.log(res.data);
- tableData.value = res.data
- console.log(res.data[0].slot);
- } else {
- ElMessage.warning(res.msg)
+// console.log(res.data);
+// tableData.value = res.data
+// console.log(res.data[0].slot);
+// } else {
+// ElMessage.warning(res.msg)
- }
- });
+// }
+// });
// 鐮存崯
const open = async(row) => {
try {
@@ -49,7 +49,7 @@
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
- glassId: row.GlassId,
+ glassId: row.glass_id,
controlsId: 300,
line: 2001,
machine: '鍐峰姞宸�',
@@ -82,7 +82,7 @@
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
- glassId: row.GlassId,
+ glassId: row.glass_id,
controlsId: 301,
line: 2001,
machine: '鍐峰姞宸�',
@@ -127,13 +127,11 @@
<el-table height="240" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="GlassId" align="center" :label="$t('workOrder.glassID')" min-width="180" />
- <el-table-column prop="Height" align="center" :label="$t('workOrder.height')" min-width="80" />
- <el-table-column prop="Width" align="center" :label="$t('workOrder.width')" min-width="120" />
- <el-table-column prop="Thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
- <el-table-column prop="FilmsId" align="center" :label="$t('workOrder.coatingtypes')" min-width="120" />
- <el-table-column prop="SerialNumber" align="center" :label="$t('workOrder.productionsequence')" min-width="120" />
- <el-table-column prop="FlowCardId" align="center" :label="$t('workOrder.cardnumber')" min-width="120" />
+ <el-table-column prop="glass_id" align="center" :label="$t('workOrder.glassID')" min-width="180" />
+ <el-table-column prop="width" align="center" :label="$t('workOrder.width')" min-width="120" />
+ <el-table-column prop="height" align="center" :label="$t('workOrder.height')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
+ <el-table-column prop="glass_type" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
<el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button>
diff --git a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
index 57e6567..3b1ac08 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicDatatwo.vue
@@ -20,20 +20,20 @@
const requestData = {
line: 2002
};
-request.post("/cacheGlass/taskCache/selectEdgTask",{
- ...requestData,
+// request.post("/cacheGlass/taskCache/selectEdgTask",{
+// ...requestData,
-}).then((res) => {
- if (res.code == 200) {
+// }).then((res) => {
+// if (res.code == 200) {
- console.log(res.data);
- tableData.value = res.data
- console.log(res.data[0].slot);
- } else {
- ElMessage.warning(res.msg)
+// console.log(res.data);
+// tableData.value = res.data
+// console.log(res.data[0].slot);
+// } else {
+// ElMessage.warning(res.msg)
- }
- });
+// }
+// });
// 鐮存崯
const open = async(row) => {
try {
@@ -49,7 +49,7 @@
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
- glassId: row.GlassId,
+ glassId: row.glass_id,
controlsId: 300,
line: 2002,
machine: '鍐峰姞宸�',
@@ -82,7 +82,7 @@
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
- glassId: row.GlassId,
+ glassId: row.glass_id,
controlsId: 301,
line: 2002,
machine: '鍐峰姞宸�',
@@ -128,13 +128,11 @@
<el-table height="240" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="GlassId" align="center" :label="$t('workOrder.glassID')" min-width="180" />
- <el-table-column prop="Height" align="center" :label="$t('workOrder.height')" min-width="80" />
- <el-table-column prop="Width" align="center" :label="$t('workOrder.width')" min-width="120" />
- <el-table-column prop="Thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
- <el-table-column prop="FilmsId" align="center" :label="$t('workOrder.coatingtypes')" min-width="120" />
- <el-table-column prop="SerialNumber" align="center" :label="$t('workOrder.productionsequence')" min-width="120" />
- <el-table-column prop="FlowCardId" align="center" :label="$t('workOrder.cardnumber')" min-width="120" />
+ <el-table-column prop="glass_id" align="center" :label="$t('workOrder.glassID')" min-width="180" />
+ <el-table-column prop="width" align="center" :label="$t('workOrder.width')" min-width="120" />
+ <el-table-column prop="height" align="center" :label="$t('workOrder.height')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
+ <el-table-column prop="glass_type" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
<el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java
index 1589b7d..3443a6f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java
@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author wu
@@ -13,4 +16,5 @@
*/
public interface EdgGlassTaskInfoService extends IService<EdgGlassTaskInfo> {
+ List<Map<String, Object>> selectEdgInfo(String line);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
index 34a06f4..b88c9c6 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
@@ -1,14 +1,18 @@
package com.mes.edgglasstask.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.mapper.EdgGlassTaskInfoMapper;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -17,4 +21,13 @@
@Service
public class EdgGlassTaskInfoServiceImpl extends ServiceImpl<EdgGlassTaskInfoMapper, EdgGlassTaskInfo> implements EdgGlassTaskInfoService {
+ @Override
+ public List<Map<String, Object>> selectEdgInfo(String line) {
+ LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassWrapper = new LambdaQueryWrapper<>();
+ edgGlassWrapper
+ .eq(EdgGlassTaskInfo::getLine, line)
+ .eq(EdgGlassTaskInfo::getStatus, "1")
+ .orderByDesc(EdgGlassTaskInfo::getTime);
+ return baseMapper.selectMaps(edgGlassWrapper);
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index 813c75d..48df75a 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -718,8 +718,8 @@
jsonObject.append("currentCutTerritory", currentCutTerritorys);
//log.info("鏈璇嗗埆鐗堝浘{},++++{}",engineerId,currentCutTerritorys);
//纾ㄨ竟淇℃伅
- List<Map<String, Object>> EdgTasks1 = taskCacheService.selectEdgInfo("2001");
- List<Map<String, Object>> EdgTasks2 = taskCacheService.selectEdgInfo("2002");
+ List<Map<String, Object>> EdgTasks1 = edgGlassTaskInfoService.selectEdgInfo("2001");
+ List<Map<String, Object>> EdgTasks2 = edgGlassTaskInfoService.selectEdgInfo("2002");
jsonObject.append("EdgTasks1", EdgTasks1);
jsonObject.append("EdgTasks2", EdgTasks2);
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
index 0e330b0..cf78834 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -1,5 +1,6 @@
package com.mes.taskcache.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -7,6 +8,7 @@
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
+import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
@@ -23,7 +25,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -44,57 +46,59 @@
/**
* 娣诲姞鐞嗙墖绗间换鍔�
+ *
* @param taskCache
* @return
*/
@Override
- public boolean insertTaskCache(TaskCache taskCache){
+ public boolean insertTaskCache(TaskCache taskCache) {
baseMapper.insert(taskCache);
return true;
}
/**
* 鏌ヨ纾ㄨ竟浠诲姟
+ *
* @param line
* @return
*/
@Override
- public List<Map<String,Object>> selectEdgInfo(String line) {
- List<TaskCache> taskCache=baseMapper.selectList(new MPJLambdaWrapper<TaskCache>()
+ public List<Map<String, Object>> selectEdgInfo(String line) {
+ List<TaskCache> taskCache = baseMapper.selectList(new MPJLambdaWrapper<TaskCache>()
.selectAll(TaskCache.class)
.eq(TaskCache::getEndCell, line)
- .eq(TaskCache::getTaskStatus,1)
+ .eq(TaskCache::getTaskStatus, 1)
.orderByAsc(TaskCache::getCreateTime));
- List<Map<String,Object>> result=new ArrayList<>();
- int serialNumber=1;
- for(TaskCache taskCache1:taskCache){
- Map<String,Object> map=new HashMap<>();
+ List<Map<String, Object>> result = new ArrayList<>();
+ int serialNumber = 1;
+ for (TaskCache taskCache1 : taskCache) {
+ Map<String, Object> map = new HashMap<>();
// GlassInfo glassInfo=glassInfoMapper.selectOne(new MPJLambdaWrapper<GlassInfo>()
// .selectAll(GlassInfo.class)
// .eq(GlassInfo::getGlassId,taskCache1.getGlassId()));
- List<GlassInfo> glassInfos=glassInfoMapper.selectJoinList(GlassInfo.class, new MPJLambdaWrapper<GlassInfo>()
+ List<GlassInfo> glassInfos = glassInfoMapper.selectJoinList(GlassInfo.class, new MPJLambdaWrapper<GlassInfo>()
.selectAll(GlassInfo.class)
.innerJoin(EdgStorageCageDetails.class, on -> on
.eq(EdgStorageCageDetails::getGlassId, GlassInfo::getGlassId)
.eq(EdgStorageCageDetails::getEngineerId, GlassInfo::getEngineerId))
- .eq(GlassInfo::getGlassId,taskCache1.getGlassId())
- .eq(EdgStorageCageDetails::getState,Const.GLASS_STATE_OUT)
+ .eq(GlassInfo::getGlassId, taskCache1.getGlassId())
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_OUT)
);
- if(glassInfos.size()==1){
- GlassInfo glassInfo=glassInfos.get(0);
- map.put("Line",line);//绾胯矾 2001 1绾匡紝 2002 2绾�
- map.put("Width",glassInfo.getWidth());//瀹�
- map.put("Height",glassInfo.getHeight());//楂�
- map.put("Thickness",glassInfo.getThickness());//鍘�
- map.put("GlassId",glassInfo.getGlassId());//鐜荤拑ID
- map.put("FlowCardId",glassInfo.getFlowCardId());//娴佺▼鍗″彿
- map.put("TemperingLayoutId",glassInfo.getTemperingLayoutId());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID
- map.put("TemperingFeedSequence",glassInfo.getTemperingFeedSequence());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID鍐呯殑搴忓彿
- map.put("FilmsId",glassInfo.getFilmsid());//鑶滅郴
- map.put("SerialNumber",serialNumber);//鍑虹墖椤哄簭
+ if (glassInfos.size() == 1) {
+ GlassInfo glassInfo = glassInfos.get(0);
+ map.put("Line", line);//绾胯矾 2001 1绾匡紝 2002 2绾�
+ map.put("Width", glassInfo.getWidth());//瀹�
+ map.put("Height", glassInfo.getHeight());//楂�
+ map.put("Thickness", glassInfo.getThickness());//鍘�
+ map.put("GlassId", glassInfo.getGlassId());//鐜荤拑ID
+ map.put("FlowCardId", glassInfo.getFlowCardId());//娴佺▼鍗″彿
+ map.put("TemperingLayoutId", glassInfo.getTemperingLayoutId());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID
+ map.put("TemperingFeedSequence", glassInfo.getTemperingFeedSequence());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID鍐呯殑搴忓彿
+ map.put("FilmsId", glassInfo.getFilmsid());//鑶滅郴
+ map.put("SerialNumber", serialNumber);//鍑虹墖椤哄簭
result.add(map);
- }else if(glassInfos.size()>1){
- log.info("鏁版嵁涓嶇鍚堥�昏緫--纾ㄨ竟闃熷垪glassId閲嶅:",glassInfos);
+ } else if (glassInfos.size() > 1) {
+ log.info("鏁版嵁涓嶇鍚堥�昏緫--纾ㄨ竟闃熷垪glassId閲嶅:", glassInfos);
return new ArrayList<>();
}
serialNumber++;
@@ -111,16 +115,18 @@
/**
* 鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
+ *
* @return
*/
@Override
- public List<TaskCache> selectCacheInfo(){
- return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0));
+ public List<TaskCache> selectCacheInfo() {
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus, 0));
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0));
}
/**
* 鏌ヨ鍏ㄩ儴浠诲姟
+ *
* @return
*/
@Override
@@ -130,54 +136,60 @@
/**
* 鏌ヨ寰呰繘鐗囦换鍔�
+ *
* @return
*/
@Override
- public List<TaskCache> selectInputTaskCache(){
- return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,1));
+ public List<TaskCache> selectInputTaskCache() {
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus, 0).eq(TaskCache::getTaskType, 1));
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",1));
}
/**
* 鏌ヨ寰呭嚭鐗囦换鍔�
+ *
* @return
*/
@Override
- public List<TaskCache> selectOutTaskCache(){
- return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,2));
+ public List<TaskCache> selectOutTaskCache() {
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus, 0).eq(TaskCache::getTaskType, 2));
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",2));
}
/**
* 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ *
* @param line
* @return
*/
@Override
- public List<TaskCache> selectLastOutCacheInfos(int line){
- return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
+ public List<TaskCache> selectLastOutCacheInfos(int line) {
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell, line).eq(TaskCache::getTaskStatus, 1).orderByDesc(TaskCache::getCreateTime));
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line).eq("task_status",1).orderByDesc("ID"));
}
/**
* 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ *
* @param line
* @return
*/
@Override
- public TaskCache selectLastOutCacheInfo(int line){
- return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
+ public TaskCache selectLastOutCacheInfo(int line) {
+ return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell, line).eq(TaskCache::getTaskStatus, 1).orderByDesc(TaskCache::getCreateTime));
}
+
/**
* 鏌ヨ鍒ゆ柇纾ㄨ竟绾挎槸鍚︽湁鐜荤拑杩愯
+ *
* @param
* @return
*/
@Override
public List<TaskCache> selectTaskCacheIsRun() {
- List<TaskCache> taskCaches=null;
- taskCaches=taskCacheMapper.selectJoinList(TaskCache.class, new MPJLambdaWrapper<TaskCache>()
+ List<TaskCache> taskCaches = null;
+ taskCaches = taskCacheMapper.selectJoinList(TaskCache.class, new MPJLambdaWrapper<TaskCache>()
.select("top 4 t.end_cell,ISNULL(b.glass_id, 0)as glass_id")
.leftJoin("big_storage_cage_feed_task as b on t.glass_id=b.glass_id ")
.groupBy("t.end_cell,b.glass_id,t.create_time")
--
Gitblit v1.8.0