更新主界面

ZengTao

2023-11-30 536ba9c36bc53201cfbafb7a1063f119a2ee3a1d

更新主界面

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

@@ -309,6 +309,7 @@
  "Normal":"Normal",

  "Entering":"Entering",

  "Outing":"Outing",

  "Suspend":"Suspend"



  "Suspend":"Suspend",

  "Stop":"Stop",

  "Start":"Start"

}

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

@@ -305,6 +305,8 @@
  "Entering":"正在进",

  "Outing":"正在出",

  "Suspend":"暂停",

  "Stop":"停止",

  "Start":"开始",

  "langparameter": {

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

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


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

@@ -215,8 +215,7 @@
                    <el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>

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

                    <el-table-column :width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>

                    <el-table-column :width="130" prop="orderId"

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

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

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

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

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

@@ -236,8 +235,7 @@
                    <el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>

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

                    <el-table-column :width="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>

                    <el-table-column :width="130" prop="orderId"

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

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

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

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

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

@@ -405,29 +403,32 @@
                <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="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')">

                    <template slot-scope='scope'>

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

                        {{

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

                        }}

                    </template>

                </el-table-column>

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

                    <template slot-scope='scope'>

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

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

                    </template>

                </el-table-column>

                <el-table-column :width="280" :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>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.state==1?false:true"

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

                            :disabled="scope.row.state == 1 ? false : true"

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

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

                            @click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">

                            {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.glassId!=null?true:false"

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

                            :disabled="scope.row.glassId != null ? true : false"

                            @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Increase')

                            }}</el-button>

                    </template>

