From d3bb6745eb1da8f8c244f9393209e048395867f6 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 10 七月 2024 17:14:00 +0800
Subject: [PATCH] add a inputtime and outputtime
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index 4b7fb7c..c1ced37 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -198,7 +198,10 @@
if (preRecord != null) {
record.id = preRecord.id;
record.inTime = preRecord.outTime;
+ record.outLineTime = preRecord.outLineTime;
}else{
+ record.inTime = new Date();
+ record.inLineTime = new Date();
assemblyPlan.setInputNumber(assemblyPlan.getInputNumber() + 1);
}
record.outTime = new Date();
@@ -218,7 +221,8 @@
if (node.isRecord) {
record.deviceCycleContent = node.deviceCycleContent;
}
- if(node.getIsEnd()){
+ if(node.getIsEnd() && record.outLineTime == null){
+ record.outLineTime = new Date();
assemblyPlan.setOutputNumber(assemblyPlan.getOutputNumber() + 1);
}
assemblyPlanDao.updateByPrimaryKeySelective(assemblyPlan);
--
Gitblit v1.8.0