Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes

严智鑫

2024-03-19 1da9aafdf0d7fe00a6a91483cd4bdd5283dff0e1

Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes

# Conflicts:
#	Albania_Mes-ui/src/views/home/index.vue
#	springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java

 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

@@ -519,7 +519,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>
@@ -539,6 +539,10 @@
                    </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>
@@ -1027,6 +1031,7 @@
        },
        del() {
            
            this.StorageCageAdd = true;
        }



 springboot-vue3/effective-pom.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
<!--                                                                        -->
<!-- Generated by Maven Help Plugin on 2024-03-07T14:06:55+08:00            -->
<!-- Generated by Maven Help Plugin on 2024-03-19T08:09:38+08:00            -->
<!-- See: http://maven.apache.org/plugins/maven-help-plugin/                -->
<!--                                                                        -->
<!-- ====================================================================== -->
@@ -5574,6 +5574,24 @@
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.poi</groupId>
      <artifactId>poi</artifactId>
      <version>4.1.2</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.poi</groupId>
      <artifactId>poi-ooxml</artifactId>
      <version>4.1.2</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.poi</groupId>
      <artifactId>poi-ooxml-schemas</artifactId>
      <version>4.1.2</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-amqp</artifactId>
      <version>2.3.2.RELEASE</version>

 springboot-vue3/src/main/java/com/example/springboot/AuthorityApplication.java

@@ -1,5 +1,7 @@
package com.example.springboot;



import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext;
@@ -17,12 +19,6 @@
    SpringApplication springApplication = new SpringApplication(AuthorityApplication.class);
    ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);
    WebSocketServer.setApplicationContext(configurableApplicationContext);







  }


 springboot-vue3/src/main/java/com/example/springboot/common/MessageReceiver.java

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,21 @@
        // \\ TODO Auto-generated catch block
        e.printStackTrace();
      }
      
      // List<Short> ss= S7control.getinstance().ReadWord("DB14.0", 1);
      // System.out.println(ss);
      // System.out.println(111111);
      // List<Short> E0sss1id = S7control.getinstance().ReadWord("DB14.0",1);
      // String E01id = S7control.getinstance().readStrings("DB14.38");
      // System.out.println(E01id);
      // if (S7control.getinstance().CheckConnected() == false) {
        byte[] E0sss1id = S7control.getinstance().ReadByte("DB14.208",1);
      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

@@ -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

@@ -16,20 +16,17 @@
        // TODO Auto-generated method stub
        //
        System.out.println("启动完成");

        //  new PlcHold().start();
        // new PlcHoldNew().start();
        // new PLCAutoMes().start();
        //  new PlcHold().start();
        //  new PlcHoldNew().start();
        

        new Plchome().start();
         new Plchome().start();
        //  new PlcLayout().start();
        //  new Plcalarm().start();

        //  new Plcsign().start();

        //  new Plcstate().start();
        //  new PlcPositioning1().start();

        //  new PlcParameter2().start();
        //  new PLCAutomaticParameterSetting().start();


 springboot-vue3/src/main/java/com/example/springboot/controller/MessageController.java

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;// 玻璃信息


 springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java

@@ -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;// 玻璃信息


 springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java

@@ -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/";
    
@@ -256,7 +256,7 @@
     */
    public static Connection getConn() throws SQLException {
        Connection conn = null;
        conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
        conn = DriverManager.getConnection("jdbc:mysql://10.153.19.150:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
        return conn;
    }


 springboot-vue3/src/main/resources/JsonFile/PlcAlbania.json

@@ -1,6 +1,6 @@
{
   "plcAddressBegin":"DB14.0",
   "plcAddressLenght":"210",
   "plcAddressLenght":"208",
   "dataType":"word",
   "parameteInfor":[
      {
@@ -409,16 +409,6 @@
         "addressLenght":"2",
         "ratio":"1",
         "unit":"mm/S"
      },{
         "codeId": "MainControl",
         "addressIndex":"208",
         "addressLenght":"2",
         "ratio":"1",
         "unit":"mm/S"
      }




   ]
}

 springboot-vue3/src/main/resources/application.properties

@@ -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