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/entity/OutTasks.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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/entity/OutTasks.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/entity/OutTasks.java"
index 9b365aa..9d35007 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/entity/OutTasks.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/entity/OutTasks.java"
@@ -7,6 +7,7 @@
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import javax.persistence.Transient;
@Entity
@Table(name="gmms_out_tasks")
@@ -40,6 +41,7 @@
private String infoContent;
private String rackNumber;
private Long taskIds;
+ private int priority;
public OutTasks() {
}
@@ -87,6 +89,12 @@
this.thickness=thickness;
this.pkgNum=pkgNum;
this.stockThickness=stockThickness;
+ }
+ public int getPriority() {
+ return priority;
+ }
+ public void setPriority(int priority) {
+ this.priority = priority;
}
public Long getTaskIds() {
return taskIds;
@@ -270,6 +278,16 @@
public void setStockThickness(double stockThickness) {
this.stockThickness = stockThickness;
}
-
+
+ public void Finsh() {
+ this.infoContent="";
+ this.workStatus="";
+ this.machineStatus="浠诲姟瀹屾垚";
+ }
+
+ /*@Transient
+ public void LoadFinsh() {
+ this.stockThickness = stockThickness;
+ }*/
}
--
Gitblit v1.8.0