From 99f113b35308144878037b808697c2075c811041 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 四月 2024 11:05:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
index bcfd442..8607c8d 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
@@ -21,9 +21,11 @@
  * @since 2024-03-27
  */
 @Mapper
+
 @Repository
 @InterceptorIgnore(tenantLine = "true")
-// 鎸囧畾浣跨敤 hangzhoumes 鏁版嵁婧�
+@DS("hangzhoumes") // 鎸囧畾浣跨敤 hangzhoumes 鏁版嵁婧�
+
 public interface DownWorkstationMapper extends BaseMapper<DownWorkstation> {
 
 
@@ -32,8 +34,8 @@
     List<DownWorkstation> selectdownWorkstationstate();
 
 
-    @Select("SELECT flow_card_id,filmsid,width,height,thickness FROM down_glass_task WHERE task_stauts = 1;")
-    List<DownGlassTask> selectunloadingtaskstate();
+//    @Select("SELECT flow_card_id,filmsid,width,height,thickness FROM down_glass_task WHERE task_stauts = 1;")
+//    List<DownGlassTask> selectunloadingtaskstate();
     //鏇存柊钀芥灦鏁伴噺
 //    @Update("UPDATE down_workstation SET racks_number = #{racksNumber} " +
 //            "WHERE flow_card_id = #{flowCardId}")

--
Gitblit v1.8.0