From 812de271142a39b7c5ead401e1a3ea150d7c31d7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 18 三月 2024 10:16:54 +0800
Subject: [PATCH] 实体类修改
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 12 ++++++++----
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 4 ++--
springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java | 3 +--
springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java | 3 +--
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 6 ++++--
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 4 ++--
6 files changed, 18 insertions(+), 14 deletions(-)
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 5e1f626..dd6b213 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
@@ -4,7 +4,9 @@
import java.util.List;
import com.example.springboot.service.*;
import org.springframework.beans.factory.annotation.Autowired;
-import com.example.springboot.entity.Flowcard;
+
+import com.example.springboot.entity.FlowCard;
+import com.example.springboot.entity.FlowCard;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.MeasureSetting;
import com.example.springboot.entity.Out_slice;
@@ -159,7 +161,7 @@
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
//鏌ヨ褰撳墠璁㈠崟浠诲姟
- List<Flowcard> OrderTask = storageCageService.SelectOrderTask();
+ List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
jsonObject.append("OrderTask", OrderTask);
} catch (InterruptedException e) {
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 70c26d9..a95fab6 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
@@ -18,10 +18,10 @@
System.out.println("鍚姩瀹屾垚");
// new PlcHold().start();
- new PlcHoldNew().start();
+ // new PlcHoldNew().start();
// new PLCAutoMes().start();
- //new Plchome().start();
+ new Plchome().start();
// new PlcLayout().start();
// new Plcalarm().start();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java b/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
index 525d3e4..fbb9979 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
@@ -5,12 +5,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
-import cn.hutool.core.date.DateTime;
import lombok.Data;
@Data
@TableName("`flowcard`")
-public class Flowcard {
+public class FlowCard {
private Integer id;// 鑷id
private String flowcard;// 娴佺▼鍗d
private Integer number;// 鐜荤拑鏁伴噺
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java b/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
index 525d3e4..fbb9979 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
@@ -5,12 +5,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
-import cn.hutool.core.date.DateTime;
import lombok.Data;
@Data
@TableName("`flowcard`")
-public class Flowcard {
+public class FlowCard {
private Integer id;// 鑷id
private String flowcard;// 娴佺▼鍗d
private Integer number;// 鐜荤拑鏁伴噺
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 be93c8b..f9c62da 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
@@ -3,7 +3,7 @@
import org.apache.ibatis.annotations.*;
import com.example.springboot.entity.CarPosition;
-import com.example.springboot.entity.Flowcard;
+import com.example.springboot.entity.FlowCard;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
@@ -269,7 +269,7 @@
void StorageCageAddGlass(String cell, GlassInfo glassInfo);
@Select("select * from flowcard where state!=2")
- List<Flowcard> SelectOrderTask();
+ List<FlowCard> SelectOrderTask();
@Select("select * from glassinfo where flowcard=#{flowcard} order by mateid,tier")
List<GlassInfo> SelectOrderView(String flowcard);
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 09efc5f..4d5bf1d 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
@@ -12,7 +12,7 @@
import com.example.springboot.common.Result;
import com.example.springboot.component.Plchome;
import com.example.springboot.component.S7control;
-import com.example.springboot.entity.Flowcard;
+import com.example.springboot.entity.FlowCard;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
@@ -273,14 +273,16 @@
return Result.success(map);
}
- public List<Flowcard> SelectOrderTask() {
- List<Flowcard> OrderTask=homeMapper.SelectOrderTask();
- for (Flowcard flowcard : OrderTask) {
+ //鏌ヨ璁㈠崟浠诲姟
+ public List<FlowCard> SelectOrderTask() {
+ List<FlowCard> OrderTask=homeMapper.SelectOrderTask();
+ for (FlowCard flowcard : OrderTask) {
flowcard.setglassinfo(homeMapper.SelectOrderView(flowcard.getFlowcard()));
}
return OrderTask;
}
+ //寮�濮嬩换鍔�
public Result ClaimTasks(String flowcard, Integer state) {
if(state==1){
homeMapper.ClaimTasks(flowcard,0);
@@ -292,6 +294,7 @@
return Result.success(map);
}
+ //浠诲姟妯″紡淇敼
public Result ModeChange(String flowcard, Integer method) {
if(method==1){
homeMapper.ModeChange(flowcard,0);
@@ -303,6 +306,7 @@
return Result.success(map);
}
+ //淇敼娴嬮噺淇℃伅
public Result UpdateQueue(GlassInfo glassInfo) {
homeMapper.UpdateQueue(glassInfo.getFlowcard(),glassInfo.getWidth(),glassInfo.getHeight(),glassInfo.getGlasstype());
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.8.0