From 51b05b093fa15dd477981372f67ae7b3b2747733 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期一, 23 九月 2024 08:49:29 +0800
Subject: [PATCH] change-3

---
 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
index 068877f..617d31a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
@@ -225,13 +225,15 @@
                     rmRepairRecordMapper.deleteRmRepairRecordByCode(sfcCode);
                 }
             }
-            RmRepairRecord rmRepairRecord = new RmRepairRecord();
-            rmRepairRecord.setBoxCode(result.getSfcCode());
-            rmRepairRecord.setProcessesCode(result.getLocationCode());
-            rmRepairRecord.setOriginalResult(result.getOutRsSign());
-            rmRepairRecord.setCreateTime(new Date());
-            rmRepairRecordMapper.insertRmRepairRecord(rmRepairRecord);
-            daPassingStationCollectionMapper.deleteDaPassingStationCollectionById(result.getId());
+            if (ObjectUtil.isNotEmpty(result)){
+                RmRepairRecord rmRepairRecord = new RmRepairRecord();
+                rmRepairRecord.setBoxCode(result.getSfcCode());
+                rmRepairRecord.setProcessesCode(result.getLocationCode());
+                rmRepairRecord.setOriginalResult(result.getOutRsSign());
+                rmRepairRecord.setCreateTime(new Date());
+                rmRepairRecordMapper.insertRmRepairRecord(rmRepairRecord);
+                daPassingStationCollectionMapper.deleteDaPassingStationCollectionById(result.getId());
+            }
         }
 
     }

--
Gitblit v1.9.3