From 42d37ce9f59c15801cde7d63a439156934978bb4 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 30 八月 2024 11:41:24 +0800
Subject: [PATCH] 8.26-8.29售后维护升级 1.增加逻辑：料架退回二次接力后，当仓储车准备送回库内时先查询此料架是否有其他线需要使用，有则直接从当前上片位送至下一上片位（省去中间退库，再从库内送至下一上片位的动作） 2.增加逻辑：当派尔开工下发任务料架顺序为，2，4，2类型时，上片机吸完2号架后退回二次接力但不能退库，等待4号架吸片完成退回二次接力后，2号架再从二次接力推进上片位然后亮灯（此时料架任务自动切换成下第二个2号架任务） 3.增加页面弹窗：仓储待执行任务 4.增加汇报逻辑：除原先仓储完成后汇报派尔料架已回库外，另外增加检索只要北玻系统完成但派尔未确认的都进行汇报直至派尔确认 5.修改页面查询：已完成任务仅查询一百条 6.定期删除完成数据
---
江苏皓晶项目/Haojing/src/main/java/com/northglass/repository/OutTasksDao.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/OutTasksDao.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/OutTasksDao.java"
index dc01199..9777554 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/OutTasksDao.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/OutTasksDao.java"
@@ -3,10 +3,21 @@
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import com.northglass.entity.OutTasks;
public interface OutTasksDao extends JpaRepository<OutTasks, Long>{
+
+ //鏌ヨ 鏈�缁堜换鍔＄姸鎬�
+ @Query("select t from OutTasks t order by t.taskIds desc")
+ public List<OutTasks> FindAll100();
+
+ @Query("select t from OutTasks t where t.mesStatus=?1 and t.destination=?2 order by t.taskIds asc")
+ public List<OutTasks> FindTaskLine(String mesStatus,String destination);
+
+ @Query("select t from OutTasks t where t.mesStatus!=?1 and t.destination=?2 order by t.taskIds asc")
+ public List<OutTasks> FindNotTaskLine(String mesStatus,String destination);
//鏌ヨ 鏈�缁堜换鍔＄姸鎬�
@Query("select t from OutTasks t where t.mesStatus=?1 order by t.finshTime desc")
@@ -57,11 +68,15 @@
public List<OutTasks> FindOutTasksTaskIds(String taskid);
//鏌ヨ machineStatus, workStatus , flag 鏈哄櫒锛屽伐浣滅姸鎬侊紝浠诲姟鐘舵��
- @Query("select t from OutTasks t where t.machineStatus=?1 and t.workStatus=?2 and t.flag=?3 order by t.taskIds asc")
+ @Query("select t from OutTasks t where t.machineStatus=?1 and t.workStatus=?2 and t.flag=?3 order by t.priority desc,t.taskIds asc")
public List<OutTasks> FindMachineStatusWorkStatus(String machineStatus,String workStatus,String flag);
+ //鏌ヨ 鏈畬鎴愪换鍔�
+ @Query("select t from OutTasks t where t.machineStatus!='浠诲姟瀹屾垚' and t.flag='姝ｅ父' order by t.priority desc,t.taskIds asc")
+ public List<OutTasks> findWaitTask();
+
//鏌ヨ machineStatus1,machineStatus2 workStatus
- @Query("select t from OutTasks t where (t.machineStatus=?1 or t.machineStatus=?2) and t.workStatus=?3 and t.flag=?4")
+ @Query("select t from OutTasks t where (t.machineStatus=?1 or t.machineStatus=?2) and t.workStatus=?3 and t.flag=?4 order by t.taskIds asc")
public List<OutTasks> FindMachineStatusWorkStatus(String machineStatus1,String machineStatus2,String workStatus,String flag);
@@ -69,4 +84,12 @@
@Query("select t from OutTasks t where t.taskType=?1 and t.machineStatus=?2 and t.workStatus=?3")
public List<OutTasks> FindTaskTypeTasking(String taskType,String machineStatus,String workStatus);
+ //鏌ヨ姝ゆ枡鏋� 鏈紑濮嬬殑浠诲姟
+ @Query("select t from OutTasks t where t.stockName=?1 and t.machineStatus='绛夊緟寮�濮�' and t.workStatus='绛夊緟涓�' order by t.taskIds asc")
+ public List<OutTasks> FindStockName(String stockName);
+
+ //鏌ヨ姝ょ洰鐨勫湴鐨� 鏈畬鎴愮殑浠诲姟
+ @Query("select t from OutTasks t where t.destination=?1 and t.machineStatus='绛夊緟寮�濮�' and t.workStatus='绛夊緟涓�' order by t.taskIds asc")
+ public List<OutTasks> FindDestination(String destination);
+
}
--
Gitblit v1.8.0