@@ -472,13 +473,13 @@
                    <el-form-item>

                        <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"

                            v-model="glassid2"></el-input>

                        <el-button type="primary" @click="SelectGlassByGlassIDs(1)" >{{ $t('Query')

                        <el-button type="primary" @click="SelectGlassByGlassIDs(1)">{{ $t('Query')

                        }}</el-button>

                    </el-form-item>

                    <el-form-item>

                        <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"

                            v-model="glassid1"></el-input>

                        <el-button type="primary" @click="SelectGlassByGlassIDs(2)" >{{ $t('Query')

                        <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Query')

                        }}</el-button>

                    </el-form-item>

                </div>

@@ -567,11 +568,11 @@
                    </el-form-item>

                </div>

                <div style="display: flex;justify-content: space-around;">

                    <el-button @click="DeleteQueueGlasss(2)" type="primary" >{{ $t('Clear Current')

                    <el-button @click="DeleteQueueGlasss(2)" type="primary">{{ $t('Clear Current')

                    }}</el-button>

                    <el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled">

                        {{ $t('Confirm Modification') }}</el-button>

                    <el-button @click="DeleteQueueGlasss(1)" type="primary" >{{ $t('Clear Current')

                    <el-button @click="DeleteQueueGlasss(1)" type="primary">{{ $t('Clear Current')

                    }}</el-button>

                    <el-button @click="InsertQueueGlass(1)" type="primary" :disabled="disabled1">

                        {{ $t('Confirm Modification') }}</el-button>

@@ -586,8 +587,9 @@


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

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

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

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

            }}</el-button>



            <el-table :data="this.OutSlice" :height="700" border style="width: 100%;overflow: auto;">

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

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

@@ -734,7 +736,7 @@
            OutSlice: [],

            AluminumFrame: [],

            framebarcode: "",

            isAllowQueue:true

            isAllowQueue: true

        };

    },

    created() {

@@ -778,8 +780,7 @@
                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];



                    this.isAllowQueue=obj.isAllowQueue;

                    console.log(obj);

                    this.isAllowQueue = obj.isAllowQueue;

                    //出片队列

                    this.OutSlice = obj.listoutslice[0];

                    this.loadglassheight = obj.loadglassheight;

@@ -946,7 +947,6 @@
            SelectGlassByGlassID(this.glassid).then(res => {

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

                    this.form = res.data.form;

                    console.log(this.form);

                    this.dialogFormVisible = true;

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

                } else {

@@ -1046,6 +1046,11 @@
        showform7() {

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

                this.AluminumFrame = res.data.listAluminumFrame;

                this.AluminumFrame.sort(function (x, y) {

                    if(x['storageCage']!=null&&y['storageCage']!=null){

                        return y['storageCage']['tier'] - x['storageCage']['tier'];

                    }

                });

                this.AluminumFrame.forEach(item => {

                    if (item.storageCage != null && item.out_slice == null) {

                        item.isCheck = true;

@@ -1261,7 +1266,7 @@
        InsertQueueGlass(parameter) {

            if (parameter == 1 && this.form5.glassId != "") {

                if (this.form5.glassId != this.form2.glassId) {

                    InsertQueueGlassId(1,this.form5).then(res => {

                    InsertQueueGlassId(1, this.form5).then(res => {

                        if (res.data.message == 200) {

                            this.form5 = {};

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

@@ -1274,7 +1279,7 @@
                }

            } else if (parameter == 2 && this.form4.glassId != "") {

                if (this.form4.glassId != this.form3.glassId) {

                    InsertQueueGlassId(2,this.form4).then(res => {

                    InsertQueueGlassId(2, this.form4).then(res => {

                        if (res.data.message == 200) {

                            this.form4 = {};

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

@@ -1351,8 +1356,8 @@
            arr.splice(index, 1, ...arr.splice(index + 1, 1, arr[index]));

        },

        //切换出片队列状态

        isAllowQueueState(){

            isAllowQueues(!this.isAllowQueue).then(res=>{

        isAllowQueueState() {

            isAllowQueues(!this.isAllowQueue).then(res => {

                if (res.data.message == 200) {

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

                }


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

@@ -36,15 +36,15 @@

    // new PlcHold().start();

    new Plcaction().start();
    // new Plcaction().start();
    //
    new Plchome().start();
    //
    new PlcParameter().start();
    // //
    // new PlcParameter().start();
    //
    // new Plcalarm().start();
    //
    new Plcsign().start();
    // new Plcsign().start();
    //
    // new Plcstate().start();
    // new PlcPositioning1().start();
@@ -55,6 +55,6 @@
    // new PlcServoManualone().start();
    // new PLCManualJog().start();
    // new PlcManualonePosition().start();
    new PlcManualonePosition2().start();
    // new PlcManualonePosition2().start();
  }
}

 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java

@@ -187,7 +187,6 @@
  // 根据玻璃id查询玻璃信息
  @GetMapping("/SelectGlassByGlassID")
  public Result SelectGlassByGlassID(String glassid) throws SQLException {
    // north_glass_buffer1 north_glass_buffer1s = homeMapper.SelectGlassByGlassID(glassid);
    Queue queue=jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdQueue(glassid, "", "");
    Map<String, Object> map = new HashMap<>();
    if(glassid!=""){
@@ -274,7 +273,7 @@
  // 根据铝框id获取对应玻璃信息
  @PostMapping("/SelectAluminumFrameInfoById")
  public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
    List<north_glass_buffer1> listAluminumFrame = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIds("","",FrameBarcode);
    List<north_glass_buffer1> listAluminumFrame = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdss(FrameBarcode);
    String flip=jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
    for (north_glass_buffer1 north_glass_buffer1 : listAluminumFrame) {
      north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));

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

@@ -100,6 +100,9 @@
         return queue;
    }

	

    //根据玻璃id，订单id，铝框id查询客户玻璃信息
    public  List<north_glass_buffer1> SelectGlassByGlassIdOrderIdFrameIds(String glassid,String orderid,String frameid) throws SQLException {
        conn = getConn();
        // north_glass_buffer1 glass=new north_glass_buffer1();
@@ -136,7 +139,42 @@
         return glass;
    }

	
    //根据铝框id查询客户玻璃信息
    public  List<north_glass_buffer1> SelectGlassByGlassIdOrderIdFrameIdss(String frameid) throws SQLException {
        conn = getConn();
        // north_glass_buffer1 glass=new north_glass_buffer1();
        List<north_glass_buffer1> glass=new ArrayList<north_glass_buffer1>();
        String sql = "select * from north_glass_buffer1 where FrameBarcode=?";
         ps = conn.prepareStatement(sql);
         ps.setString(1, frameid);
         rs= ps.executeQuery();
         while (rs.next()) {
            north_glass_buffer1 north_glass_buffer1s=new north_glass_buffer1();

            north_glass_buffer1s.setId(rs.getInt("Id"));
            north_glass_buffer1s.setordernumber(rs.getString("ordernumber"));
            north_glass_buffer1s.setlistnumber(rs.getString("listnumber"));
            north_glass_buffer1s.setboxnumber(rs.getString("boxnumber"));
            north_glass_buffer1s.setbarcode(rs.getString("barcode"));
            north_glass_buffer1s.setglasslength(rs.getDouble("glasslength"));
            north_glass_buffer1s.setglassheight(rs.getDouble("glassheight"));
            north_glass_buffer1s.setglasslengthmm(rs.getDouble("glasslength_mm"));
            north_glass_buffer1s.setglassheightmm(rs.getDouble("glassheight_mm"));
            north_glass_buffer1s.setitemtype(rs.getString("itemtype"));
            north_glass_buffer1s.setslotnumber(rs.getString("slotnumber"));
            north_glass_buffer1s.setdatemodified(rs.getString("datemodified"));
            north_glass_buffer1s.setdatecreated(rs.getString("datecreated"));
            north_glass_buffer1s.setFrameBarcode(rs.getString("FrameBarcode"));


            glass.add(north_glass_buffer1s);
			
         }
        //  conn.close();
         return glass;
    }

    //根据铝框id查询是否翻转
    public String SelectFlipByFrameBarcode(String frameBarcode) throws SQLException {
        conn = getConn();
        // north_glass_buffer1 glass=new north_glass_buffer1();