From 2eb92a30cc41d70264c33e7b29e54403e0d906cc Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 30 七月 2024 15:25:04 +0800
Subject: [PATCH] 兼容无任务工作中的品检追溯信息
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 b0b5e5c..ee2743e 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
@@ -391,10 +391,10 @@
}
StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
- deviceLastDao.updateByPrimaryKeySelective(deviceLast);
+ deviceLastDao.updateByPrimaryKey(deviceLast);
saveDeviceProductionLog(deviceLast);
PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
- if (node.isRecord) {
+ if (node != null && node.isRecord) {
saveDeviceLife(deviceLast);
}
return count;
--
Gitblit v1.8.0