From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +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 | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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 e29eb16..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
@@ -6,17 +6,23 @@
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoProperties.Storage;
import org.springframework.stereotype.Service;
import com.example.springboot.common.Result;
+import com.example.springboot.component.S7control;
import com.example.springboot.entity.Out_slice;
+import com.example.springboot.entity.StorageCage;
import com.example.springboot.mapper.HomeMapper;
+import com.example.springboot.mapper.SpianMapper;
@Service
public class OutSliceServive {
@Autowired
private HomeMapper homeMapper;
+ @Autowired
+ private SpianMapper spianMapper;
@Autowired
private JdbcConnections jdbcConnections;
@@ -27,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;
}
}
@@ -43,15 +50,21 @@
return listoutslice;
}
-public Result CompleteQueue(String id, String frameid) {
- homeMapper.CompleteQueue(id);
- Short num=homeMapper.SelectCountByFrameNo(frameid);
- if(num==0){
- homeMapper.CompleteQueueByFrameNo(frameid);
+ public Result CompleteQueue(String id, String frameid, String glassid) {
+ homeMapper.CompleteQueue(id);
+ Short num = homeMapper.SelectCountByFrameNo(frameid);
+ if (num == 0) {
+ homeMapper.CompleteQueueByFrameNo(frameid);
+ }
+ StorageCage storageCage = homeMapper.SelectGlassInfo(glassid);
+ 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<>();
+ map.put("message", "200");
+ return Result.success(map);
}
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- return Result.success(map);
-}
}
--
Gitblit v1.8.0