From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java | 67 +++------------------------------
1 files changed, 6 insertions(+), 61 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 c4d3469..2c548c5 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
@@ -2,80 +2,25 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.downglassinfo.entity.DownGlassInfo;
-import com.mes.downglassinfo.entity.DownGlassTask;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.downworkstation.entity.DownWorkstation;
-import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
/**
* <p>
- * Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
* </p>
*
* @author zhoush
* @since 2024-03-27
*/
-@Mapper
+
+
@Repository
@InterceptorIgnore(tenantLine = "true")
-@DS("salve_1") // 鎸囧畾浣跨敤 hangzhoumes 鏁版嵁婧�
-public interface DownWorkstationMapper extends BaseMapper<DownWorkstation> {
+@DS("hangzhoumes") // 鎸囧畾浣跨敤 hangzhoumes 鏁版嵁婧�
+public interface DownWorkstationMapper extends MPJBaseMapper<DownWorkstation> {
-//鏌ヨ宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
- @Select("SELECT dwt.flow_card_id,dw.id,dw.racks_number FROM down_workstation_task dwt JOIN down_workstation dw ON dwt.flow_card_id = dw.flow_card_id WHERE dwt.state = 1 LIMIT 1")
- List<DownWorkstation> selectdownWorkstationstate();
-
-
- @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}")
-// void update_racks_number(@Param("flowCardId") String flowCardId,
-// @Param("racksNumber") Integer racksNumber);
-
- //鎻掑叆鏈烘浠诲姟琛�
-// @Insert("INSERT INTO down_workstation_task (flow_card_id, width, height, thickness, filmsid,state) " +
-// "VALUES (#{flowCardId}, #{width}, #{height}, #{thickness}, #{filmsid},1)")
-// void insertdownWorkstationtask(DownGlassInfo downGlassInfo);
-
- //鏍规嵁宸ヤ綅id鏇存柊瀹炰綋绫绘帴鏀剁殑鏁版嵁
-// @Update("UPDATE down_workstation SET width = #{width}, height = #{height}, flow_card_id = #{flowCardId} WHERE workstation_id = #{workstationId}")
-// void updateFlowCardId(DownWorkstation downWorkstation);
-
-
-
-
-
-
-// @Update("UPDATE down_workstation_task SET state = 0 WHERE flow_card_id = #{flowCardId}")
-// void update_task_state_to_zero(@Param("flowCardId") String flowCardId);
-
-
-// @Select("SELECT * FROM down_workstation WHERE workstation_id BETWEEN #{startId} AND #{endId}")
-// List<DownWorkstation> getDownWorkstationsInRange(@Param("startId") int startId, @Param("endId") int endId);
-
-
-
-// @Select("SELECT DISTINCT flowcard_id from glass_info")
-// @ResultType(Map.class)
-// List<Map<String, Object>> getflowCardId();
-
-// @Update("UPDATE down_workstation SET flow_card_id = NULL, total_quantity = 0, racks_number = 0 WHERE workstation_id = #{workstationId}")
-// void clearFlowCardInfoByWorkstationId(@Param("workstationId") int workstationId);
-
- // 鑾峰彇鎬绘暟閲�
-// @Select("SELECT total_quantity FROM down_workstation WHERE workstation_id = #{workstationId}")
-// int getTotalQuantity(@Param("workstationId") int workstationId);
-
- // 鑾峰彇钀芥灦鏁伴噺
-// @Select("SELECT racks_number FROM down_workstation WHERE workstation_id = #{workstationId}")
-// int getRacksNumber(@Param("workstationId") int workstationId);
}
--
Gitblit v1.8.0