From 8358df1ea747c49b18072204dee4cffe6e2a1357 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 05 一月 2024 15:05:10 +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 | 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 135fe4d..aeba11e 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;
}
}
@@ -59,7 +60,7 @@
if(storageCage!=null){
spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
}
- homeMapper.UpdateCageTask2(glassid);
+ homeMapper.DeleteByGlassID(glassid);
S7control.getinstance().WriteWord("DB105.12", (short) 0);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
--
Gitblit v1.8.0