| Albania_Mes-ui/src/lang/locales/en-US.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Albania_Mes-ui/src/views/home/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| springboot-vue3/src/main/java/MyGenerator.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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", 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); 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"; 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); } 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");
