From 79f0730bd3551cf3e438a94f2bf72f52b6c03091 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 三月 2024 09:36:40 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
Albania_Mes-ui/src/api/home.js | 1
Albania_Mes-ui/src/lang/locales/zh-CN.json | 4
springboot-vue3/src/main/java/com/example/springboot/entity/MeasureSetting.java | 34 +
Albania_Mes-ui/src/views/home/index.vue | 1344 +----------------------------------------------
springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java | 43 +
springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java | 69 ++
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 185 ------
7 files changed, 201 insertions(+), 1,479 deletions(-)
diff --git a/Albania_Mes-ui/src/api/home.js b/Albania_Mes-ui/src/api/home.js
index 04cfd77..8dc939e 100644
--- a/Albania_Mes-ui/src/api/home.js
+++ b/Albania_Mes-ui/src/api/home.js
@@ -293,3 +293,4 @@
data:""
})
}
+
diff --git a/Albania_Mes-ui/src/lang/locales/zh-CN.json b/Albania_Mes-ui/src/lang/locales/zh-CN.json
index e772957..0a48184 100644
--- a/Albania_Mes-ui/src/lang/locales/zh-CN.json
+++ b/Albania_Mes-ui/src/lang/locales/zh-CN.json
@@ -1,4 +1,8 @@
{
+ "Importorder":"瀵煎叆璁㈠崟",
+ "Measure":"娴嬮噺",
+ "StorageCage":"鐞嗙墖绗�",
+ "Taskqueue":"浠诲姟闃熷垪",
"Clear":"娓呴櫎",
"ip":"localhost",
"systemTitle": "鐧诲綍绯荤粺",
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 5b2c12f..7a27ff3 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -250,27 +250,18 @@
</div>
</div>
<div style="display:flex;justify-content: space-around;width: 9zz5%;margin: 0 auto;">
- <!-- <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid1"
- :class="ManuallyInfeedGlass == true ? 'hide' : ''"></el-input> -->
- <el-button type="primary" @click="SelectGlassByGlassIDs()" :disabled="ManuallyInfeedGlass"
- :class="ManuallyInfeedGlass == true ? 'hide' : ''">
- {{ $t('Manually Infeed Glass') }}</el-button>
- <el-button type="primary" @click="showform2()" :disabled="OrderInfo"
- :class="OrderInfo == true ? 'hide' : ''">{{ $t('Order Info')
- }}</el-button>
- <el-button type="primary" @click="showform6()" :disabled="OutingQueue"
- :class="OutingQueue == true ? 'hide' : ''">
- {{ $t('Outing Queue') }}</el-button>
- <el-button type="primary" @click="TaskStop(0)" :disabled="OutingQueue"
- :class="StopTask == true ? 'hide' : ''">
- {{ $t('Terminate Feeding') }}</el-button>
- <el-button type="primary" @click="TaskStop(1)" :disabled="StopTask" :class="StopTask == true ? 'hide' : ''">
- {{ $t('Terminate Outing') }}</el-button>
- <el-button type="primary" @click="SoftEmergencyStop()" :disabled="SoftEmergencyStopState"
+ <el-button type="primary" @click="showform(1)" :disabled="SoftEmergencyStopState"
:class="SoftEmergencyStopState == true ? 'hide' : ''">
- {{ $t('SoftEmergencyStop') }}</el-button>
- <!-- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>
- <el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button> -->
+ {{ $t('Import order') }}</el-button>
+ <el-button type="primary" @click="showform(2)" :disabled="SoftEmergencyStopState"
+ :class="SoftEmergencyStopState == true ? 'hide' : ''">
+ {{ $t('Measure') }}</el-button>
+ <el-button type="primary" @click="showform(2)" :disabled="SoftEmergencyStopState"
+ :class="SoftEmergencyStopState == true ? 'hide' : ''">
+ {{ $t('StorageCage') }}</el-button>
+ <el-button type="primary" @click="showform(2)" :disabled="SoftEmergencyStopState"
+ :class="SoftEmergencyStopState == true ? 'hide' : ''">
+ {{ $t('Task queue') }}</el-button>
</div>
<div>
<el-table :data="this.tasklist1" border style="width: 100%">
@@ -328,7 +319,19 @@
</div>
</div>
</el-main>
- <el-footer>
+ <el-dialog :visible.sync="Importorder" :title="$t('Importorder')"
+ top="5vh">
+ </el-dialog>
+ <el-dialog :visible.sync="Measure" :title="$t('Measure')"
+ top="5vh">
+ </el-dialog>
+ <el-dialog :visible.sync="StorageCage" :title="$t('StorageCage')"
+ top="5vh">
+ </el-dialog>
+ <el-dialog :visible.sync="Taskqueue" :title="$t('Taskqueue')"
+ top="5vh">
+ </el-dialog>
+ <!-- <el-footer>
<div class="blocks" style="position: relative;">
<div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:237px;">
<div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist1" :key="item['date']"
@@ -450,423 +453,16 @@
<el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 10)">
{{ $t('Clear') }}</el-button>
</div>
-
-
</div>
- </el-footer>
- <el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">
- <el-form :model="form" label-width="100px" style="padding-right: 30px">
- <el-form-item :label="$t('Barcode')">
- <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid"></el-input>
- <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.glassId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Order No')">
- <el-input v-model="form.orderId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('List No')">
- <el-input v-model="form.listId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Box No')">
- <el-input v-model="form.boxId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Length')">
- <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>
- <template #footer>
- <span class="dialog-footer">
- <!-- <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"
- type="primary">{{
- $t('confirm') }}</el-button> -->
- <el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"
- type="primary">{{
- $t('confirm') }}</el-button>
- <el-button @click="cancel()">{{ $t('cancel') }}</el-button>
- </span>
- </template>
- </el-dialog>
-
- <el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">
- <el-form :model="form1" label-width="100px" style="padding-right: 30px">
- <el-form-item :label="$t('Order No')">
- <el-input v-model="form1.order" autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Number')">
- <el-input v-model="form1.number" autocomplete="off" />
- </el-form-item>
- </el-form>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
- <el-button @click="cancel1()">{{ $t('cancel') }}</el-button>
- </span>
- </template>
- </el-dialog>
-
- <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
- <el-table :data="this.alarm" border style="width: 100%;font-size: 25px;">
- <el-table-column prop="id" :label="$t('id')"></el-table-column>
- <el-table-column prop="content" :label="$t('content')"></el-table-column>
- <el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
- </el-table>
- </el-dialog>
-
- <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">
- <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="cageglassid"></el-input>
- <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 :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')">
- <template slot-scope='scope'>
- {{
- scope.row.tier == 1 ? $t('Inside') : $t('Outside')
- }}
- </template>
- </el-table-column>
- <el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
- <el-table-column :min-width="80" 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="50" prop="boxId" :label="$t('Box No')"></el-table-column>
- <el-table-column :min-width="80" prop="state" :label="$t('Glass 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 :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 :min-width="80" prop="lengthWidth" :label="$t('State')">
- <template slot-scope='scope'>
- {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}
- </template>
- </el-table-column>
- <el-table-column :min-width="250" :label="$t('Operate')">
- <template slot-scope='scope'>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- :disabled="scope.row.state == 1 ? false : true"
- @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"
- @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('Disable') : $t('Enable') }}</el-button>
- <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('Add')
- }}</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChanges"
- @current-change="handleCurrentChanges" :pager-count="7" :current-page="currentPages"
- :page-sizes="[42, 84, 126, 420]" :page-size="pagesizes" layout="total, sizes, prev, pager, next, jumper"
- :total="cageinfo.length > 0 ? cageinfo.length : null" background style="float: right; margin-top: 20px">
- </el-pagination>
-
- </el-dialog>
-
- <el-dialog :visible.sync="dialogFormVisible4" :title="$t('Order Info')" top="5vh">
- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="orderid"></el-input>
- <el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>
- <el-table :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)
- " :height="700" border style="width: 100%;overflow: auto;">
- <el-table-column prop="barcode" :label="$t('Barcode')"></el-table-column>
- <el-table-column prop="ordernumber" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="listnumber" :label="$t('List No')"></el-table-column>
- <el-table-column prop="boxnumber" :label="$t('Box No')"></el-table-column>
- <el-table-column prop="frameBarcode" :label="$t('Frame No')"></el-table-column>
- <el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>
- <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>
- </el-table>
- <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange" @current-change="handleCurrentChange"
- :pager-count="7" :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pagesize"
- layout="total, sizes, prev, pager, next, jumper" :total="GlassInfo.length > 0 ? GlassInfo.length : null"
- background style="float: right; margin-top: 20px">
- </el-pagination>
- </el-dialog>
- <el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">
- <el-form :model="form" label-width="100px" style="padding-right: 30px">
- <div style="display: flex;justify-content: center;">
- <el-form-item>
- {{ $t('Confirm State') }}:{{ this.isConfirm == true ? $t('Allow') : $t('Not Allow') }}
- <el-button type="primary" @click="isConfirmState()">
- {{ this.isConfirm == true ? $t('Not Allow') : $t('Allow') }}</el-button>
- </el-form-item>
- <el-form-item>
- {{ $t('Current State') }}:{{ this.Scanningmethod == false ? $t('Automatic') : $t('Hand Movement') }}
- <el-button type="primary" @click="SwitchScanMethod()">{{ $t('Switch')
- }}</el-button>
- </el-form-item>
- <el-form-item>
- <el-input style="width:70%;" maxlength="13" :placeholder="$t('Enter the glass barcode')"
- v-model="glassid1"></el-input>
- <el-button type="primary" :disabled="!Scanningmethod" @click="WriteGlassID()">{{ $t('Add')
- }}</el-button>
- </el-form-item>
- <el-form-item>
- {{ $t('Barcode') }}:
- <el-input style="width:70%;" maxlength="14" :disabled="true" v-model="CurrrentGlassId"></el-input>
- </el-form-item>
- </div>
- <div style="display: flex;justify-content: space-around;">
- <label for="">{{ $t('Upper film position') }}</label>
-
- <label for="">{{ $t('Scan Code Point') }}</label>
- </div>
- <div style="display: flex;justify-content: space-around;height: 40px;">
- <label for="">{{ $t('current Information') }}</label>
- <label for="">{{ $t('Modify Information') }}</label>
- <label for="">{{ $t('current Information') }}</label>
- <label for="">{{ $t('Modify Information') }}</label>
- </div>
-
- <div style="display: flex;justify-content: space-around;">
- <el-form-item :label="$t('Barcode')">
- <el-input v-model="form2.glassId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Barcode')">
- <el-input v-model="form4.glassId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Barcode')">
- <el-input v-model="form3.glassId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Barcode')">
- <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.orderId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Order No')">
- <el-input v-model="form4.orderId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Order No')">
- <el-input v-model="form3.orderId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Order No')">
- <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.listId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('List No')">
- <el-input v-model="form4.listId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('List No')">
- <el-input v-model="form3.listId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('List No')">
- <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.boxId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Box No')">
- <el-input v-model="form4.boxId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Box No')">
- <el-input v-model="form3.boxId" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Box No')">
- <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.glasswidthmm" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Length')">
- <el-input v-model="form4.glasswidthmm" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Length')">
- <el-input v-model="form3.glasswidthmm" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Length')">
- <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.glassheightmm" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Width')">
- <el-input v-model="form4.glassheightmm" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Width')">
- <el-input v-model="form3.glassheightmm" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Width')">
- <el-input v-model="form5.glassheightmm" readonly autocomplete="off" />
- </el-form-item>
- </div>
- <div style="display: flex;justify-content: right;">
- <el-button @click="InsertQueueGlass(1)" style="margin-right: 100px;" type="primary"
- :disabled="disabled1">
- {{ $t('Confirm') }}</el-button>
- </div>
- </el-form>
- </el-dialog>
-
- <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Outing Queue')" top="5vh">
- {{ $t('Queue State') }}:
- {{ this.isAllowQueue
- == true ? $t('Start') : $t('Stop')
- }}
- <el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue
- == true ? $t('Stop') : $t('Start')
- }}</el-button>
- <!-- {{ $t('Sorting State') }}:
- {{
- this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
- }}
- <el-button type="primary" @click="isAllowReorderings()" :disabled="this.isAllowQueue">{{
- this.isAllowReordering == true ? $t('Allow') : $t('Not Allow')
- }}</el-button> -->
- <!-- <el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input> -->
- <el-button type="primary" @click="showform7()">{{ $t('Add') }}</el-button>
- <label style="background-color:yellow;font-size: 23px;" for="">
- {{ isQueueWarning == true ? $t('The slot is disabled') : "" }}
- </label>
- <div style="display:flex;">
- <div style="width:70%;">
- <el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border
- :cell-style="cellStyle" style="width: 100%;overflow: auto;font-size: 18px;">
- <el-table-column prop="barcode" :label="$t('Frame No')"></el-table-column>
- <el-table-column :min-width="175" prop="glassId" :label="$t('Barcode')"></el-table-column>
- <el-table-column :min-width="70" prop="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column :min-width="70" prop="listId" :label="$t('List No')"></el-table-column>
- <el-table-column :min-width="70" prop="boxId" :label="$t('Box No')"></el-table-column>
- <el-table-column :min-width="100" prop="glasswidthmm" :label="$t('Length')"></el-table-column>
- <el-table-column :min-width="100" prop="glassheightmm" :label="$t('Width')"></el-table-column>
- <el-table-column :min-width="90" prop="state" :label="$t('Glass State')">
- <template slot-scope='scope'>
- {{ scope.row.state == 0 ? $t('Waiting') : scope.row.state == 1 ? $t('Outing') :
- scope.row.state
- == 2
- ? $t('Outed') : scope.row.state == 3 ? $t('Absent') : $t('Completed') }}
- </template>
- </el-table-column>
- <el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>
- <el-table-column :min-width="90" prop="barcode" :label="$t('Complete')">
- <template slot-scope='scope' style="height:100px;height:100px;">
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- :disabled="!(!isAllowQueue && scope.row.state != 1 && scope.row.state != 2)"
- @click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{
- $t('Complete')
- }}</el-button>
- </template>
- </el-table-column>
-
- <el-table-column :width="100" :label="$t('Operate')">
- <template slot-scope='scope'>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- :disabled="isAllowQueue" @click="deleteproductionqueueglass(scope.row.barcode)">{{
- $t('Delete') }}</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <div style="width:30%;" v-for="(item) in CurrentFrame" :key="item['barcode']">
- <el-button style="margin-left: 42%;" type="primary" @click="FrameStateUpdate(item['barcode'])">{{
- $t('Next') }}</el-button>
- <h1 style="font-size: 40px;text-align: center;">{{ $t('Current Frame') }}:{{ item['barcode'] }}</h1>
- <h1 style="font-size: 30px;text-align: center;">
- {{ item['flip'] == true ? $t('EXTERIQR OUT AND BYPASS TO THE LEFT')
- : $t('EXTERIQR OUT AND BYPASS TO THE RIGHT') }}
- </h1>
- <h1 style="font-size: 30px;text-align: center;">{{ item['framewidthmm'] }}*{{ item['frameheightmm'] }}
- </h1>
-
- <div class="frame" :style="'background-color: green;margin-top:30px;margin:0 auto;width: ' +
- FrameWidthHeight('before', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;height:' +
- FrameWidthHeight('after', item['framewidthmm'], item['frameheightmm'], item['position']) + 'px;'
- ">
- </div>
- </div>
- </div>
-
- </el-dialog>
-
- <el-dialog :visible.sync="dialogFormVisible7" :title="$t('Glass information corresponding to aluminum frame')"
- top="5vh">
- <el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input>
- <el-button type="primary" @click="showform7()">{{ $t('Query') }}</el-button>
- <el-button type="primary" @click="AddOutSliceS()">{{ $t('Add') }}</el-button>
- <el-button type="primary" @click="CloseForm7()">{{ $t('Cancel') }}</el-button>
- <el-table :data="this.AluminumFrame" :height="700" border style="width: 100%;overflow: auto;">
- <el-table-column prop="frameBarcode" :label="$t('Frame No')"></el-table-column>
- <el-table-column prop="barcode" :label="$t('Barcode')"></el-table-column>
- <el-table-column prop="ordernumber" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="listnumber" :label="$t('List No')"></el-table-column>
- <el-table-column prop="boxnumber" :label="$t('Box No')"></el-table-column>
- <el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>
- <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>
- <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')">
- <template slot-scope='scope'>
- {{
- scope.row.storageCage == null ? "" : scope.row.storageCage.tier == 1 ? $t('Inside') : $t('Outside')
- }}
- </template>
- </el-table-column>
-
- <el-table-column prop="out_slice.state" :label="$t('In the queue')">
- <template slot-scope='scope'>
- {{ scope.row.out_slice != null ? $t('Yes') : $t('No') }}
- </template>
- </el-table-column>
-
- <el-table-column prop="storageCage.tier" :label="$t('In the cage')">
- <template slot-scope='scope'>
- {{ scope.row.storageCage != null ? $t('Yes') : $t('No') }}
- </template>
- </el-table-column>
- </el-table>
- </el-dialog>
- <el-dialog :visible.sync="dialogFormCountDown" :title="$t('Approximately resettable time')" top="5vh">
- <div :style="'font-size: ' + PromptSize + 'px;text-align: center;'">
- <!-- {{ this.CountDowns }} -->
- {{ this.CountDowns }}
- </div>
- </el-dialog>
+ </el-footer> -->
</el-container>
</template>
<script>
import {
- home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
- SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,
- SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue,
- isAllowReorderings, FrameStateUpdate, WriteGlassID, ClearGlassId, CloseForm7, TaskStop, SoftEmergencyStop, SwitchScanMethod
+ home, home2, UpdateTask, SelectCageInfo, DeleteByGlassID,
+ SelectPassword, Disabled, AddOutSliceS, SelectPermissionByUserName, currentUsername, CompleteQueue,
+ isAllowReorderings, WriteGlassID, ClearGlassId, CloseForm7, SoftEmergencyStop, SwitchScanMethod
} from "../../api/home";
@@ -886,12 +482,10 @@
dialogFormVisible: false,
dialogFormVisible1: false,
dialogFormVisible2: false,
- dialogFormVisible3: false,
- dialogFormVisible4: false,
- dialogFormVisible5: false,
- dialogFormVisible6: false,
- dialogFormVisible7: false,
- dialogFormCountDown: false,
+ Importorder:false,
+ Measure:false,
+ StorageCage:false,
+ Taskqueue:false,
form: {
orderId: "",
glassId: "",
@@ -977,6 +571,17 @@
}
,
methods: {
+ showform(i){
+ if(i==1){
+ this.Importorder=true;
+ }else if(i==2){
+ this.Measure=true;
+ }else if(i==3){
+ this.StorageCage=true;
+ }else if(i==4){
+ this.Taskqueue=true;
+ }
+ },
init() {
let viewname = "Home";
if (typeof (WebSocket) == "undefined") {
@@ -1015,78 +620,9 @@
this.tasklist1 = obj.tasklist1[0];
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
- //鑾峰彇褰撳墠鎵爜鏂瑰紡
- if (obj.Scanningmethod != null) {
- this.Scanningmethod = obj.Scanningmethod[0];
- }
-
- //鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
- if (obj.CurrrentGlassId != null) {
- const specialChars = /[^\w\s]/g;
- this.CurrrentGlassId = obj.CurrrentGlassId[0].replace(specialChars, "");
- }
-
- //鏌ヨ褰撳墠閾濇淇℃伅
- this.CurrentFrame = obj.CurrentFrame;
-
- // 鑾峰彇璁惧鐘舵��
- if (obj.DeviceList != null) {
- this.DeviceList = obj.DeviceList[0];
- }
- //鑾峰彇璁惧涓婄殑鐜荤拑id
- if (obj.GlassIdList != null) {
- this.GlassIdList = obj.GlassIdList[0];
- }
- //鑾峰彇寰呯‘璁ょ殑閾濇鐜荤拑淇℃伅
- if (obj.AluminumFrame != null) {
- this.AluminumFrame = obj.AluminumFrame[0];
- if (this.dialogFormVisible6 == true) {
- this.dialogFormVisible7 = true;
- }
- }
-
- //鏍规嵁杩涚墖鐘舵�佸嚭鍙戣繘鐗囦换鍔�
- if (obj.FeedState != null) {
- if (obj.FeedState[0] == true) {
- this.InsertQueueGlass(1);
- }
- }
+
-
- // if (obj.alarmmg[0].length > 0) {
- // if (this.alarm.length > 0) {
- // if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {
- // this.alarm = obj.alarmmg[0];
- // this.dialogFormVisible2 = true;
- // }
- // } else {
- // this.alarm = obj.alarmmg[0];
- // this.dialogFormVisible2 = true;
- // }
- // }
- // //鏄惁鎬ュ仠
- // if (obj.emergencystop != null) {
- // this.EmergencyStop = obj.emergencystop[0];
- // }
-
- // //澶嶄綅鍊掕鏃�
- // if (obj.countdown != null) {
- // if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {
- // this.CountDown();
- // }
- // }
-
- // //澶嶄綅瀹屾垚淇″彿
- // if (obj.reset != null) {
- // this.reset = obj.reset[0];
- // }
-
- //鏄惁鏈夎繘鐗囪姹�
- if (obj.D01RequestState != null) {
- this.D01RequestState = obj.D01RequestState[0];
- }
- // this.D01RequestState=true;
//鏄惁鍏佽鍑虹墖
this.isAllowQueue = obj.isAllowQueue[0];
@@ -1097,52 +633,6 @@
//鍑虹墖闃熷垪
if (this.isAllowReordering == true) {
this.OutSlice = obj.listoutslice[0];
- }
- //鑾峰彇涓婄墖浣嶇幓鐠冧俊鎭�
-
- if (obj.zhuangtai != null) {
- this.zhuangtai = obj.zhuangtai[0];
- }
- //涓婄墖浣嶇幓鐠冧俊鎭�
- if (obj.form2 != null && obj.form2 != "") {
- this.form2 = obj.form2[0];
- this.loadglassheight2 = 70;
- } else {
- this.form2 = {};
- }
-
- //鏄惁闇�瑕佹墜鍔ㄧ‘璁や笂鐗�
- this.isConfirm = obj.isConfirm[0];
-
- //鎵爜浣嶇幓鐠冧俊鎭�
- if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
- this.form3 = obj.form3[0];
- this.loadglassheight1 = 70;
- } else {
- this.form3 = {};
- }
-
- if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
- this.loadglassheight1 = 70;
- if (this.form5.glassId != obj.form3[0].glassId&&this.ManuallyInfeedGlass==false) {
- this.showform3();
-
- }
- this.form5 = obj.form3[0];
- this.glassid1 = "";
- if (this.D01RequestState == true) {
- this.Sizerange(this.form5, 3);
- } else {
- this.disabled1 = true;
- }
- } else {
- if (this.glassid1 == "") {
- this.DeleteBarcodeGlass();
- }
- }
- //鏁版嵁搴撹繛鎺ユ槸鍚︽甯�
- if (obj.dbconnected == "false") {
- this.text = this.$t('DataBase Connection failed');
}
//鐞嗙墖绗肩幓鐠冧俊鎭�
if (this.dialogFormVisible3 == true) {
@@ -1197,10 +687,6 @@
});
});
- //鍔犺浇灏忚溅浣嶇疆淇℃伅
- Loadcarlist().then(res => {
- this.carlist = res.data.carlist;
- });
//鍔犺浇绗煎瓙浣跨敤鎯呭喌鏁版嵁
home().then(res => {
this.tableData = res.data.list;
@@ -1217,168 +703,12 @@
this.cagelist3 = res.data.list3;
this.cagelist4 = res.data.list4;
});
- //鍔犺浇鎶ヨ淇℃伅
- SelectAlarmmgInfo().then(res => {
- this.alarm = res.data.alarmmg;
- });
-
//鍔犺浇纭瀵嗙爜
SelectPassword().then(res => {
this.password = res.data.password;
});
},
- //鏍规嵁鏍煎瓙鐘舵�佷慨鏀归鑹�
- getStatusClass(state) {
- if (state == 0) {
- return "gezi";
- } else if (state == 1) {
- return "blue gezi";
- } else if (state == 2) {
- return "yellow gezi";
- } else if (state == 3) {
- return "black gezi";
- } else {
- return "black gezi";
- }
- },
- //鎸夎鍗曞嚭鐗�
- getOrder() {
- if (this.form1.order != "") {
- InsertOrder(this.order).then(res => {
- if (res.data.message == 200) {
- this.dialogFormVisible1 = false;
- this.$message.success(this.$t('Operation successful'));
- } else {
- this.$message.error(this.$t('There is no glass for this order'));
- }
- this.load();
- });
- }
- },
- //鎵嬪姩涓婄墖
- sbumitglassid() {
- if (this.form.order != "") {
- if (this.form.height < 380 || this.form.width < 390 || this.form.height > 1810 || this.form.width > 2760) {
- this.$message.error(this.$t('The glass size is not within the range'));
- } else {
- if (this.zhuangtai == true) {
- Addglassid(this.glassid).then(res => {
- if (res.data.message2 == 200) {
- this.$message.success(this.$t('Operation successful'));
- this.cancel();
- } else if (res.data.message2 == 500) {
- this.$message.error(this.$t('There are currently tasks'));
- }
- else if (res.data.message2 == 300) {
- this.$message.error(this.$t('There is no such glass'));
- }
- else if (res.data.message2 == 400) {
- this.$message.error(this.$t('There is no such slot'));
- }
- });
- } else {
- this.$message.error(this.$t('There are currently tasks'));
- }
- }
- }
- },
- //鏄剧ず纭鐜荤拑淇℃伅涔熸病
- showform(buttons) {
- if (buttons == 1) {
- this.confirm1 = true;
- this.confirm2 = false;
- } else if (buttons == 2) {
- this.confirm1 = false;
- this.confirm2 = true;
- }
- //鏍规嵁杈撳叆鐨勭幓鐠僫d鑾峰彇鐜荤拑淇℃伅
- SelectGlassByGlassID(this.glassid).then(res => {
- if (res.data.form != null) {
- this.form = res.data.form;
- this.dialogFormVisible = true;
- this.$message.success(this.$t('query was successful'));
- } else {
- this.dialogFormVisible = true;
- this.$message.error(this.$t('There is no such glass'));
- }
- });
- },
- //鏄剧ず璁㈠崟淇℃伅椤甸潰
- showform1() {
- if (this.order != "") {
- SelectGlassNo(this.order).then(res => {
- this.form1.order = this.order;
- this.form1.number = res.data.count;
- });
- this.dialogFormVisible1 = true;
- }
- },
- //鏄剧ず鎵爜浣嶅拰涓婄墖浣�
- showform3() {
- this.dialogFormVisible5 = true;
- },
- //鎵嬪姩鍐欏叆plc鎵爜浣嶇幓鐠僫d
- WriteGlassID() {
- if (this.glassid1.length == 14) {
- WriteGlassID(this.glassid1).then(res => {
- console.log(res.data);
- this.$message.success(this.$t('Successful operation'));
- });
- } else {
- this.$message.error(this.$t('Please enter the correct glassID'));
- }
- },
- //鑾峰彇鎵爜浣嶅拰涓婄墖浣嶆暟鎹�
- SelectGlassByGlassIDs() {
- this.showform3();
-
- },
- //鏌ヨ瀹㈡埛鐜荤拑淇℃伅
- 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 => {
- this.AluminumFrame = res.data.AluminumFrame;
- });
- this.dialogFormVisible7 = true;
- },
- //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
- cancel() {
- this.dialogFormVisible = false;
- this.form = {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- };
- },
- //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
- cancel1() {
- this.dialogFormVisible1 = false;
- this.form1 = {};
- },
- //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
- cancel3() {
- this.dialogFormVisible5 = false;
- this.form1 = {};
- },
+
//缁撴潫杩�/鍑虹墖浠诲姟
endtask(type, glassid, cell) {
this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
@@ -1403,20 +733,6 @@
message: this.$t('Operation canceled')
});
});
- },
- //鏄剧ず鐞嗙墖绗艰鎯呬俊鎭�
- showcageinfo(cage) {
- if (this.CageDetails == false) {
- cage = this.cageglassid;
- SelectCageInfo(cage).then(res => {
- this.cageinfo = res.data.cageinfo;
- this.currentPages = 1;
- this.dialogFormVisible3 = true;
- });
- } else {
- this.$message.error(this.$t('You do not have this permission'));
- }
-
},
//鍒犻櫎鐞嗙墖绗肩幓鐠�
deleteglass(glassid, state) {
@@ -1448,90 +764,6 @@
});
});
},
- //鎵嬪姩鍑虹墖
- outglass(glassid, state) {
- this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
- inputType: 'password',
- inputPlaceholder: this.$t('Please enter the password'),
- confirmButtonText: this.$t('Yes'),
- cancelButtonText: this.$t('No'),
- type: 'warning'
- }).then(({ value }) => {
- if (this.password == value) {
- if (state == 1) {
- OutByGlassID(glassid).then(res => {
- if (res.data.message2 == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- else if (res.data.message2 == 300) {
- this.$message.error(this.$t('Unable to find the placement method of the aluminum frame'));
- }
- else if (res.data.message2 == 400) {
- this.$message.error(this.$t('Unable to find whether the aluminum frame is flipped or not'));
- }
- else if (res.data.message2 == 500) {
- this.$message.error(this.$t('This glass is already in the Queue'));
- }
- });
- } else {
- this.$message.error(this.$t('No out allowed'));
- }
- } else {
- this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
- }
- }).catch(() => {
- this.$message({
- type: 'info',
- message: this.$t('Operation canceled')
- });
- });
- },
- //鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
- insertglass(cage, cell, tier) {
- this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
- inputType: 'password',
- inputPlaceholder: this.$t('Please enter the password'),
- confirmButtonText: this.$t('Yes'),
- cancelButtonText: this.$t('No'),
- type: 'warning'
- }).then(({ value }) => {
- if (this.password == value) {
- this.insertcage = cage;
- this.insertcell = cell;
- this.inserttier = tier;
- this.showform(2);
- } else {
- this.$message.error(this.$t('Password error'));//瀵嗙爜閿欒
- }
- }).catch(() => {
- this.$message({
- type: 'info',
- message: this.$t('Operation canceled')
- });
- });
- },
- //鎵嬪姩涓婄墖
- FeedInglassid() {
- if (this.form.glassId != "" && this.form.glassId != null) {
- Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- this.dialogFormVisible = false;
- this.glassid="";
- }
- else if (res.data.message == 400) {
- this.$message.error(this.$t('The glass size is not within the range'));
- }
- else if (res.data.message == 300) {
- this.$message.error(this.$t('This glass is already in the cage'));
- }
- });
- } else {
- this.$message.error(this.$t('There is no such glass'));
- }
-
-
- },
//鍚敤//鐞嗙墖绗肩鐢�
UpdateDisabled(cage, cell, disabled) {
Disabled(cage, cell, disabled).then(res => {
@@ -1540,35 +772,7 @@
}
});
},
- //鍒犻櫎鍑虹墖闃熷垪鐜荤拑
- deleteproductionqueueglass(id) {
- this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
- inputType: 'password',
- inputPlaceholder: this.$t('Please enter the password'),
- confirmButtonText: this.$t('Yes'),
- cancelButtonText: this.$t('No'),
- type: 'warning'
- }).then(({ value }) => {
- if (this.password == value) {
- DeleteProductionQueueGlass(id).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- } else {
- this.$message.error(this.$t('This frame has glass that is currently outing'));
- }
- });
- }
- }).catch(() => {
- this.$message({
- type: 'info',
- message: this.$t('Operation canceled')
- });
- });
- },
- //琛ㄦ牸鍒犻櫎
- handleDelete(index, row) {
- console.log(index, row);
- },
+
//鏀瑰彉姣忛〉瀹圭撼鐨勬暟鎹噺
handleSizeChange: function (size) {
this.pagesize = size;
@@ -1585,214 +789,7 @@
handleCurrentChanges: function (currentPage) {
this.currentPages = currentPage;
},
- //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
- InsertQueueGlass(parameter) {
- if (parameter == 1 && this.form5.glassId != "") {
- if (this.form5.glassId != this.form2.glassId && this.form5.glassId != this.form3.glassId) {
- if (this.dialogFormVisible5 == true) {
- InsertQueueGlassId(1, this.form5).then(res => {
- if (res.data.message == 200) {
- this.form5 = {};
- this.$message.success(this.$t('Operation successful'));
- }
- else if (res.data.message == 400) {
- this.$message.error(this.$t('The glass size is not within the range'));
- } else {
- this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
- }
- });
- }
- } else {
- this.$message.error(this.$t('The glass ID already exists in the loading queue'));
- }
- } else if (parameter == 2 && this.form4.glassId != "") {
- if (this.form4.glassId != this.form3.glassId && this.form4.glassId != this.form2.glassId) {
- InsertQueueGlassId(2, this.form4).then(res => {
- if (res.data.message == 200) {
- this.form4 = {};
- this.$message.success(this.$t('Operation successful'));
- } else {
- this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
- }
- });
- } else {
- this.$message.error(this.$t('The glass ID already exists in the loading queue'));
- }
-
-
- }
- },
- //娓呴櫎涓婄墖闃熷垪鐜荤拑
- DeleteQueueGlasss(parameter) {
- if (parameter == 1) {
- DeleteQueueGlass(1).then(res => {
- if (res.data.message == 200) {
- this.form3 = {};
- this.$message.success(this.$t('Operation successful'));
- }
- });
- } else {
- DeleteQueueGlass(2).then(res => {
- if (res.data.message == 200) {
- this.form2 = {};
- this.$message.success(this.$t('Operation successful'));
- }
- });
- }
- },
- //淇敼鎵爜浣嶇幓鐠冪姸鎬�
- UpdateQueueStates() {
- UpdateQueueState().then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- });
- },
- //閾濇瀵瑰簲鐜荤拑淇℃伅娣诲姞閾濇id鍜屾槸鍚︽坊鍔犲埌闃熷垪
- CheckBoxchange(glassid, isChecked) {
- this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })
- },
- //娣诲姞鍒板嚭鐗囬槦鍒�
- AddOutSliceS() {
- if (this.AluminumFrame != null) {
- AddOutSliceS(this.AluminumFrame[0].frameBarcode).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- });
- }
- },
- //鍏抽棴寰呯‘璁ら摑妗嗕俊鎭晫闈㈠苟娓呴櫎寰呯‘璁や俊鎭�
- CloseForm7() {
- if (this.AluminumFrame != null) {
- CloseForm7().then(res => {
- if (res.data.message == 200) {
- this.AluminumFrame = null;
- this.dialogFormVisible7 = false;
- this.$message.success(this.$t('Operation successful'));
- }
- });
- }
- },
- //缃《
- getTopMove(row, index) {
- let Sequence = [];
- this.OutSlice.forEach(item => {
- Sequence.push(item.sequence);
- });
- let OutSliceArr = [];
- OutSliceArr.push(row);
- let belowstop = 1;
- let hereframeno = this.OutSlice[index].barcode;
- let upperstop = 0;
- for (let i = index + 1; i < this.OutSlice.length; i++) {
- if (this.OutSlice[i].barcode == hereframeno) {
- OutSliceArr.push(this.OutSlice[i]);
- belowstop += 1;
- } else {
- break;
- }
- }
- this.OutSlice.splice(index, belowstop);
- for (let i = 0; i < OutSliceArr.length; i++) {
- this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
- upperstop += 1;
- }
- this.UpdateSequence(Sequence);
- },
- //涓婄Щ
- getUpMove(row, index) {
- let Sequence = [];
- this.OutSlice.forEach(item => {
- Sequence.push(item.sequence);
- });
- let OutSliceArr = [];
- OutSliceArr.push(row);
- let belowstop = 1;
- let upperstop = 0;
- let index_x = index - 1;
- let hereframeno = this.OutSlice[index].barcode;
- let upperframeno = this.OutSlice[index_x].barcode;
- for (let i = index + 1; i < this.OutSlice.length; i++) {
- if (this.OutSlice[i].barcode == hereframeno) {
- OutSliceArr.push(this.OutSlice[i]);
- belowstop += 1;
- } else {
- break;
- }
- }
- this.OutSlice.splice(index, belowstop);
- for (let i = index_x; i >= 0; i--) {
- if (this.OutSlice[i].barcode != upperframeno) {
- upperstop = i + 1;
- break;
- }
- }
- for (let i = 0; i < OutSliceArr.length; i++) {
- this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
- upperstop += 1;
- }
- this.UpdateSequence(Sequence);
- },
- //涓嬬Щ
- getDownMove(row, index) {
- let Sequence = [];
- this.OutSlice.forEach(item => {
- Sequence.push(item.sequence);
- });
- let OutSliceArr = [];
- OutSliceArr.push(row);
-
- let belowstop = 1;
- let upperstop = this.OutSlice.length - 1;
- let flag = 0;
- let hereframeno = this.OutSlice[index].barcode;
- let upperframeno;
- for (let i = index + 1; i < this.OutSlice.length; i++) {
- if (this.OutSlice[i].barcode == hereframeno) {
- OutSliceArr.push(this.OutSlice[i]);
- belowstop += 1;
- } else {
- break;
- }
- }
- this.OutSlice.splice(index, belowstop);
- for (let i = index; i < this.OutSlice.length; i++) {
- if (this.OutSlice[i].barcode != hereframeno && this.OutSlice[i].barcode != upperframeno) {
- upperframeno = this.OutSlice[i].barcode;
- flag += 1;
- upperstop = i;
- }
- if (i == this.OutSlice.length - 1 && flag == 1) {
- flag += 1;
- upperstop = i + 1;
- }
- if (flag == 2) {
- break;
- }
- }
- for (let i = 0; i < OutSliceArr.length; i++) {
- this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
- upperstop += 1;
- }
- this.UpdateSequence(Sequence);
- },
- //淇敼鍑虹墖椤哄簭
- UpdateSequence(Sequence) {
- let i = 0;
- this.OutSlice.forEach(item => {
- item.sequence = Sequence[i];
- i++;
- });
- },
- //鍒囨崲鍑虹墖闃熷垪鐘舵��
- isAllowQueueState() {
- isAllowQueues(!this.isAllowQueue, this.OutSlice).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- })
- },
+
//鏄惁鍏佽鍑虹墖闃熷垪鎺掑簭
isAllowReorderings() {
isAllowReorderings(!this.isAllowReordering, this.OutSlice).then(res => {
@@ -1801,107 +798,6 @@
}
})
},
- //鍒囨崲涓婄墖鏄惁闇�瑕佺‘璁ょ幓鐠冧俊鎭�
- isConfirmState() {
- isConfirmStates(!this.isConfirm).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- });
- }
- ,
- //琛ㄦ牸鏍峰紡
- cellStyle({ column, rowIndex, columnIndex }) {
- column = rowIndex;
- rowIndex = column;
- let style = "";
- if (columnIndex === 8) {
- // style = "font-size:200px;text-align: center;";
- style = "";
- }
- // if (columnIndex === 9 && row.flip == 1) {
- // style = "background-Color:yellow;";
- // }
- // if (columnIndex === 6 && row.state == 3) {
- // style = "background-Color:gray;";
- // }
- return style;
- }
- ,
- //鍚堝苟琛�
- objectSpanMethod({ row, column, rowIndex, columnIndex }) {
- // console.log(row, column, "ss");
- row = column;
- column = row
- let arrOutSlice = this.OutSlice;
- let rowspans = 0;
- let colspans = 1;
- let barcode = arrOutSlice[rowIndex].barcode;
-
- let barcode2;
- if (rowIndex != 0) {
- barcode2 = arrOutSlice[rowIndex - 1].barcode;
- }
- if (columnIndex === 0 || columnIndex === 10) {
- if (barcode != barcode2) {
- // this.FrameNoFlag = barcode;
- for (let i = rowIndex; i < this.OutSlice.length; i++) {
- if (barcode == arrOutSlice[i].barcode) {
- barcode = arrOutSlice[i].barcode;
- rowspans += 1;
- } else {
- break;
- }
- }
- return {
- rowspan: rowspans,
- colspan: colspans
- };
- } else {
- return {
- rowspan: 0,
- colspan: 0
- };
- }
- }
- },
- //鍒ゆ柇鐜荤拑鏄惁瓒呭嚭鑼冨洿
- Sizerange(Glass, position) {
- if (this.ManuallyInfeedGlass == false) {
- 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)) {
- 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;
- }
- } else {
- if (position == 1 || position == 3) {
- this.disabled1 = false;
- } else {
- this.disabled = false;
- }
- // if (position == 3 && this.isConfirm == true && this.D01RequestState == true && this.dialogFormVisible5 == true) {
- // this.InsertQueueGlass(1);
- // }
- }
- }
- },
- //娓呯┖寰呯‘璁ょ幓鐠冧俊鎭�
- DeleteBarcodeGlass() {
- this.form5 = {};
- },
//鎵嬪姩瀹屾垚鍑虹墖浠诲姟
CompleteQueue(id, frameid, glassid) {
CompleteQueue(id, frameid, glassid).then(res => {
@@ -1909,81 +805,6 @@
this.$message.success(this.$t('Operation successful'));
}
});
- },
- //60绉掑浣嶅�掓暟璁℃椂
- CountDown() {
- let count = 60;
- let timer = setInterval(
- () => {
- if (this.EmergencyStop == true) {
- this.dialogFormCountDown = false;
- clearInterval(timer);
- this.CountDowns = "0";
- } else {
- if (count > 0) {
- this.PromptSize = 500;
- count--;
- this.CountDowns = count;
- this.dialogFormCountDown = true;
- }
- else {
- this.PromptSize = 200;
- this.CountDowns = "Waiting for reset";
- if (this.reset == true) {
- clearInterval(timer);
- this.dialogFormCountDown = false;
- }
- }
- }
- },
- 1000
- );
-
- },
- //鏇存崲褰撳墠閾濇
- FrameStateUpdate(frameno) {
- FrameStateUpdate(frameno).then(res => {
- if (res.data.message == 200) {
- this.$message.success("Operation successful");
- }
- });
- },
- //褰撳墠閾濇鍥惧舰
- FrameWidthHeight(state, width, height, position) {
- if (state == "before") {
- if (position == 0) {
- if (width > height) {
- return 400;
- }
- else {
- return width / height * 400;
- }
- } else {
- if (width > height) {
- return height / width * 400;
- }
- else {
- return 400;
- }
- }
- }
- if (state == "after") {
- if (position == 0) {
- if (width < height) {
- return 400;
- }
- else {
- return height / width * 400;
- }
- } else {
- if (width < height) {
- return width / height * 400;
- }
- else {
- return 400;
- }
- }
- }
},
//鑾峰彇璁惧鏄剧ず鐘舵��
ShowDeviceList(num) {
@@ -2004,77 +825,8 @@
const specialChars = /[^\w\s]/g;
return this.GlassIdList[num].replace(specialChars, "");
}
- },
- //娓呴櫎鐜荤拑id
- ClearGlassId(position, num) {
- if (this.ClearGlassID == false) {
- console.log(this.DeviceList, num);
- if (this.DeviceList[num] == 0) {
- if (this.GlassIdList[num].length <= 14) {
- this.$confirm(this.$t('Are you sure to clear this barcode ?'), this.$t('confirm'), {
- confirmButtonText: this.$t('Yes'),
- cancelButtonText: this.$t('No'),
- type: 'warning'
- }).then(() => {
- ClearGlassId(position, this.GlassIdList[num]).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- } else {
- this.$message.success(this.$t('operation failed'));
- }
- });
- }).catch(() => {
- this.$message({
- type: 'info',
- message: this.$t('Operation canceled')
- });
- });
- } else {
- this.$message.error(this.$t('There is no glass ID here'));
- }
- } else {
- //鑷姩鐘舵�佷笉鑳芥竻闄ょ幓鐠僫d
- this.$message.error(this.$t('Unable to clear glass ID in automatic mode'));
- }
- } else {
- this.$message.error(this.$t('You do not have this permission'));
- }
- },
- //缁堟杩�/鍑虹墖浠诲姟
- TaskStop(num) {
- TaskStop(num).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- });
- },
- //杞�ュ仠
- SoftEmergencyStop() {
- this.$confirm(this.$t('Are you sure you want an emergency stop ?'), this.$t('confirm'), {
- confirmButtonText: this.$t('Yes'),
- cancelButtonText: this.$t('No'),
- type: 'warning'
- }).then(() => {
- SoftEmergencyStop.then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- });
- }).catch(() => {
- this.$message({
- type: 'info',
- message: this.$t('Operation canceled')
- });
- });
- },
- //鍒囨崲浜岀淮鐮佽幏鍙栨柟寮�
- SwitchScanMethod() {
- SwitchScanMethod(!this.Scanningmethod).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- });
}
+
}
}
</script>
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index a849080..448fefc 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -1,26 +1,15 @@
package com.example.springboot.component;
-
-import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
-
-import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-
import com.example.springboot.service.*;
import org.springframework.beans.factory.annotation.Autowired;
-
-import com.example.springboot.entity.Glass;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
-import com.example.springboot.entity.device.PlcParameterObject;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
@@ -126,183 +115,13 @@
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
- if (S7control.getinstance().CheckConnected() == true) {
-
- // 閾濇绾夸氦浜�
- if (S7controlLK.getinstance().CheckConnected() == true) {
- if (CurrentFrame != null) {
- S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");
- }
- String E01id = S7controlLK.getinstance().readStrings("DB17.0");
- String J01id = S7controlLK.getinstance().readStrings("DB17.22");
-
- List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);
- List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1);
- Short framerequest = liststate.get(0);
- if (framerequest == 1) {
- // 閾濇id
- String position;
- try {
- position = dbserve.SelectPositionByFrameBarcode(J01id);
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- position = "0";
- e.printStackTrace();
- }
- Short send;
- if (position.equals("0")) {
- send = 0;
- } else {
- send = 1;
- }
- S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
- }
- }
-
- // 鑾峰彇褰撳墠鎵爜鏂瑰紡
- List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
- if (Scanningmethods != null) {
- for (Boolean Scanningmethod : Scanningmethods) {
- jsonObject.append("Scanningmethod", Scanningmethod);
- }
- }
- // 鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
- String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
- jsonObject.append("CurrrentGlassId", CurrrentGlassId);
-
- // 鑾峰彇D01-D06,A01,A02,B01,B02鐘舵��
- List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10);
- jsonObject.append("DeviceList", DeviceList);
- // 鑾峰彇D01-D06,A01,A02,B01,B02鐜荤拑id
- List<String> GlassIdList = new ArrayList<String>();
- GlassIdList.add(spianService.queGlassid("DB103.44", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.58", 14).toString());
-
- GlassIdList.add(spianService.queGlassid("DB103.184", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.212", 14).toString());
-
- GlassIdList.add(spianService.queGlassid("DB103.128", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.142", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.156", 14).toString());
-
- GlassIdList.add(spianService.queGlassid("DB103.72", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.86", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.100", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.114", 14).toString());
- jsonObject.append("GlassIdList", GlassIdList);
-
- // 鑾峰彇Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃�
- List<String> addressList = new ArrayList<String>();
- addressList.add("DB106.12");
- addressList.add("DB106.0");
- List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
- if (paramlist != null) {
- jsonObject.append("params", paramlist);
- }
- // // 鑾峰彇杩涚墖杞︾姸鎬�
- // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
- // 1);// 鑾峰彇杩涚墖杞︾姸鎬�
- // if (datas1ListState != null) {
- // boolean exist1 = datas1ListState.contains((short) 0);
- // jsonObject.append("zhuangtai", exist1);
- // }
-
- // // 鑾峰彇杩涚墖鐜荤拑淇℃伅
- // List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
- // if (inglassInfo != null) {
- // if (inglassInfo.size() > 0) {
- // jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
- // }
- // }
- // // 鑾峰彇閾濇idDB106.DBW64锛屾坊鍔犲埌鍑虹墖闃熷垪
- // String frameno="X21763329601FB";
- String frameno = spianService.queGlassid("DB103.270", 14).toString();
- if (!frameno.equals(Plchome.FrameNo)) {
- Plchome.FrameNo = frameno;
- try {
- Short num = 0;
- List<north_glass_buffer1> north_glass_buffer1s = north_Glass_Buffer1Service
- .SelectAluminumFrameInfoById(Plchome.FrameNo);
- for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
- if (north_glass_buffer1.getstorageCage() == null) {
- break;
- }
- num++;
- }
- if (num == north_glass_buffer1s.size()) {
- north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
- } else {
- Plchome.AluminumFrame = north_glass_buffer1s;
- }
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- if (AluminumFrame != null) {
- jsonObject.append("AluminumFrame", AluminumFrame);
- }
-
- // 澶嶄綅鍊掕鏃�
- // 鍦板潃104.9.6
- List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
- for (Boolean countdowns : countdown) {
- jsonObject.append("countdown", countdowns);
- }
- // jsonObject.append("countdown", true);
- // 澶嶄綅瀹屾垚淇″彿
- List<Boolean> resetss = S7control.getinstance().ReadBits("DB103.284", 1);
- for (Boolean reset : resetss) {
- jsonObject.append("reset", reset);
- }
-
- // 鏄惁鎬ュ仠
- List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
- for (Boolean emergencystop : emergencystops) {
- jsonObject.append("emergencystop", emergencystop);
- }
- // 鑾峰彇杩涚墖璇锋眰鐘舵��
- List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
- boolean D01RequestState = D01Request.contains((short) 1);
- jsonObject.append("D01RequestState", D01RequestState);
-
- // 鑾峰彇杩涚墖鍙戦�佺姸鎬�
- List<Short> D01respnse = S7control.getinstance().ReadWord("DB106.16", 1);
- boolean D01ResponseState = D01respnse.contains((short) 1);
- // jsonObject.append("D01RequestState", D01RequestState);
- // 鑷姩杩涚墖
- isConfirm = true;
- if (isConfirm == true && form3.getglassId() != null && form3.getglassId() != "") {
- if ((form3.getglassheight() < 380 || form3.getglasswidth() < 390
- || form3.getglassheight() > 1810
- || form3.getglasswidth() > 2760)
- || (form3.getglassheight() < 390 || form3.getglasswidth() < 380
- || form3.getglassheight() > 2760 || form3.getglasswidth() > 1810)) {
- FeedState = true;
- jsonObject.append("FeedState", FeedState);
- FeedState = false;
- } else {
- if (D01RequestState == true && D01ResponseState != true) {
- storageCageService.InsertQueueGlassId((short) 1, form3);
- }
- }
- }
-
- }
+
} catch (InterruptedException e) {
e.printStackTrace();
}
- boolean dbconnected = false;
- try {
- dbserve.getConn();
- dbconnected = true;
- } catch (Exception e) {
- // TODO: handle exception
- dbconnected = false;
- }
- jsonObject.append("dbconnected", dbconnected);
+
// jsonObject.append("params", new short[] { 30, 40, });
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
if (sendwServer != null) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java b/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
new file mode 100644
index 0000000..f90a3bc
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
@@ -0,0 +1,43 @@
+package com.example.springboot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * 娴佺▼鍗¤〃
+ */
+@Data
+@TableName("flowcard")
+public class FlowCard {
+
+ /**
+ * 涓婚敭锛岃嚜鍔ㄧ敓鎴�
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 娴佺▼鍗�
+ */
+ private String flowcard;
+ /**
+ * 鎬诲眰鏁�
+ */
+ private Integer totaltier;
+ /**
+ * 鐜荤拑鏁伴噺
+ */
+ private Integer number;
+ /**
+ * 浠诲姟绾胯矾
+ */
+ private Integer line;
+ /**
+ * 鐘舵��
+ */
+ private Integer state;
+
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java b/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
new file mode 100644
index 0000000..977b843
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
@@ -0,0 +1,69 @@
+package com.example.springboot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * 鐜荤拑琛�
+ */
+@Data
+@TableName("glassinfo")
+public class GlassInfo {
+
+ /**
+ * 涓婚敭锛岃嚜鍔ㄧ敓鎴�
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 娴佺▼鍗d
+ */
+ private Integer flowcard;
+ /**
+ * 鐜荤拑绫诲瀷
+ */
+ private Integer glasstype;
+ /**
+ * 閰嶇墖id
+ */
+ private Integer mateid;
+ /**
+ * 鐜荤拑id
+ */
+ private String glassid;
+ /**
+ * 灞�
+ */
+ private Integer tier;
+ /**
+ * 鑶滅郴
+ */
+ private String films;
+ /**
+ * 瀹�
+ */
+ private Double width;
+ /**
+ * 楂�
+ */
+ private Double height;
+ /**
+ * 鍘氬害
+ */
+ private Double thickness;
+ /**
+ * 鏁伴噺
+ */
+ private Integer number;
+ /**
+ * 瀹屾垚鏁伴噺
+ */
+ private Integer finishnumber;
+
+}
+
+
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/MeasureSetting.java b/springboot-vue3/src/main/java/com/example/springboot/entity/MeasureSetting.java
new file mode 100644
index 0000000..da28cda
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/MeasureSetting.java
@@ -0,0 +1,34 @@
+package com.example.springboot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * 娴嬮噺璇樊琛�
+ */
+@Data
+@TableName("measuresetting")
+public class MeasureSetting {
+
+ /**
+ * 涓婚敭锛岃嚜鍔ㄧ敓鎴�
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 瀹借宸�
+ */
+ private Double errorWidth;
+ /**
+ * 楂樿宸�
+ */
+ private Double errorHeight;
+ /**
+ * 绾胯矾
+ */
+ private Integer line;
+
+}
--
Gitblit v1.8.0