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

wuyouming666

2023-12-05 e47aa1b3ca12923e194d6e88187d2ecdb29eb186

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

 CanadaMes-ui/src/lang/locales/en-US.json

@@ -1,6 +1,6 @@
{

  

  "ip": "192.168.10.21",

  "ip": "localhost",

  "systemTitle": "Login System",

  "usernamePlaceholder": "Please enter username",

  "passwordPlaceholder": "Please enter password",

@@ -303,7 +303,7 @@
  "Confirm Modification":"Confirm modification",

  "The glass ID already exists in the loading queue":"The glass ID already exists in the loading queue",

  "This glass ID already exists in the sorting cage":"This glass ID already exists in the sorting cage",

  "Production queue":"Production queue",

  "Outing Queue":"Outing Queue",

  "Enter the Frame No":"Enter the Frame No",

  "Frame No":"Frame No",

  "Glass information corresponding to aluminum frame":"Glass information corresponding to aluminum frame",

@@ -318,6 +318,9 @@
  "Start":"Start",

  "Sequence":"Sequence",

  "Position":"Position",

  "Top":"Top",

  "Up":"Up",

  "Down":"Down",

    "ServoManualone": {

      "A01 所在格子": "A01 Current Grid",

      "数量": "Quantity",


 CanadaMes-ui/src/lang/locales/zh-CN.json

@@ -293,7 +293,7 @@
  "Confirm Modification": "确认修改",

  "The glass ID already exists in the loading queue": "上片队列已存在此玻璃id",

  "This glass ID already exists in the sorting cage": "理片笼内已存在此玻璃id",

  "Production queue":"上片队列",

  "Outing Queue":"出片队列",

  "Enter the Aluminum Frame No":"请输入铝框id",

  "Frame No":"铝框id",

  "Glass information corresponding to aluminum frame":"铝框对应的玻璃信息",

@@ -310,6 +310,9 @@
  "Start":"开始",

  "Sequence":"顺序",

  "Position":"位置",

  "Top":"置顶",

  "Up":"上移",

  "Down":"下移",

  "langparameter": {

    "conveyor Velocity(Auto FAST)": "D01-D06 皮带输送自动快速",

    "conveyor Velocity(Auto SLOW)": "D01-D06 皮带输送自动慢速",


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

@@ -199,6 +199,10 @@
    font-size: 25px;

}



@media screen and (min-width: 1900px) { 
    .blocks{transform: scale(1.5,1.05);width: 1210px;}

} 


.el-message-box__btns {

    padding: 0px 15px 0;

    text-align: right;

@@ -315,7 +319,7 @@
                <div class="blocks-img2"></div>

                <div class="blocks-img3"></div>

                <el-button class="orderbutton1" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</el-button>

                <el-button class="orderbutton2" type="primary" @click="showform6()">{{ $t('Production queue') }}</el-button>

                <el-button class="orderbutton2" type="primary" @click="showform6()">{{ $t('Outing Queue') }}</el-button>



                <!-- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">

                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"

@@ -419,14 +423,14 @@
            <el-button type="primary" @click="showcageinfo(1)">{{ $t('Query') }}</el-button>

            <el-table :data="cageinfo.slice((currentPages - 1) * pagesizes, currentPages * pagesizes)" :height="700" border

                style="width: 100%;overflow: auto;">

                <el-table-column :width="90" prop="cage" :label="$t('Cage No')"></el-table-column>

                <el-table-column :width="90" prop="cell" :label="$t('Slot No')"></el-table-column>

                <el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>

                <el-table-column :width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>

                <el-table-column :width="100" prop="orderId" :label="$t('Order No')"></el-table-column>

                <el-table-column :width="80" prop="listId" :label="$t('List No')"></el-table-column>

                <el-table-column :width="100" prop="boxId" :label="$t('Box No')"></el-table-column>

                <el-table-column :width="100" prop="state" :label="$t('State')">

                <el-table-column :min-width="50" prop="cage" :label="$t('Cage No')"></el-table-column>

                <el-table-column :min-width="50" prop="cell" :label="$t('Slot No')"></el-table-column>

                <el-table-column :min-width="55" prop="tier" :label="$t('The Side')"></el-table-column>

                <el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>

                <el-table-column :min-width="100" prop="orderId" :label="$t('Order No')"></el-table-column>

                <el-table-column :min-width="80" prop="listId" :label="$t('List No')"></el-table-column>

                <el-table-column :min-width="100" prop="boxId" :label="$t('Box No')"></el-table-column>

                <el-table-column :min-width="90" prop="state" :label="$t('State')">

                    <template slot-scope='scope'>

                        {{

                            scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?

@@ -434,12 +438,12 @@
                        }}

                    </template>

                </el-table-column>

                <el-table-column :width="150" prop="lengthWidth" :label="$t('Dim')">

                <el-table-column :min-width="150" prop="lengthWidth" :label="$t('Dim')">

                    <template slot-scope='scope'>

                        {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{ scope.row.glassHeightMm }}

                    </template>

                </el-table-column>

                <el-table-column :width="280" :label="$t('Operate')">

                <el-table-column :min-width="250" :label="$t('Operate')">

                    <template slot-scope='scope'>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</el-button>

@@ -614,11 +618,9 @@
            </template>

        </el-dialog>



        <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Production queue')" top="5vh">

            <!-- <el-button type="primary" @click="showform7()">{{ $t('Increase') }}</el-button> -->

        <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Outing Queue')" top="5vh">

            <el-button type="primary" @click="isAllowQueueState()">{{ this.isAllowQueue == true ? $t('Start') : $t('Stop')

            }}</el-button>



            <el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border

                style="width: 100%;overflow: auto;">

                <el-table-column prop="glassId" :label="$t('Barcode')"></el-table-column>

@@ -637,16 +639,17 @@
                <el-table-column prop="barcode" :label="$t('Frame No')"></el-table-column>

                <el-table-column :width="280" :label="$t('Operate')">

                    <template slot-scope='scope'>

                        <el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)"

                        <el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)" style="font-size: 15px;"

                            :disabled="(scope.$index == 0 || isAllowQueue == true || scope.row.state == 1)">

                            置顶

                            {{$t('Top')}}

                        </el-button>

                        <el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)"

                        <el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)" style="font-size: 15px;"

                            :disabled="(scope.$index == 0 || isAllowQueue == true || scope.row.state == 1)">

                            上移

                            {{$t('Up')}}

                        </el-button>

                        <el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)"

                            :disabled="(OutSlice.length - 1 == scope.$index || isAllowQueue == true || scope.row.state == 1)">下移

                        <el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)" style="font-size: 15px;"

                            :disabled="(OutSlice.length - 1 == scope.$index || isAllowQueue == true || scope.row.state == 1)">

                            {{$t('Down')}}

                        </el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="isAllowQueue"

                            @click="deleteproductionqueueglass(scope.row.barcode)">{{ $t('Delete') }}</el-button>

