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

wu

2023-11-30 0ece3ba8c92df0438af52b8de6b9225d8ada4103

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

@@ -215,14 +215,13 @@
                    <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="north_glass_buffer1s.ordernumber"

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

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

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

                    <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box 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')">

                        <template slot-scope='scope'>

                            {{ scope.row.north_glass_buffer1s.glasslength }}*{{ scope.row.north_glass_buffer1s.glassheight

                            }}

                            {{ scope.row.glasswidthmm }}*1{{ scope.row.glassheightmm }}

                        </template>

                    </el-table-column>

                    <el-table-column :label="$t('Terminate Task')">

@@ -237,14 +236,13 @@
                    <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="north_glass_buffer1s.ordernumber"

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

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

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

                    <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box 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')">

                        <template slot-scope='scope'>

                            {{ scope.row.north_glass_buffer1s.glasslength }}*{{ scope.row.north_glass_buffer1s.glassheight

                            }}

                            {{ scope.row.glasswidthmm }}*1{{ scope.row.glassheightmm }}

                        </template>

                    </el-table-column>



@@ -336,28 +334,28 @@
                    <el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>

                </el-form-item>

                <el-form-item :label="$t('Barcode')">

                    <el-input v-model="form.barcode" readonly autocomplete="off" />

                    <el-input v-model="form.glassId" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('Order No')">

                    <el-input v-model="form.ordernumber" readonly autocomplete="off" />

                    <el-input v-model="form.orderId" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('List No')">

                    <el-input v-model="form.listnumber" readonly autocomplete="off" />

                    <el-input v-model="form.listId" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('Box No')">

                    <el-input v-model="form.boxnumber" readonly autocomplete="off" />

                    <el-input v-model="form.boxId" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('Length')">

                    <el-input v-model="form.glasslength" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('Width')">

                    <el-input v-model="form.glassheight" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('Length')">

                    <el-input v-model="form.glasslengthmm" readonly autocomplete="off" />

                    <el-input v-model="form.glasswidthmm" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('Width')">

                    <el-input v-model="form.glassheightmm" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('Length')">

                    <el-input v-model="form.glasswidth" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('Width')">

                    <el-input v-model="form.glassheight" readonly autocomplete="off" />

                </el-form-item>



            </el-form>

@@ -407,20 +405,29 @@
                <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="north_glass_buffer1s.listnumber"

                <el-table-column :width="80" prop="listId"

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

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

                <el-table-column :width="150" prop="lengthWidth" :label="$t('Dim')"></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'):"" }}

                    </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 }}

                    </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;"

                        <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;"

                        <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>

