Albania_Mes-ui/src/lang/locales/en-US.json
@@ -1,5 +1,5 @@ { "All Out":"All Out", "Operation failed":"Operation canceled", "Flowcard":"Flowcard", "Glasstype":"Glasstype", Albania_Mes-ui/src/views/home/index.vue
@@ -253,20 +253,20 @@ </div> <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;"> <el-button type="primary" @click="showform(1)" :disabled="SoftEmergencyStopState" style="z-index: 999;" :class="SoftEmergencyStopState == true ? 'hide' : ''" style="z-index: 999;"> :class="SoftEmergencyStopState == true ? 'hide' : ''"> {{ $t('Import order') }}</el-button> <el-button type="primary" @click="showform(2)" :disabled="SoftEmergencyStopState" style="z-index: 999;" :class="SoftEmergencyStopState == true ? 'hide' : ''" style="z-index: 999;"> :class="SoftEmergencyStopState == true ? 'hide' : ''"> {{ $t('Measure') }}</el-button> <el-button type="primary" @click="showform(3)" :disabled="SoftEmergencyStopState" style="z-index: 999;" :class="SoftEmergencyStopState == true ? 'hide' : ''" style="z-index: 999;"> :class="SoftEmergencyStopState == true ? 'hide' : ''"> {{ $t('StorageCage') }}</el-button> <el-button type="primary" @click="showform(4)" :disabled="SoftEmergencyStopState" style="z-index: 999;" :class="SoftEmergencyStopState == true ? 'hide' : ''" style="z-index: 999;"> :class="SoftEmergencyStopState == true ? 'hide' : ''"> {{ $t('Task queue') }}</el-button> </div> <div style="display: flex;align-items: center;"> <div class="blocks" style="position: relative;width: 100%;"> @@ -332,9 +332,10 @@ <div> <!--功能--> <div> <el-button type="primary" @click="ManualMatching()" :disabled="SoftEmergencyStopState" style="z-index: 999;"> 人工匹配</el-button> <el-button type="primary" @click="ManualMatching()" :disabled="SoftEmergencyStopState" style="z-index: 999;"> 人工匹配</el-button> </div> <!--显示--> <div style="width:100%;height: 600px;border: 1px solid black;"> @@ -394,7 +395,7 @@ </el-table-column> <el-table-column prop="number" :label="$t('Order No')"> </el-table-column> <el-table-column prop="" :label="$t('No Of Cage')"> <el-table-column prop="cageno" :label="$t('No Of Cage')"> </el-table-column> <el-table-column prop="finishnumber" :label="$t('Finish No')"> </el-table-column> @@ -410,10 +411,14 @@ </el-table-column> <el-table-column prop="state" :label="$t('Task State')"> <template slot-scope='scope'> {{ scope.row.state >= 0?scope.row.state == 0 ? $t('Start') : $t('Stop'):"" }} {{ scope.row.state >= 0 ? scope.row.state == 0 ? $t('Start') : $t('Stop') : "" }} </template> </el-table-column> <el-table-column prop="method" :label="$t('Task Method')"> <template slot-scope='scope'> {{ scope.row.state >= 0 ? scope.row.method == 0 ? $t('Out') : $t('All Out') : "" }} </template> </el-table-column> <el-table-column prop="line" :label="$t('Task Line')"> </el-table-column> @@ -736,7 +741,7 @@ UpdateQueue(this.StorageCageAddInfo[index]).then(res => { if (res.data.message == 200) { this.$message.success(this.$t('Operation successful')); }else{ } else { this.$message.error(this.$t('Operation failed')); } }); @@ -854,7 +859,7 @@ }, //人工匹配 ManualMatching() { this.StorageCageAdd=true; this.StorageCageAdd = true; } } springboot-vue3/src/main/java/MyGenerator.java
@@ -18,7 +18,7 @@ public class MyGenerator { /** 数据源配置*/ 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 jdbc = "jdbc:mysql://localhost: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/AuthorityApplication.java
@@ -1,7 +1,7 @@ package com.example.springboot; import com.example.springboot.common.MessageSender; import org.springframework.amqp.rabbit.annotation.EnableRabbit; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; @@ -19,12 +19,6 @@ SpringApplication springApplication = new SpringApplication(AuthorityApplication.class); ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args); WebSocketServer.setApplicationContext(configurableApplicationContext); }
File was deleted springboot-vue3/src/main/java/com/example/springboot/common/MessageSender.java
File was deleted springboot-vue3/src/main/java/com/example/springboot/common/RabbitConfig.java
File was deleted springboot-vue3/src/main/java/com/example/springboot/component/MessageQueueReader.java
File was deleted springboot-vue3/src/main/java/com/example/springboot/component/ModuleA.java
File was deleted springboot-vue3/src/main/java/com/example/springboot/component/ModuleB.java
File was deleted springboot-vue3/src/main/java/com/example/springboot/component/PlcHoldNew.java
@@ -33,15 +33,19 @@ // \\ TODO Auto-generated catch block e.printStackTrace(); } // List<Short> ss= S7control.getinstance().ReadWord("DB14.0", 1); // System.out.println(ss); String E01id = S7control.getinstance().readStrings("DB14.0"); System.out.println(E01id); // if (S7control.getinstance().CheckConnected() == false) { spianService = WebSocketServer.applicationContext.getBean(SpianServiceNew.class); albaniaMapper = WebSocketServer.applicationContext.getBean(AlbaniaMapper.class); spianService.selectAll(albaniaMapper.SelectGlass()); //spianService.selectAll(albaniaMapper.SelectGlass()); //读取DB14区文件 PlcParameterObject plcmes=PLCAutoMes.PlcMesObject; String ExportTOMES1=plcmes.getPlcParameter("ExportTOMES1").getValue();//出片请求一线 String ExportToMES2=plcmes.getPlcParameter("ExportToMES2").getValue();//出片请求二线 String PLCToMES=plcmes.getPlcParameter("PLCToMES").getValue();//进片请求 springboot-vue3/src/main/java/com/example/springboot/component/RabbitMQUtils.java
File was deleted springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -18,7 +18,7 @@ S7PLC s7PLC; // PLC通讯类实例 private EPlcType plcType = EPlcType.S1500; // 西门子PLC类型 private String ip = "192.168.10.1"; // plc ip地址 private int port = 102; // plc 端口号 private int port = 65; // plc 端口号 private static volatile S7control instance = null; @@ -465,4 +465,8 @@ } return addresslist; } public String readStrings(String addr) { return s7PLC.readString(addr); } } 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 PLCAutoMes().start(); // new PlcHoldNew().start(); // new PLCAutoMes().start(); new Plchome().start(); new Plchome().start(); // new PlcLayout().start(); // new Plcalarm().start();
File was deleted springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
@@ -17,6 +17,7 @@ private Integer state;// 状态 private Integer method;// 出片方式 private Date starttime;// 任务领取时间 public List<GlassInfo> glassinfo;// 玻璃信息
@@ -21,4 +21,5 @@ private Integer number;// 数量 private Integer finishnumber;// 完成数量 private Integer measurenumber;// 测量完成数量 private Integer cageno;//笼内数量 } springboot-vue3/src/main/java/com/example/springboot/entity/flowcard.java
@@ -17,6 +17,7 @@ private Integer state;// 状态 private Integer method;// 出片方式 private Date starttime;// 任务领取时间 public List<GlassInfo> glassinfo;// 玻璃信息
@@ -21,4 +21,5 @@ private Integer number;// 数量 private Integer finishnumber;// 完成数量 private Integer measurenumber;// 测量完成数量 private Integer cageno;//笼内数量 } springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
@@ -25,8 +25,6 @@ public StorageCage storageCage; public void setstorageCage(StorageCage storageCage) { this.storageCage = storageCage; } springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
@@ -2,14 +2,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.example.springboot.entity.GlassInfo; import com.example.springboot.entity.RolePermission; import org.apache.ibatis.annotations.*; import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @Mapper @Repository springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -239,7 +239,7 @@ void DeleteStroageCageByCell(Integer cell); //修改格子玻璃数量 @Update("update storage_cage set number=number+#{num} where cell=#{cell}") @Update("update storage_cage set number=ifnull(number,0)+#{num} where cell=#{cell}") void updateStroageCageByCell(Integer cell, Integer num); //计算格子内剩余宽度 @@ -271,7 +271,7 @@ @Select("select * from flowcard where state!=2") List<FlowCard> SelectOrderTask(); @Select("select * from glassinfo where flowcard=#{flowcard} order by mateid,tier") @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); @Update("update flowcard set state=#{state} where flowcard=#{flowcard}") @@ -280,7 +280,7 @@ @Update("update flowcard set method=#{method} where flowcard=#{flowcard}") void ModeChange(String flowcard, int method); @Update("update queue set flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype},state=1 where state=0") @Update("update queue set flowcard=#{flowcard},glasswidth=#{width},glassheight=#{height},glasstype=#{glasstype},state=1 where state<=0") void UpdateQueue(String flowcard,double width,double height,Integer glasstype); @Update("update glassinfo set finishnumber=finishnumber+1 where flowcard=#{flowcard} and mateid=#{mateid} and tier=#{geTier}") springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
@@ -19,7 +19,7 @@ * driver,url,username,password */ private static final String DRIVER = "com.mysql.jdbc.Driver"; private static final String URL = "jdbc:mysql://localhost:3306/canadames"; private static final String URL = "jdbc:mysql://10.153.19.150:3306/canadames"; private static final String USERNAME = "root"; private static final String PASSWORD = "beibo.123/";
@@ -23,9 +23,6 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=GMT+8 spring.rabbitmq.host=10.153.19.150 spring.rabbitmq.port=5672 spring.rabbitmq.username=guest spring.rabbitmq.password=guest
