wu
2023-11-03 f59d1cd5a51e6e1dea40b7253e16cac9f949fc30
增加玻璃表
4个文件已修改
1个文件已添加
116 ■■■■ 已修改文件
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -39,7 +39,7 @@
      jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
      spianService.selectout("1145");
      spianService.selectAll2();
      //spianService.selectAll2();
      //增加队列表数据
      //spianMapper.insertqueue("1",1,1500);
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -203,7 +203,7 @@
            map.put("message", "300");
        } else {
            homeMapper.Inglassid(glass, cage, cell, tier);
            spianMapper.UpdataAddCage1(glass.getWidth(), cage, cell);
            spianMapper.UpdataAddCage1(glass.getGlassWidth(), cage, cell);
        }
        return Result.success(map);
    }
springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
@@ -3,8 +3,8 @@
public class Glass{
    private Integer id;
    private String orderId;
    private double glassWidth;
    private double glassHeight;
    private double width;
    private double height;
    private String glassId;
    
    
@@ -27,20 +27,20 @@
        this.orderId = orderId;
    }
    
    public double getWidth() {
        return glassWidth;
    public double getwidth() {
        return width;
    }
    public void setHeight(double glassHeight) {
        this.glassHeight = glassHeight;
    public void setHeight(double height) {
        this.height = height;
    }
    public double getHeight() {
        return glassHeight;
        return height;
    }
    public void setWidth(double glassWidth) {
        this.glassWidth = glassWidth;
    public void setWidth(double width) {
        this.width = width;
    }
     public String getGlassId() {
springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
New file
@@ -0,0 +1,84 @@
package com.example.springboot.entity;
public class north_glass_buffer1 {
    private Integer id; //自增id
    private String ordernumber;//订单id
    private String listnumber;//集合id
    private String boxnumber;//箱子id
    private String barcode;//玻璃id
    private double glasslength;//玻璃宽
    private double glassheight;//玻璃高
    private double glasslength_mm;//玻璃宽mm
    private double glassheight_mm;//玻璃高mm
    public Integer id() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    public Integer getId() {
        return id;
    }
    public String getordernumber() {
        return ordernumber;
    }
    public void setordernumber(String ordernumber) {
        this.ordernumber = ordernumber;
    }
    public String getlistnumber() {
        return listnumber;
    }
    public void setlistnumber(String listnumber) {
        this.listnumber = listnumber;
    }
    public String getboxnumber() {
        return boxnumber;
    }
    public void setboxnumber(String boxnumber) {
        this.boxnumber = boxnumber;
    }
    public String getbarcode() {
        return barcode;
    }
    public void setbarcode(String barcode) {
        this.barcode = barcode;
    }
    public Double getglasslength() {
        return glasslength;
    }
    public void setglasslength(Double glasslength) {
        this.glasslength = glasslength;
    }
    public Double getglassheight() {
        return glassheight;
    }
    public void setglassheight(Double glassheight) {
        this.glassheight = glassheight;
    }
    public Double getglasslength_mm() {
        return glasslength_mm;
    }
    public void setglasslength_mm(Double glasslength_mm) {
        this.glasslength_mm = glasslength_mm;
    }
    public Double glassheight_mm() {
        return glassheight_mm;
    }
    public void setglassheight_mm(Double glassheight_mm) {
        this.glassheight_mm = glassheight_mm;
    }
}
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -37,7 +37,7 @@
        if (glasslist == null) {
            return (300);
        }
        double widths = glasslist.getWidth();
        double widths = glasslist.getwidth();
        String orderids = glasslist.getOrderId();
        List<String> adddresslist = new ArrayList<>();
@@ -74,7 +74,7 @@
                cells = cages1.getCell();// 格子号
                prcid = cages1.getPrcId();// 传给prc的目标地id
                width = cages1.getWidth();// 格子剩余宽度
                widths = glasslist.getWidth();
                widths = glasslist.getwidth();
                // 执行进片
                datas.add((short) 1000);
@@ -143,7 +143,7 @@
                    // 数据库修改笼子表新增一条玻璃
                    for (int i = 2; i > 0; i--) {
                        Glass qglass = spianMapper.SelectQueueGlass(i);
                        width = qglass.getWidth();// 格子剩余宽度
                        width = qglass.getwidth();// 格子剩余宽度
                        spianMapper.UpdataAddqueCage(qglass.getOrderId(), qglass.getGlassId(), width, cage1, cells, i,
                                1);
                        spianMapper.UpdataAddCage1(width, cage1, cells);// 减少格子宽度
@@ -166,7 +166,7 @@
                Glass qglass = spianMapper.SelectQueueGlass(i);
                String orderid = qglass.getOrderId().toString();
                String glassid = qglass.getGlassId();
                widths = qglass.getWidth();
                widths = qglass.getwidth();
                List<StorageCage> storageCage = spianMapper.selectAll(orderid);
                if (storageCage == null) {
                    return (400);
@@ -192,7 +192,7 @@
                        cells = cages1.getCell();// 格子号
                        prcid = cages1.getPrcId();// 传给prc的目标地id
                        width = cages1.getWidth();// 格子剩余宽度
                        widths = qglass.getWidth();
                        widths = qglass.getwidth();
                        // 执行进片
                        datas.add((short) 1000);