From c1cb663f4308ddf02ee6ea435c809c8162585b03 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 01 八月 2024 16:38:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java
index 6c134c8..8171037 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java
@@ -1,14 +1,21 @@
package com.mes.shelfrack.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.mes.common.config.Const;
+import com.mes.rawusage.entity.RawUsage;
+import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
import com.mes.shelfrack.mapper.ShelfRackMapper;
import com.mes.shelfrack.entity.ShelfRack;
import com.mes.shelfrack.service.ShelfRackService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.List;
+import java.util.Map;
/**
* @author system
@@ -26,6 +33,29 @@
return shelfRackMapper.selectList(query);
}
+//
+// public void yourMethodName() {
+// List<Map<String, Object>> resultList = shelfRackMapper.selectMaps(
+// new LambdaQueryWrapper<ShelfRack>()
+// .select(ShelfRack::getNumber, RawUsage::getRawType, RawUsage::getRawWidth,
+// RawUsage::getRawHeight, RawUsage::getRawThickness, ShelfRack::getModTime,
+// ShelfRack::getEnableState, RawUsage::getPieces, RawUsage::getLeftPieces,
+// "(datediff(now(), raw_usage.create_time)) as rukuTime",
+// "(concat(if(ROUND(raw_usage.left_pieces / #{param1} * 100, 0) < 20, 20, ROUND(raw_usage.left_pieces / #{param1} * 100, 0)), '%')) as bfb")
+// .leftJoin(RawUsage.class, RawUsage::getId, ShelfRack::getRawPackageId)
+// .orderByAsc(ShelfRack::getNumber)
+// );
+//
+// // Process resultList as needed
+// }
+
+
+
+ @Override
+ public List<RawUsageAndShelfRack> selectshelf_rack() {
+ return baseMapper.selectshelf_rack();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0