@@ -671,9 +674,7 @@
                <el-table-column prop="storageCage.cage" :label="$t('Cage No')"></el-table-column>

                <el-table-column prop="storageCage.cell" :label="$t('Slot No')"></el-table-column>

                <el-table-column prop="storageCage.tier" :label="$t('The Side')"></el-table-column>



                <el-table-column prop="FrameNo" :label="$t('Frame No')"></el-table-column>



                <el-table-column prop="Flip" :label="$t('Flip')"></el-table-column>

                <el-table-column prop="out_slice.state" :label="$t('In the queue')">

                    <template slot-scope='scope'>

@@ -795,7 +796,7 @@
                console.log("您的浏览器不支持WebSocket");

            } else {

                //console.log("您的浏览器支持WebSocket");

                let socketUrl = "ws://" + this.$t('ip')+":8888" + "/springboot-vue3/api/talk/" + viewname;

                let socketUrl = "ws://" + this.$t('ip') + ":8888" + "/springboot-vue3/api/talk/" + viewname;

                if (socket != null) {

                    socket.close();

                    socket = null;

@@ -833,41 +834,39 @@
                    if (this.isAllowQueue == true) {

                        this.OutSlice = obj.listoutslice[0];

                    }

                    //获取上片位玻璃信息

                    this.loadglassheight = obj.loadglassheight;

                    if (obj.zhuangtai != null) {

                        this.zhuangtai = obj.zhuangtai[0];

                    }

                    // if (this.dialogFormVisible7 == true) {

                    //     this.showform7();

                    // } else {

                    //     if (obj.FrameNo != null && obj.FrameNo != "") {

                    //         this.framebarcode = obj.FrameNo[0];

                    //         this.showform7();

                    //         this.addoutslice();

                    //     }

                    // }

                    //上片位玻璃信息

                    if (obj.form2 != null && obj.form2 != "") {

                        this.form2 = obj.form2[0];

                    } else {

                        this.form2 = {};

                    }

                    
                    //是否需要手动确认上片

                    this.isConfirm = obj.isConfirm[0];

                    //扫码位玻璃信息

                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {

                        this.form3 = obj.form3[0];

                    } else {

                        this.form3 = {};

                    }

                    this.isConfirm = obj.isConfirm[0];

                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {

                        this.form5 = obj.form3[0];

                        this.showform3();

                        this.Sizerange(this.form5);

                        this.Sizerange(this.form5, 3);



                    } else {

                        this.Sizerange(this.form5);

                        this.Sizerange(this.form5, 3);

                    }

                    //数据库连接是否正常

                    if (obj.dbconnected == "false") {

                        this.text = this.$t('DataBase Connection failed');

                    }

                    //理片笼玻璃信息

                    if (this.dialogFormVisible3 == true) {

                        SelectCageInfo(this.cageglassid).then(res => {

                            this.cageinfo = res.data.cageinfo;

@@ -893,7 +892,8 @@
            home().then(res => {

                this.tableData = res.data.list;

            });

            SelectCageInfo(1).then(res => {

            //加载理片笼玻璃信息

            SelectCageInfo("").then(res => {

                this.cageinfo = res.data.cageinfo;

                this.currentPages = 1;

            });

@@ -1019,62 +1019,58 @@
        },

        //获取扫码位和上片位数据

        SelectGlassByGlassIDs(parameter) {



            this.showform3();

            if (parameter == 1) {

                SelectGlassByGlassID(this.glassid2).then(res => {

                    if (res.data.form != null) {

                        this.form4 = res.data.form;

                        this.$message.success(this.$t('query was successful'));

                        this.Sizerange(this.form4);

                        if (res.data.form.glassId != null) {

                            this.form4 = res.data.form;

                            this.$message.success(this.$t('query was successful'));

                            this.Sizerange(this.form4, 2);

                        } else {

                            this.$message.error(this.$t('There is no such glass'));

                        }



                    } else {

                        this.$message.error(this.$t('There is no such glass'));

                    }

                    if (this.form4.length > 0) {

                        if (this.form4.glassId == "") {

                            this.disabled = false;

                        } else {

                            this.disabled = true;

                        }

                    }



                });

            } else {

                SelectGlassByGlassID(this.glassid1).then(res => {

                    if (res.data.form != null) {

                        this.form5 = res.data.form;

                        this.$message.success(this.$t('query was successful'));

                        this.Sizerange(this.form5);

                        if (res.data.form.glassId != null) {

                            this.form5 = res.data.form;

                            this.$message.success(this.$t('query was successful'));

                            this.Sizerange(this.form5, 1);

                        } else {

                            this.$message.error(this.$t('There is no such glass'));

                        }

                    } else {

                        this.$message.error(this.$t('There is no such glass'));

                    }

                    if (this.form5.length > 0) {

                        if (this.form5.glassId == "") {

                            this.disabled = false;

                        } else {

                            this.disabled = true;

                        }

                    }



                });

            }



        },

        //查询客户玻璃信息

        selectglassinfo() {

            SelectGlass(this.orderid).then(res => {

                this.currentPage = 1;

                this.GlassInfo = res.data.glass;

            });

        },

        //显示客户玻璃信息

        showform2() {

            SelectGlass(this.orderid).then(res => {

                this.GlassInfo = res.data.glass;

            });

            this.dialogFormVisible4 = true;

        },

        //显示出片队列

        showform6() {

            this.dialogFormVisible6 = true;

        },

        //显示铝框对应玻璃信息

        showform7() {

            //查询铝框id对应玻璃信息

            SelectAluminumFrameInfoById(this.framebarcode).then(res => {

@@ -1111,6 +1107,7 @@
            this.dialogFormVisible1 = false;

            this.form1 = {};

        },

        //取消操作时关闭页面

        cancel3() {

            this.dialogFormVisible5 = false;

            this.form1 = {};

@@ -1144,7 +1141,6 @@
        showcageinfo(cage) {

            cage = this.cageglassid;

            SelectCageInfo(cage).then(res => {



                this.cageinfo = res.data.cageinfo;

                this.currentPages = 1;

                this.dialogFormVisible3 = true;

@@ -1282,8 +1278,6 @@
                    message: this.$t('Operation canceled')

                });

            });

        }, handleEdit(index, row) {

            console.log(index, row);

        },

        //表格删除

        handleDelete(index, row) {

@@ -1363,9 +1357,11 @@
                }

            });

        },

        //铝框对应玻璃信息添加铝框id和是否添加到队列

        CheckBoxchange(glassid, isChecked) {

            this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })

        },

        //添加到出片队列

        addoutslice() {

            var dats_ = new Array();

            this.AluminumFrame.forEach(item => {

@@ -1383,7 +1379,9 @@
                    this.$message.success(this.$t('Operation successful'));

                }

            });

        }, getTopMove(row, index) {

        }, 
        //置顶

        getTopMove(row, index) {

            let Sequence = [];

            this.OutSlice.forEach(item => {

                Sequence.push(item.sequence);

@@ -1485,6 +1483,7 @@
            }

            this.UpdateSequence(Sequence);

        },

        //修改顺序

        UpdateSequence(Sequence) {

            let i = 0;

            this.OutSlice.forEach(item => {

@@ -1509,16 +1508,6 @@
            });

        }

        ,

        arraySpanMethod({ row, column, rowIndex, columnIndex }) {

            console.log(row, column);

            if (rowIndex % 2 === 0) {

                if (columnIndex === 0) {

                    return [1, 2];

                } else if (columnIndex === 1) {

                    return [0, 0];

                }

            }

        },

        //合并行

        objectSpanMethod({ row, column, rowIndex, columnIndex }) {

            // console.log(row, column, "ss");

@@ -1533,7 +1522,7 @@
            if (rowIndex != 0) {

                barcode2 = arrOutSlice[rowIndex - 1].barcode;

            }

            if (columnIndex === 9) {

            if (columnIndex === 10) {

                if (barcode != barcode2) {

                    // this.FrameNoFlag = barcode;

                    for (let i = rowIndex; i < this.OutSlice.length; i++) {

@@ -1558,46 +1547,40 @@
            }

        },

        //判断玻璃是否超出范围

        Sizerange(Glass) {

        Sizerange(Glass, position) {

            if ((Glass.glassheight < 380 || Glass.glasswidth < 390 || Glass.glassheight > 1810 || Glass.glasswidth > 2760) || (Glass.glassheight < 390 || Glass.glasswidth < 380 || Glass.glassheight > 2760 || Glass.glasswidth > 1810)) {

                // if (this.disabled == false) {

                this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {

                    confirmButtonText: this.$t('Yes'),

                    type: 'info',

                    callback: (action) => {

                        this.$message({

                            type: 'info',

                            message: `action: ${ action }`

                        }).then(

                            this.DeleteBarcodeGlass()

                        );

                    }

                });

                if (position == 1 || position == 3) {

                    this.disabled1 = true;

                } else {

                    this.disabled = true;

                    // this.$message.error(this.$t('The glass size is not within the range'));

                    this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {

                        confirmButtonText: this.$t('Yes'),

                        type:'info',

                        callback: action => {

                            this.$message({

                                type: 'info',

                                action: action

                            }).then(

                                this.DeleteBarcodeGlass()

                            );

                        }

                    });

                // }

                // this.$message(this.$t('The glass size is not within the range'), this.$t('confirm'), {

                //     // confirmwidth: 7000,

                //     // height: 8000,

                //     confirmButtonText: this.$t('Yes'),

                //     type: 'info'

                // }).then(() => {

                //     this.$message.success(this.$t('Operation successful'));

                // }).catch(() => {

                //     this.$message({

                //         type: 'warning',

                //         message: this.$t('Operation canceled')

                //     });

                // });

            // }

            this.disabled1 = true;

        } else {

            this.disabled1 = false;

                }

            } else {

                if (position == 1 || position == 3) {

                    this.disabled1 = false;

                } else {

                    this.disabled = false;

                }

                if (position == 3&&this.isConfirmState==true) {

                    this.InsertQueueGlass(1);

                }

            }

        },

        //清空待确认玻璃信息

        DeleteBarcodeGlass() {

            this.form5 = {};

        }

    },

    DeleteBarcodeGlass(){

        this.form5={};

    }

}

}

</script>

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

@@ -92,7 +92,7 @@
            // 伍 获取进是否有待确认的玻璃id
            String queid = spianMapper.Selectqueueid();
            int state = spianMapper.Selectqueuestate();
            jsonObject.append("queid", queid);
            jsonObject.append("state", queid);
            jsonObject.append("state", state);
            // 获取扫码位与上片位玻璃信息
            Queue form2 = homeMapper.GetQueueInfo(2);

 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

@@ -17,28 +17,29 @@
    //
    System.out.println("启动完成");

    new PlcHold().start();
//
    // new PlcHold().start();
    //
    //
    
    new Plchome().start();
//    //
     new PlcParameter().start();
     //
     // new Plcalarm().start();
     //
     new Plcsign().start();
     //
     new Plcaction().start();
     new Plcstate().start();
     new PlcPositioning1().start();
     new PlcPositioning2().start();
    new PlcParameter2().start();
     new PlcParameter1().start();
     new PLCAutomaticParameterSetting().start();
    
    //  new PlcParameter().start();
    //  //
    //  // new Plcalarm().start();
    //  //
    //  new Plcsign().start();
    //  //
    //  new Plcaction().start();
    //  new Plcstate().start();
    //  new PlcPositioning1().start();
    //  new PlcPositioning2().start();
    //  new PlcParameter2().start();
    //  new PlcParameter1().start();
    //  new PLCAutomaticParameterSetting().start();

     new PlcManualonePosition().start();
     new PlcManualonePosition2().start();
     new PlcServoManualone().start();
     new PLCManualJog().start();
    //  new PlcManualonePosition().start();
    //  new PlcManualonePosition2().start();
    //  new PlcServoManualone().start();
    //  new PLCManualJog().start();
  }
}

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

