From 7fac117d5b0217be53bdf7945bcfb3c1715b5bbb Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 一月 2024 08:28:11 +0800
Subject: [PATCH] 代码测试后更新
---
CanadaMes-ui/src/views/home/index.vue | 4 +
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 28 +++++++-------
CanadaMes-ui/src/lang/locales/en-US.json | 1
springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 23 ++++++-----
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 34 +----------------
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 13 ++++--
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 6 --
CanadaMes-ui/src/lang/locales/zh-CN.json | 4 ++
8 files changed, 47 insertions(+), 66 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 562e83d..24aabbb 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -360,6 +360,7 @@
"Hand Movement":"Hand Movement",
"Please enter the correct glassID":"Please enter the correct glassID",
"Switch":"Switch",
+ "This frame has glass that is currently outing":"This frame has glass that is currently outing",
"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 1135939..0591804 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -36,6 +36,9 @@
"northglassMESsystem": "鍖楃幓MES绯荤粺",
"exit": "閫�鍑�",
"changePassword": "淇敼瀵嗙爜",
+ "Old password":"鏃у瘑鐮�",
+ "New password":"鏂板瘑鐮�",
+ "Confirm password":"鎻愪氦瀵嗙爜",
"resetPassword": "閲嶇疆瀵嗙爜",
"home": "涓婚〉",
"role": "瑙掕壊",
@@ -350,6 +353,7 @@
"Hand Movement":"鎵嬪姩",
"Please enter the correct glassID":"璇疯緭鍏ユ纭殑鐜荤拑ID",
"Switch":"鍒囨崲",
+ "This frame has glass that is currently outing":"姝ら摑妗嗘湁姝ｅ湪鍑虹墖鐨勭幓鐠�",
"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 c7eab6f..48158a8 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -787,7 +787,7 @@
<el-table-column :min-width="90" prop="barcode" :label="$t('Complete')">
<template slot-scope='scope' style="height:100px;height:100px;">
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- :disabled="!(!isAllowQueue && scope.row.state != 2 && scope.row.state != 4)"
+ :disabled="!(!isAllowQueue && scope.row.state != 1 && scope.row.state != 2)"
@click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{
$t('Complete')
}}</el-button>
@@ -1629,6 +1629,8 @@
DeleteProductionQueueGlass(id).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
+ }else{
+ this.$message.error(this.$t('This frame has glass that is currently outing'));
}
});
}
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 b8a0c05..0850abc 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
@@ -153,7 +153,7 @@
// // TODO: handle exception
// }
- // if (S7control.getinstance().CheckConnected() == true) {
+ if (S7control.getinstance().CheckConnected() == true) {
// 鑾峰彇褰撳墠鎵爜鏂瑰紡
List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
@@ -264,37 +264,7 @@
for (Boolean emergencystop : emergencystops) {
jsonObject.append("emergencystop", emergencystop);
}
-
- // // 缁堟缁х画鎸夐挳
- // List<String> niuanaddressList3 =
- // Arrays.asList(config.getProperty("Parameter2.stop").split(","));
- // List<Boolean> anniuread =
- // S7control.getinstance().readBits(niuanaddressList3);
- // // Boolean[] value4 = { false, false};
- // // List<Boolean> anniuread = new ArrayList<>(Arrays.asList(value4));
- // Boolean[] value5 = { true };
- // List<Boolean> resets = new ArrayList<>(Arrays.asList(value5));
- // short[] anniuparams = new short[anniuread.size()];
- // for (int i = 0; i < anniuread.size(); i++) {
- // boolean value = anniuread.get(i);
- // anniuparams[i] = value ? (short) 1 : (short) 0;
- // }
-
- // short[] resets2 = new short[resets.size()];
- // for (int i = 0; i < resets.size(); i++) {
- // boolean value = resets.get(i);
- // resets2[i] = value ? (short) 1 : (short) 0;
- // }
-
- // for (short number : resets2) {
-
- // if (number == 1) {
- // jsonObject.append("Abort", anniuparams);
-
- // }
-
- // }
- // }
+ }
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
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 6b392e3..e609d7f 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
@@ -17,28 +17,28 @@
//
System.out.println("鍚姩瀹屾垚");
- new PlcHold().start();
+ // new PlcHold().start();
new Plchome().start();
- new PlcLayout().start();
- new Plcalarm().start();
+ // new PlcLayout().start();
+ // new Plcalarm().start();
- new Plcsign().start();
+ // new Plcsign().start();
- new Plcstate().start();
- new PlcPositioning1().start();
+ // new Plcstate().start();
+ // new PlcPositioning1().start();
- new PlcParameter2().start();
+ // new PlcParameter2().start();
- new PLCAutomaticParameterSetting().start();
+ // new PLCAutomaticParameterSetting().start();
- new PlcManualonePosition().start();
- new PlcManualonePosition2().start();
- new PlcServoManualone().start();
- new PLCManualJog().start();
- new Plclog().start();
+ // new PlcManualonePosition().start();
+ // new PlcManualonePosition2().start();
+ // new PlcServoManualone().start();
+ // new PLCManualJog().start();
+ // new Plclog().start();
- new PlcInteractionState().start();
+ // new PlcInteractionState().start();
//new PlcParameter1Review().start();
// new PLCAutomaticParameterSettingReview().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 69666cd..ca448cd 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
@@ -335,11 +335,7 @@
// 鏍规嵁閾濇id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@PostMapping("/DeleteProductionQueueGlass")
public Result DeleteProductionQueueGlass(String FrameNo) {
- homeMapper.CompleteQueueByFrameNo(FrameNo);
-
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- return Result.success(map);
+ return outSliceServive.CompleteQueueByFrameNo(FrameNo);
}
// 娣诲姞閾濇id瀵瑰簲鐜荤拑鍒板嚭鐗囬槦鍒�
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 f5a7bee..a9d7b02 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
@@ -179,12 +179,12 @@
@Select("select rp.* from role_permission rp inner join user r on rp.role_id=r.role_id and r.username=#{username} and (permission_id=32 or permission_id=33 or permission_id=34 or permission_id=35 or permission_id=36 or permission_id=37 or permission_id=38 or permission_id=39)")
List<RolePermission> SelectPermissionByUserName(String username);
- //鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟
- @Update("update out_slice set state=3 where id=#{id}")
- void CompleteQueue(String id);
+ // //鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟
+ // @Update("update out_slice set state=2 where id=#{id}")
+ // void CompleteQueue(String id);
//鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟
- @Update("update out_slice set state=3 where id=#{id}")
+ @Update("update out_slice set state=2 where glassid=#{glassid}")
void CompleteQueueByGlassId(String glassid);
//鏌ヨ閾濇id瀵瑰簲鐜荤拑瀹屾垚鏁伴噺
@@ -223,4 +223,9 @@
@Update("update storage_cage set width=width+#{width} where cage=#{cage} and cell=#{cell};")
void UpdataCageWidth(double width, int cage, int cell);
+ //鑾峰彇閾濇鏈夋病鏈夋鍦ㄥ嚭鐗囩殑鐜荤拑
+ @Select("select count(*) from out_slice where barcode=#{frameNo} and state=1")
+ Short SelectOutingQueueCount(String frameNo);
+
+
}
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 c7a9a27..ed78fe2 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
@@ -52,16 +52,7 @@
// 瀹屾垚鍑虹墖浠诲姟
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 && storageCage.getState().equals("3")) {
- spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
- homeMapper.DeleteByGlassID(glassid);
- }
+ homeMapper.CompleteQueueByGlassId(glassid);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
@@ -122,4 +113,16 @@
return homeMapper.SelectCurrentFrame();
}
+public Result CompleteQueueByFrameNo(String frameNo) {
+ Map<String, Object> map = new HashMap<>();
+ Short num= homeMapper.SelectOutingQueueCount(frameNo);
+ if(num==0){
+ homeMapper.CompleteQueueByFrameNo(frameNo);
+ map.put("message", "200");
+ }else{
+ map.put("message", "300");
+ }
+ return Result.success(map);
+}
+
}
--
Gitblit v1.8.0