From c6b519695e8d0190182da679e6bbb5397c524f67 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 01 八月 2024 14:52:35 +0800
Subject: [PATCH] repair
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 c27d466..f87a757 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
@@ -357,9 +357,11 @@
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
deviceLastDao.updateByPrimaryKey(deviceLast);
saveDeviceProductionLog(deviceLast);
- boolean isEndNode = nodeDao.isEndNode(preDeviceRecord.currNode);
- if (isEndNode) {
- saveDeviceLife(deviceLast);
+ if(preDeviceRecord.currNode != null){
+ boolean isEndNode = nodeDao.isEndNode(preDeviceRecord.currNode);
+ if (isEndNode) {
+ saveDeviceLife(deviceLast);
+ }
}
return count;
}
@@ -473,6 +475,7 @@
public List<PltProductQualityInspectionItems> getQualityItems(String proId) {
Map<String, Object> params = new HashMap<>();
params.put("proId", proId);//item start count
+ params.put("disabled", "0");
//鏌ヨ绗﹀悎鏉′欢鐨勮褰�
return qualityItemsDao.selectSome(params);
}
@@ -480,6 +483,7 @@
public List<PltProductTestInspectionItems> getTestItems(String proId) {
Map<String, Object> params = new HashMap<>();
params.put("proId", proId);
+ params.put("disabled", "0");
return testItemsDao.selectSome(params);
}
--
Gitblit v1.8.0