From d562b35ec9d09979971066ba9c07ec8576f9a45e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 八月 2024 16:38:22 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 6d3295e..438f790 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
@@ -349,16 +349,18 @@
repairInfo.repairTime = new Date();
repairInfo.repairBy = workLast.userId;
repairInfo.repairReason = vo.errorMsg;
- repairInfo.fromNode = preDeviceRecord.currNode;
+ if (preDeviceRecord != null) {
+ repairInfo.fromNode = preDeviceRecord.currNode;
+ }
repairInfoDao.insertSelective(repairInfo);
StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
-
+ deviceLast.setRepairId(repairInfo.getId());
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
deviceLastDao.updateByPrimaryKey(deviceLast);
saveDeviceProductionLog(deviceLast);
- boolean isEndNode = nodeDao.isEndNode(preDeviceRecord.currNode);
- if (isEndNode) {
+ //鍙缁忓巻杩囩粨鏉熻妭鐐�,灏变竴鐩磋褰昫evice life
+ if (preDeviceRecord != null && preDeviceRecord.getOutLineTime() != null) {
saveDeviceLife(deviceLast);
}
return count;
--
Gitblit v1.8.0