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

wuyouming666

2024-05-29 75375a0f68c8b91799482dc1cd2ec7d7f211167f

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

 CanadaMes-ui/src/configuration/Manualoneposition.json

@@ -7,9 +7,8 @@
      "type": "0",

      "address": "DB100.0",

      "count": 3,

      "state": 1,

      "min":1,

      "max":210

      "state": 1

     
  

    },

    {

@@ -64,9 +63,8 @@
      "type": "0",

      "address": "DB100.0",

      "count": 3,

      "state": 1,

      "min":1,

      "max":210

      "state": 1

   
     

      

    },

@@ -122,9 +120,8 @@
      "type": "0",

      "address": "DB100.0",

      "count": 3,

      "state": 1,

      "min":1,

      "max":105

      "state": 1

     
    },

    {

      "name": "B01定位速度",


 CanadaMes-ui/src/views/Electrical/ManualonePosition.vue

@@ -200,7 +200,7 @@


  const values = inputData.map(item => item.value);



  console.log(values);





if (values.length > 0) {



@@ -274,6 +274,15 @@
  });



  const values = inputData.map(item => item.value);

  if (values.length > 0) {



let firstValue = values[0];

if (!(firstValue >= "1" && firstValue <= "105")) {

  values.shift();

  this.$message.error("Out of range");

  return false;

}

}

  data.unshift([], []);

  data.push(values);

}

@@ -303,7 +312,7 @@
  if (values.length > 0) {



let firstValue = values[0];

if (!(firstValue >= "106" && firstValue <= "210")) {

if (!(firstValue >= "105" && firstValue <= "210")) {

  values.shift();

  this.$message.error("Out of range");

  return false;


 CanadaMes-ui/src/views/home/index.vue

@@ -1209,7 +1209,7 @@
                    this.CurrentFrame = obj.CurrentFrame;

                    if (obj.CurrentFrame.length!=0) {

                        if (this.CurrentFrame[0].frameheightmm > this.CurrentFrame[0].framewidthmm) {

                            if (this.CurrentFrame[0].frameheightmm < 23.62205 || this.CurrentFrame[0].framewidthmm < 15.748) {

                            if (this.CurrentFrame[0].frameheightmm < 23.62205 || this.CurrentFrame[0].framewidthmm < 15.748||this.CurrentFrame[0].frameheightmm > 144.094488 || this.CurrentFrame[0].framewidthmm > 70.8661417) {

                                this.framecolor1 = "red";

                            } else {

                                if (this.CurrentFrame[0].flip == 2) {

@@ -1220,7 +1220,7 @@


                            }

                        } else {

                            if (this.CurrentFrame[0].frameheightmm < 15.748 || this.CurrentFrame[0].framewidthmm < 23.62205) {

                            if (this.CurrentFrame[0].frameheightmm < 15.748 || this.CurrentFrame[0].framewidthmm < 23.62205||this.CurrentFrame[0].frameheightmm > 70.8661417 || this.CurrentFrame[0].framewidthmm > 144.094488) {

                                this.framecolor1 = "red";

                            } else {

                                if (this.CurrentFrame[0].flip == 2) {

@@ -1258,7 +1258,7 @@
                    if (obj.AluminumFrameInfo != null) {

                        this.AluminumFrameInfo = obj.AluminumFrameInfo;

                        if (this.AluminumFrameInfo[0].frameheightmm > this.AluminumFrameInfo[0].framelengthmm) {

                            if (this.AluminumFrameInfo[0].frameheightmm < 600 || this.AluminumFrameInfo[0].framelengthmm < 400) {

                            if (this.AluminumFrameInfo[0].frameheightmm < 600 || this.AluminumFrameInfo[0].framelengthmm < 400||this.AluminumFrameInfo[0].frameheightmm > 3660|| this.AluminumFrameInfo[0].framelengthmm > 1800) {

                                this.framestate = true;

                                this.framecolor = "red";

                            } else {

@@ -1271,7 +1271,7 @@


                            }

                        } else {

                            if (this.AluminumFrameInfo[0].frameheightmm < 400 || this.AluminumFrameInfo[0].framelengthmm < 600) {

                            if (this.AluminumFrameInfo[0].frameheightmm < 400 || this.AluminumFrameInfo[0].framelengthmm < 600||this.AluminumFrameInfo[0].frameheightmm > 1800 || this.AluminumFrameInfo[0].framelengthmm > 3660) {

                                this.framestate = true;

                                this.framecolor = "red";

                            } else {


 springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java

@@ -36,11 +36,11 @@
      // 根据玻璃id获取订单号,单独数据源
      
      // try {
      //   //spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","",""));
      //   north_glass_buffer1 aa=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","","");
      //   spianMapper.UpdataAddCage2("123", "123", aa, 5, 1, 9, 2,2000.00);
      // } catch (SQLException e) {
      //   // TODO Auto-generated catch block
      //   spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X22670914802GV","",""));
        //north_glass_buffer1 aa=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","","");
        //spianMapper.UpdataAddCage2("123", "123", aa, 5, 1, 9, 2,2000.00);
      //} catch (SQLException e) {
        // TODO Auto-generated catch block
      //   e.printStackTrace();
      // }
      //        spianService.selectout2("X21942610602GV");

 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -304,7 +304,7 @@
                                    framewidth=frameInfo.getframeheightmm();

                                    frameheight=frameInfo.getframelengthmm();

                                }

                                if(framewidth<600||frameheight<400){

                                if(framewidth<600||frameheight<400||framewidth>3660||frameheight>1800){

                                    Plchome.AluminumFrame = north_glass_buffer1s;

                                    Plchome.AluminumFrameInfo=frameInfo;

                                }else{


 springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java

@@ -466,12 +466,14 @@
    public static Connection getConn() throws SQLException {
        try {
            Connection conn = null;
            conn =
            DriverManager.getConnection("jdbc:mysql://localhost:3306/test?serverTimezone=GMT%2B8&characterEncoding=utf-8",
            "root", "beibo.123/");
            // conn = DriverManager.getConnection(
            //         "jdbc:mysql://192.168.102.9:3306/production?serverTimezone=GMT%2B8&characterEncoding=utf-8&useSSL=false",
            //         "northglass", "n0rthgla55");
            // conn =
            // DriverManager.getConnection("jdbc:mysql://localhost:3306/test?serverTimezone=GMT%2B8&characterEncoding=utf-8",
            // "root", "beibo.123/");
            conn = DriverManager.getConnection(
                    "jdbc:mysql://192.168.102.9:3306/production?serverTimezone=GMT%2B8&characterEncoding=utf-8&useSSL=false",
                    "northglass", "n0rthgla55");
                    // "jdbc:mysql://localhost:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8&useSSL=false",
                    // "root", "beibo.123/");
            return conn;
        } catch (Exception e) {
            // TODO: handle exception

 springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java

@@ -67,7 +67,7 @@

        // String orderid="A001";
        // 获取铝框相关度最高的笼子排序
        List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode, widths, 400);
        List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode, widths, 600);
        // 判断铝框指定空格是否需要间隔空间

        if (storageCage.size() == 0) {