From 130170246c92b431b5b276dd015726bd9eaf9d75 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 25 三月 2024 14:25:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java | 2
springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java | 3
springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java | 8
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 5
Albania_Mes-ui/src/views/home/index.vue | 79 +++++-
springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java | 41 +--
springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json | 8
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 43 ++-
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 23 +
/dev/null | 403 ---------------------------------
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 4
springboot-vue3/src/main/java/MyGenerator.java | 2
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java | 24 +-
springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java | 4
springboot-vue3/src/main/resources/application.properties | 1
springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java | 17 +
16 files changed, 162 insertions(+), 505 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 4cf0f78..1f925fe 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -302,12 +302,23 @@
margin-top: -150px;
margin-left: -200px;
}
+
+.cells {
+ height: 100%;
+}
</style>
<template>
<el-container>
<!-- <el-header style="padding: 10px;"></el-header> -->
<el-main>
- <div class="box" @click="dialogFormVisible2 = true">
+ <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
+ <el-table :data="this.alarm" border style="width: 100%;font-size: 25px;">
+ <el-table-column prop="id" :label="$t('id')"></el-table-column>
+ <el-table-column prop="content" :label="$t('content')"></el-table-column>
+ <el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
+ </el-table>
+ </el-dialog>
+ <div class="box" @click="dialogFormVisible2 = true" style="z-index: 999;">
<div class="text">
<!-- Alarm: -->
{{ this.text }}
@@ -333,28 +344,52 @@
{{ $t('Task queue') }}</el-button>
</div>
- <div style="display: flex;align-items: center;">
+ <div style="display: flex;align-items: center;overflow: hidden;">
<div class="blocks" style="position: relative;width: 100%;">
- <div class="blocks-img" :style="'z-index:999;left:150px;top:555px;'">
+ <div class="blocks-img" :style="'z-index:99;left:150px;top:555px;'">
</div>
<div
- :style="'position: absolute;z-index:999;left:271px;top:987px;width:210px;height:38px;background-color:' + ShowDeviceList(0) + ';;'">
+ :style="'position: absolute;z-index:99;left:271px;top:987px;width:210px;height:38px;background-color:' + ShowDeviceList(0) + ';'">
</div>
<div
- :style="'position: absolute;z-index:999;left:553px;top:956px;width:110px;height:74px;background-color:' + ShowDeviceList(0) + ';;'">
+ :style="'position: absolute;z-index:99;left:553px;top:956px;width:110px;height:74px;background-color:' + ShowDeviceList(0) + ';'">
</div>
<div
- :style="'position: absolute;z-index:999;left:800px;top:450px;width:115px;height:30px;background-color:' + ShowDeviceList(0) + ';;'">
+ :style="'position: absolute;z-index:99;left:800px;top:450px;width:115px;height:30px;background-color:' + ShowDeviceList(0) + ';'">
</div>
<div
- :style="'position: absolute;z-index:999;left:800px;top:675px;width:115px;height:30px;background-color:' + ShowDeviceList(0) + ';;'">
+ :style="'position: absolute;z-index:99;left:800px;top:675px;width:115px;height:30px;background-color:' + ShowDeviceList(0) + ';'">
</div>
- <div
- :style="'position: absolute;z-index:999;left:740px;top:930px;width:230px;height:90px;background-color:' + ShowDeviceList(0) + ';;'">
- <div v-for="item in cagelist1" :key="item['number']">
- <div v-for="(num) in item['number']" :key="num">
- 1
+ <div :style="'position: absolute;z-index:1000;left:740px;top:507px;width:230px;height:114px;'">
+ <div v-for="item in cagelist4" :key="item['id']"
+ :style="'display:flex;height:4.55px;position: relative;'">
+ <div class="cells" v-for="(num) in item['number']" :key="num" :style="'width: ' + (item['glassWidth'] * 0.046) + 'px;background-color:' + ShowCellList(1) + ';position: absolute;left:' +
+ ((item['glassWidth'] * 0.046 * (num - 1)) + ((num - 1) * 5)) + 'px;'">
+ </div>
+ </div>
+ </div>
+ <div :style="'position: absolute;z-index:1000;left:740px;top:730px;width:230px;height:90px;'">
+ <div v-for="item in cagelist3" :key="item['id']"
+ :style="'display:flex;height:2.25px;position: relative;'">
+ <div class="cells" v-for="(num) in item['number']" :key="num" :style="'width: ' + (item['glassWidth'] * 0.046) + 'px;background-color:' + ShowCellList(1) + ';position: absolute;left:' +
+ ((item['glassWidth'] * 0.046 * (num - 1)) + ((num - 1) * 5)) + 'px;'">
+ </div>
+ </div>
+ </div>
+ <div :style="'position: absolute;z-index:1000;left:740px;top:830px;width:230px;height:90px;'">
+ <div v-for="item in cagelist2" :key="item['id']"
+ :style="'display:flex;height:2.25px;position: relative;'">
+ <div class="cells" v-for="(num) in item['number']" :key="num" :style="'width: ' + (item['glassWidth'] * 0.046) + 'px;background-color:' + ShowCellList(1) + ';position: absolute;left:' +
+ ((item['glassWidth'] * 0.046 * (num - 1)) + ((num - 1) * 5)) + 'px;'">
+ </div>
+ </div>
+ </div>
+ <div :style="'position: absolute;z-index:1000;left:740px;top:930px;width:230px;height:90px;'">
+ <div v-for="item in cagelist1" :key="item['id']"
+ :style="'display:flex;height:2.25px;position: relative;'">
+ <div class="cells" v-for="(num) in item['number']" :key="num" :style="'width: ' + (item['glassWidth'] * 0.046) + 'px;background-color:' + ShowCellList(1) + ';position: absolute;left:' +
+ ((item['glassWidth'] * 0.046 * (num - 1)) + ((num - 1) * 5)) + 'px;'">
</div>
</div>
</div>
@@ -480,13 +515,14 @@
<el-button type="primary" @click="AnewMeasure()" :disabled="SoftEmergencyStopState"
style="z-index: 999;">閲嶆柊娴嬮噺</el-button>
</div>
+ <br>
<!--鏄剧ず-->
- <div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;margin: auto auto;">
+ <div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;">
<!--鐜荤拑鍥� #81b337-->
- <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin: auto;position:absolute;width:'
- + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
- + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
- + (this.LastQueue.glassheight / 25 * 7) + 'px;background-color: #93d2f3;text-align: center;'">
+ <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:auto auto;position:absolute;width:'
+ + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
+ + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
+ + (this.LastQueue.glassheight / 25 * 7) + 'px;background-color: #93d2f3;text-align: center;'">
{{ this.LastQueue.glasswidth }}*{{ this.LastQueue.glassheight }}
</div>
@@ -995,6 +1031,15 @@
}
}
},
+ //鑾峰彇璁惧鏄剧ず鐘舵��
+ ShowCellList(num) {
+ if (num == null) {
+ return "";
+ } else if (num > 0) {
+ return "gray";
+ // return "rgba(0,0,0,1)";
+ }
+ },
//鑾峰彇璁惧鐜荤拑id
ShowGlassIdList(num) {
if (this.GlassIdList != null && this.GlassIdList.length > 0) {
diff --git a/springboot-vue3/src/main/java/MyGenerator.java b/springboot-vue3/src/main/java/MyGenerator.java
index 9343999..f5a219f 100644
--- a/springboot-vue3/src/main/java/MyGenerator.java
+++ b/springboot-vue3/src/main/java/MyGenerator.java
@@ -18,7 +18,7 @@
public class MyGenerator {
/** 鏁版嵁婧愰厤缃�*/
- private static final String jdbc = "jdbc:mysql://10.153.19.150:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
+ private static final String jdbc = "jdbc:mysql://192.168.10.99:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
private static final String driverName = "com.mysql.cj.jdbc.Driver";
private static final String username = "root";
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
index e9e5ee3..cced744 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutoMes.java
@@ -80,18 +80,18 @@
// readAndUpdateWordValues(PlcframeObject);
// readAndUpdateWordValues(plcStateObject);
- int index = PlcMesObject.getPlcParameter("AddStart").getAddressIndex();
- // System.out.println(index);
- PlcMesObject.getPlcParameter("AddStart").getAddress(index);
- // System.out.println(PlcMesObject.getPlcParameter("AddStart").getAddress(index));
- List<String> addresses = new ArrayList<>();
- addresses.add("FeedID");
- addresses.add("AddStart");
- // System.out.println(addresses);
- // System.out.println(PlcMesObject.getPlcParameterValues(addresses));
- List<String> addresses2 = new ArrayList<>();
- addresses2.add("FeedID");
- addresses2.add("FeedCarStatus");
+ // int index = PlcMesObject.getPlcParameter("AddStart").getAddressIndex();
+ // // System.out.println(index);
+ // PlcMesObject.getPlcParameter("AddStart").getAddress(index);
+ // // System.out.println(PlcMesObject.getPlcParameter("AddStart").getAddress(index));
+ // List<String> addresses = new ArrayList<>();
+ // addresses.add("FeedID");
+ // addresses.add("AddStart");
+ // // System.out.println(addresses);
+ // // System.out.println(PlcMesObject.getPlcParameterValues(addresses));
+ // List<String> addresses2 = new ArrayList<>();
+ // addresses2.add("FeedID");
+ // addresses2.add("FeedCarStatus");
//System.out.println(PlcReadObject.getPlcParameterValues(addresses2));
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
index 71490a0..886fb12 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -33,17 +33,7 @@
// \\ TODO Auto-generated catch block
e.printStackTrace();
}
- // List<Short> ss= S7control.getinstance().ReadWord("DB14.0", 1);
- // System.out.println(ss);
- // System.out.println(111111);
- // List<Short> E0sss1id = S7control.getinstance().ReadWord("DB14.0",1);
- // String E01id = S7control.getinstance().readStrings("DB14.38");
- // System.out.println(E01id);
- // if (S7control.getinstance().CheckCsonnected() == false) {
- List<Short> E0sss1id = S7control.getinstance().ReadWord("DB14.206",1);
- //List<String> st= S7control.getinstance().readStrings("DB14.206");
- byte[] E0sss1ids = S7control.getinstance().ReadByte("DB14.206",2);
- byte[] E0sss1idss = S7control.getinstance().ReadByte("DB14.0",210);
+
spianService = WebSocketServer.applicationContext.getBean(SpianServiceNew.class);
albaniaMapper = WebSocketServer.applicationContext.getBean(AlbaniaMapper.class);
//spianService.selectAll(albaniaMapper.SelectGlass());
@@ -59,25 +49,26 @@
//涓�鍙风嚎璇锋眰
- if (ExportTOMES1.equals("1") == true&&B01State.equals("0")==true) {
- //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
- spianService.selectout(1);
- }
- //浜岀嚎鍙疯姹傛椂
- if (ExportToMES2.equals("1") == true&&B01State.equals("0")==true) {
- //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
- spianService.selectout(2);
- }
+ // if (ExportTOMES1.equals("1") == true&&B01State.equals("0")==true) {
+ // //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
+ // spianService.selectout(1);
+ // }
+ // //浜岀嚎鍙疯姹傛椂
+ // if (ExportToMES2.equals("1") == true&&B01State.equals("0")==true) {
+ // //灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
+ // spianService.selectout(2);
+ // }
//杩涚墖璇锋眰鏃�
+ if(PLCToMES!=null && B01State!=null){
if(PLCToMES.equals("1")==true&&B01State.equals("0")==true){
//灏嗚繍杈撹溅鐘舵�佹敼涓哄繖纰�
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
+ //S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
spianService.selectAll(albaniaMapper.SelectGlass());
}
-
+
//浠诲姟瀹屾垚鏃�
if(TastState.equals("1")==true){
@@ -93,7 +84,7 @@
}
}
}
-
+ }
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
deleted file mode 100644
index 96fd659..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.example.springboot.component;
-
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-
-import com.example.springboot.common.MessageSender;
-import org.apache.commons.io.FileUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.stereotype.Component;
-
-@Component
-public class PlcParameter extends Thread {
-
-// private final MessageSender messageSender;
-//
-// public PlcParameter(MessageSender messageSender) {
-// this.messageSender = messageSender;
-// }
-
- @Override
- public void run() {
- while (this != null) {
- try {
-// try {
-// RabbitMQUtils.sendMessage("Hello, world!", "module_queue");
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// try {
-// RabbitMQUtils.receiveMessage("module_queue");
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// String message = "Hello, RabbitMQ!";
-// messageSender.sendMessage(message);
- Thread.sleep(500);
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
-
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("key1", "value1");
- jsonObject.put("key2", 123);
- JSONArray jsonArray = new JSONArray();
- jsonArray.add("item1");
- jsonArray.add("item2");
- jsonObject.put("key3", jsonArray);
-
- try {
- // 灏� JSON 瀵硅薄杞崲涓哄瓧绗︿覆骞跺彂閫佸埌闃熷垪
- RabbitMQUtils.sendJsonMessage(jsonObject, "json_queue");
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- try {
- // 浠庨槦鍒楁帴鏀跺苟瑙ｆ瀽 JSON 娑堟伅涓� JSONObject 瀵硅薄
- JSONObject receivedJsonObject = RabbitMQUtils.receiveJsonMessage(JSONObject.class, "json_queue");
- System.out.println(receivedJsonObject.toString());
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
-
-}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 7387e96..592c4b3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -116,30 +116,39 @@
//璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰
- //String MesSend=plcmes.getPlcParameter("MESToGaStatus").getValue();//鍙戦��
- //double width=plcmes.getPlcParameter("Height").getValue();//瀹�
- //double height=plcmes.getPlcParameter("width").getValue();//楂�
+ // String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰
+ // String MesSend=plcmes.getPlcParameter("MESToGaStatus").getValue();//鍙戦��
+ // double width=Double.valueOf(plcmes.getPlcParameter("Height").getValue());//瀹�
+ // double height=Double.valueOf(plcmes.getPlcParameter("width").getValue());//楂�
+
+ // String PlcRequest=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+"";
+ // double width=Double.parseDouble(S7control.getinstance().ReadWord("DB14.28", 1).get(0)+"");
+ // double height=Double.parseDouble(S7control.getinstance().ReadWord("DB14.30", 1).get(0)+"");
+ // String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+"";
+
//鑾峰彇娴嬮噺鐨勯暱锛屽
-
-
- //String url="C:\\Users\\SNG-ZDH-012\\Desktop\\闃垮皵宸村凹浜氭暟鎹姹�.xlsx";E:\
- //String url="E:\\闃垮皵宸村凹浜氭暟鎹姹�.xlsx";
- // List result= HomeService.ReadExecl(url);
- // for(int i=0;i<result.size();i++){
- // System.out.println(result.get(i));
- // }
-
-
-
+ boolean istest = false;
String PlcRequest = "1";
String MesSend = "0";
double width = 402;
double height = 402;
//鍖归厤
+ //System.err.println(PlcRequest+","+MesSend+","+width+","+height);
+ if ("0".equals(PlcRequest)&&istest) {
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0);
+ }
if ("1".equals(PlcRequest)&&"0".equals(MesSend)) {
- GlassInfo MesureGlassinfo=HomeService.Normal(width, height, "1");
+ boolean is=HomeService.Normal(width, height, "1");
+ if (is&&istest) {
+ // 娴嬮噺鎴愬姛
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
+
+ }else if(istest){
+ // 閲嶆柊娴嬮噺
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 4);
+ }
+
}
Queue LastQueue= QueueMapper.selectLastQueue();
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
@@ -158,7 +167,7 @@
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
- //鏌ヨ褰撳墠璁㈠崟浠诲姟
+ // //鏌ヨ褰撳墠璁㈠崟浠诲姟
List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
jsonObject.append("OrderTask", OrderTask);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlchomeNew.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlchomeNew.java
deleted file mode 100644
index b925fa3..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlchomeNew.java
+++ /dev/null
@@ -1,403 +0,0 @@
-package com.example.springboot.component;
-
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.example.springboot.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.example.springboot.entity.Glass;
-import com.example.springboot.entity.Out_slice;
-import com.example.springboot.entity.Queue;
-import com.example.springboot.entity.StorageCage;
-import com.example.springboot.entity.alarmmg;
-import com.example.springboot.entity.north_glass_buffer1;
-import com.example.springboot.entity.device.PlcBitObject;
-import com.example.springboot.entity.device.PlcParameterObject;
-import com.example.springboot.mapper.HomeMapper;
-import com.example.springboot.mapper.SpianMapper;
-
-public class PlchomeNew extends Thread {
-
- @Autowired
- private HomeMapper homeMapper;
- private OutSliceServive outSliceServive;
- private SpianMapper spianMapper;
- private SpianService spianService;
- private North_Glass_Buffer1Service north_Glass_Buffer1Service;
- private JdbcConnections dbserve;
- // 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
- public static Boolean isAllowQueue = true;
- public static Boolean isAllowReordering = true;
- // 鍑虹墖闃熷垪璀﹀憡
- public static Boolean isQueueWarning = false;
- // 閾濇id
- public static String FrameNo = "";
- // 鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
- public static Boolean isConfirm = false;
- // 寰呯‘璁ょ殑鍑虹墖闃熷垪
- public static List<north_glass_buffer1> AluminumFrame;
-
- // private Configuration config;
-
- private StorageCageService storageCageService;
-
- public static Boolean FeedState = false;
-
- // public Plchome() throws IOException {
- // config = new Configuration("config.properties");
- // }
-
- // public static Map b=new HashMap<>();
- // b.put()
- @Override
- public void run() {
- while (this != null) {
- JSONObject jsonObject = new JSONObject();
- try {
- Thread.sleep(1000);
- // 娉ㄥ叆mapper
-
- homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
- spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
- spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
- outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
- north_Glass_Buffer1Service = WebSocketServer.applicationContext
- .getBean(North_Glass_Buffer1Service.class);
- storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
- dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
-
- // 绗煎瓙浣跨敤鎯呭喌
- List<StorageCage> tableData = homeMapper.selectAll();
- jsonObject.append("tableData", tableData);
- // 鏍肩悊鐗囩鏍煎瓙鐘舵��
- List<StorageCage> cagelist1 = homeMapper.selectRack1();
- List<StorageCage> cagelist2 = homeMapper.selectRack2();
- List<StorageCage> cagelist3 = homeMapper.selectRack3();
- List<StorageCage> cagelist4 = homeMapper.selectRack4();
- jsonObject.append("cagelist1", cagelist1);
- jsonObject.append("cagelist2", cagelist2);
- jsonObject.append("cagelist3", cagelist3);
- jsonObject.append("cagelist4", cagelist4);
- // 杩涘嚭鐗囦换鍔�
- List<StorageCage> tasklist1 = homeMapper.selectinout(3);
- List<StorageCage> tasklist2 = homeMapper.selectinout(2);
- jsonObject.append("tasklist1", tasklist1);
- jsonObject.append("tasklist2", tasklist2);
- // 鏌ヨ鎶ヨ淇℃伅
- List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
- jsonObject.append("alarmmg", alarmmg);
-
- // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
- String queid = spianMapper.Selectqueueid();
- int state = spianMapper.Selectqueuestate();
- jsonObject.append("queid", queid);
- jsonObject.append("state", state);
- // 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
- Queue form2 = homeMapper.GetQueueInfo(2);
- Queue form3 = homeMapper.GetQueueInfo(1);
- if (form2.getglassId() != null && form2.getglassId() != "") {
- jsonObject.append("form2", form2);
- }
- if (form3.getglassId() != null && form3.getglassId() != "") {
- jsonObject.append("form3", form3);
- }
- // 鑾峰彇鍑虹墖闃熷垪淇℃伅
- List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
- jsonObject.append("listoutslice", listoutslice);
- // 鑾峰彇褰撳墠鍑虹墖闃熷垪鍑虹墖鐘舵��
- jsonObject.append("isAllowQueue", PlchomeNew.isAllowQueue);
- // 鑾峰彇鍑虹墖闃熷垪璀﹀憡鐘舵��
- jsonObject.append("isQueueWarning", PlchomeNew.isQueueWarning);
- // 鑾峰彇褰撳墠鍑虹墖闃熷垪璋冨簭鐘舵��
- jsonObject.append("isAllowReordering", PlchomeNew.isAllowReordering);
- // 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
- jsonObject.append("isConfirm", isConfirm);
- // 鏌ヨ褰撳墠閾濇淇℃伅
- Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
- jsonObject.append("CurrentFrame", CurrentFrame);
-
- // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
- // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
-
- // public static PlcParameterObject plcParameterObject = initUtil.initword(PlcParameter);
- // public static PlcBitObject plcPlcTest = initUtil.initbit(PlcTest);
- // public static PlcBitObject plcBitObject = initUtil.initbit(PlcSign);
- // public static PlcParameterObject plcStateObject = initUtil.initword(PlcState);
- // public static PlcBitObject plcPlcAlarm = initUtil.initbit(PlcAlarm);
- // public static PlcParameterObject PlcMesObject = initUtil.initword(PlcMes);
- // public static PlcParameterObject PlcReadObject = initUtil.initword(PlcRead);
- // public static PlcParameterObject PlcframeObject = initUtil.initword(Plcframe);
-
- PlcParameterObject PlcParameter = PLCAutoMes.plcParameterObject;// plc鍙傛暟鍦板潃DB100
- PlcBitObject PlcTest = PLCAutoMes.plcPlcTest;// plc鏍囪瘑鍦板潃DB101
- PlcBitObject PlcSign = PLCAutoMes.plcBitObject;// plc璁惧鐘舵�佸湴鍧�DB102
- PlcParameterObject PlcState = PLCAutoMes.plcStateObject;// plc鐘舵�佸湴鍧�DB103
- PlcBitObject PlcAlarm = PLCAutoMes.plcPlcAlarm;// plc鎶ヨ鍦板潃DB104
- PlcParameterObject MesMission = PLCAutoMes.PlcMesObject;// mes浠籑ES鍔″湴鍧�DB105
- PlcParameterObject PLCMission = PLCAutoMes.PlcReadObject;// plc浠诲姟鍦板潃DB106
- PlcParameterObject Plcframe = PLCAutoMes.PlcframeObject;// plc閾濇鍦板潃DB17
-
- // if (S7control.getinstance().CheckConnected() == true) {
-
- // 閾濇绾夸氦浜�
- if (S7controlLK.getinstance().CheckConnected() == true) {
- if (CurrentFrame != null) {
- S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(),
- Plcframe.getPlcParameter("E01id")
- .getAddress(Plcframe.getPlcParameter("E01id").getAddressIndex()));
- }
- String E01id = S7controlLK.getinstance().readStrings(Plcframe.getPlcParameter("E01id")
- .getAddress(Plcframe.getPlcParameter("E01id").getAddressIndex()));
- String J01id = S7controlLK.getinstance().readStrings(Plcframe.getPlcParameter("J01id")
- .getAddress(Plcframe.getPlcParameter("J01id").getAddressIndex()));
-
- String framerequest = Plcframe.getPlcParameter("J01Quest").getValue();
- // List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);
- // List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1);
- // Short framerequest = liststate.get(0);
- if (framerequest.equals("1")) {
- // 閾濇id
- String position;
- try {
- position = dbserve.SelectPositionByFrameBarcode(J01id);
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- position = "0";
- e.printStackTrace();
- }
- Short send;
- if (position.equals("0")) {
- send = 0;
- } else {
- send = 1;
- }
- S7controlLK.getinstance().WriteWord(Plcframe.getPlcParameter("J01Quest")
- .getAddress(Plcframe.getPlcParameter("J01Quest").getAddressIndex()), (short) send);
- }
- }
-
- // 鑾峰彇褰撳墠鎵爜鏂瑰紡
- // List<Boolean> Scanningmethods =
- // S7control.getinstance().ReadBits("DB101.11.4", 1);
- // if (Scanningmethods != null) {
- // for (Boolean Scanningmethod : Scanningmethods) {
- // jsonObject.append("Scanningmethod", Scanningmethod);
- // }
- // }
- //
- Boolean Scanningmethod = PlcTest.getPlcBit("Scanningmethod").getValue();
- if (Scanningmethod != null) {
- jsonObject.append("Scanningmethod", Scanningmethod);
- }
-
- // 鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
- String CurrrentGlassId=PlcState.getPlcParameter("Scanningguns").getValue();
-
- // String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
- jsonObject.append("CurrrentGlassId", CurrrentGlassId);
-
- // 鑾峰彇D01-D06,A01,A02,B01,B02鐘舵��
- // List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10);
- List<String> DeviceStateList=new ArrayList<String>();
- DeviceStateList.add("D01.State");
- DeviceStateList.add("D02.State");
- DeviceStateList.add("B01.State");
- DeviceStateList.add("B02.State");
- DeviceStateList.add("A01.State");
- DeviceStateList.add("A02.State");
- DeviceStateList.add("D03.State");
- DeviceStateList.add("D04.State");
- DeviceStateList.add("D05.State");
- DeviceStateList.add("D06.State");
- List<String> DeviceList=PlcState.getPlcParameterValues(DeviceStateList);
- jsonObject.append("DeviceList", DeviceList);
-
- // 鑾峰彇D01-D06,A01,A02,B01,B02鐜荤拑id
- List<String> GlassStateList=new ArrayList<String>();
- GlassStateList.add("D01ID");
- GlassStateList.add("D02ID");
- GlassStateList.add("B01ID1");
- GlassStateList.add("B02ID1");
- GlassStateList.add("A01ID1");
- GlassStateList.add("A01ID2");
- GlassStateList.add("A02ID1");
- GlassStateList.add("D03ID");
- GlassStateList.add("D04ID");
- GlassStateList.add("D05ID");
- GlassStateList.add("D06ID");
- List<String> GlassIdList = PlcState.getPlcParameterValues(GlassStateList);
- // List<String> GlassIdList = new ArrayList<String>();
- // GlassIdList.add(spianService.queGlassid("DB103.44", 14).toString());
- // GlassIdList.add(spianService.queGlassid("DB103.58", 14).toString());
-
- // GlassIdList.add(spianService.queGlassid("DB103.184", 14).toString());
- // GlassIdList.add(spianService.queGlassid("DB103.212", 14).toString());
-
- // GlassIdList.add(spianService.queGlassid("DB103.128", 14).toString());
- // GlassIdList.add(spianService.queGlassid("DB103.142", 14).toString());
- // GlassIdList.add(spianService.queGlassid("DB103.156", 14).toString());
-
- // GlassIdList.add(spianService.queGlassid("DB103.72", 14).toString());
- // GlassIdList.add(spianService.queGlassid("DB103.86", 14).toString());
- // GlassIdList.add(spianService.queGlassid("DB103.100", 14).toString());
- // GlassIdList.add(spianService.queGlassid("DB103.114", 14).toString());
- jsonObject.append("GlassIdList", GlassIdList);
-
- // 鑾峰彇Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃�
- List<String> addressList = new ArrayList<String>();
- addressList.add("A02Position");
- addressList.add("A01Position");
- List<String> paramlist=PLCMission.getPlcParameterValues(addressList);
- // addressList.add("DB106.12");
- // addressList.add("DB106.0");
- // List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
- if (paramlist != null) {
- jsonObject.append("params", paramlist);
- }
- // // 鑾峰彇杩涚墖杞︾姸鎬�
-
- // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
- // 1);// 鑾峰彇杩涚墖杞︾姸鎬�
- // if (datas1ListState != null) {
- // boolean exist1 = datas1ListState.contains((short) 0);
- // jsonObject.append("zhuangtai", exist1);
- // }
-
- // // 鑾峰彇杩涚墖鐜荤拑淇℃伅
- // List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
- // if (inglassInfo != null) {
- // if (inglassInfo.size() > 0) {
- // jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
- // }
- // }
- // // 鑾峰彇閾濇idDB106.DBW64锛屾坊鍔犲埌鍑虹墖闃熷垪
- // String frameno="X21763329601FB";
-
- String frameno=PlcState.getPlcParameter("Frameid").getValue();//寰呯數姘旀洿鏂板湴鍧�琛ㄦ牸
- // String frameno = spianService.queGlassid("DB103.270", 14).toString();
- if (!frameno.equals(PlchomeNew.FrameNo)) {
- PlchomeNew.FrameNo = frameno;
- try {
- Short num = 0;
- List<north_glass_buffer1> north_glass_buffer1s = north_Glass_Buffer1Service
- .SelectAluminumFrameInfoById(PlchomeNew.FrameNo);
- for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
- if (north_glass_buffer1.getstorageCage() == null) {
- break;
- }
- num++;
- }
- if (num == north_glass_buffer1s.size()) {
- north_Glass_Buffer1Service.AddOutSliceS(PlchomeNew.FrameNo);
- } else {
- PlchomeNew.AluminumFrame = north_glass_buffer1s;
- }
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- if (AluminumFrame != null) {
- jsonObject.append("AluminumFrame", AluminumFrame);
- }
-
- // 澶嶄綅鍊掕鏃�
- // 鍦板潃104.9.6
- Boolean countdown=PlcAlarm.getPlcBit("resetDelay").getValue();
- jsonObject.append("countdown", countdown);
- // List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
- // for (Boolean countdowns : countdown) {
- // jsonObject.append("countdown", countdowns);
- // }
- // jsonObject.append("countdown", true);
- // 澶嶄綅瀹屾垚淇″彿
- String reset=PlcState.getPlcParameter("resetDelay").getValue();
- jsonObject.append("reset", reset);
- // List<Boolean> resetss = S7control.getinstance().ReadBits("DB103.284", 1);
- // for (Boolean reset : resetss) {
- // jsonObject.append("reset", reset);
- // }
-
- // 鏄惁鎬ュ仠
- Boolean emergencystop=PlcAlarm.getPlcBit("emergencystopalarm").getValue();
- jsonObject.append("emergencystop", emergencystop);
-
- // List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
- // for (Boolean emergencystop : emergencystops) {
- // jsonObject.append("emergencystop", emergencystop);
- // }
- // 鑾峰彇杩涚墖璇锋眰鐘舵��
- String D01Request=PLCMission.getPlcParameter("FeedRequest").getValue();
-
- // List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
- Boolean D01RequestState = D01Request.contains("1");
- jsonObject.append("D01RequestState", D01RequestState);
-
- // 鑾峰彇杩涚墖鍙戦�佺姸鎬�
- String D01respnse=PLCMission.getPlcParameter("A02QuestStartPosition").getValue();
- // List<Short> D01respnse = S7control.getinstance().ReadWord("DB106.16", 1);
- boolean D01ResponseState = D01respnse.contains("1");
- // jsonObject.append("D01RequestState", D01RequestState);
- // 鑷姩杩涚墖
- isConfirm = true;
- if (isConfirm == true && form3.getglassId() != null && form3.getglassId() != "") {
- if ((form3.getglassheight() < 380 || form3.getglasswidth() < 390 || form3.getglassheight() > 1810
- || form3.getglasswidth() > 2760)
- || (form3.getglassheight() < 390 || form3.getglasswidth() < 380
- || form3.getglassheight() > 2760 || form3.getglasswidth() > 1810)) {
- FeedState = true;
- jsonObject.append("FeedState", FeedState);
- FeedState = false;
- } else {
- if (D01RequestState == true && D01ResponseState != true) {
- storageCageService.InsertQueueGlassId((short) 1, form3);
- }
- }
- }
-
- // }
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- boolean dbconnected = false;
- try {
- dbserve.getConn();
- dbconnected = true;
- } catch (Exception e) {
- // TODO: handle exception
- dbconnected = false;
- }
- jsonObject.append("dbconnected", dbconnected);
- // jsonObject.append("params", new short[] { 30, 40, });
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
-
- if (webserver != null) {
-
- List<String> messages = webserver.getMessages();
-
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
-
- }
-
- }
- }
- }
- }
-}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index d4a7529..9ad8e83 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -470,7 +470,10 @@
}
return addresslist;
}
-
+ public void writeString(String addr,String data) {
+ s7PLC.writeString(addr,data);
+ }
+
public String readStrings(String addr) {
return s7PLC.readString(addr);
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 40f05a3..d71b64f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -16,9 +16,9 @@
// TODO Auto-generated method stub
//
System.out.println("鍚姩瀹屾垚");
- // new PLCAutoMes().start();
+ //new PLCAutoMes().start();
// new PlcHold().start();
- // new PlcHoldNew().start();
+ //new PlcHoldNew().start();
new Plchome().start();
// new PlcLayout().start();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java
index f0bc2e2..dacfd4c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/device/PlcParameterInfo.java
@@ -112,8 +112,8 @@
}
if (addressLength == 14 ) {
int wordindex = index;
- int newIndex = wordindex + 13;
- return stringdatas[0] + "." + wordindex +"-" + newIndex;
+ //int newIndex = wordindex + 13;
+ return stringdatas[0] + "." + wordindex ;
}
return null;
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
index 84b1c7b..1522f15 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/AlbaniaMapper.java
@@ -29,7 +29,7 @@
@Update("UPDATE `albania`.`storage_cage` SET `glass_id` =#{glassid}, `width` =width-#{glasswidth}, `glasswidth` =#{glasswidth}, `glassheight` =#{glassheight}, `glasswidthmm` =#{glasswidthmm}, `glassheightmm` = #{glassheightmm}, `state` = #{state}, `glasstype` = #{glasstype}, `number` = #{number} WHERE `id` =#{id};")
void AddCage(int id,String glassid,Double glasswidth,Double glassheight,Double glasswidthmm,Double glassheightmm,int state,int glasstype,int number);
//鑾峰彇杩涚墖鏁版嵁
- @Select("select glassid,flowcard,glasswidth as width,glassheight as height,glasswidthmm,glassheightmm,glasstype from queue where state=0 limit 1")
+ @Select("select glassid,flowcard,glasswidth as width,glassheight as height,glasswidthmm,glassheightmm,glasstype from queue where state=1 limit 1")
GlassInfo SelectGlass();
//涓�鍙风嚎鏌ヨ浠诲姟
@Select("select * from v_cagerelease1 where mateid not in(select mateid from v_cagerelease1 where surplus=0 group by mateid);")
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
index e908ad8..4ebf773 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
@@ -38,4 +38,7 @@
"values (null,null,null,null,null,null,#{glasswidthmm},#{glassheightmm},null,#{state},NOW())")
void insertMatchFailure(@Param("glasswidthmm") double glasswidthmm, @Param("glassheightmm") double glassheightmm,@Param("state") int state);
+ @Delete("delete from queue where state<=0")
+ void DeleteErrorQueue();
+
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java b/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
index b70f990..54bf11e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
@@ -63,11 +63,11 @@
}
// 鍖归厤閫昏緫
- public GlassInfo Normal(double width, double height, String line) {
+ public boolean Normal(double width, double height, String line) {
List<Queue> ErrowQueues= QueueMapper.selectErrorQueues();
if (ErrowQueues.size()>0) {
//System.out.println("鏈夊尮閰嶅け璐ユ暟鎹湭鍘婚櫎");
- return new GlassInfo();
+ return false;
}
List<GlassInfo> Result = NormalGlassInfo(width, height, "1");
if (Result.size() == 1) {
@@ -77,7 +77,7 @@
GlassInfoMapper.updatemeasurenumber(GlassInfo.getId());
System.out.println("鍖归厤鎴愬姛");
System.out.println(GlassInfo.getGlassid());
- return GlassInfo;
+ return true;
} else if (Result.size() > 1) {
// 鍖归厤澶辫触 鍖归厤鍒板鏉＄鍚堢殑鏁版嵁 娣诲姞鏁版嵁
QueueMapper.insertMatchFailure(width, height, 0);
@@ -88,7 +88,7 @@
QueueMapper.insertMatchFailure(width, height, -1);
System.out.println("鏈壘鍒扮鍚堢殑鏁版嵁");
}
- return new GlassInfo();
+ return false;
}
// Execl琛ㄦ牸 浼犲叆鏂囦欢璺緞
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
index 7b49fa8..db1fd2a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
@@ -36,6 +36,8 @@
//濡傛灉鏈夊悓绫诲瀷鏃剁洿鎺ュ鍔�
if(cageid!=Integer.MIN_VALUE){
//鍙戦�乸lc浠诲姟
+ Mestast(glassid, 1001, cageid, 1,"MESID1");
+ //浠诲姟鍙戦�佸瓧
//Mestast(glassid,1001,cageid,1);
}else{
@@ -48,7 +50,7 @@
}
//褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖400绗煎瓙宸叉弧
if(cageid!=Integer.MIN_VALUE){
- Mestast(glassid,1001,cageid,1);
+ Mestast(glassid,1001,cageid,1,"MESID1");
//鍙戦�乸lc浠诲姟
}else{
@@ -80,7 +82,7 @@
StorageCage glass= albaniaMapper.SelectCageGlass(glasstype);
//鍙戦�侀厤鐗囨暟鎹�
- Mestast(glassmate.getGlasstype()+"i", glass.getId(),2002, 0);
+ Mestast(glassmate.getGlasstype()+"i", glass.getId(),2002, 0,"MESID1");
albaniaMapper.AddFinishNumber(flowcard, mateid, tier);
albaniaMapper.Inserttask(1, 0, glass.getId(), 2002, glassmate.getGlassid()+i, glasstype,glass.getFlowcard(),mateid,tier);
if(tier==sumid){
@@ -107,8 +109,12 @@
glassidlist.add((byte) iditem);
}
byte[] bytes = Bytes.toArray(glassidlist);
+ //writeString
System.out.println("outmesidbytes:" + bytes.length);
- S7control.getinstance().WriteByte(plcmes.getPlcParameter(address).getAddress(),bytes);
+ System.out.println(plcmes.getPlcParameter(address).getAddress());
+ System.out.println();
+
+ //S7control.getinstance().WriteByte(plcmes.getPlcParameter(address).getAddress(),bytes);
//S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
}
@@ -146,8 +152,9 @@
}
//涓嬪彂鐞嗙墖浠诲姟
- public void Mestast(String glassid,int MESToPLCStart1,int MESToPLCTarget1,int MESToPLC) {
- outmesid(glassid, "MESID1");//涓嬪彂鐜荤拑id
+ public void Mestast(String glassid,int MESToPLCStart1,int MESToPLCTarget1,int MESToPLC,String address) {
+ //outmesid(glassid, "MESID1");//涓嬪彂鐜荤拑id
+ S7control.getinstance().writeString(plcmes.getPlcParameter(address).getAddress(),glassid);
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStart1").getAddress(), (short) MESToPLCStart1);//璧峰浣嶇疆
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCTarget1").getAddress(), (short) MESToPLCTarget1);//鐩爣浣嶇疆
if(MESToPLC!=0){
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index 883b3db..912cdbb 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -21,6 +21,7 @@
import com.example.springboot.entity.StorageTask;
import com.example.springboot.entity.device.PlcParameterObject;
import com.example.springboot.mapper.HomeMapper;
+import com.example.springboot.mapper.QueueMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
@Service
@@ -30,6 +31,9 @@
@Autowired
private OutSliceServive outSliceServive;
+
+ @Autowired
+ private QueueMapper QueueMapper;
@Autowired
private SpianService spianService;
@@ -280,9 +284,9 @@
// 鏌ヨ璁㈠崟浠诲姟
public List<FlowCard> SelectOrderTask() {
List<FlowCard> OrderTask = homeMapper.SelectOrderTask();
- for (FlowCard flowcard : OrderTask) {
- flowcard.setglassinfo(homeMapper.SelectOrderView(flowcard.getFlowcard()));
- }
+ // for (FlowCard flowcard : OrderTask) {
+ // flowcard.setglassinfo(homeMapper.SelectOrderView(flowcard.getFlowcard()));
+ // }
return OrderTask;
}
@@ -328,8 +332,10 @@
// 璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
// 绉婚櫎
- // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
- // (short) 3);
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 3);
+ //鍒犻櫎鏁版嵁
+ QueueMapper.DeleteErrorQueue();
+
// plcmes.getPlcParameter("GaToMES").setValue("3");
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -341,8 +347,9 @@
// 璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
// 閲嶆柊娴嬮噺
- // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
- // (short) 2);
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 2);
+ //鍒犻櫎鏁版嵁
+ QueueMapper.DeleteErrorQueue();
// plcmes.getPlcParameter("GaToMES").setValue("2");
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -394,7 +401,7 @@
glasstype = Integer.valueOf(value);
}
homeMapper.AddGlassinfo(map.get("order").toString(), glasstype,
- Integer.parseInt(map.get("glasstype").toString()) // 闇�瑕佽绠� 閰嶇墖ID
+ Integer.parseInt(map.get("matching").toString()) // 闇�瑕佽绠� 閰嶇墖ID
, glasstype+"" // 闇�瑕佽绠� 鐜荤拑ID
, Integer.parseInt(map.get("tier").toString()), map.get("films").toString(),
Double.parseDouble(map.get("base").toString()), Double.parseDouble(map.get("height").toString()),
diff --git a/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json b/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
index 47c58e7..ab65b19 100644
--- a/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
+++ b/springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json
@@ -409,12 +409,6 @@
"addressLenght":"2",
"ratio":"1",
"unit":"mm/S"
- },{
- "codeId": "MainControl",
- "addressIndex":"208",
- "addressLenght":"2",
- "ratio":"1",
- "unit":"mm/S"
- }
+ }
]
}
diff --git a/springboot-vue3/src/main/resources/application.properties b/springboot-vue3/src/main/resources/application.properties
index 5f6b5f7..01f54d2 100644
--- a/springboot-vue3/src/main/resources/application.properties
+++ b/springboot-vue3/src/main/resources/application.properties
@@ -6,6 +6,7 @@
#\u6570\u636E\u5E93\u9A71\u52A8
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#\u6570\u636E\u5E93\u8FDE\u63A5\u5730\u5740
+#spring.datasource.url=jdbc:mysql://localhost:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
spring.datasource.url=jdbc:mysql://10.153.19.150:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#\u6570\u636E\u5E93\u7528\u6237\u540D
spring.datasource.username=root
--
Gitblit v1.8.0