From 6e7b0553632cae15c79c259aeb93edfd61a5f297 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 25 三月 2024 15:59:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 22 +++++++++--
springboot-vue3/src/main/java/MyGenerator.java | 2
Albania_Mes-ui/src/lang/locales/en-US.json | 4 ++
Albania_Mes-ui/src/views/home/index.vue | 35 +++++++++--------
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 4 ++
5 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/Albania_Mes-ui/src/lang/locales/en-US.json b/Albania_Mes-ui/src/lang/locales/en-US.json
index 38a0ed7..c15415c 100644
--- a/Albania_Mes-ui/src/lang/locales/en-US.json
+++ b/Albania_Mes-ui/src/lang/locales/en-US.json
@@ -1,4 +1,8 @@
{
+ "Customer":"Customer",
+ "Tier":"Tier",
+ "Matching":"Matching",
+ "Productname":"Productname",
"All Out":"All Out",
"Operation failed":"Operation canceled",
"Flowcard":"Flowcard",
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 1f925fe..76e5c23 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -448,16 +448,28 @@
</el-main>
<el-dialog :visible.sync="Importorder" :title="$t('Import order')" top="5vh">
<!--鏂囦欢瀵煎叆鏁版嵁椤甸潰-->
- <div id="fileinput" class="container">
+ <div id="" class="container">
<div class="header">
<div class="btn">
<el-button type="primary" @click="importData()">淇濆瓨</el-button>
- </div>
- <div class="inp">
+
<input type="file" id="uploadExcel" multiple @change="Change" />
</div>
</div>
- <table id="table">
+ <el-table :data="this.dataList" border style="width: 100%;">
+ <el-table-column prop="Customer" :label="$t('Customer')"></el-table-column>
+ <el-table-column prop="order" :label="$t('Order')"></el-table-column>
+ <el-table-column prop="base" :label="$t('Width')"></el-table-column>
+ <el-table-column prop="height" :label="$t('Height')"></el-table-column>
+ <el-table-column prop="thickness" :label="$t('Thickness')"></el-table-column>
+ <el-table-column prop="films" :label="$t('Films')"></el-table-column>
+ <el-table-column prop="quantity" :label="$t('No')"></el-table-column>
+ <el-table-column prop="tier" :label="$t('Tier')"></el-table-column>
+ <el-table-column prop="matching" :label="$t('Matching')"></el-table-column>
+ <el-table-column prop="glasstype" :label="$t('Glasstype')"></el-table-column>
+ <el-table-column prop="productname" :label="$t('Productname')"></el-table-column>
+ </el-table>
+ <!-- <table id="table">
<thead>
<tr>
<th>Customer</th>
@@ -475,17 +487,6 @@
</thead>
<tbody style="text-align: center">
<tr v-for="item in dataList" :key="item.id">
- <!-- <td>{{ item[0] }}</td>
- <td>{{ item[1] }}</td>
- <td>{{ item[2] }}</td>
- <td>{{ item[3] }}</td>
- <td>{{ item[4] }}</td>
- <td>{{ item[5] }}</td>
- <td>{{ item[6] }}</td>
- <td>{{ item[7] }}</td>
- <td>{{ item[8] }}</td>
- <td>{{ item[9] }}</td>
- <td>{{ item[10] }}</td> -->
<td>{{ item.Customer }}</td>
<td>{{ item.order }}</td>
<td>{{ item.base }}</td>
@@ -499,7 +500,7 @@
<td>{{ item.productname }}</td>
</tr>
</tbody>
- </table>
+ </table> -->
</div>
</el-dialog>
@@ -1099,7 +1100,7 @@
},
importData() {
-
+ alert(1);
//let tbdata=JSON.stringify(this.dataList);
let tbdata=this.dataList;
console.log(tbdata);
diff --git a/springboot-vue3/src/main/java/MyGenerator.java b/springboot-vue3/src/main/java/MyGenerator.java
index f5a219f..9343999 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://192.168.10.99:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
+ 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 driverName = "com.mysql.cj.jdbc.Driver";
private static final String username = "root";
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 65c1980..e7e6bb2 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
@@ -312,4 +312,8 @@
@Select("select * from storage_cage where cage=#{cage} order by id desc")
List<StorageCage> SelectStorageCageByCage(Integer cage);
+ // 娣诲姞鍑虹墖闃熷垪
+ @Insert("INSERT INTO flowcard(`flowcard`, `totaltier`, `number`, `line`, `state`, `method`, `starttime`) "
+ +" select #{flowcard}, 0, #{number}, 0, 0, 0, now() where 0=( select count(*) from flowcard where flowcard=#{flowcard});")
+ void InsertFlowcard(String flowcard, Integer number);
}
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 912cdbb..ee61e88 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
@@ -284,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;
}
@@ -363,7 +363,8 @@
List<Map> TypeDatas = homeMapper.SelectType();
Map<String, String> TypeData = new HashMap<String, String>();// 寰楀埌澶勭悊瀹屽悗鎵�鏈夌殑绫诲瀷
Map<String, Integer> groupby=new HashMap<String, Integer>(); // 寰楀埌澶勭悊瀹屽悗鎵�鏈夋�诲眰鏁�;
-
+ Map<String, Integer> OrderFinishedProduct=new HashMap<String, Integer>(); // 寰楀埌澶勭悊瀹屽悗璁㈠崟鎴愬搧鎬绘暟閲�;
+ //"order zong 0 1 10 2 10"
List<Map> RemoveErrorData = IportDataStr.stream()
.filter(item -> (item.get("order") != null && item.get("glasstype") != null && item.get("tier") != null
&&
@@ -377,6 +378,17 @@
RemoveErrorData.forEach(item -> {
String key=item.get("order").toString()+"_"+item.get("matching").toString();
+ String keyCount=item.get("order").toString()+"_"+item.get("matching").toString()+"_"+item.get("tier").toString();
+ String keyCountSum=item.get("order").toString()+"_"+item.get("matching").toString()+"_Sum";//璁㈠崟鎬绘暟
+ if (OrderFinishedProduct.get(keyCount)!=null) {
+ Integer count=OrderFinishedProduct.get(keyCount)+1;
+ Integer sumcount=OrderFinishedProduct.get(keyCountSum)+Integer.parseInt(item.get("quantity").toString());
+ OrderFinishedProduct.put(keyCount,count);
+ OrderFinishedProduct.put(keyCountSum,sumcount);
+ }else if(OrderFinishedProduct.get(keyCount)==null&&groupby.get(key)==null){
+ OrderFinishedProduct.put(keyCount,1);
+ OrderFinishedProduct.put(keyCountSum,Integer.parseInt(item.get("quantity").toString()));
+ }
if (groupby.get(key)!=null) {
Integer Tiers=groupby.get(key)+1;
groupby.put(key, Tiers);
@@ -407,6 +419,8 @@
Double.parseDouble(map.get("base").toString()), Double.parseDouble(map.get("height").toString()),
Double.parseDouble(map.get("thickness").toString()),
Integer.parseInt(map.get("quantity").toString()),groupby.get(tierkey));// 闇�瑕佽绠楁�诲眰鏁�
+ //璁㈠崟鍐呮�诲眰鏁�
+ homeMapper.InsertFlowcard(map.get("order").toString(),OrderFinishedProduct.get(tierkey+"_Sum"));
}
Map<String, Object> ResultCode = new HashMap<>();
ResultCode.put("message", "200");
--
Gitblit v1.8.0