From 6ad80ed766ca364fae07a98fd8f42086c9b0aecd Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 11 十月 2024 08:47:26 +0800
Subject: [PATCH] 统一文件在Git上的大小写
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 8 ++++----
springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java | 2 +-
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
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 442e8bd..7d576f4 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
@@ -9,7 +9,7 @@
@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 442e8bd..7d576f4 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
@@ -9,7 +9,7 @@
@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 2d43d28..4d37809 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;
@@ -272,7 +272,7 @@
void StorageCageAddGlass(String cell, GlassInfo glassInfo);
@Select("select * from flowcard where state!=2")
- List<FlowCard> SelectOrderTask();
+ List<Flowcard> SelectOrderTask();
@Select("select gi.*,sum(sc.number) as cageno from glassinfo gi left join storage_cage sc on gi.glasstype=sc.glasstype where gi.flowcard=#{flowcard} group by gi.id order by gi.mateid,gi.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 b177138..5c78fef 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
@@ -14,7 +14,7 @@
import com.example.springboot.component.PLCAutoMes;
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;
@@ -289,9 +289,9 @@
}
// 鏌ヨ璁㈠崟浠诲姟
- 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;
--
Gitblit v1.8.0