From 707d28bd18f8832ac3824af4ae6f50dc1a30ee41 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 29 十一月 2023 11:02:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 187 +++++++----
springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java | 26 +
springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java | 68 ++++
.vscode/settings.json | 3
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 204 +++++-------
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 46 +-
CanadaMes-ui/src/lang/locales/en-US.json | 2
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 81 +++--
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 81 ++++-
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 58 +-
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 109 ++----
11 files changed, 506 insertions(+), 359 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c5f3f6b..a760fd6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
{
- "java.configuration.updateBuildConfiguration": "interactive"
+ "java.configuration.updateBuildConfiguration": "interactive",
+ "java.debug.settings.onBuildFailureProceed": true
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index a3374c9..f27a908 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -254,7 +254,7 @@
"endTime":"endTime",
"The Side":"The Side",
- "barcode":"barcode",
+ "Barcode":"Barcode",
"Order No":"Order No",
"List No":"List No",
"Box No":"Box No",
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index f6c4317..cf98cf8 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -67,17 +67,17 @@
}
.blocks {
-
-
background-image: url('../../img/xmjc.png');
margin: 0 auto;
background-repeat: no-repeat;
background-attachment: local;
- width: 1660px;
min-height: 55vh;
+ width: 1400px;
max-width: 94vw;
background-size: 1200px 510px;
- /* max-width: 100vw;
+ margin: 0 auto;
+ /* width: 1660px;
+ max-width: 100vw;
background-size: 1660px 560px; */
@@ -119,8 +119,8 @@
.orderbutton2 {
position: absolute;
- left: 1170px;
- top: 70px;
+ left: 500px;
+ top: -10px;
}
.blocks-img3 {
@@ -185,6 +185,11 @@
.el-dialog {
width: 90%;
}
+
+/* .el-table td,
+.el-table th {
+ padding: 0px 0;
+} */
</style>
<template>
<el-container>
@@ -209,11 +214,17 @@
<el-table :data="this.tasklist1" border style="width: 100%">
<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="150" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>
- <el-table-column :width="130" prop="north_glass_buffer1s.ordernumber" :label="$t('Order 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"
+ :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="lengthWidth" :label="$t('Dim')"></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
+ }}
+ </template>
+ </el-table-column>
<el-table-column :label="$t('Terminate Task')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -225,13 +236,15 @@
<el-table :data="this.tasklist2" border style="width: 100%">
<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="150" prop="glassId" :labelf="$t('Infeed glass barcode')"></el-table-column>
- <el-table-column :width="130" prop="north_glass_buffer1s.ordernumber" :label="$t('Order 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"
+ :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="lengthWidth" :label="$t('Dim')">
+ <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.north_glass_buffer1s.glasslength }}*{{ scope.row.north_glass_buffer1s.glassheight
+ }}
</template>
</el-table-column>
@@ -341,10 +354,10 @@
<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.glasslengthmm" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Width')">
- <el-input v-model="form.glassheightMm" readonly autocomplete="off" />
+ <el-input v-model="form.glassheightmm" readonly autocomplete="off" />
</el-form-item>
</el-form>
@@ -392,12 +405,12 @@
<el-table-column :width="90" prop="cage" :label="$t('Cage No')"></el-table-column>
<el-table-column :width="90" prop="cell" :label="$t('Slot No')"></el-table-column>
<el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>
- <el-table-column :width="100" prop="glassId" :label="$t('Barcode')"></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="100" prop="north_glass_buffer1s.listnumber"
+ <el-table-column :width="80" prop="north_glass_buffer1s.listnumber"
: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="170" prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <el-table-column :width="150" prop="lengthWidth" :label="$t('Dim')"></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;"
@@ -420,11 +433,11 @@
<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>
@@ -547,11 +560,11 @@
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
- <el-button @click="DeleteQueueGlasss(2)" type="primary" :disabled="disabled1">{{ $t('Clear Current')
+ <el-button @click="DeleteQueueGlasss(2)" type="primary" :disabled="disabled">{{ $t('Clear Current')
}}</el-button>
- <el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled1">
+ <el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled">
{{ $t('Confirm Modification') }}</el-button>
- <el-button @click="DeleteQueueGlasss(1)" type="primary" :disabled="disabled1">{{ $t('Clear Current')
+ <el-button @click="DeleteQueueGlasss(1)" type="primary" :disabled="disabled">{{ $t('Clear Current')
}}</el-button>
<el-button @click="InsertQueueGlass(1)" type="primary" :disabled="disabled1">
{{ $t('Confirm Modification') }}</el-button>
@@ -576,6 +589,17 @@
<el-table-column prop="north_glass_buffer1s.glassheight" :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)"
+ :disabled="scope.$index == 0">
+ 缃《
+ </el-button>
+ <el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)"
+ :disabled="scope.$index == 0">
+ 涓婄Щ
+ </el-button>
+ <el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)"
+ :disabled="OutSlice.length - 1 == scope.$index">涓嬬Щ
+ </el-button>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="deleteproductionqueueglass(scope.row.id)">{{ $t('Delete') }}</el-button>
</template>
@@ -608,7 +632,7 @@
{{ 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') }}
@@ -616,7 +640,8 @@
</el-table-column>
<el-table-column :width="80" :label="$t('Operate')">
<template slot-scope='scope'>
- <el-checkbox label="" :disabled="!(scope.row.storageCage != null&&scope.row.out_slice == null)" :checked="scope.row.isCheck" @change="CheckBoxchange(scope.row.barcode,$event)"></el-checkbox>
+ <el-checkbox label="" :disabled="!(scope.row.storageCage != null && scope.row.out_slice == null)"
+ :checked="scope.row.isCheck" @change="CheckBoxchange(scope.row.barcode, $event)"></el-checkbox>
</template>
</el-table-column>
</el-table>
@@ -709,7 +734,6 @@
methods: {
init() {
let viewname = "Home";
-
if (typeof (WebSocket) == "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
@@ -743,50 +767,56 @@
this.tasklist1 = obj.tasklist1[0];
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
+
+ //鍑虹墖闃熷垪
+ this.OutSlice = obj.listoutslice[0];
this.loadglassheight = obj.loadglassheight;
if (obj.zhuangtai != null) {
this.zhuangtai = obj.zhuangtai[0];
}
- if(this.dialogFormVisible7==true){
+ if (this.dialogFormVisible7 == true) {
this.showform7();
}
- // this.glassid1 = obj.queid[0];
- // if (obj.queid[0] != "" && obj.queid[0] != null && obj.state[0] == 0) {
- // this.state = false;
- // this.disabled = true;
- // this.disabled1 = false;
- // this.showform3();
- // } else if (obj.queid[0] != "" && obj.queid[0] != null && obj.state[0] == 1) {
- // this.state = true;
- // this.disabled = true;
- // this.disabled1 = true;
- // }
- // else {
- // this.state = true;
- // this.disabled = false;
- // this.disabled1 = false;
- // }
if (obj.form2 != null && obj.form2 != "") {
this.form2 = obj.form2[0];
} else {
this.form2 = {};
}
-
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
this.form3 = obj.form3[0];
+
} else {
this.form3 = {};
-
}
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.disabled1 == false) {
+ this.disabled1 = true;
+ this.$message.error(this.$t('The glass size is not within the range'));
+ }
+ } else {
+ this.disabled1 = false;
+ }
+ } else {
+ if (this.form5.glassheightmm < 380 || this.form5.glasslengthmm < 390 || this.form5.glassheightmm > 1810 || this.form5.glasslengthmm > 2760) {
+ if (this.disabled1 == false) {
+ this.disabled1 = true;
+ // this.$message.error(this.$t('The glass size is not within the range'));
+ }
+ } else {
+ this.disabled1 = false;
+ }
}
//if (obj.dbconnected == "false") {
this.text = this.$t('DataBase Connection failed');
// }
- SelectCageInfo(this.cage).then(res => {
- this.cageinfo = res.data.cageinfo;
- });
+ if (this.dialogFormVisible3 == true) {
+ SelectCageInfo(this.cage).then(res => {
+ this.cageinfo = res.data.cageinfo;
+ });
+ }
SelectGlass(this.orderid).then(res => {
this.GlassInfo = res.data.glass;
});
@@ -954,6 +984,15 @@
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.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 {
this.$message.error(this.$t('There is no such glass'));
}
@@ -991,13 +1030,13 @@
SelectAluminumFrameInfoById(this.framebarcode).then(res => {
this.AluminumFrame = res.data.listAluminumFrame;
this.AluminumFrame.forEach(item => {
- if(item.storageCage!=null&&item.out_slice==null){
+ if (item.storageCage != null && item.out_slice == null) {
item.isCheck = true;
- }else{
+ } else {
item.isCheck = false;
}
- item.Flip=res.data.flip;
- item.FrameNo=this.framebarcode;
+ item.Flip = res.data.flip;
+ item.FrameNo = this.framebarcode;
});
});
this.dialogFormVisible7 = true;
@@ -1051,7 +1090,6 @@
this.cage = cage;
SelectCageInfo(cage).then(res => {
this.cageinfo = res.data.cageinfo;
- console.log(this.cageinfo)
this.dialogFormVisible3 = true;
});
},
@@ -1261,35 +1299,42 @@
}
});
},
- CheckBoxchange(glassid,isChecked){
- this.AluminumFrame.forEach(item=>{item.barcode=glassid;item.isCheck=isChecked})
- console.log(this.AluminumFrame);
+ CheckBoxchange(glassid, isChecked) {
+ this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })
},
- addoutslice(){
+ addoutslice() {
// var AluminumFrames1=this.AluminumFrame.map(item=>{return item.barcode});
// var AluminumFrames2=this.AluminumFrame.map(item=>{return item.isCheck});
// var AluminumFrames3=this.AluminumFrame.map(item=>{return item.Flip});
- var dats_=new Array();
+ var dats_ = new Array();
this.AluminumFrame.forEach(item => {
- var dats2_=new Array();
- dats2_[0]=item.barcode;
- dats2_[1]=item.isCheck;
- dats2_[2]=item.Flip;
- dats2_[3]=item.FrameNo;
- dats2_[4]=item.glasslengthMm;
- dats2_[5]=item.glassheightMm;
- dats_[dats_.length]=dats2_;
+ var dats2_ = new Array();
+ dats2_[0] = item.barcode;
+ dats2_[1] = item.isCheck;
+ dats2_[2] = item.Flip;
+ dats2_[3] = item.FrameNo;
+ dats2_[4] = item.glasslengthmm;
+ dats2_[5] = item.glassheightmm;
+ dats_[dats_.length] = dats2_;
});
- console.log(dats_);
- //var AluminumFrames=this.AluminumFrame.map((item)=>({barcode,isCheck,Flip}) );
- // console.log(AluminumFrames1);
- // console.log(AluminumFrames2);
- // console.log(AluminumFrames3);
- AddOutSliceS(dats_).then(res=>{
+ AddOutSliceS(dats_).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
});
+ }, getTopMove(row, index) {
+ this.OutSlice.splice(index, 1)
+ this.OutSlice.unshift(row)
+ },
+ //涓婄Щ
+ getUpMove(row, index) {
+ let arr = this.OutSlice;
+ arr.splice(index - 1, 1, ...arr.splice(index, 1, arr[index - 1]));
+ },
+ //涓嬬Щ
+ getDownMove(row, index) {
+ let arr = this.OutSlice;
+ arr.splice(index, 1, ...arr.splice(index + 1, 1, arr[index]));
}
}
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index ec56e0c..a38d1f2 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -2,6 +2,7 @@
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.List;
import org.apache.ibatis.javassist.compiler.ast.Symbol;
@@ -39,23 +40,9 @@
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- String str = "Hello";
- char[] charArray = new char[str.length()];
- for (int i = 0; i < str.length(); i++) {
- charArray[i] = str.charAt(i);
- }
- System.out.println(charArray);
- // spianService.selectout("1145");
- // spianService.selectAll("11");
- // spianService.selectAll2();
- // 澧炲姞闃熷垪琛ㄦ暟鎹�
- // spianMapper.insertqueue("1",1,1500);
-
// 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
// try {
-
// north_glass_buffer1 glass = jdbcConnections.selectGlass(112);
-
// // System.out.println(glass.getOrderId());
// } catch (SQLException e) {
// // TODO Auto-generated catch block
@@ -65,102 +52,82 @@
// 鍒ゆ柇杩涚墖璇锋眰
List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
- List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.12", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
+ List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.16", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
- if (datas1List != null && datas1ListState != null) {
-
- // 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
- boolean exist = datas1List.contains((short) 1);
- // 鑾峰彇杩涚墖杞︾姸鎬�
- boolean exist1 = datas1ListState.contains((short) 0);
- // 鍒ゆ柇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
- boolean exist2 = datas1ListState2.contains((short) 1);
-
- String glassid = "";
- StringBuilder strId = new StringBuilder();
- StringBuilder writedstrId = new StringBuilder();
-
- if (!inglassbegin & !exist1)// 褰撹繘鐗囪溅涓嶇┖闂叉椂
- {
- inglassbegin = true;
- }
- if (inglassbegin & exist1)// 褰撹繘鐗囪溅绌洪棽鏃�
- {
- inglassbegin = false;
- spianMapper.Updatetask(1, 0);// 绔嬪嵆缁撴潫鏁版嵁搴撹〃涓殑涓婄墖浠诲姟
- spianMapper.UpdataAddCageState(1, 2);
- }
- // 杩涚墖璇锋眰涓�1鏃�
- if (exist == true) {
- // 褰撹繘鐗囪溅绌洪棽鏃�
- if (exist1 == true) {
- // 鑾峰彇宸蹭笅鍙戠殑杩涚墖id 涓巔lc璇锋眰鐨刬d浣滄瘮杈�
- byte[] writedglassidbytes = S7control.getinstance().ReadByte("DB105.16", 13);
- if (writedglassidbytes != null) { //
- // 鑾峰彇鐜荤拑id
- for (byte iditem : writedglassidbytes) {
- writedstrId.append(iditem);
- }
- }
- // 鑾峰彇杩涚墖id
- byte[] datas1ListID = S7control.getinstance().ReadByte("DB106.26", 13);
- if (datas1ListID != null) {
- // 鑾峰彇鐜荤拑id
- for (byte list1 : datas1ListID) {
- strId.append(list1);
-
- }
- if (!writedstrId.toString().equals(strId.toString())) // 宸茬粡涓嬪彂鐨刬d涓巔lc璇锋眰鐨刬d涓嶄竴鏍锋椂锛岃涓轰笉鏄噸澶嶇殑浠诲姟锛屾墠鎵ц涓嬪彂浠诲姟鎸囦护
- {
-
- int glasslimit = 1;// 鍒ゆ柇鏄惁鏄鐗囦笂鐗�
- if (glasslimit == 1) {
- spianService.selectAll(strId.toString());
- } else {
- spianService.selectAll(strId.toString());
- }
- S7control.getinstance().WriteByte("DB105.16", datas1ListID);// 娲惧彂杩涚墖id
-
- }
- // spianService.selectAll(Short.parseShort(strId.toString()));
- }
-
- }
- // System.out.println(exist);
- }
- // 涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0
- if (exist1 == false) { // 杩涚墖杞﹀繖纰屾椂
- if (exist2 == true) { // 浠诲姟宸插惎鍔ㄦ椂
- S7control.getinstance().WriteWord("DB105.12", (short) 0);// 杩涚墖浠诲姟鍚姩鏀逛负0
- }
- }
+
+ boolean B01backs =spianService.listbool("DB106.60");// b01姹囨姤
+ boolean B02backs = spianService.listbool("DB106.62");// b02姹囨姤
+ StringBuilder B01glassid=spianService.queGlassid("DB106.DBB26");//BO1鐨勭幓鐠僫d
+ StringBuilder B02glassid=spianService.queGlassid("DB106.DBB26");//B02鐨勭幓鐠僫d
+ //褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
+ if(B01backs==true){
+ //褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负1
+ spianMapper.UpdateCageOver(B01glassid.toString(),1);//鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬�
+ spianMapper.Updatetask(1,0);//鏇存敼杩涚墖浠诲姟鐘舵�佷负1
+ spianMapper.overqueue(B01glassid.toString(),0);//鏇存敼涓婄墖浠诲姟琛ㄧ殑鐘舵�佷负0
+ S7control.getinstance().WriteWord("DB105.48", (short) 1);//搴旂瓟B01灏忚溅鏀跺埌
+ S7control.getinstance().WriteWord("DB105.16", (short) 0);//杩涚墖浠诲姟鍚姩鏀逛负0
+ }else{
+ S7control.getinstance().WriteWord("DB105.48", (short) 0);//鎭㈠B01灏忚溅搴旂瓟
+ }
+ //褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
+ if(B02backs==true){
+ //褰揃02灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负0
+ spianMapper.UpdateCageOver(B02glassid.toString(),0);//鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
+ spianMapper.UpdatetaskOut(B02glassid.toString()); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�
+ S7control.getinstance().WriteWord("DB105.50", (short) 1);//搴旂瓟B02灏忚溅鏀跺埌
+ }else{
+ S7control.getinstance().WriteWord("DB105.50", (short) 0);//鎭㈠B02灏忚溅搴旂瓟
}
+
+
+ // 鑾峰彇DO1鏁版嵁
+ StringBuilder queueid1 = spianService.queGlassid("DB106.DBB26");
+ // 鑾峰彇DO2鏁版嵁
+ StringBuilder queueid2 = spianService.queGlassid("DB103.DBB78");
+ System.out.println("D01"+queueid1);
+ System.out.println("D02"+queueid2);
+ int questate = spianMapper.Selectqueuestate();//鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
+ // queueid1.toString().isEmpty()
+ north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());//D01鐨勭幓鐠冧俊鎭�
+ north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());//D02鐜荤拑淇℃伅
+ double quewitdh=0;
+ double quewitdh2=0;
+ //褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
+ if(glass1==null){
+ quewitdh=0;
+ queueid1=new StringBuilder("");
+ }else{
+ quewitdh=glass1.getglasslengthmm();
+ }
+ if(glass2==null){
+ quewitdh2=0;
+ queueid2=new StringBuilder("");
+ }else{
+ quewitdh2=glass2.getglasslengthmm();
+ }
+
+
+ if (queueid1!=null&& questate == 0) {
+ // 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ spianMapper.insertqueue(queueid1.toString(), 1, quewitdh);
+ }
+ if (queueid2!=null) {
+ // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ spianMapper.insertqueue(queueid2.toString(), 2, quewitdh2);
+ spianMapper.overqueue2(queueid2.toString(),0,1);//鏇存敼涓婄墖浠诲姟琛ㄧ殑鐘舵�佷负0
+ }
+
+ // 鍑虹墖浠诲姟////////////////////////////////
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
- List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.14", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
- StringBuilder writedstrIdOut = new StringBuilder();
+ List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
+ // StringBuilder writedstrIdOut = new StringBuilder();
// 鑾峰彇宸蹭笅鍙戠殑鍑虹墖id
- byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 13);
- if (writedglassidbytesOut != null) {
- // 鑾峰彇鐜荤拑id
- for (byte iditem : writedglassidbytesOut) {
- writedstrIdOut.append((char) iditem);
- }
- }
- // 鑾峰彇BO1鏁版嵁
- StringBuilder queueid1 = spianService.queGlassid("DB103.DBB32");
- // 鑾峰彇BO2鏁版嵁
- StringBuilder queueid2 = spianService.queGlassid("DB103.DBB46");
- if (queueid1 != null) {
- // 鍐欏叆B01鐨勬暟鎹埌涓婄墖闃熷垪琛�
- spianMapper.insertqueue(queueid1.toString(), 1, 0);
- }
- if (queueid2 != null) {
- // 鍐欏叆B02鐨勬暟鎹埌涓婄墖闃熷垪琛�
- spianMapper.insertqueue(queueid2.toString(), 2, 0);
- }
+ byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 14);
+ String writedstrIdOut = new String(writedglassidbytesOut);
- // 鍑虹墖浠诲姟////////////////////////////////
+
boolean outstate = false;// 鍑虹墖杞︾┖闂插垽鏂�
boolean outstate1 = false;// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
if (outlist != null && outlist1 != null) {
@@ -176,41 +143,42 @@
}
if (outglassbegin & outstate)// 褰撲换鍔″紑濮嬩笖鍑虹墖杞︾┖闂叉椂
{
- outglassbegin = false;
- spianMapper.UpdatetaskOut(); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�
- spianMapper.UpdataAddCageState(0, 3);// 灏嗗嚭鐗囦腑鐨勬牸瀛愮姸鎬佹敼鎴�0
+ outglassbegin = false;
}
if (outstate == true & glass.getbarcode() != null) { // 褰撳嚭鐗囪溅绌洪棽涓旀湁鍑虹墖浠诲姟寰呭畬鎴愭椂
// 鍒ゆ柇鏈変袱涓嚭鐗囨垨璋冩嫧浠诲姟鏃跺苟涓斿嚭鐗噄d鍜屾湭瀹屾垚鐨勫嚭鐗囦换鍔d涓嶄竴鏍锋椂鎵ц鍑虹墖
- if (glass.getId() == 2 & !writedstrIdOut.toString().equals(glass.getbarcode().toString())) {
+ if (!writedstrIdOut.toString().equals(glass.getbarcode().toString())) {
spianService.selectout2(glass.getbarcode().toString());
+ outstate=false;
}
}
// 鍒ゆ柇褰撳墠鏄惁鏈夋湭鎵ц鐨勪换鍔�
int outnum = spianMapper.SelectOutSliceshu();
- if (outnum == 0) {
+ //褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
+ if (outnum == 0&&outstate == true ) {
// 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
String outglassid = spianMapper.SelectOutSlice();
if (outglassid != null) {
spianService.selectout2(outglassid);
+ outstate=false;
}
}
- if (outstate == false) {// 涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0//鍑虹墖杞︾┖闂插垽鏂�
+ if (outstate == true) {// 涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0//鍑虹墖杞︾┖闂插垽鏂�
if (outstate1 == true) {
- S7control.getinstance().WriteWord("DB105.14", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
+ S7control.getinstance().WriteWord("DB105.18", (short) 0);// 鍑虹墖浠诲姟鍚姩鏀逛负0
}
}
}
- if (outstate == true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
- Integer state = spianMapper.Selectoutstate();
- String orderid = spianMapper.SelectOrderout();
+ // if (outstate == true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
+ // Integer state = spianMapper.Selectoutstate();
+ // String orderid = spianMapper.SelectOrderout();
- if (orderid != null && state == 0) {
- spianService.selectout(orderid);
- }
- }
+ // if (orderid != null && state == 0) {
+ // spianService.selectout(orderid);
+ // }
+ // }
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
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 60f5831..0d53465 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,7 +1,14 @@
package com.example.springboot.component;
import cn.hutool.json.JSONObject;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
@@ -11,9 +18,11 @@
public class Plchome extends Thread {
+ @Autowired
private HomeMapper homeMapper;
private SpianMapper spianMapper;
private JdbcConnections dbserve;
+ private JdbcConnections jdbcConnections;
@Override
public void run() {
@@ -28,6 +37,7 @@
// 娉ㄥ叆mapper
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+ jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
// 绗煎瓙浣跨敤鎯呭喌
List<StorageCage> tableData = homeMapper.selectAll();
jsonObject.append("tableData", tableData);
@@ -44,17 +54,35 @@
List<StorageCage> tasklist1 = homeMapper.selectinout(3);
List<StorageCage> tasklist2 = homeMapper.selectinout(2);
for (StorageCage storageCage : tasklist1) {
- storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ // storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ try {
+ storageCage.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("", "", ""));
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ try {
+ storageCage.setnorth_glass_buffer1s(
+ jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(storageCage.getGlassId(), "", ""));
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
}
for (StorageCage storageCage : tasklist2) {
- storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
- }
+ // storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ try {
+ storageCage.setnorth_glass_buffer1s(
+ jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(storageCage.getGlassId(), "", ""));
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+ }
jsonObject.append("tasklist1", tasklist1);
jsonObject.append("tasklist2", tasklist2);
// 鏌ヨ鎶ヨ淇℃伅
List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
jsonObject.append("alarmmg", alarmmg);
- // // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+ // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
// List<String> addressList = new ArrayList<String>();
// addressList.add("DB106.12");
// addressList.add("DB106.0");
@@ -67,7 +95,7 @@
// 1);// 鑾峰彇杩涚墖杞︾姸鎬�
// 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)
@@ -75,22 +103,43 @@
// }
// 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
String queid = spianMapper.Selectqueueid();
- String state = spianMapper.Selectqueuestate();
+ int state = spianMapper.Selectqueuestate();
jsonObject.append("queid", queid);
jsonObject.append("state", state);
// 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
String queueglassid2 = homeMapper.GetQueueInfo(2);
String queueglassid1 = homeMapper.GetQueueInfo(1);
- north_glass_buffer1 form2 = homeMapper.SelectGlassByGlassID(queueglassid2);
- north_glass_buffer1 form3 = homeMapper.SelectGlassByGlassID(queueglassid1);
- jsonObject.append("form2", form2);
- jsonObject.append("form3", form3);
- // List<Short> paramlists = new ArrayList<Short>();
- // short para1 = 11111;
- // short para2 = 32000;
- // paramlists.add(para1);
- // paramlists.add(para2);
- // System.out.println(paramlists);
+ // north_glass_buffer1 form2 = homeMapper.SelectGlassByGlassID(queueglassid2);
+ // north_glass_buffer1 form3 = homeMapper.SelectGlassByGlassID(queueglassid1);
+
+ north_glass_buffer1 form2;
+ if(queueglassid2.length()!=0){
+ try {
+ form2 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(queueglassid2, "", "");
+ jsonObject.append("form2", form2);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ north_glass_buffer1 form3;
+ if(queueglassid1.length()!=0){
+ try {
+ form3 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(queueglassid1, "", "");
+ jsonObject.append("form3", form3);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ // 鑾峰彇鍑虹墖闃熷垪淇℃伅
+ List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
+ for (Out_slice out_slice : listoutslice) {
+ out_slice.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(out_slice.getGlassId()));
+ out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
+ }
+ jsonObject.append("listoutslice", listoutslice);
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
boolean dbconnected = false;
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index 565ae8d..9e66cf1 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -1,19 +1,16 @@
package com.example.springboot.controller;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
+import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.logging.log4j.util.PropertySource.Comparator;
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.HomeService;
-// import com.example.springboot.service.MultiFieldComparator;
+import com.example.springboot.service.JdbcConnections;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
import com.example.springboot.component.S7control;
@@ -22,8 +19,8 @@
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.entity.Out_slice;
-
import org.springframework.web.bind.annotation.*;
+
@RestController
@RequestMapping("/home")
@@ -40,6 +37,9 @@
@Autowired
SpianMapper spianMapper;
+ @Autowired
+ private JdbcConnections jdbcConnections;
+
// 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
@GetMapping("/load")
public Result selectAll() {
@@ -66,11 +66,14 @@
// 鏌ヨ杩�/鍑虹墖浠诲姟
@GetMapping("/loadinout")
- public Result selectinout(Integer types) {
+ public Result selectinout(Integer types) throws SQLException{
List<StorageCage> storageCageinout = homeMapper.selectinout(types);
+
for (StorageCage storageCage : storageCageinout) {
- storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ storageCage.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(storageCage.getGlassId(), "", ""));
+ // storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
}
+
Map<String, Object> map = new HashMap<>();
map.put("list", storageCageinout);
return Result.success(map);
@@ -141,10 +144,12 @@
// 鏌ヨ鐞嗙墖绗艰鎯�
@GetMapping("/SelectCageInfo")
- public Result SelectCageInfo(short cage) {
+ public Result SelectCageInfo(short cage) throws SQLException {
List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
for (StorageCage storageCage : cageinfo) {
- storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ // storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ storageCage.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(storageCage.getGlassId(), "", ""));
+
}
Map<String, Object> map = new HashMap<>();
map.put("cageinfo", cageinfo);
@@ -202,10 +207,16 @@
// 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
@GetMapping("/SelectGlassByGlassID")
- public Result SelectGlassByGlassID(String glassid) {
- north_glass_buffer1 north_glass_buffer1s = homeMapper.SelectGlassByGlassID(glassid);
+ public Result SelectGlassByGlassID(String glassid) throws SQLException {
+ // north_glass_buffer1 north_glass_buffer1s = homeMapper.SelectGlassByGlassID(glassid);
+
+ north_glass_buffer1 north_glass_buffer1s=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
Map<String, Object> map = new HashMap<>();
+ if(glassid!=""){
+
map.put("form", north_glass_buffer1s);
+
+ }
return Result.success(map);
}
@@ -226,18 +237,17 @@
if (result > 0) {
map.put("message", "300");
} else {
- // homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
- // spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthMm(), cage,
- // cell);
+ homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
+ spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthmm(), cage, cell);
}
return Result.success(map);
}
// 鏌ヨ鐜荤拑淇℃伅
@PostMapping("/SelectGlass")
- public Result SelectGlass(String orderid) {
+ public Result SelectGlass(String orderid) throws SQLException {
Map<String, Object> map = new HashMap<>();
- List<north_glass_buffer1> glass = homeMapper.SelectGlass(orderid);
+ List<north_glass_buffer1> glass = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIds("", orderid, "");
map.put("glass", glass);
return Result.success(map);
}
@@ -251,8 +261,8 @@
map.put("message", "300");
} else {
homeMapper.InsertQueueGlassId(glassid, id);
- // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
- spianMapper.selectAll(glassid);
+ //璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ spianService.selectAll(glassid);
map.put("message", "200");
}
return Result.success(map);
@@ -287,62 +297,31 @@
// 鏍规嵁閾濇id鑾峰彇瀵瑰簲鐜荤拑淇℃伅
@PostMapping("/SelectAluminumFrameInfoById")
- public Result SelectAluminumFrameInfoById(String FrameBarcode) {
- List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode);
- String flip = homeMapper.SelectFlipByFrameBarcode(FrameBarcode);
+ public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
+
+ // List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode);
+ List<north_glass_buffer1> listAluminumFrame = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIds("","",FrameBarcode);
+ String flip=homeMapper.SelectFlipByFrameBarcode(FrameBarcode);
for (north_glass_buffer1 north_glass_buffer1 : listAluminumFrame) {
- // north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
- // north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
+ north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
+ north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
}
Map<String, Object> map = new HashMap<>();
map.put("listAluminumFrame", listAluminumFrame);
map.put("flip", flip);
return Result.success(map);
}
+
+
// 鏌ヨ鍑虹墖闃熷垪鏁版嵁
@PostMapping("/SelectProductionqueue")
- public Result SelectProductionqueue() {
+ public Result SelectProductionqueue() throws SQLException {
List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
for (Out_slice out_slice : listoutslice) {
- out_slice.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(out_slice.getGlassId()));
+ out_slice.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(out_slice.getGlassId(), "", ""));
out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
}
-
- // HashMap<String,List<Out_slice>> map=new HashMap<String,List<Out_slice>>();
- // HashMap map=new HashMap<>();
- // for (Out_slice out_slice : listoutslice) {
- // String key_=out_slice.getState()+"-";
- // if (map.get(key_)==null) {
- // List<Out_slice> lists=new ArrayList<Out_slice>();
- // lists.add(out_slice);
- // map.put(key_, lists);
- // }else{
- // List<Out_slice> lists=(List<Out_slice>)map.get(key_);
- // lists.add(out_slice);
- // map.put(key_,lists);
- // }
- // }
- // System.out.println(map);
-
- // List<Out_slice> listskey=(List<Out_slice>)map.get("1-");
- // List<Out_slice> list=new ArrayList<Out_slice>();
- // for (Out_slice out_slice : listskey) {
- // if (list.isEmpty()) {
- // list.add(out_slice);
- // }else{
- // for (int i=0;i<list.size();i++) {
- // Out_slice out_slice2=list.get(i);
- // if(out_slice.getID()>out_slice2.getID()){
- // continue;
- // }else{
- // list.add(i,out_slice2);
- // }
- // }
- // }
- // }
- // Collections.sort(listoutslice,new MultiFieldComparator());
-
Map<String, Object> maps = new HashMap<>();
maps.put("listoutslice", listoutslice);
return Result.success(maps);
@@ -357,12 +336,12 @@
return Result.success(map);
}
- //
+ //
@PostMapping("/AddOutSliceS")
- public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) {
+ public Result AddOutSliceS(@RequestBody String[][] AluminumFrames ) {
for (String[] item : AluminumFrames) {
- if (item[1] == "true") {
- homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5]);
+ if(item[1]=="true"){
+ homeMapper.AddOutSliceS(item[0],item[2],item[3],item[4],item[5]);
}
}
System.out.println(AluminumFrames);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
index 370e790..b491ac3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
@@ -9,7 +9,7 @@
private double glasslength;//鐜荤拑瀹�
private double glassheight;//鐜荤拑楂�
private double glasslengthmm;//鐜荤拑瀹絤m
- private double glassheightmm;//鐜荤拑楂榤m
+ private double glassheightmm;
private String glassoutside;//
private String glassinside;//
@@ -19,6 +19,26 @@
private String datemodified;//
private String datecreated;//
private String FrameBarcode;//
+
+ private StorageCage storageCage;
+
+ public void setstorageCage(StorageCage storageCage) {
+ this.storageCage = storageCage;
+ }
+
+ public StorageCage getstorageCage() {
+ return storageCage;
+ }
+
+ private Out_slice out_slice;
+
+ public void setOut_slice(Out_slice out_slice) {
+ this.out_slice = out_slice;
+ }
+
+ public Out_slice getOut_slice() {
+ return out_slice;
+ }
public Integer id() {
return id;
@@ -81,8 +101,8 @@
this.glasslengthmm = glasslengthmm;
}
- public Double glassheightmm() {
- return glassheightmm;
+ public Double getglassheightmm() {
+ return glasslengthmm;
}
public void setglassheightmm(Double glassheightmm) {
this.glassheightmm = glassheightmm;
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index 97b792a..8eee477 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -7,14 +7,13 @@
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.north_glass_buffer1_frames;
import com.example.springboot.entity.Out_slice;
import java.util.List;
@Mapper
public interface HomeMapper {
- // 鏌ヨ姣忎釜绗煎瓙鐨勪娇鐢ㄦ儏鍐�
+ //鏌ヨ姣忎釜绗煎瓙鐨勪娇鐢ㄦ儏鍐�
@Select("select cage,round(100-(21-sum(if(state>0,1,state)))/21*100) as cell,21-sum(if(state>0,1,state)) as state from (select cage,cell,max(state) as state from storage_cage group by cage,cell) as cages group by cage")
List<StorageCage> selectAll();
@@ -66,103 +65,104 @@
@Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid} and state=3")
void UpdateCageTask2(@Param("glassid") String glassid);
- // 鑾峰彇鎶ヨ淇℃伅
+ //鑾峰彇鎶ヨ淇℃伅
@Select("select id,content,timeon as timeons,endTime from alarmmg where endTime is null")
List<alarmmg> SelectAlarmmgInfo();
- // 鑾峰彇鐞嗙墖绗煎唴鐜荤拑淇℃伅
+ //鑾峰彇鐞嗙墖绗煎唴鐜荤拑淇℃伅
@Select("select *,concat(round(a.glasswidth),' x ',round(a.glassheight)) as lengthwidth from storage_cage as a")
List<StorageCage> SelectCageInfo(short cage);
@Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid}")
void DeleteByGlassID(String glassid);
- // 鏌ヨ灏忚溅浣嶇疆
+ //鏌ヨ灏忚溅浣嶇疆
@Select("select * from car_position")
List<CarPosition> Loadcarlist();
- // 鏌ヨ鎿嶄綔瀵嗙爜
+ //鏌ヨ鎿嶄綔瀵嗙爜
@Select("select dianqimima from user where id=1")
String SelectPassword();
- // 鏍规嵁鐜荤拑id鏌ヨ鐞嗙墖绗间俊鎭�
+ //鏍规嵁鐜荤拑id鏌ヨ鐞嗙墖绗间俊鎭�
@Select("select * from storage_cage where glass_id=#{glassid}")
StorageCage SelectGlassInfo(String glassid);
- // 鏌ヨ鐜荤拑淇℃伅
- // @Select("select * from glass where glassid=#{glassid}")
+ //鏌ヨ鐜荤拑淇℃伅
+// @Select("select * from glass where glassid=#{glassid}")
@Select("SELECT ordernumber,listnumber,boxnumber,barcode,glasslength,glassheight,glasslength_mm,glassheight_mm FROM north_glass_buffer1 where barcode=#{barcode}")
north_glass_buffer1 SelectGlassByGlassID(String barcode);
- // 鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
+ //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
@Update("update storage_cage set disabled=#{disabled} where cage=#{cage} and cell=#{cell}")
void Disabled(short cage, short cell, short disabled);
- // 鐞嗙墖绗兼柊澧炵幓鐠�
- @Update("update storage_cage set state=1,glass_id=#{glass.barcode},order_id=#{glass.ordernumber},glasswidth=#{glass.glasslengthMm},glassheight=#{glass.glassheightMm} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
+ //鐞嗙墖绗兼柊澧炵幓鐠�
+ @Update("update storage_cage set state=1,glass_id=#{glass.barcode},order_id=#{glass.ordernumber},glasswidth=#{glass.glasslengthmm},glassheight=#{glass.glassheightmm} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
void Inglassid(north_glass_buffer1 glass, short cage, short cell, short tier);
- // 鏌ヨ鐞嗙墖绗间腑鏄惁鏈夋鐜荤拑
+ //鏌ヨ鐞嗙墖绗间腑鏄惁鏈夋鐜荤拑
@Select("select count(*) from storage_cage where glass_id=#{glassId}")
short SelectStorageByGlassId(String glassId);
- // 鏍规嵁璁㈠崟鏌ヨ鐜荤拑淇℃伅
+ //鏍规嵁璁㈠崟鏌ヨ鐜荤拑淇℃伅
@Select("select * from north_glass_buffer1 where position(#{orderid} in ordernumber)")
List<north_glass_buffer1> SelectGlass(String orderid);
- // 鑾峰彇涓婄墖闃熷垪淇℃伅
+ //鑾峰彇涓婄墖闃熷垪淇℃伅
@Select("select glassid from queue where id=#{id}")
String GetQueueInfo(int id);
- // 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
@Select("update queue set glassid=#{glassid},state=1 where id=#{id}")
- void InsertQueueGlassId(String glassid, Short id);
+ void InsertQueueGlassId(String glassid,Short id);
- // 纭鎵爜浣嶇幓鐠冧俊鎭�
+ //纭鎵爜浣嶇幓鐠冧俊鎭�
@Select("update queue set state=1 where id=1")
void UpdateQueueState();
- // 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
@Select("update queue set glassid='',state=0 where id=#{id}")
void DeleteQueueGlass(String id);
- // 鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟
+ //鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟
@Select("select count(*) from storage_cage where order_id=#{orderid}")
Short SelectGlassNo(String orderid);
- // 鏍规嵁鐜荤拑id浠庡鎴疯〃鏌ヨ鏁版嵁
+ //鏍规嵁鐜荤拑id浠庡鎴疯〃鏌ヨ鏁版嵁
@Select("select * from north_glass_buffer1 where barcode=#{glassid}")
north_glass_buffer1 SelectBoxNo(String glassid);
- // 鏌ヨ鍑虹墖闃熷垪淇℃伅
+ //鏌ヨ鍑虹墖闃熷垪淇℃伅
@Select("select * from out_slice where state=0 or state=1")
List<Out_slice> SelectProductionqueue();
- // 鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
+ //鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
@Select("select * from storage_cage where glass_id=#{glassid}")
StorageCage SelectStorageGlassById(String glassid);
- // 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+
+ //鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@Select("update out_slice set state=3 where id=#{id}")
void DeleteProductionQueueGlass(Short id);
- // 鏍规嵁閾濇id鏌ヨ瀵瑰簲鐜荤拑淇℃伅
+ //鏍规嵁閾濇id鏌ヨ瀵瑰簲鐜荤拑淇℃伅
@Select("select * from north_glass_buffer1 where FrameBarcode=#{FrameBarcode}")
List<north_glass_buffer1> SelectAluminumFrameInfoById(String FrameBarcode);
- // 鏌ヨ鏍规嵁id鏌ヨ
+ //鏌ヨ鏍规嵁id鏌ヨ
@Select("select b.* from storage_cage a inner join out_slice b on a.glass_id=b.glassId where b.glassId=#{glassId}")
List<Out_slice> SelectOutSliceById(String glassId);
- // 鏌ヨ鐜荤拑id鏄惁
+ //鏌ヨ鐜荤拑id鏄惁
@Select("select Flip from north_glass_buffer1_frames where Barcode=#{frameBarcode} limit 1")
String SelectFlipByFrameBarcode(String frameBarcode);
- // 鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
+ //鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
@Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1)")
Out_slice SelectQueueByglassid(String getbarcode);
- // 鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
+ //鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
@Select("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip});")
void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 86dbe5a..61ff339 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -15,7 +15,7 @@
public interface SpianMapper {
//鍒ゆ柇鐩搁偦绗煎瓙鏄惁鏈夌┖鏍�
- @Select("select COUNT(if(a.state1=0,cell,null))as cell,ROUND(id/2)as id from (select *,max(state)as state1 from storage_cage a GROUP BY cage,cell)as a where (a.cage=#{cage1}-1 or a.cage=#{cage1}+1)and if(a.cage<6,a.cage>0 and a.cage<6,a.cage>5) GROUP BY cage ORDER BY cell desc LIMIT 1")
+ @Select("select COUNT(if(a.state1=0,cell,null))as cell,ROUND(id/2)as id from (select *,max(state)as state1 from storage_cage a GROUP BY cage,cell)as a where (a.cage=#{cage1}-1 or a.cage=#{cage1}+1)and if(a.cage<6,a.cage>0 and a.cage<6,a.cage>5) and disabled=0 GROUP BY cage ORDER BY cell desc LIMIT 1")
int selectCage(int cage1);
//@Select("(select*from storage_cage as a where a.state=0 and cage%2=0 ORDER BY id LIMIT 1)union (select a.* from storage_cage a inner join (select cage,if(shu2=1,shu3,shu5) as gezi from ( select cage, count(case when state1=1 and state2=0 then cell else null end)as shu1, count(case when state1=0 then cell else null end) as shu2, min(case when state1=1 and state2=0 then cell else null end) as shu3, min(case when state1=0 then cell else null end) as shu4, min(case when state1=0 or state2=0 then cell else null end) as shu5 from (select *,max(state) as state1,min(state) as state2 from storage_cage group by cage,cell) as a where cage%2!=0 GROUP BY cage HAVING shu2>1 or (shu2=1 and shu1>0) ) as sss limit 1)as b on a.cage=b.cage and a.cell=b.gezi and a.state=0 order by tier limit 1) ORDER BY id LIMIT 1;")
@@ -26,33 +26,31 @@
@Select("select state from storage_cage where cage=#{cage} and cell=#{cell} and tier=1;")
int selectcell(int cage,int cell);
//鍒ゆ柇璇ョ瀛愭槸鍚︽湁鍚堥�傚搴︾┖鏍�
- @Select("select cage,cell,tier,id,ROUND(id/2)as prcId,width from storage_cage where cage=#{cage1} and cell=#{cell} and state=0 and width>=#{width} ORDER BY cell asc,tier asc LIMIT 1")
+ @Select("select cage,cell,tier,id,ROUND(id/2)as prcId,width from storage_cage where cage=#{cage1} and cell=#{cell} and state=0 and disabled=0 and width>=#{width} ORDER BY cell asc,tier asc LIMIT 1")
StorageCage selectCage1(int cage1,int cell,double width);
//鍒ゆ柇绗煎瓙鍐呯幓鐠冩暟
@Select("select COUNT(tier)as tier from storage_cage where cage=#{cage} and cell=#{cell} and state=1;")
int selectsum(int cage,int cell);
+ //瀹屾垚杩涚墖涓殑鐜荤拑鐘舵��
+ @Update("update storage_cage set state=#{state} where glass_id=#{glassid};")
+ void UpdateCageOver(String glassid,int state);
- //@Update("update longzi set glass_id = #{glass_id}, width = #{width}, state = #{state} where cell = #{cell}")
- @Update("update longzi set glass_id =123, width =1600, state =1 where cell =24")
- void update();
+
//鑾峰彇鐜荤拑淇℃伅
- @Select("select orderid as ordernumber,width as glasslengthmm from glass where glassid=#{glassid}")
+ @Select("select ordernumber as ordernumber,glasslength_mm as glasslengthmm,barcode from north_glass_buffer1 where barcode=#{glassid}")
north_glass_buffer1 selectGlass(String glassid);
- @Insert("insert into storage_task(task_type,task_state,shelf_rack,load_rack)values(#{storage_task},#{task_state},#{shelf_rack},#{load_rack})")
- void insert(StorageTask storageTask);
-
//鍑虹墖浠诲姟鏌ヨ
- @Select("select COUNT(order_id)order_id,cage,cell,glasswidth,tier,ROUND(id/2)as prcId,glass_id from storage_cage a where a.order_id=#{orderId} GROUP BY cage,cell ORDER BY cage desc,order_id desc,cell desc,glasswidth desc limit 1")
+ @Select("select COUNT(order_id)order_id,cage,cell,glasswidth,tier,ROUND(id/2)as prcId,glass_id from storage_cage a where a.order_id=#{orderId} and disabled=0 and state=1 GROUP BY cage,cell ORDER BY cage desc,order_id desc,cell desc,glasswidth desc limit 1")
StorageCage selectOut(String orderId);
// @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id,glass_id from storage_cage as a where a.order_id=#{orderId} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
// StorageCage selectOut(String orderId);
//鎸夌幓鐠僆D鍑虹墖浠诲姟鏌ヨ
- @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id from storage_cage as a where a.glass_id=#{glassid} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
+ @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id from storage_cage as a where a.glass_id=#{glassid} and state=1 and disabled=0 order by cage desc,tier desc,cell desc LIMIT 1")
StorageCage selectOut2(String glassid);
//鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
- @Select("select COUNT(state) from storage_cage where cage=#{cage} and cell=#{cell}")
+ @Select("select COUNT(state) from storage_cage where cage=#{cage} and cell=#{cell} and state=1")
int selectGlassState(int cage,int cell);
//鍒ゆ柇璇ヨ皟鎷ㄧ殑绗煎瓙
@@ -91,8 +89,8 @@
@Update("update storage_task set task_state=#{state} where task_type=#{type} and task_state=0;")
void Updatetask(int state,int type);
//淇敼浠诲姟琛�
- @Update("update storage_task set task_state=1 where (task_type=1 or task_type=2) and task_state=0;")
- void UpdatetaskOut();
+ @Update("update storage_task set task_state=1 where (task_type=1 or task_type=2) and task_state=0 and glass_id=#{glassid};")
+ void UpdatetaskOut(String glassid);
//鏌ヨ鎸夎鍗曞嚭鐗�
@Select("select order_id state from order_out where state=0")
String SelectOrderout();
@@ -108,13 +106,18 @@
//鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
@Select("select glass_id from storage_cage where cage=#{cage} and cell=#{cell} and tier=2;")
String SelectGlassid(int cage,int cell);
- //鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
+ //鍒ゆ柇鏈夊嚑鍧楃幓鐠冭繕鍦ㄥ嚭鐗囦腑
@Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
Integer Selectoutstate();
- //娣诲姞浠诲姟搴忓垪
//鑾峰彇杩涚墖闃熷垪id
- @Insert("INSERT INTO `canadames`.`queue`(`glassid`, `type`, `state`,width) VALUES (#{glassid},#{type},0,#{width});")
+ @Insert("update queue set glassid=#{glassid},width=#{width} where type=#{type};")
void insertqueue(String glassid,int type,double width);
+ //瀹屾垚杩涚墖闃熷垪浠诲姟
+ @Update("update queue set state=#{state} where glassid=#{glassid};")
+ void overqueue(String glassid,int state);
+ //鏇存崲浠诲姟闃熷垪
+ @Update("update queue set state=#{state} where glassid=#{glassid} and type=#{type};")
+ void overqueue2(String glassid,int state,int type);
//鑾峰彇浠诲姟搴忓垪
@Select("select glassid,orderid,width,type from queue where state=#{state}")
StorageCage SelectQueue(int state);
@@ -139,14 +142,15 @@
//鑾峰彇杩涚墖闃熷垪id
@Select("select glassid from queue where type=1")
String Selectqueueid();
- //鑾峰彇杩涚墖闃熷垪id
+ //鑾峰彇杩涚墖闃熷垪鏄惁鏈夊緟鍏ュ簱
@Select("select state from queue where type=1")
- String Selectqueuestate();
+ int Selectqueuestate();
//鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑闇�瑕佸嚭
- @Select("SELECT * FROM `out_slice` where state=0 or state=0 order by id limit 1;")
+ @Select("SELECT glassid FROM `out_slice` where state=0 order by id limit 1;")
String SelectOutSlice();
//鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑姝ｅ湪鍑虹墖涓�
- @Select("SELECT count(*) FROM `out_slice` where state=1 or state=0 order by id limit 1;")
+ @Select("SELECT count(*) FROM `out_slice` where state=1;")
int SelectOutSliceshu();
+
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
index f032d87..30c135e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
@@ -5,6 +5,8 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
import org.springframework.stereotype.Component;
@@ -38,6 +40,72 @@
conn.close();
return glass;
}
+
+ public north_glass_buffer1 SelectGlassByGlassIdOrderIdFrameId(String glassid,String orderid,String frameid) throws SQLException {
+ conn = getConn();
+ north_glass_buffer1 north_glass_buffer1s=new north_glass_buffer1();
+ String sql = "select * from north_glass_buffer1 where barcode=? or ordernumber=? or FrameBarcode=?";
+ ps = conn.prepareStatement(sql);
+ ps.setString(1, glassid);
+ ps.setString(2, orderid);
+ ps.setString(3, frameid);
+ rs= ps.executeQuery();
+ while (rs.next()) {
+ 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"));
+ }
+ // conn.close();
+ return north_glass_buffer1s;
+ }
+
+ public List<north_glass_buffer1> SelectGlassByGlassIdOrderIdFrameIds(String glassid,String orderid,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 barcode=? or ordernumber=? or FrameBarcode=?";
+ ps = conn.prepareStatement(sql);
+ ps.setString(1, glassid);
+ ps.setString(2, orderid);
+ ps.setString(3, 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;
+ }
+
/**
* 1. 鍔犺浇椹卞姩
* 2. 鑾峰彇杩炴帴 conn
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index 8bad256..797c9ff 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -22,8 +22,6 @@
private SpianMapper spianMapper;
// @GetMapping("/all")
- // 杩涚墖浠诲姟,浼犺鍗昳d
- // 鎸夎鍗曚紭鍏堣繘鐗�
public Short selectAll(String glassid) {
int cage1;
@@ -45,8 +43,10 @@
List<String> adddresslist = new ArrayList<>();
adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.4");// 杩涚墖绗肩幓鐠冩暟
- adddresslist.add("DB105.12");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
+ adddresslist.add("DB105.4");// 杩涚墖鐜荤拑瀹�
+ adddresslist.add("DB105.8");//杩涚墖绗煎唴宸叉湁鐜荤拑鏁�
+ adddresslist.add("DB105.16");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
+
List<Short> datas = new ArrayList<>();
// String orderid="A001";
@@ -79,10 +79,11 @@
widths = glasslist.getglasslengthmm();
// 鎵ц杩涚墖
- datas.add((short) 1000);
- datas.add((short) prcid);
- datas.add((short) prctier);
- datas.add((short) 1);
+ datas.add((short) 1000);//璧峰浣嶇疆
+ datas.add((short) prcid);//鐩爣浣嶇疆
+ datas.add((short) widths);//杩涚墖鐜荤拑瀹�
+ datas.add((short) prctier); //鐜荤拑鏁�
+ datas.add((short) 1);//浠诲姟鍚姩
//鑾峰彇璇ユ牸瀛愬唴鏄惁鏈夌幓鐠�
int cellint=spianMapper.selectcell(cage1,cells);
if(cellint==1){
@@ -93,6 +94,7 @@
spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString());// 鏂板浠诲姟
S7control.getinstance().WriteWord(adddresslist, datas);
+
}else{
// 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
spianMapper.UpdataAddCage(orderids.toString(), glassid, widths, cage1, cells, ids, 2);
@@ -102,7 +104,7 @@
// S7control.getinstance().WriteByte("DB105.16",glassid);
}
-
+ outmesid(glassid,"DB105.20");
return (200);
}
@@ -154,10 +156,12 @@
ids = cages1.getId();// 鏁版嵁搴揑D
cells = cages1.getCell();// 鏍煎瓙鍙�
prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
+ String glassid="";
// 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
for (int i = 2; i > 0; i--) {
north_glass_buffer1 qglass = spianMapper.SelectQueueGlass(i);
width = qglass.getglasslengthmm();// 鏍煎瓙鍓╀綑瀹藉害
+ glassid=qglass.getbarcode();
spianMapper.UpdataAddqueCage(qglass.getordernumber(), qglass.getbarcode(), width, cage1, cells, i,
1);
spianMapper.UpdataAddCage1(width, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
@@ -169,7 +173,7 @@
datas.add((short) 0);
datas.add((short) 1);
S7control.getinstance().WriteWord(adddresslist, datas);
-
+ outmesid(glassid,"DB105.20");
return (200);
}
@@ -217,6 +221,7 @@
spianMapper.UpdataAddCage(orderid, glassid, widths, cage1, cells, ids, 2);
spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString());// 鏂板浠诲姟
+ outmesid(glassid,"DB105.20");
// S7control.getinstance().WriteWord(adddresslist, datas);
break;
// S7control.getinstance().WriteByte("DB105.16",glassid);
@@ -238,10 +243,10 @@
// spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔★紝鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
// 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
List<String> adddresslist = new ArrayList<>();
- adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
- adddresslist.add("DB105.8");// 鍑虹墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.10");// 鍑虹墖绗肩幓鐠冩暟
- adddresslist.add("DB105.14");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
+ adddresslist.add("DB105.10");// 鍑虹墖杞﹁捣濮嬩綅缃�
+ adddresslist.add("DB105.12");// 鍑虹墖杞︾洰鏍囦綅缃�
+ adddresslist.add("DB105.14");// 鍑虹墖绗肩幓鐠冩暟
+ adddresslist.add("DB105.18");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout = spianMapper.selectOut(orderid);
@@ -288,7 +293,7 @@
spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, orderid);// 鏂板浠诲姟
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassid);// 娲惧彂鍑虹墖ID
+ outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
if (pd != null) {
cage = pd.getCage();
cell = pd.getCage();
@@ -349,7 +354,7 @@
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
System.out.println(datas);
- outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return Result.success(cagecell); // 缁撴潫
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
@@ -376,7 +381,7 @@
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return Result.success(cagecell); // 缁撴潫
}
@@ -389,13 +394,14 @@
public Short selectout2(String glassid) {
- // spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�,鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
// 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
List<String> adddresslist = new ArrayList<>();
- adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
- adddresslist.add("DB105.8");// 鍑虹墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.10");// 鍑虹墖绗肩幓鐠冩暟
- adddresslist.add("DB105.14");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
+ char[] a=glassid.toCharArray();
+
+ adddresslist.add("DB105.10");// 鍑虹墖杞﹁捣濮嬩綅缃�
+ adddresslist.add("DB105.12");// 鍑虹墖杞︾洰鏍囦綅缃�
+ adddresslist.add("DB105.14");// 鍑虹墖绗肩幓鐠冩暟
+ adddresslist.add("DB105.18");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout = spianMapper.selectOut2(glassid);
@@ -431,23 +437,23 @@
spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
}
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassid);// 娲惧彂鍑虹墖ID
+ outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
return (200);// 缁撴潫
} else {
// 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
int state = spianMapper.selectGlassState(cage, cell);
// 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
- if (state == 0) {
+ if (state == 1) {
// spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);
datas.add((short) prcid);
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
+ outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板浠诲姟
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
- outmesid(glassid);// 娲惧彂鍑虹墖ID
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
return (200);// 缁撴潫
@@ -481,7 +487,7 @@
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return (200); // 缁撴潫
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
@@ -509,7 +515,7 @@
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return (200);// 缁撴潫
}
@@ -517,21 +523,22 @@
}
}
- //娲惧彂璋冩嫧浠诲姟鐜荤拑id
- public void outmesid(String glassid) {
- System.out.println("outmesid:" + glassid);
+ //娲惧彂浠诲姟鐜荤拑id
+ public void outmesid(String glassid,String address) {
+ //System.out.println("outmesid:" + glassid);
List<Byte> glassidlist = new ArrayList();
- for (char iditem : glassid.toCharArray()) {
- glassidlist.add(Byte.valueOf(String.valueOf(iditem)));
+ char ds[]=glassid.toCharArray();
+ for (char iditem : ds) {
+ glassidlist.add((byte)iditem);
}
byte[] bytes = Bytes.toArray(glassidlist);
System.out.println("outmesidbytes:" + bytes.length);
- S7control.getinstance().WriteByte("DB105.30", bytes);// 娲惧彂鍑虹墖id
+ S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
}
//鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆
public StringBuilder queGlassid(String address) {
StringBuilder writedstrIdOut = new StringBuilder();
- byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, 13);
+ byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, 14);
if (writedglassidbytesOut != null) {
// 鑾峰彇鐜荤拑id
for (byte iditem : writedglassidbytesOut) {
@@ -550,4 +557,10 @@
String s = new String(bytes, StandardCharsets.UTF_8);
return s.toCharArray();
}
+ //鍒ゆ柇闆嗗悎閲屾槸鍚︿负1
+ public boolean listbool(String address) {
+ List<Short> list = S7control.getinstance().ReadWord(address, 1);//杩斿洖涓簍ure鏃朵负1
+ boolean listbool = list.contains((short) 1);
+ return listbool;
+ }
}
--
Gitblit v1.8.0