From 46f29e79b43be98199d0727a71d85dddaa6e1fd4 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 15 十二月 2023 10:00:23 +0800
Subject: [PATCH] 增加A01 A02行走伺服回零 输入密码才能点击
---
springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 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 ed546f4..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
@@ -1,35 +1,70 @@
package com.example.springboot.service;
import java.sql.SQLException;
+import java.util.HashMap;
import java.util.List;
+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;
public void AddOutSliceS(String[][] AluminumFrames) throws SQLException {
int sequence = homeMapper.SelectMaxSquence();
-
+
// 娣诲姞鍒版暟鎹簱
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;
}
}
}
-
+ // 鏌ヨ鍑虹墖闃熷垪
+ 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()));
+ }
+ return listoutslice;
+ }
+
+ 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);
+ }
}
--
Gitblit v1.8.0