From 15b78874d82451bdb5de80b84d9d033332a03387 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 24 七月 2024 12:36:27 +0800
Subject: [PATCH] 原片仓储增加查询任务 ，查询架子信息，下片缓存推送路径修改
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/StorageTaskMapper.xml | 22 +++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java | 12 +++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/ShelfRackMapper.xml | 16 ++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java | 11 ++
hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java | 14 +++
UI-Project/src/utils/api.js | 23 +++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java | 9 ++
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 4
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java | 7 +
UI-Project/src/views/Caching/cachingun.vue | 2
/dev/null | 5 -
UI-Project/src/views/GlassStorage/MaterialRackManagement.vue | 14 +--
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java | 10 ++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-prod.yml | 2
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml | 2
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java | 29 +++++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java | 2
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java | 4
19 files changed, 166 insertions(+), 24 deletions(-)
diff --git a/UI-Project/src/utils/api.js b/UI-Project/src/utils/api.js
new file mode 100644
index 0000000..c8674a7
--- /dev/null
+++ b/UI-Project/src/utils/api.js
@@ -0,0 +1,23 @@
+// src/services/api.js
+import request from 'request';
+
+
+export const findTasks = (id, newState) => {
+ const url = `glassStorage/api/storageTask/findTasks`;
+ const options = {
+ method: 'POST',
+ url,
+ json: true,
+ body: { id, enableState: newState }
+ };
+
+ return new Promise((resolve, reject) => {
+ request(options, (error, response, body) => {
+ if (error) {
+ reject(new Error(error.message));
+ } else {
+ resolve(body);
+ }
+ });
+ });
+};
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index e7110cc..2ce7900 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -205,7 +205,7 @@
-const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/downcache`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
diff --git a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
index 421e064..0f132b5 100644
--- a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
+++ b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
@@ -575,17 +575,13 @@
</script>
<style scoped>
-html, body {
- height: 100%;
- margin: 0;
- padding: 0;
- overflow: hidden; /* 绂佹鍑虹幇婊氬姩鏉� */
-}
-.app-container {
- flex-direction: column;
- height: 100vh; /* 浣跨敤瑙嗗彛楂樺害 */
+#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
+#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
+#dialog-footer{
+ text-align: center;
+ margin-top: -15px;
}
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index e99f53e..581478d 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -106,7 +106,7 @@
console.log('娓呴櫎鎴愬姛');
ElMessage.success(response.message);
dialogFormVisiblea2.value = false;
- } else if (response.code === 400) {
+ } else if (response.code === 500) {
// 娓呴櫎澶辫触鐨勯�昏緫
console.log('娓呴櫎澶辫触');
console.log(response.message); // 鎵撳嵃鏈嶅姟鍣ㄨ繑鍥炵殑閿欒淇℃伅
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index 4bf1348..6673bc9 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -121,8 +121,8 @@
@Test
public void testSelectCacheEmpty() {
- List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty();
- log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
+// List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty();
+// log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
}
@Test
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java
index f1bda86..cc226f8 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.GetMapping;
import java.util.List;
+import java.util.Map;
/**
*
@@ -99,4 +100,13 @@
return Result.success(result);
}
+
+ @ApiOperation(value = "鏋跺瓙琛ㄦ牸鏌ヨ",notes = "鏋跺瓙琛ㄦ牸鏌ヨ",produces = "application/json")
+ @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
+ @GetMapping("/findshelfrack")
+ public Result findshelfrack() {
+ List<Map<String, Object>> result = shelfRackService.selectshelf_rack();
+ return Result.success(result);
+ }
+
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java
index fc31d55..bea1293 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java
@@ -1,7 +1,12 @@
package com.mes.shelfrack.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.shelfrack.entity.ShelfRack;
+
+import java.util.List;
+import java.util.Map;
+
/**
*
*
@@ -10,6 +15,8 @@
*
*/
-public interface ShelfRackMapper extends BaseMapper<ShelfRack> {
+public interface ShelfRackMapper extends MPJBaseMapper<ShelfRack> {
+
+ List<Map<String, Object>> selectshelf_rack();
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.xml
deleted file mode 100644
index 719ef59..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.shelfrack.mapper.ShelfRackMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java
index d66b35e..bb0bdb0 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
+import java.util.Map;
+
/**
* @author system
* @since 2024-07-09 14:51:27
@@ -12,6 +14,6 @@
List<ShelfRack> findList(ShelfRack params);
-
+ List<Map<String, Object>> selectshelf_rack();
}
\ No newline at end of file
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..85d4adc 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,20 @@
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.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 +32,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<Map<String, Object>> selectshelf_rack() {
+ return baseMapper.selectshelf_rack();
+ }
+
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
index 88b1494..0678559 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
@@ -15,6 +15,8 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.GetMapping;
import java.util.List;
+import java.util.Map;
+import java.util.Optional;
/**
*
@@ -99,4 +101,14 @@
return Result.success(result);
}
+
+ @ApiOperation(value = "浠诲姟鏌ヨ",notes = "浠诲姟鏌ヨ",produces = "application/json")
+ @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
+ @GetMapping("/findTasks")
+ public Result findLatestTasks() {
+ List<Map<String, Object>> result = storageTaskService.Tasks();
+ return Result.success(result);
+ }
+
+
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java
index 4d99c52..f2737a1 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java
@@ -2,6 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.storagetask.entity.StorageTask;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
/**
*
*
@@ -9,7 +15,10 @@
* @since 2024-07-09 14:51:27
*
*/
-
+@Repository
public interface StorageTaskMapper extends BaseMapper<StorageTask> {
+
+ List<Map<String, Object>> selectTasks();
+
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.xml
deleted file mode 100644
index 69ad537..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.storagetask.mapper.StorageTaskMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
index 0af86b2..bad474f 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
@@ -16,4 +16,6 @@
List<StorageTask> findList(StorageTask params);
Map<String, Optional<StorageTask>> findLatestTasks();
+
+ List<Map<String, Object>> Tasks();
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
index e9506e9..04cb2d7 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
@@ -55,6 +55,13 @@
}
+ @Override
+ public List<Map<String, Object>> Tasks() {
+ return baseMapper.selectTasks();
+ }
+
+
+
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
index 974323a..53a3a66 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
hangzhoumes:
- url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8
+ url: jdbc:mysql://127.0.0.1:3306/yiwumes?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-prod.yml
index 0c3ff07..782f39a 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
hangzhoumes:
- url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8
+ url: jdbc:mysql://127.0.0.1:3306/yiwumes?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/ShelfRackMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/ShelfRackMapper.xml
new file mode 100644
index 0000000..0e13316
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/ShelfRackMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mes.shelfrack.mapper.ShelfRackMapper">
+
+
+ <select id="selectshelf_rack" resultType="java.util.Map">
+ <![CDATA[
+ SELECT a.number, b.raw_type, b.raw_width, b.raw_height, b.raw_thickness, b.left_pieces, a.mod_time, a.enable_state, b.pieces,
+ datediff(now(), b.create_time) as rukutime,
+ concat(if(ROUND(b.left_pieces / b.pieces * 100, 0) < 20, 20, ROUND(b.left_pieces / b.pieces * 100, 0)), '%') as bfb
+ FROM shelf_rack AS a
+ LEFT JOIN raw_usage AS b ON a.raw_package_id = b.id
+ ]]>
+ </select>
+
+</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/StorageTaskMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/StorageTaskMapper.xml
new file mode 100644
index 0000000..9fb2ca0
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/StorageTaskMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mes.storagetask.mapper.StorageTaskMapper">
+
+
+
+ <select id="selectTasks" resultType="java.util.Map">
+ <![CDATA[
+ SELECT d.*, g.raw_thickness, g.color
+ FROM (
+ (SELECT * FROM storage_task AS a WHERE a.task_state = '宸插畬鎴�' ORDER BY a.id DESC LIMIT 1)
+ UNION ALL
+ (SELECT * FROM storage_task AS c WHERE c.task_state = '姝ｅ湪宸ヤ綔')
+ UNION ALL
+ (SELECT * FROM storage_task AS b WHERE b.task_state = '绛夊緟涓�')
+ ) AS d
+ LEFT JOIN shelf_rack AS f ON f.id = d.shelf_rack
+ LEFT JOIN raw_usage AS g ON g.id = f.raw_package_id
+ ]]>
+ </select>
+
+</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
index 05ec5fe..4f0bd8b 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
@@ -1,6 +1,7 @@
package mes;
import com.mes.GlassStorageApplication;
+import com.mes.shelfrack.service.ShelfRackService;
import com.mes.storagetask.entity.StorageTask;
import com.mes.storagetask.service.StorageTaskService;
import lombok.extern.slf4j.Slf4j;
@@ -27,6 +28,8 @@
@Autowired
private StorageTaskService storageTaskService;
+ @Autowired
+ private ShelfRackService shelfRackService;
@Test
@@ -43,8 +46,17 @@
// storageTaskService.updateById(storageTask);
// storageTaskService.getBaseMapper().deleteById(1);
// storageTaskService.findList(storageTask);
- storageTaskService.findLatestTasks();
+ ///storageTaskService.findLatestTasks();
+ storageTaskService.Tasks();
}
+ @Test
+ public void selectshelf_rack() {
+
+ shelfRackService.selectshelf_rack();
+ }
+
+
+
--
Gitblit v1.8.0