ZengTao
2024-05-29 6c584c489a317cee78729707890db4bb1ee3f062
修改进片找格子的判断
3个文件已修改
14 ■■■■■ 已修改文件
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/service/JdbcConnections.java
@@ -472,6 +472,8 @@
            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) {