ZengTao
2023-12-12 2ba8207a939aca40c4540e8aa203bce082029734
代码更新(修改出片)
3个文件已修改
9 ■■■■■ 已修改文件
CanadaMes-ui/src/views/home/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/home/index.vue
@@ -1599,11 +1599,14 @@
            rowIndex = column;
            let style = "";
            if (columnIndex === 8 ) {
                style = "font-size:25px;";
                style = "font-size:25px;text-align: center;";
            }
            if (columnIndex === 9 && row.flip == 1) {
                style = "background-Color:yellow;";
            }
            if (columnIndex === 6 && row.state == 3) {
                style = "background-Color:gray;";
            }
            style
            return style;
        }
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -197,7 +197,7 @@
          int sequence = homeMapper.SelectMaxSquence();
          homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
              north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),
              sequence, position, 0);
              sequence, position, (short)0);
          map.put("message2", "200");
        } else {
          map.put("message2", "300");
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -153,7 +153,7 @@
  //查询玻璃是否已存在于出片队列
  @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1 or state=2)")
  @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1 or state=2 or state=3)")
  Out_slice SelectQueueByglassid(String getbarcode);
  //添加出片队列