From 28ded8102d83cf74bc232d1cdfc89b7f22c41952 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 03 十二月 2024 09:09:31 +0800
Subject: [PATCH] 增加点击防抖事件 增加笼子使用详情的计算优化。 增加数据推送时的报错处理 测量台交互逻辑增加 参数界面增加翻转加减速度
---
springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
index 7ace4e6..f61395c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
@@ -13,13 +13,14 @@
@Repository
public interface GlassInfoMapper extends BaseMapper<GlassInfo> {
- @Select("select gi.* from flowcard as fd LEFT JOIN glassinfo as gi on fd.flowcard=gi.flowcard where fd.orderstate=1 and gi.flowcard is not null and gi.width<=#{maxwidth} and gi.width>=#{minwidth} and gi.height<=#{maxheight} and gi.height>=#{minheight} and gi.films=#{Films} and gi.thickness>=#{Thickness} and gi.measurenumber<gi.number")
+ @Select("select gi.* from flowcard as fd LEFT JOIN glassinfo as gi on fd.flowcard=gi.flowcard where fd.orderstate=1 and gi.flowcard is not null and gi.width<=#{maxwidth} and gi.width>=#{minwidth} and gi.height<=#{maxheight} and gi.height>=#{minheight} and gi.films=#{Films} and gi.thickness>=#{Thickness}")
List<GlassInfo> selectGlassInfos(@Param("maxwidth") double maxwidth, @Param("minwidth") double minwidth, @Param("maxheight") double maxheight, @Param("minheight") double minheight,Integer Thickness,String Films);
// @Select("SELECT COUNT(*) FROM role_permission WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
// boolean checkExists(@Param("roleId") int roleId, @Param("permissionId") int permissionId);
- @Select("SELECT g.* FROM flowcard as f left join glassinfo as g on f.flowcard=g.flowcard WHERE f.orderstate = #{orderstate} and state!=2")
+ // @Select("SELECT g.* FROM flowcard as f left join glassinfo as g on f.flowcard=g.flowcard WHERE f.orderstate = #{orderstate} and state!=2 and g.number>measurenumber")
+ @Select("SELECT g.flowcard,g.mateid,g.tier,g.films,g.width,g.height,g.thickness,g.number,(g.number-g.measurenumber)as measurenumber FROM flowcard as f left join glassinfo as g on f.flowcard=g.flowcard WHERE f.orderstate = 1 and state!=2 and g.number>measurenumber")
List<GlassInfo> selectOrderState(@Param("orderstate") int orderstate);
@Update("UPDATE glassinfo SET measurenumber = measurenumber+1 WHERE id = #{id}")
--
Gitblit v1.8.0