From 63650b635ac59b24292c584a80a9ad3496a14748 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 12 十二月 2023 09:22:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..617f7d7 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
@@ -33,8 +33,9 @@
// 娣诲姞鍒版暟鎹簱
for (String[] item : AluminumFrames) {
if (item[1] == "true") {
+ Short state=0;
String position = jdbcConnections.SelectPositionByFrameBarcode(item[3]);
- homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5], sequence, position);
+ homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5], sequence, position,state );
sequence += 1;
}
}
@@ -56,8 +57,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