From 42154214c5698326710edf336b3148830b646bb2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 11 六月 2025 13:17:56 +0800
Subject: [PATCH] 望美切换订单模式修改
---
河北望美项目/MES_11/src/main/java/com/northglass/repository/GalssTaskDao.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/GalssTaskDao.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/GalssTaskDao.java"
index a34c08a..8c55c26 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/GalssTaskDao.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/GalssTaskDao.java"
@@ -31,10 +31,10 @@
@Query("select t from GalssTask t where t.workProcedure='涓嬬墖' and t.workState=?1 and t.patternTask.groups=?2")
public List<GalssTask> findByCounttask(String state,Long groups);
- @Query("select t from GalssTask t where t.workProcedure='娴嬮噺' and t.workState='寰呰瘑鍒�' and t.patternTask.groups=?1 order by t.patternTask.id")
+ @Query("select t from GalssTask t where t.workProcedure='娴嬮噺' and t.workState='寰呰瘑鍒�' and t.patternTask.groups=?1 order by t.patternTask.id,t.engineeringId")
public List<GalssTask> findByidentify1(Long groups);
- @Query("select t from GalssTask t where t.workProcedure='娴嬮噺' and t.workState='寰呰瘑鍒�' and t.patternTask.groups=?1 and (((t.width<=?3 and t.width>=?2) and (t.height<=?5 and t.height>=?4)) or ((t.width<=?5 and t.width>=?4) and (t.height<=?3 and t.height>=?2))) order by t.patternTask.id")
+ @Query("select t from GalssTask t where t.workProcedure='娴嬮噺' and t.workState='寰呰瘑鍒�' and t.patternTask.groups=?1 and (((t.width<=?3 and t.width>=?2) and (t.height<=?5 and t.height>=?4)) or ((t.width<=?5 and t.width>=?4) and (t.height<=?3 and t.height>=?2))) order by t.patternTask.id,t.engineeringId")
public List<GalssTask> findByidentify2(Long groups,Double minwidth,Double maxwidth,Double minheigth,Double maxheigth);
@Query("select t from GalssTask t where t.workProcedure='娴嬮噺' and t.workState='寰呰瘑鍒�' ")
@@ -49,8 +49,8 @@
@Query("select t from GalssTask t where t.workProcedure='澶嶅悎' and t.workState='澶嶅悎澶辫触' and t.patternTask.groups=?1")
public List<GalssTask> findIncompound(Long groups);
- @Query("select t from GalssTask t where t.typeId=?1 and t.patternTask.groups=?2")
- public List<GalssTask> findbyTypeId(Long id,Long groups);
+ @Query("select t from GalssTask t where t.typeId=?1 and t.processcardId=?2 and t.patternTask.groups=?3")
+ public List<GalssTask> findbyTypeId(Long id,String processcardId,Long groups);
@Query("select t from GalssTask t where t.patternTask.id=?1")
public List<GalssTask> findpattern(Long id);
@@ -61,10 +61,10 @@
@Query("select t from GalssTask t where t.typeId=?1 ")
public List<GalssTask> findbyTypeId1(Long id);
- @Query("select t.dropFrame from GalssTask t where t.patternTask.groups=?1 group by dropFrame ")
+ @Query("select t.dropFrame from GalssTask t where t.patternTask.groups=?1 and t.patternTask.rawFile.state='宸查鍙�' group by dropFrame ")
public List<GalssTask> findDroplist(Long groups);
- @Query("select t from GalssTask t where t.dropFrame=?1 and t.patternTask.groups=?2")
+ @Query("select t from GalssTask t where t.dropFrame=?1 and t.patternTask.rawFile.state='宸查鍙�' and t.patternTask.groups=?2")
public List<GalssTask> findDropframeList(String dropframe,Long groups);
@Query("select t from GalssTask t where t.slicecageRank=?1 and t.patternTask.groups=?2")
@@ -74,7 +74,7 @@
public List<GalssTask> findslicecagerank2(Long slicecageid,Long groups);
- @Query("select count(t) from GalssTask t where t.dropFrame=?1 and t.patternTask.groups=?2")
+ @Query("select count(t) from GalssTask t where t.dropFrame=?1 and t.patternTask.rawFile.state='宸查鍙�' and t.patternTask.groups=?2")
public int finddropframecount(String dropframe,Long groups);
--
Gitblit v1.8.0