@@ -1,9 +1,9 @@
package com.example.springboot.entity;

//小车信息表
public class CarPosition {
    public int carid;
    public int start;
    public int end;
    public int carid;//小车id
    public int start;//小车起始位置
    public int end;//小车终点位置

    public void setcarId(Integer carid) {
        this.carid = carid;

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

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

//玻璃信息表
public class Glass {
  private Integer id;
  private Integer id;//自增id
  private String orderId;//订单id
  private double width;//宽度
  private double height;//高度

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

@@ -1,12 +1,12 @@
package com.example.springboot.entity;

import java.sql.Date;

//按订单出片表
public class OrderOut {
    private Integer id;
    private Integer id;//自增id
    private String orderid;//订单id
    private Integer state;//状态
    private Date modtime;
    private Date modtime;//修改时间

    public Integer id() {
        return id;

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

@@ -1,15 +1,16 @@
package com.example.springboot.entity;

//出片队列表
public class Out_slice {
    private int id;
    private String glassId;
    private String barcode;
    private double glasswidth;
    private double glassheight;
    private int state;
    private String time;
    private int sequence;
    private String position;
    private int id;//自增id
    private String glassId;//玻璃id
    private String barcode;//铝框id
    private double glasswidth;//玻璃宽
    private double glassheight;//玻璃高
    private int state;//出片状态
    private int flip;//是否翻转
    private String time;//修改时间
    private int sequence;//出片顺序
    private String position;//玻璃摆放位置

    public String getPosition() {
        return position;
@@ -52,6 +53,14 @@
        this.time = time;
    }

    public int getFlip() {
        return flip;
    }

    public void setFlip(int flip) {
        this.flip = flip;
    }

    public int getID() {
        return id;
    }

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

@@ -1,18 +1,18 @@
package com.example.springboot.entity;

//上片队列表
public class Queue {
    private int id;
    private String glassId;
    private String orderId;
    private String listId;
    private String boxId;
    private double glasswidth;
    private double glassheight;
    private double glasswidthmm;
    private double glassheightmm;
    private int type;
    private int state;
    private String time;
    private int id;//自增id
    private String glassId;//玻璃id
    private String orderId;//订单id
    private String listId;//列表id
    private String boxId;//箱子id
    private double glasswidth;//玻璃宽
    private double glassheight;//玻璃高
    private double glasswidthmm;//玻璃宽英制
    private double glassheightmm;//玻璃高英制
    private int type;//类型
    private int state;//状态
    private String time;//修改时间

    public int getid() {
        return id;

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

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

//理片笼表
public class StorageCage {
    private Integer id; //自序id
    private Integer prcId;//plcid

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

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

//出片任务表
public class StorageTask{
    private Integer id;//自序
    private String taskType;//类型

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

@@ -1,14 +1,13 @@
package com.example.springboot.entity;

import java.util.Date;

//报警信息表
public class alarmmg {
  private Integer id;
  private String content;
  private Date timeon;
  private Date endTime;

  private String timeons;
  private Integer id;//自增id
  private String content;//报警内容
  private Date timeon;//报警时间
  private Date endTime;//报警结束时间
  private String timeons;//报警时间，非时间戳类型

  // 自增id
  public void setid(Integer id) {

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

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

//客户玻璃信息表
public class north_glass_buffer1 {
    private Integer id; //自增id
    private String ordernumber;//订单id
@@ -15,7 +15,7 @@
    private String glassinside;//
    private String glassbetween;//
    private String itemtype;//
    private String slotnumber;//
    private String slotnumber;//格子
    private String datemodified;//
    private String datecreated;//
    private String FrameBarcode;//铝框id