@@ -465,106 +472,106 @@
                    <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)" :disabled="disabled">{{ $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)" :disabled="disabled">{{ $t('Query')

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

                        }}</el-button>

                    </el-form-item>

                </div>

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

                    <el-form-item :label="$t('Barcode')">

                        <el-input v-model="form2.barcode" readonly autocomplete="off" />

                        <el-input v-model="form2.glassId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Barcode')">

                        <el-input v-model="form4.barcode" readonly autocomplete="off" />

                        <el-input v-model="form4.glassId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Barcode')">

                        <el-input v-model="form3.barcode" readonly autocomplete="off" />

                        <el-input v-model="form3.glassId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Barcode')">

                        <el-input v-model="form5.barcode" readonly autocomplete="off" />

                        <el-input v-model="form5.glassId" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

                    <el-form-item :label="$t('Order No')">

                        <el-input v-model="form2.ordernumber" readonly autocomplete="off" />

                        <el-input v-model="form2.orderId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Order No')">

                        <el-input v-model="form4.ordernumber" readonly autocomplete="off" />

                        <el-input v-model="form4.orderId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Order No')">

                        <el-input v-model="form3.ordernumber" readonly autocomplete="off" />

                        <el-input v-model="form3.orderId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Order No')">

                        <el-input v-model="form5.ordernumber" readonly autocomplete="off" />

                        <el-input v-model="form5.orderId" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

                    <el-form-item :label="$t('List No')">

                        <el-input v-model="form2.listnumber" readonly autocomplete="off" />

                        <el-input v-model="form2.listId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('List No')">

                        <el-input v-model="form4.listnumber" readonly autocomplete="off" />

                        <el-input v-model="form4.listId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('List No')">

                        <el-input v-model="form3.listnumber" readonly autocomplete="off" />

                        <el-input v-model="form3.listId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('List No')">

                        <el-input v-model="form5.listnumber" readonly autocomplete="off" />

                        <el-input v-model="form5.listId" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

                    <el-form-item :label="$t('Box No')">

                        <el-input v-model="form2.boxnumber" readonly autocomplete="off" />

                        <el-input v-model="form2.boxId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Box No')">

                        <el-input v-model="form4.boxnumber" readonly autocomplete="off" />

                        <el-input v-model="form4.boxId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Box No')">

                        <el-input v-model="form3.boxnumber" readonly autocomplete="off" />

                        <el-input v-model="form3.boxId" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Box No')">

                        <el-input v-model="form5.boxnumber" readonly autocomplete="off" />

                        <el-input v-model="form5.boxId" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

                    <el-form-item :label="$t('Length')">

                        <el-input v-model="form2.glasslength" readonly autocomplete="off" />

                        <el-input v-model="form2.glasswidthmm" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Length')">

                        <el-input v-model="form4.glasslength" readonly autocomplete="off" />

                        <el-input v-model="form4.glasswidthmm" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Length')">

                        <el-input v-model="form3.glasslength" readonly autocomplete="off" />

                        <el-input v-model="form3.glasswidthmm" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Length')">

                        <el-input v-model="form5.glasslength" readonly autocomplete="off" />

                        <el-input v-model="form5.glasswidthmm" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

                    <el-form-item :label="$t('Width')">

                        <el-input v-model="form2.glassheight" readonly autocomplete="off" />

                        <el-input v-model="form2.glassheightmm" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Width')">

                        <el-input v-model="form4.glassheight" readonly autocomplete="off" />

                        <el-input v-model="form4.glassheightmm" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Width')">

                        <el-input v-model="form3.glassheight" readonly autocomplete="off" />

                        <el-input v-model="form3.glassheightmm" readonly autocomplete="off" />

                    </el-form-item>

                    <el-form-item :label="$t('Width')">

                        <el-input v-model="form5.glassheight" readonly autocomplete="off" />

                        <el-input v-model="form5.glassheightmm" readonly autocomplete="off" />

                    </el-form-item>

                </div>

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

                    <el-button @click="DeleteQueueGlasss(2)" type="primary" :disabled="disabled">{{ $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" :disabled="disabled">{{ $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>

@@ -579,14 +586,16 @@


        <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-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="north_glass_buffer1s.ordernumber" :label="$t('Order No')"></el-table-column>

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

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

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

                <el-table-column prop="north_glass_buffer1s.glasslength" :label="$t('Length')"></el-table-column>

                <el-table-column prop="north_glass_buffer1s.glassheight" :label="$t('Width')"></el-table-column>

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

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

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

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

                <el-table-column prop="storageCage.glasswidthmm" :label="$t('Length')"></el-table-column>

                <el-table-column prop="storageCage.glassheightmm" :label="$t('Width')"></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)"

@@ -651,9 +660,9 @@
<script>



import {

    home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,

    home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,

    SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,

    SelectAluminumFrameInfoById, SelectProductionqueue, DeleteProductionQueueGlass, AddOutSliceS

    SelectAluminumFrameInfoById, SelectProductionqueue, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues

} from "../../api/home";





@@ -724,7 +733,8 @@
            pageCount: 0,

            OutSlice: [],

            AluminumFrame: [],

            framebarcode: ""

            framebarcode: "",

            isAllowQueue:true

        };

    },

    created() {

@@ -768,6 +778,8 @@
                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];



                    this.isAllowQueue=obj.isAllowQueue;

                    console.log(obj);

                    //出片队列

                    this.OutSlice = obj.listoutslice[0];

                    this.loadglassheight = obj.loadglassheight;

