From 1f64989b3cbf7c031acc4a3f706431fba3af2081 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 17 七月 2024 16:28:30 +0800
Subject: [PATCH] outline time change back
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 4 +++-
1 files changed, 3 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 270287e..24aea10 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
@@ -217,6 +217,7 @@
if (preRecord != null) {
record.id = preRecord.id;
record.inTime = preRecord.outTime;
+ record.outLineTime = preRecord.outLineTime;//涓嬭竟鍒ゆ柇鏄惁缁撴潫浼氱敤鍒� 寰楃暀鐫�
} else {
record.inTime = new Date();
record.inLineTime = new Date();
@@ -276,7 +277,7 @@
* @return 鐘舵��
*/
private Integer getStatus(String status, boolean isEnd, String workType) {
- //缁勮 2024/07/17 鐩墠缁勮workType 1 鍙湁MarkOk //娴嬭瘯 //鍝佹 //缁翠慨
+ //缁勮 2024/07/17 鐩墠缁勮workType 1 鍙湁MarkOk //娴嬭瘯 //鍝佹
if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_TEST.equals(workType) || WORK_TYPE_INSPECTION.equals(workType) || WORK_TYPE_REPAIR.equals(workType)) {
return switch (status) {
case QrCodeConstant.MarkOk -> isEnd ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
@@ -285,6 +286,7 @@
default -> throw new RuntimeException("鐘舵�侀敊璇�");
};
}
+ //缁翠慨
throw new RuntimeException("鐘舵�侀敊璇紝鏃犳晥鐨勮妭鐐圭被鍨�: " + workType);
}
/**
--
Gitblit v1.8.0