From 2d0800d8a425abe45ac13b3f7257eced1d51c7bd Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 11 十二月 2023 10:58:04 +0800
Subject: [PATCH] 调整手动完成任务逻辑
---
CanadaMes-ui/src/views/home/index.vue | 18 ---
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 4
CanadaMes-ui/src/api/home.js | 4
CanadaMes-ui/src/lang/locales/en-US.json | 5
springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 29 +++++--
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 132 +++++++++++++++-----------------
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 4
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 6
CanadaMes-ui/src/lang/locales/zh-CN.json | 5
9 files changed, 99 insertions(+), 108 deletions(-)
diff --git a/CanadaMes-ui/src/api/home.js b/CanadaMes-ui/src/api/home.js
index 29d0964..1d4772c 100644
--- a/CanadaMes-ui/src/api/home.js
+++ b/CanadaMes-ui/src/api/home.js
@@ -222,9 +222,9 @@
})
}
-export function CompleteQueue(id,frameid) {
+export function CompleteQueue(id,frameid,glassid) {
return request({
- url: '/home/CompleteQueue?id=' + id+'&frameid='+frameid,
+ url: '/home/CompleteQueue?id=' + id+'&frameid='+frameid+'&glassid='+glassid,
method: 'post',
data:""
})
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 7e84e19..6df08de 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,6 @@
{
- "ip": "192.168.10.101",
+ "ip": "localhost",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
@@ -325,7 +325,8 @@
"Unable to find whether the aluminum frame is flipped or not":"Unable to find whether the aluminum frame is flipped or not",
"You do not have this permission":"You do not have this permission",
"This glass is already in the Queue":"This glass is already in the Queue",
- "complete":"complete",
+ "Complete":"Complete",
+ "Not Allow":"Not Allow",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index a8733af..5814617 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,5 +1,5 @@
{
- "ip": "192.168.10.101",
+ "ip": "localhost",
"systemTitle": "鐧诲綍绯荤粺",
"usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
"passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
@@ -317,7 +317,8 @@
"Unable to find the placement method of the aluminum frame":"鏌ヨ涓嶅埌閾濇鎽嗘斁鏂瑰紡",
"Unable to find whether the aluminum frame is flipped or not":"鏌ヨ涓嶅埌閾濇鏄惁缈昏浆",
"This glass is already in the Queue":"姝ょ幓鐠冨凡鍦ㄥ嚭鐗囬槦鍒椾腑",
- "complete":"瀹屾垚",
+ "Complete":"瀹屾垚",
+ "Not Allow":"涓嶅厑璁�",
"langparameter": {
"conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
"conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 14fbabe..00ecd88 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -663,7 +663,7 @@
<el-table-column prop="barcode" :label="$t('Complete')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="!isAllowQueue"
- @click="CompleteQueue(scope.row.id,scope.row.barcode)">{{ $t('Complete') }}</el-button>
+ @click="CompleteQueue(scope.row.id,scope.row.barcode,scope.row.glassId)">{{ $t('Complete') }}</el-button>
</template>
</el-table-column>
<el-table-column :width="280" :label="$t('Operate')">
@@ -825,11 +825,6 @@
created() {
this.load();
this.init();
- setInterval(() => {
- if(socket.readyState != 1){
- this.init();
- }
- }, 20000);
}
,
methods: {
@@ -851,13 +846,6 @@
//鎵撳紑浜嬩欢
socket.onopen = function () {
console.log("websocket宸叉墦寮�");
- // setInterval(()=>{
- // if(socket){
- // if(socket.readyState==socket.OPEN){
- // socket.send('');
- // }
- // }
- // },5000);
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = function (msg) {
@@ -1690,8 +1678,8 @@
this.form5 = {};
},
//鎵嬪姩瀹屾垚鍑虹墖浠诲姟
- CompleteQueue(id,frameid) {
- CompleteQueue(id,frameid).then(res => {
+ CompleteQueue(id,frameid,glassid) {
+ CompleteQueue(id,frameid,glassid).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
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 583f3fe..144c3bd 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
@@ -17,7 +17,6 @@
import com.example.springboot.service.OutSliceServive;
import com.example.springboot.service.SpianService;
-
public class Plchome extends Thread {
@Autowired
@@ -27,12 +26,13 @@
private SpianService spianService;
private North_Glass_Buffer1Service north_Glass_Buffer1Service;
private JdbcConnections dbserve;
- //鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
- public static Boolean isAllowQueue=true;
- //閾濇id
+ // 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
+ public static Boolean isAllowQueue = true;
+ // 閾濇id
public static String FrameNo;
- //鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
- public static Boolean isConfirm=false;
+ // 鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
+ public static Boolean isConfirm = false;
+
// public static Map b=new HashMap<>();
// b.put()
@Override
@@ -71,26 +71,26 @@
// 鏌ヨ鎶ヨ淇℃伅
List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
jsonObject.append("alarmmg", alarmmg);
- // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
- List<String> addressList = new ArrayList<String>();
- 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);// 鑾峰彇杩涚墖杞︾姸鎬�
-// 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);
- }
-
+ // // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+ // List<String> addressList = new ArrayList<String>();
+ // 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);// 鑾峰彇杩涚墖杞︾姸鎬�
+ // 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);
+ // }
+
// 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
String queid = spianMapper.Selectqueueid();
int state = spianMapper.Selectqueuestate();
@@ -99,66 +99,60 @@
// 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
Queue form2 = homeMapper.GetQueueInfo(2);
Queue form3 = homeMapper.GetQueueInfo(1);
- if(form2.getglassId()!=null&&form2.getglassId()!=""){
+ if (form2.getglassId() != null && form2.getglassId() != "") {
jsonObject.append("form2", form2);
}
- if(form3.getglassId()!=null&&form3.getglassId()!=""){
+ if (form3.getglassId() != null && form3.getglassId() != "") {
jsonObject.append("form3", form3);
}
// 鑾峰彇鍑虹墖闃熷垪淇℃伅
- List<Out_slice> listoutslice=outSliceServive.SelectProductionqueue();
+ List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
// List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
// for (Out_slice out_slice : listoutslice) {
- // out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
+ // out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
// }
jsonObject.append("listoutslice", listoutslice);
- //鑾峰彇褰撳墠鍑虹墖闃熷垪鐘舵��
- jsonObject.append("isAllowQueue",Plchome.isAllowQueue);
+ // 鑾峰彇褰撳墠鍑虹墖闃熷垪鐘舵��
+ jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
- //鑾峰彇閾濇idDB106.DBW64
+ // // 鑾峰彇閾濇idDB106.DBW64
// String frameno=spianService.queGlassid("DB106.24",14).toString();
// if(frameno!=Plchome.FrameNo){
- // Plchome.FrameNo=frameno;
+ // Plchome.FrameNo=frameno;
// }
- // Plchome.FrameNo="123";
// try {
- // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+ // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
// } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
// }
- //鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
+ // 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
jsonObject.append("isConfirm", isConfirm);
- //閾濇绾夸氦浜�
+ // 閾濇绾夸氦浜�
// //閾濇id璇锋眰瀛�
// List<Short> framerequest = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
// if(framerequest!=null){
- // //閾濇id
- // String franmeno= spianService.queGlassid("閾濇id鍦板潃", 14).toString();
- // String position;
- // try {
- // position=dbserve.SelectPositionByFrameBarcode(franmeno);
- // } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // position="0";
- // e.printStackTrace();
- // }
- // Short send;
- // if(position=="0"){
- // send=0;
- // }else{
- // send=1;
- // }
- // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short)send);
+ // //閾濇id
+ // String franmeno= spianService.queGlassid("閾濇id鍦板潃", 14).toString();
+ // String position;
+ // try {
+ // position=dbserve.SelectPositionByFrameBarcode(franmeno);
+ // } catch (SQLException e) {
+ // // TODO Auto-generated catch block
+ // position="0";
+ // e.printStackTrace();
// }
-
+ // Short send;
+ // if(position=="0"){
+ // send=0;
+ // }else{
+ // send=1;
+ // }
+ // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short)send);
+ // }
-
-
-
-
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
boolean dbconnected = false;
try {
@@ -171,16 +165,12 @@
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 (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+ }
+ }
-
-
-
-
}
}
}
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 713f4ae..84afd96 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
@@ -20,7 +20,7 @@
//new PlcHold().start();
//
//
-// new Plchome().start();
+ new Plchome().start();
//// //
// new PlcParameter().start();
// //
@@ -32,7 +32,7 @@
// new Plcstate().start();
// new PlcPositioning1().start();
// new PlcPositioning2().start();
- new PlcParameter2().start();
+ // new PlcParameter2().start();
// new PlcParameter1().start();
// new PLCAutomaticParameterSetting().start();
//
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index b85fc8a..dbe13fa 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -140,7 +140,7 @@
@GetMapping("/UpdateTask")
public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types);
+ homeMapper.UpdateTask(types,glassid);
StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
homeMapper.UpdateCageTask1(glassid);
@@ -374,8 +374,8 @@
//鎵嬪姩瀹屾垚浠诲姟
@PostMapping("/CompleteQueue")
- public Result CompleteQueue(String id,String frameid) {
- return outSliceServive.CompleteQueue(id,frameid);
+ public Result CompleteQueue(String id,String frameid,String glassid) {
+ return outSliceServive.CompleteQueue(id,frameid,glassid);
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index b41062a..e494aba 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -55,8 +55,8 @@
short SelectInTask();
// 鎵嬪姩瀹屾垚浠诲姟
- @Update("update storage_task set task_state=1 where task_type=#{task_type} and task_state=0")
- void UpdateTask(@Param("task_type") Integer task_type);
+ @Update("update storage_task set task_state=1 where task_type=#{task_type} and task_state=0 and glass_id=#{glassid}")
+ void UpdateTask(@Param("task_type") Integer task_type,String glassid);
// 鎵嬪姩瀹屾垚杩涚墖浠诲姟淇敼绗煎瓙鏁版嵁
@Update("update storage_cage set state=1 where glass_id=#{glassid} and state=2")
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..4e670f0 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;
@@ -43,15 +49,20 @@
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);
+ 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