From 4142b96426da5346f5e2143a54775dbe5b154d2c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 20 十二月 2023 15:05:46 +0800
Subject: [PATCH] 修改终止任务功能
---
springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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..7457865 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
@@ -28,27 +28,29 @@
private JdbcConnections jdbcConnections;
public void AddOutSliceS(String[][] AluminumFrames) throws SQLException {
- int sequence = homeMapper.SelectMaxSquence();
+ // int sequence = homeMapper.SelectMaxSquence();
// 娣诲姞鍒版暟鎹簱
- for (String[] item : AluminumFrames) {
- if (item[1] == "true") {
- String position = jdbcConnections.SelectPositionByFrameBarcode(item[3]);
- homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5], sequence, position);
- sequence += 1;
- }
- }
+ // 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,state );
+ // sequence += 1;
+ // }
+ // }
}
// 鏌ヨ鍑虹墖闃熷垪
public List<Out_slice> SelectProductionqueue() {
List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
- for (Out_slice out_slice : listoutslice) {
- out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
- }
+ // for (Out_slice out_slice : listoutslice) {
+ // out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
+ // }
return listoutslice;
}
+ //瀹屾垚鍑虹墖浠诲姟
public Result CompleteQueue(String id, String frameid, String glassid) {
homeMapper.CompleteQueue(id);
Short num = homeMapper.SelectCountByFrameNo(frameid);
@@ -56,9 +58,10 @@
homeMapper.CompleteQueueByFrameNo(frameid);
}
StorageCage storageCage = homeMapper.SelectGlassInfo(glassid);
- spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
-
- homeMapper.UpdateCageTask2(glassid);
+ if(storageCage!=null){
+ spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
+ }
+ homeMapper.DeleteByGlassID(glassid);
S7control.getinstance().WriteWord("DB105.12", (short) 0);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
--
Gitblit v1.8.0