From ae80a383fe63c465cd5c497283261c2d7322fc55 Mon Sep 17 00:00:00 2001
From: 17602169347 <h17602169347@163.com>
Date: Wed, 8 Feb 2023 14:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=AA=E5=BC=80=E6=9C=BA?=
 =?UTF-8?q?=E5=92=8C=E5=B7=B2=E5=AE=8C=E6=88=90=E7=94=9F=E4=BA=A7=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TtInjectDataController.java    | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/injectdata/controller/TtInjectDataController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/injectdata/controller/TtInjectDataController.java
index e4f3b7b..5f8ab24 100644
--- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/injectdata/controller/TtInjectDataController.java
+++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/injectdata/controller/TtInjectDataController.java
@@ -139,10 +139,22 @@ public class TtInjectDataController extends JeecgController<TtInjectData, ITtInj
 				 long time = date.getTime();
 				 long time2 = sdf.parse(openDate).getTime();
 				 int Minutes = (int)(time - time2) / (1000 * 60 );
-				 injectData.setOpenTime(Minutes);//开机时长分钟
-				 injectData.setTodayQty((int)Math.round(Minutes * 2.5));//现在产量，每分钟3个
-
-				 injectData.setTodayProgress(injectData.getTodayQty()/12);
+				 if(Minutes < 0){//未到开机时间
+					 injectData.setOpenTime(0);//开机时长分钟
+					 injectData.setEquipStatus(4);
+					 injectData.setTodayProgress(0);
+					 injectData.setTodayQty(0);
+				 }else{
+					 injectData.setOpenTime(Minutes);//开机时长分钟
+					 injectData.setTodayQty((int)Math.round(Minutes * 2.5));//现在产量，每分钟3个
+					 injectData.setTodayProgress(injectData.getTodayQty()/12);
+					 if(injectData.getTodayProgress() >= 100){//生产完成关机
+						 injectData.setEquipStatus(4);
+						 injectData.setOpenTime(480);
+						 injectData.setTodayProgress(100);
+						 injectData.setTodayQty(1200);
+					 }
+				 }
 			 }
 			 injectDataList.add(injectData);
 		 }