@@ -791,7 +803,7 @@
                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {

                        this.form5 = obj.form3[0];

                        this.showform3();

                        if (this.form5.glassheightmm < 380 || this.form5.glasslengthmm < 390 || this.form5.glassheightmm > 1810 || this.form5.glasslengthmm > 2760) {

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

                            if (this.disabled1 == false) {

                                this.disabled1 = true;

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

@@ -800,7 +812,7 @@
                            this.disabled1 = false;

                        }

                    } else {

                        if (this.form5.glassheightmm < 380 || this.form5.glasslengthmm < 390 || this.form5.glassheightmm > 1810 || this.form5.glasslengthmm > 2760) {

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

                            if (this.disabled1 == false) {

                                this.disabled1 = true;

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

@@ -817,9 +829,6 @@
                            this.cageinfo = res.data.cageinfo;

                        });

                    }

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

                        this.GlassInfo = res.data.glass;

                    });



                    this.$forceUpdate();



@@ -846,14 +855,14 @@
                this.cagelist3 = res.data.list3;

                this.cagelist4 = res.data.list4;

            });

            //加载进片任务数据

            loadtask(this.task1).then(res => {

                this.tasklist1 = res.data.list;

            });

            //加载进出片任务数据

            loadtask(this.task2).then(res => {

                this.tasklist2 = res.data.list;

            });

            // //加载进片任务数据

            // loadtask(this.task1).then(res => {

            //     this.tasklist1 = res.data.list;

            // });

            // //加载进出片任务数据

            // loadtask(this.task2).then(res => {

            //     this.tasklist2 = res.data.list;

            // });

            //加载报警信息

            SelectAlarmmgInfo().then(res => {

                this.alarm = res.data.alarmmg;

@@ -937,6 +946,7 @@
            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 {

@@ -967,6 +977,14 @@
                    if (res.data.form != null) {

                        this.form4 = res.data.form;

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

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

                            if (this.disabled == false) {

                                this.disabled = true;

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

                            }

                        } else {

                            this.disabled = false;

                        }

                    } else {

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

                    }

@@ -984,13 +1002,12 @@
                    if (res.data.form != null) {

                        this.form5 = res.data.form;

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

                        if (this.form5.glassheightmm < 380 || this.form5.glasslengthmm < 390 || this.form5.glassheightmm > 1810 || this.form5.glasslengthmm > 2760) {

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

                            if (this.disabled1 == false) {

                                this.disabled1 = true;

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

                            }

                        } else {

                            alert(1);

                            this.disabled1 = false;

                        }

                    } else {

@@ -1138,11 +1155,8 @@
                            if (res.data.message3 == 200) {

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

                            }

                            else if (res.data.message2 == 300) {

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

                            }

                            else if (res.data.message2 == 500) {

                                this.$message.error(this.$t('This glass is already in the cage'));

                                this.$message.error(this.$t('This glass is already in the Queue'));

                            }

                        });

                    } else {

@@ -1245,9 +1259,9 @@
        },

        //手动添加扫码位玻璃

        InsertQueueGlass(parameter) {

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

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

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

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

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

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

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

                            this.form5 = {};

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

@@ -1258,9 +1272,9 @@
                } else {

                    this.$message.error(this.$t('The glass ID already exists in the loading queue'));

                }

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

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

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

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

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

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

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

                            this.form4 = {};

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

@@ -1335,6 +1349,14 @@
        getDownMove(row, index) {

            let arr = this.OutSlice;

            arr.splice(index, 1, ...arr.splice(index + 1, 1, arr[index]));

        },

        //切换出片队列状态

        isAllowQueueState(){

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

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

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

                }

            })

        }

    }

}