From be64830b020d7cacc429776b0fe5bfab4d893e05 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 12 十二月 2023 08:32:31 +0800
Subject: [PATCH] 调整出片队列逻辑

---
 springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java b/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
index 4e670f0..135fe4d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
@@ -56,8 +56,9 @@
       homeMapper.CompleteQueueByFrameNo(frameid);
     }
     StorageCage storageCage = homeMapper.SelectGlassInfo(glassid);
-    spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
-    
+    if(storageCage!=null){
+      spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
+    }
     homeMapper.UpdateCageTask2(glassid);
     S7control.getinstance().WriteWord("DB105.12", (short) 0);
     Map<String, Object> map = new HashMap<>();

--
Gitblit v1.8.0