From 36160f9cc609f465b5d4f3433e3c0105beaba393 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 14 四月 2025 11:16:53 +0800
Subject: [PATCH] 测压任务增加内阻值
---
src/main/java/com/whyc/pojo/db_abe_ram/AbeInf.java | 1 +
src/main/java/com/whyc/service/WmsService.java | 4 ++++
src/main/java/com/whyc/pojo/db_wms/Task.java | 2 ++
3 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_abe_ram/AbeInf.java b/src/main/java/com/whyc/pojo/db_abe_ram/AbeInf.java
index 7a1acca..cdcbb82 100644
--- a/src/main/java/com/whyc/pojo/db_abe_ram/AbeInf.java
+++ b/src/main/java/com/whyc/pojo/db_abe_ram/AbeInf.java
@@ -16,4 +16,5 @@
@ApiModelProperty("abe璁惧瀵瑰簲鐨勫崟浣撶紪鍙�")
private Integer abeMonId;
private String taskNo;
+ private Float nowMonRes;
}
diff --git a/src/main/java/com/whyc/pojo/db_wms/Task.java b/src/main/java/com/whyc/pojo/db_wms/Task.java
index 2dc3646..0b3f62a 100644
--- a/src/main/java/com/whyc/pojo/db_wms/Task.java
+++ b/src/main/java/com/whyc/pojo/db_wms/Task.java
@@ -60,6 +60,8 @@
@ApiModelProperty(value = "杩斿洖搴撲綅鏃堕棿,鏀捐揣瀹屾垚鏃堕棿")
private Date backFinishTime;
+ @ApiModelProperty(value = "娴嬪帇浠诲姟鐨勫唴闃诲��")
+ private Float nowMonRes;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index 99c3415..2e24d38 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -184,7 +184,11 @@
task.setActivationChamberStartTime(statusTime);
}break;
case 14:
+ task.setActivationChamberPickUpTime(statusTime);break;
case 24:
+ //娴嬪帇浠诲姟,寮�濮嬪彇娴嬪帇缁撴潫鐨勭數姹�. 璇诲彇abe_inf琛ㄤ腑鐨勫唴闃�,鎻掑叆鍒颁换鍔￠噷
+ AbeInf abeInf = abeInfService.get();
+ task.setNowMonRes(abeInf.getNowMonRes());
task.setActivationChamberPickUpTime(statusTime);break;
case 15:
case 25:
--
Gitblit v1.9.1