From a446066c5f3cedc33e035b2bbc9ad36b5aa18512 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 14 十二月 2023 08:25:11 +0800
Subject: [PATCH] 调整提示框字体大小
---
CanadaMes-ui/src/views/home/index.vue | 38 ++-
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 24 +-
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 335 +++++++++++++++++------------
CanadaMes-ui/src/lang/locales/en-US.json | 9
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 172 ++++++++-------
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 37 +-
CanadaMes-ui/src/lang/locales/zh-CN.json | 1
7 files changed, 352 insertions(+), 264 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index a315b89..e983db3 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -325,7 +325,14 @@
"Unable to find whether the aluminum frame is flipped or not":"Unable to find whether the aluminum frame is flipped or not",
"You do not have this permission":"You do not have this permission",
"This glass is already in the Queue":"This glass is already in the Queue",
- "complete":"complete",
+ "Complete":"Complete",
+ "Not Allow":"Not Allow",
+ "Completed":"Completed",
+ "Waiting":"Waiting",
+ "Deleted":"Deleted",
+ "Glass State":"Glass State",
+ "Absent":"Absent",
+ "Approximately resettable time":"Approximately resettable time",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 0966dab..94a7ab4 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -324,6 +324,7 @@
"Deleted":"宸插垹闄�",
"Glass State":"鐜荤拑鐘舵��",
"Absent":"涓嶅瓨鍦�",
+ "Approximately resettable time":"鍙浣嶅ぇ姒傛椂闂�",
"langparameter": {
"conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
"conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 0782ede..e9a4965 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -419,11 +419,10 @@
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
- <el-table :data="this.alarm" border style="width: 100%;">
+ <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-column prop="endTime" :label="$t('endTime')"></el-table-column>
</el-table>
</el-dialog>
@@ -635,14 +634,14 @@
this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
}}</el-button>
<el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border :cell-style="cellStyle"
- style="width: 100%;overflow: auto;">
+ style="width: 100%;overflow: auto;font-size: 18px;">
<el-table-column :min-width="100" prop="glassId" :label="$t('Barcode')"></el-table-column>
<el-table-column prop="storageCage.orderId" :label="$t('Order No')"></el-table-column>
<el-table-column prop="storageCage.listId" :label="$t('List No')"></el-table-column>
<el-table-column prop="storageCage.boxId" :label="$t('Box No')"></el-table-column>
<el-table-column prop="storageCage.glasswidthmm" :label="$t('Length')"></el-table-column>
<el-table-column prop="storageCage.glassheightmm" :label="$t('Width')"></el-table-column>
- <el-table-column prop="state" :label="$t('Glass State')">
+ <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('Completed') :scope.row.state == 3 ? $t('Absent') :$t('Deleted') }}
</template>
@@ -729,7 +728,7 @@
</el-table>
</el-dialog>
- <el-dialog :visible.sync="dialogFormCountDown" :title="$t('Glass information corresponding to aluminum frame')" top="5vh">
+ <el-dialog :visible.sync="dialogFormCountDown" :title="$t('Approximately resettable time')" top="5vh">
<div style="font-size: 500px;text-align: center;">
{{ this.CountDowns }}
</div>
@@ -827,11 +826,13 @@
OutingQueue: true,
OrderInfo: true,
CageDetails: true,
- CountDowns:0
+ CountDowns:0,
+ D01RequestState:false
};
},
created() {
this.load();
+
this.init();
}
,
@@ -878,10 +879,12 @@
this.dialogFormVisible2=true;
}
//澶嶄綅鍊掕鏃�
- if (obj.countdown[0]== true&&this.CountDowns==0) {
+ if (obj.countdown[0] == true&&this.CountDowns==0) {
this.CountDown();
}
-
+ //鏄惁鏈夎繘鐗囪姹�
+ this.D01RequestState=obj.D01RequestState[0];
+
//鏄惁鍏佽鍑虹墖
this.isAllowQueue = obj.isAllowQueue[0];
//鍑虹墖闃熷垪
@@ -914,8 +917,14 @@
this.loadglassheight1 = 70;
this.form5 = obj.form3[0];
this.showform3();
- this.Sizerange(this.form5, 3);
this.glassid1 = "";
+ if(this.D01RequestState==true){
+ this.Sizerange(this.form5, 3);
+ }else{
+ this.disabled1=true;
+ }
+
+
} else {
if (this.glassid1 == "") {
this.DeleteBarcodeGlass();
@@ -1689,8 +1698,7 @@
} else {
this.disabled = false;
}
- console.log(position,this.isConfirm);
- if (position == 3 && this.isConfirm == true) {
+ if (position == 3 && this.isConfirm == true&&this.D01RequestState==true) {
this.InsertQueueGlass(1);
}
}
@@ -1710,17 +1718,17 @@
},
CountDown(){
//50绉掑�掓暟璁℃椂
- let count = 50;
+ let count = 45;
let timer = setInterval(
() => {
if (count > 0) {
- this.countDown = count;
+ this.CountDowns = count;
count--;
- this.CountDowns=count;
}
else {
clearInterval(timer);
- this.countDown = 0;
+ this.CountDowns = 0;
+ this.dialogFormCountDown=false;
}
},
1000
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 74e11f8..2cf3a03 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
@@ -42,6 +42,7 @@
while (this != null) {
try {
Thread.sleep(1000);
+
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -108,33 +109,37 @@
}
// 鑾峰彇鍑虹墖闃熷垪淇℃伅
List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
- // List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
- // for (Out_slice out_slice : listoutslice) {
- // out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
- // }
jsonObject.append("listoutslice", listoutslice);
// 鑾峰彇褰撳墠鍑虹墖闃熷垪鐘舵��
jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
// 鑾峰彇閾濇idDB106.DBW64
- String frameno=spianService.queGlassid("DB103.270",14).toString();
- if(frameno!=Plchome.FrameNo&&frameno!=""){
- Plchome.FrameNo=frameno;
- }
- try {
- north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ // String frameno=spianService.queGlassid("DB103.270",14).toString();
+ // if(frameno!=Plchome.FrameNo&&frameno!=""){
+ // Plchome.FrameNo=frameno;
+ // }
+ // try {
+ // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+ // } catch (SQLException e) {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
// 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
jsonObject.append("isConfirm", isConfirm);
+ //鑾峰彇杩涚墖璇锋眰鐘舵��
+ List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
+ boolean D01RequestState = D01Request.contains((short) 1);
+ // boolean D01RequestState =true;
+ jsonObject.append("D01RequestState", D01RequestState);
//澶嶄綅鍊掕鏃�
// 鍦板潃104.9.6
- List<Boolean> countdown = S7control.getinstance().ReadBits("104.9.6", 71);
- jsonObject.append("countdown", countdown);
+ List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
+ for (Boolean countdowns : countdown) {
+ jsonObject.append("countdown", countdowns);
+ }
+ // jsonObject.append("countdown", true);
// 閾濇绾夸氦浜�
// //閾濇id璇锋眰瀛�
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 53913d9..d0572b6 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,25 +17,25 @@
//
System.out.println("鍚姩瀹屾垚");
-new PlcHold().start();
+ new PlcHold().start();
new Plchome().start();
- new Plcalarm().start();
+// new Plcalarm().start();
- new Plcsign().start();
+// new Plcsign().start();
- new Plcaction().start();
- new Plcstate().start();
- new PlcPositioning1().start();
+// new Plcaction().start();
+// new Plcstate().start();
+// new PlcPositioning1().start();
- new PlcParameter2().start();
+// new PlcParameter2().start();
- new PLCAutomaticParameterSetting().start();
+// new PLCAutomaticParameterSetting().start();
- new PlcManualonePosition().start();
- new PlcManualonePosition2().start();
- new PlcServoManualone().start();
- new PLCManualJog().start();
+// new PlcManualonePosition().start();
+// new PlcManualonePosition2().start();
+// new PlcServoManualone().start();
+// new PLCManualJog().start();
}
}
\ No newline at end of file
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 be079cd..1b0f721 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
@@ -1,6 +1,6 @@
package com.example.springboot.mapper;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.*;
import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
@@ -14,166 +14,221 @@
@Mapper
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) 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;")
- //鑾峰彇璁㈠崟鍙锋帓搴忕殑绌鸿鍗曠瀛�
- @Select("select a.cage,COUNT(if(a.order_id=#{orderids},a.order_id,null))as orderid,b.shu,c.shu2,a.cell,min(a.state)as state1,disabled from storage_cage a left join (select COUNT(*)shu,cage from storage_cage where order_id=#{orderids} GROUP BY cage)as b on a.cage=b.cage left join(select cage ,COUNT(glass_id)as shu2 from storage_cage GROUP BY cage)c on a.cage=c.cage where (order_id=#{orderids} or ''='') GROUP BY cage,cell HAVING state1=0 ORDER BY shu desc,shu2,cage asc; ")
- List<StorageCage> selectAll(String orderids);
- //鑾峰彇鍒ゆ柇璇ユ牸瀛愭槸鍚﹂渶瑕佹妸澶栫墖鎺ㄥ叆鍐呯墖浣嶇疆
- @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 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!=0;")
- int selectsum(int cage,int cell);
- //瀹屾垚杩涚墖涓殑鐜荤拑鐘舵��
- @Update("update storage_cage set state=#{state} where glass_id=#{glassid};")
- void UpdateCageOver(String glassid,int state);
+ int selectCage(int cage1);
-
- //鑾峰彇鐜荤拑淇℃伅
- @Select("select *,ordernumber ,glasslength_mm as glasslengthmm,glassheight_mm as glassheightmm,barcode,listnumber,boxnumber,glasslength,glassheight from north_glass_buffer1 where barcode=#{glassid}")
- north_glass_buffer1 selectGlass(String glassid);
-
- //鍑虹墖浠诲姟鏌ヨ
+ // @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;")
+ // 鑾峰彇璁㈠崟鍙锋帓搴忕殑绌鸿鍗曠瀛�
+ @Select("select a.cage,COUNT(if(a.order_id=#{orderids},a.order_id,null))as orderid,b.shu,c.shu2,a.cell,min(a.state)as state1,disabled from storage_cage a left join (select COUNT(*)shu,cage from storage_cage where order_id=#{orderids} GROUP BY cage)as b on a.cage=b.cage left join(select cage ,COUNT(glass_id)as shu2 from storage_cage GROUP BY cage)c on a.cage=c.cage where (order_id=#{orderids} or ''='') GROUP BY cage,cell HAVING state1=0 ORDER BY shu desc,shu2,cage asc; ")
+ List<StorageCage> selectAll(String orderids);
+
+ // 鑾峰彇鍒ゆ柇璇ユ牸瀛愭槸鍚﹂渶瑕佹妸澶栫墖鎺ㄥ叆鍐呯墖浣嶇疆
+ @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 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!=0;")
+ int selectsum(int cage, int cell);
+
+ // 瀹屾垚杩涚墖涓殑鐜荤拑鐘舵��
+ @Update("update storage_cage set state=#{state} where glass_id=#{glassid} and state=3;")
+ void UpdateCageOver(String glassid, int state);
+
+ @Update("update storage_cage set state=#{state} where glass_id=#{glassid} and state=2;")
+ void UpdateCageadd(String glassid, int state);
+
+ // 鑾峰彇鐜荤拑淇℃伅
+ @Select("select *,ordernumber ,glasslength_mm as glasslengthmm,glassheight_mm as glassheightmm,barcode,listnumber,boxnumber,glasslength,glassheight from north_glass_buffer1 where barcode=#{glassid}")
+ north_glass_buffer1 selectGlass(String glassid);
+
+ // 鍑虹墖浠诲姟鏌ヨ
@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鍑虹墖浠诲姟鏌ヨ
+ 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 and disabled=0 order by cage desc,tier desc,cell desc LIMIT 1")
- StorageCage selectOut2(String glassid);
+ StorageCage selectOut2(String glassid);
- //鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
- @Select("select COUNT(state) from storage_cage where cage=#{cage} and cell=#{cell} and state=1")
- int selectGlassState(int cage,int cell);
+ // 鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
+ @Select("select COUNT(state) from storage_cage where cage=#{cage} and cell=#{cell} and state!=0")
+ int selectGlassState(int cage, int cell);
- //鍒ゆ柇璇ヨ皟鎷ㄧ殑绗煎瓙
- @Select("select glass_id,cage,cell,max(state)as shu,ROUND(id/2)as prcid,id from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} GROUP BY cage,cell HAVING shu=0 order by abs(#{cage} - cage),cell desc limit 1;")
- StorageCage selectGlassCage(int cage,double width,int cage1,int cage2);
+ // 鍒ゆ柇璇ヨ皟鎷ㄧ殑绗煎瓙
+ @Select("select glass_id,cage,cell,max(state)as shu,ROUND(id/2)as prcid,id from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} GROUP BY cage,cell HAVING shu=0 order by abs(#{cage} - cage),cell desc limit 1;")
+ StorageCage selectGlassCage(int cage, double width, int cage1, int cage2);
- //鍒犻櫎绗煎瓙淇℃伅(鍑虹墖)
+ // 鍒犻櫎绗煎瓙淇℃伅(鍑虹墖)
@Update("update storage_cage as a set state=#{state},glass_id=null,order_id=null,glasswidth=0,a.glassheight=null,a.glasswidthmm=null,a.glassheightmm=null,a.listid=null,a.boxid=null where glass_id=#{glassid} and state=3;")
- void UpdataGlassCage(String glassid,int state);
- //鏀瑰彉鐜荤拑鐘舵�佷负鍑虹墖涓�
- @Update("update storage_cage as a set state=#{state} where glass_id=#{glassid};")
- void UpdataGlassCageState(String glassid,int state);
+ void UpdataGlassCage(String glassid, int state);
- //淇敼绗煎瓙淇℃伅(杩涚墖)
+ // 鏀瑰彉鐜荤拑鐘舵�佷负鍑虹墖涓�
+ @Update("update storage_cage as a set state=#{state} where glass_id=#{glassid};")
+ void UpdataGlassCageState(String glassid, int state);
+
+ // 淇敼绗煎瓙淇℃伅(杩涚墖)
@Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where id=#{id};")
- void UpdataAddCage(String orderid,String glassid,double width,int cage,int cell,int id,int state);
+ void UpdataAddCage(String orderid, String glassid, double width, int cage, int cell, int id, int state);
@Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{glass.ordernumber},glasswidth=#{glass.glasslengthmm},glassheight=#{glass.glassheightmm},glasswidthmm=#{glass.glasslength},glassheightmm=#{glass.glassheight},listid=#{glass.listnumber},boxid=#{glass.boxnumber} where id=#{id};")
- void UpdataAddCage2(String orderid,String glassid,north_glass_buffer1 glass,int cage,int cell,int id,int state);
- //淇敼绗煎瓙淇℃伅(澶氱墖杩涚墖)
- @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where cage=#{cage} and cell=#{cell} and tier=#{tier};")
- void UpdataAddqueCage(String orderid,String glassid,double width,int cage,int cell,int tier,int state);
- //淇敼鍚岀瀛愭牸瀛愬搴�
- @Update("update storage_cage set width=width-#{width} where cage=#{cage} and cell=#{cell};")
- void UpdataAddCage1(double width,int cage,int cell);
- //淇敼鍚岀瀛愭牸瀛愬搴�
+ void UpdataAddCage2(String orderid, String glassid, north_glass_buffer1 glass, int cage, int cell, int id,
+ int state);
- @Update("update storage_cage set state=#{state} where state=#{oldstate};")
- void UpdataAddCageState(int state,int oldstate);
- //淇敼鍚岀瀛愭牸瀛愬搴�(鍑虹墖)
- @Update("update storage_cage set width=width+#{width} where cage=#{cage} and cell=#{cell};")
- void UpdataOutCage1(double width,int cage,int cell);
- //璋冩嫧鏇存崲绗煎瓙淇℃伅
+ // 淇敼绗煎瓙淇℃伅(澶氱墖杩涚墖)
+ @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where cage=#{cage} and cell=#{cell} and tier=#{tier};")
+ void UpdataAddqueCage(String orderid, String glassid, double width, int cage, int cell, int tier, int state);
+
+ // 淇敼鍚岀瀛愭牸瀛愬搴�
+ @Update("update storage_cage set width=width-#{width} where cage=#{cage} and cell=#{cell};")
+ void UpdataAddCage1(double width, int cage, int cell);
+ // 淇敼鍚岀瀛愭牸瀛愬搴�
+
+ @Update("update storage_cage set state=#{state} where state=#{oldstate};")
+ void UpdataAddCageState(int state, int oldstate);
+
+ // 淇敼鍚岀瀛愭牸瀛愬搴�(鍑虹墖)
+ @Update("update storage_cage set width=width+#{width} where cage=#{cage} and cell=#{cell};")
+ void UpdataOutCage1(double width, int cage, int cell);
+
+ // 璋冩嫧鏇存崲绗煎瓙淇℃伅
@Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=#{tier})as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth,a.glassheight=b.glassheight,a.glasswidthmm=b.glasswidthmm,a.glassheightmm=b.glassheightmm,a.listid=b.listid,a.boxid=b.boxid where a.id=#{id1}")
- void UpdateDBCage(int id1,int cage,int cell,int tier);
- // @Insert("insert into user(name, date, address, user_no) values (#{name}, #{date}, #{address}, #{userNo})")
+ void UpdateDBCage(int id1, int cage, int cell, int tier);
+
+ // @Insert("insert into user(name, date, address, user_no) values (#{name},
+ // #{date}, #{address}, #{userNo})")
// void insert (Spian spian);
- //鏂板浠诲姟琛�
+ // 鏂板浠诲姟琛�
@Insert("INSERT INTO `canadames`.`storage_task`(`task_type`, `task_state`, `shelf_rack`, `load_rack`,start_time,glass_id,count) VALUES (#{tasktype},#{taskstate},#{shelfrack},#{loadrack},now(),#{glassid},#{count});")
- void Inserttask(int tasktype,int taskstate,int shelfrack,int loadrack,String glassid,int count);
- //淇敼浠诲姟琛�
+ void Inserttask(int tasktype, int taskstate, int shelfrack, int loadrack, String glassid, int count);
+
+ // 淇敼浠诲姟琛�
@Update("update storage_task set task_state=#{state} where task_type=#{type} and task_state=0;")
- void Updatetask(int state,int type);
- //淇敼浠诲姟琛�
+ void Updatetask(int state, int type);
+
+ // 淇敼浠诲姟琛�
@Update("update storage_task set task_state=1 where task_state=0 and glass_id=#{glassid};")
void UpdatetaskOut(String glassid);
- //鏌ヨ鎸夎鍗曞嚭鐗�
+
+ // 鏌ヨ鎸夎鍗曞嚭鐗�
@Select("select order_id state from order_out where state=0")
- String SelectOrderout();
- //鍐呭鐗囪皟鎹�
+ String SelectOrderout();
+
+ // 鍐呭鐗囪皟鎹�
@Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=1)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth,a.glassheight=b.glassheight,a.glasswidthmm=b.glasswidthmm,a.glassheightmm=b.glassheightmm,a.listid=b.listid,a.boxid=b.boxid where a.cage=#{cage} and a.cell=#{cell} and a.tier=2")
- void UpdateDBCage1(int cage,int cell);
- //娓呴櫎鍐呯墖鏁版嵁
+ void UpdateDBCage1(int cage, int cell);
+
+ // 娓呴櫎鍐呯墖鏁版嵁
@Update("update storage_cage a set glass_id='',order_id='',state=0,glasswidth=0,glassheight=0,glasswidthmm=0,glassheightmm=0,listid=null,boxid=null where a.cage=#{cage} and a.cell=#{cell} and a.tier=1;")
- void UpdateDBCage2(int cage,int cell);
- //鍒ゆ柇鏄惁鏈夎皟鎷ㄥ畬鍚庡嚭鐗囩殑浠诲姟
+ void UpdateDBCage2(int cage, int cell);
+
+ // 鍒ゆ柇鏄惁鏈夎皟鎷ㄥ畬鍚庡嚭鐗囩殑浠诲姟
@Select("select COUNT(*)as id,glass_id as barcode from storage_task where (task_type=1 or task_type=2) and task_state=0;")
north_glass_buffer1 SelectDBOut();
- //鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
- @Select("select glass_id from storage_cage where cage=#{cage} and cell=#{cell} and tier=2;")
- String SelectGlassid(int cage,int cell);
- //鍒ゆ柇鏈夊嚑鍧楃幓鐠冭繕鍦ㄥ嚭鐗囦腑
- @Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
- Integer Selectoutstate();
- //鍒ゆ柇闃熷垪琛ㄦ槸鍚︽湁璇ョ幓鐠�
- @Select("select COUNT(*) from queue where glassid=#{glassid} and state=1;")
- int Selectquecount(String glassid);
- //鏇存柊杩涚墖闃熷垪
- @Update("update queue set glassid=#{glassid},orderid=#{orderid},listid=#{listid},boxid=#{boxid},state=#{state},glasswidthmm=#{glasswidthmm},glassheightmm=#{glassheightmm},glasswidth=#{glasswidth},glassheight=#{glassheight} where type=#{type};")
- void Updatequeue(String glassid,String orderid,String listid,String boxid,int state,String glasswidth,String glassheight,String glasswidthmm,String glassheightmm,int type);
- //瀹屾垚杩涚墖闃熷垪浠诲姟
- @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);
- //鑾峰彇搴忓垪琛ㄧ殑鐜荤拑瀹�
- @Select("select sum(width)+400 as width,orderid from queue where state=0 limit 1")
- StorageCage SelectQueueWidth();
- //鍒ゆ柇璇ョ瀛愭槸鍚︽湁鍚堥�傚畬鏁寸┖鏍�
- @Select("select cage,cell,tier,id,ROUND(id/2)as prcId,width,max(state)state1 from storage_cage where cage=#{cage1} and cell=#{cell} and state=0 and width>=#{width} HAVING state1=0 ORDER BY cell asc,tier desc LIMIT 1")
- StorageCage selectqueCage1(int cage1,int cell,double width);
- //鑾峰彇搴忓垪琛ㄧ殑鐜荤拑
- @Select("select glassid as barcode,orderid as ordernumber,width as glasslengthmm from queue where state=0 and type=#{type}")
- north_glass_buffer1 SelectQueueGlass(int type);
- //澶氱墖鍑哄簱娓呴櫎涓�鏁翠釜绌烘牸
- @Update("update storage_cage set glass_id='',order_id='',glasswidth=0,width=2750,state=0 where cage=#{cage} and cell=#{cell}")
- void UpdatequeOut(int cage,int cell);
- //鍒ゆ柇搴忓垪琛ㄩ噷鐨勭幓鐠冩槸鍚︽槸鍚屼竴璁㈠崟
- @Select("select COUNT(distinct orderid) from queue ")
- int SelectQueOrder();
- //瀵绘壘鍙互澶氱墖鍑虹墖鐨勭幓鐠�
- @Select("select cage,cell,ROUND(id/2)as prcId,width,count(glass_id)shu from storage_cage where order_id=#{orderid} and (cage!=#{cage} or cell!=#{cell}) GROUP BY cage,cell HAVING shu=1 ORDER BY cage desc,cell desc limit 1")
- StorageCage SelectQueout(String orderid,int cage,int cell);
- //鑾峰彇杩涚墖闃熷垪id
- @Select("select glassid from queue where type=1")
- String Selectqueueid();
- //鑾峰彇杩涚墖闃熷垪鏄惁鏈夊緟鍏ュ簱
- @Select("select state from queue where type=1")
- int Selectqueuestate();
- //鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑闇�瑕佸嚭
- @Select("SELECT glassid FROM `out_slice` where state=0 order by sequence,id limit 1;")
- String SelectOutSlice();
- //鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑姝ｅ湪鍑虹墖涓�
- @Select("SELECT count(*) FROM `out_slice` where state=1;")
- int SelectOutSliceshu();
- //鏇存柊鍑虹墖闃熷垪鐨勪换鍔＄姸鎬�
- @Update("update out_slice set state=#{state} where glassid=#{glassid}")
- void OverOutSlice(String glassid,int state);
- //鑾峰彇鐜荤拑鐨勯摑妗唅d
- @Select("select barcode from out_slice where glassid=#{glassid};")
- String SelectBarcode(String glassId);
- //鑾峰彇鍑虹墖闃熷垪鐨勯摑妗嗘槸鍚﹀叏閮ㄥ畬鎴�
- @Select("select MIN(state) from out_slice where barcode=#{barcode};")
- int SelectOverState(String barcode);
- //鍒犻櫎鍑虹墖闃熷垪璇ラ摑妗嗙殑id
- @Delete("delete from out_slice where barcode=#{barcode};")
- void DeleteQueue(String barcode);
- //鎶婅杩涚墖鐨勭幓鐠冩洿鏂板埌鍑虹墖闃熷垪
- @Select("update out_slice set state=0 where glassId=#{glassId} and state=3")
- void UpdateAddQueue(String glassId);
-}
-
\ No newline at end of file
+
+ // 鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
+ @Select("select glass_id from storage_cage where cage=#{cage} and cell=#{cell} and tier=2;")
+ String SelectGlassid(int cage, int cell);
+
+ // 鍒ゆ柇鏈夊嚑鍧楃幓鐠冭繕鍦ㄥ嚭鐗囦腑
+ @Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
+ Integer Selectoutstate();
+
+ // 鍒ゆ柇闃熷垪琛ㄦ槸鍚︽湁璇ョ幓鐠�
+ @Select("select COUNT(*) from queue where glassid=#{glassid} and state=1;")
+ int Selectquecount(String glassid);
+
+ // 鏇存柊杩涚墖闃熷垪
+ @Update("update queue set glassid=#{glassid},orderid=#{orderid},listid=#{listid},boxid=#{boxid},state=#{state},glasswidthmm=#{glasswidthmm},glassheightmm=#{glassheightmm},glasswidth=#{glasswidth},glassheight=#{glassheight} where type=#{type};")
+ void Updatequeue(String glassid, String orderid, String listid, String boxid, int state, String glasswidth,
+ String glassheight, String glasswidthmm, String glassheightmm, int type);
+
+ // 瀹屾垚杩涚墖闃熷垪浠诲姟
+ @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);
+
+ // 鑾峰彇搴忓垪琛ㄧ殑鐜荤拑瀹�
+ @Select("select sum(width)+400 as width,orderid from queue where state=0 limit 1")
+ StorageCage SelectQueueWidth();
+
+ // 鍒ゆ柇璇ョ瀛愭槸鍚︽湁鍚堥�傚畬鏁寸┖鏍�
+ @Select("select cage,cell,tier,id,ROUND(id/2)as prcId,width,max(state)state1 from storage_cage where cage=#{cage1} and cell=#{cell} and state=0 and width>=#{width} HAVING state1=0 ORDER BY cell asc,tier desc LIMIT 1")
+ StorageCage selectqueCage1(int cage1, int cell, double width);
+
+ // 鑾峰彇搴忓垪琛ㄧ殑鐜荤拑
+ @Select("select glassid as barcode,orderid as ordernumber,width as glasslengthmm from queue where state=0 and type=#{type}")
+ north_glass_buffer1 SelectQueueGlass(int type);
+
+ // 澶氱墖鍑哄簱娓呴櫎涓�鏁翠釜绌烘牸
+ @Update("update storage_cage set glass_id='',order_id='',glasswidth=0,width=2750,state=0 where cage=#{cage} and cell=#{cell}")
+ void UpdatequeOut(int cage, int cell);
+
+ // 鍒ゆ柇搴忓垪琛ㄩ噷鐨勭幓鐠冩槸鍚︽槸鍚屼竴璁㈠崟
+ @Select("select COUNT(distinct orderid) from queue ")
+ int SelectQueOrder();
+
+ // 瀵绘壘鍙互澶氱墖鍑虹墖鐨勭幓鐠�
+ @Select("select cage,cell,ROUND(id/2)as prcId,width,count(glass_id)shu from storage_cage where order_id=#{orderid} and (cage!=#{cage} or cell!=#{cell}) GROUP BY cage,cell HAVING shu=1 ORDER BY cage desc,cell desc limit 1")
+ StorageCage SelectQueout(String orderid, int cage, int cell);
+
+ // 鑾峰彇杩涚墖闃熷垪id
+ @Select("select glassid from queue where type=1")
+ String Selectqueueid();
+
+ // 鑾峰彇杩涚墖闃熷垪鏄惁鏈夊緟鍏ュ簱
+ @Select("select state from queue where type=1")
+ int Selectqueuestate();
+
+ // 鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑闇�瑕佸嚭
+ @Select("SELECT glassid FROM `out_slice` where state=0 order by sequence,id limit 1;")
+ String SelectOutSlice();
+
+ // 鍒ゆ柇閾濇鍑虹墖琛ㄦ槸鍚︽湁鐜荤拑姝ｅ湪鍑虹墖涓�
+ @Select("SELECT count(*) FROM `out_slice` where state=1;")
+ int SelectOutSliceshu();
+
+ // 鏇存柊鍑虹墖闃熷垪鐨勪换鍔＄姸鎬�
+ @Update("update out_slice set state=#{state} where glassid=#{glassid}")
+ void OverOutSlice(String glassid, int state);
+
+ // 鑾峰彇鐜荤拑鐨勯摑妗唅d
+ @Select("select barcode from out_slice where glassid=#{glassid};")
+ String SelectBarcode(String glassId);
+
+ // 鑾峰彇鍑虹墖闃熷垪鐨勯摑妗嗘槸鍚﹀叏閮ㄥ畬鎴�
+ @Select("select MIN(state) from out_slice where barcode=#{barcode};")
+ int SelectOverState(String barcode);
+
+ // 鍒犻櫎鍑虹墖闃熷垪璇ラ摑妗嗙殑id
+ @Delete("delete from out_slice where barcode=#{barcode};")
+ void DeleteQueue(String barcode);
+
+ // 鎶婅杩涚墖鐨勭幓鐠冩洿鏂板埌鍑虹墖闃熷垪
+ @Select("update out_slice set state=0 where glassId=#{glassId} and state=3")
+ void UpdateAddQueue(String glassId);
+}
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 01b9e20..7f56ab3 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
@@ -1,4 +1,5 @@
package com.example.springboot.service;
+
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -37,10 +38,10 @@
List<String> adddresslist = new ArrayList<>();
adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.4");// 杩涚墖鐜荤拑瀹�
- adddresslist.add("DB105.8");//杩涚墖绗煎唴宸叉湁鐜荤拑鏁�
+ adddresslist.add("DB105.4");// 杩涚墖鐜荤拑瀹�
+ adddresslist.add("DB105.8");// 杩涚墖绗煎唴宸叉湁鐜荤拑鏁�
adddresslist.add("DB105.16");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
-
+
List<Short> datas = new ArrayList<>();
// String orderid="A001";
@@ -64,7 +65,7 @@
}
// 鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
// 鏈夊悎閫傜┖鏍兼椂杩涚墖
- if (cages1 != null && cages >= 1&&storageCage2.getDisabled()==0) {
+ if (cages1 != null && cages >= 1 && storageCage2.getDisabled() == 0) {
ids = cages1.getId();// 鏁版嵁搴揑D
tiers = cages1.getTier();// 鍐呭鐗�
cells = cages1.getCell();// 鏍煎瓙鍙�
@@ -73,37 +74,36 @@
widths = glasslist.getglasslengthmm();
// 鎵ц杩涚墖
- 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){
- //灏嗗鐗囩幓鐠冪殑鏁版嵁鏇存柊鍒板唴鐗�
- spianMapper.UpdateDBCage(ids, cage1, cells,1);
- //灏嗘柊鍏ョ殑鐜荤拑瀛樺叆澶栫墖
- //spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids-1, 2);
- spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1,cells, ids-1, 2);
+ 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) {
+ // 灏嗗鐗囩幓鐠冪殑鏁版嵁鏇存柊鍒板唴鐗�
+ spianMapper.UpdateDBCage(ids, cage1, cells, 1);
+ // 灏嗘柊鍏ョ殑鐜荤拑瀛樺叆澶栫墖
+ // spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids-1, 2);
+ spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1, cells, ids - 1, 2);
spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
- spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(),prctier);// 鏂板浠诲姟
+ spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(), prctier);// 鏂板浠诲姟
S7control.getinstance().WriteWord(adddresslist, datas);
- System.out.println("姹囨姤鏃朵换鍔" + datas);
-
- }else{
- // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
- //spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 2);
- spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1,cells, ids, 2);
- spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
- spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(),prctier);// 鏂板浠诲姟
- S7control.getinstance().WriteWord(adddresslist, datas);
- System.out.println("姹囨姤鏃朵换鍔" + datas);
+ System.out.println("鍑虹墖浠诲姟|" + datas);
+ } else {
+ // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
+ // spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 2);
+ spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1, cells, ids, 2);
+ spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
+ spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(), prctier);// 鏂板浠诲姟
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ System.out.println("鍑虹墖浠诲姟|" + datas);
- // S7control.getinstance().WriteByte("DB105.16",glassid);
+ // S7control.getinstance().WriteByte("DB105.16",glassid);
}
- outmesid(glassid,"DB105.20");
+ outmesid(glassid, "DB105.20");
return (200);
}
@@ -113,11 +113,10 @@
}
-
public Short selectout2(String glassid) {
// 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
List<String> adddresslist = new ArrayList<>();
- char[] a=glassid.toCharArray();
+ char[] a = glassid.toCharArray();
adddresslist.add("DB105.10");// 鍑虹墖杞﹁捣濮嬩綅缃�
adddresslist.add("DB105.12");// 鍑虹墖杞︾洰鏍囦綅缃�
@@ -148,19 +147,19 @@
datas.add((short) 1000);
datas.add((short) state);
datas.add((short) 1);
- spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
+ spianMapper.OverOutSlice(glassid, 1);// 鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
-
- spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid,state);// 鏂板浠诲姟
+ spianMapper.UpdataGlassCageState(glassid, 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+
+ spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, state);// 鏂板浠诲姟
// int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
if (state == 2) {
spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
}
-
+ System.out.println("鍑虹墖浠诲姟|" + datas);
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
+ outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID
return (200);// 缁撴潫
} else {
@@ -173,12 +172,13 @@
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
- spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
- spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid,1);// 鏂板浠诲姟
+ spianMapper.OverOutSlice(glassid, 1);// 鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
+ spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, 1);// 鏂板浠诲姟
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
- spianMapper.OverOutSlice(glassid,2);//瀹屾垚鍑虹墖闃熷垪浠诲姟
- outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
+ spianMapper.UpdataGlassCageState(glassid, 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+ spianMapper.OverOutSlice(glassid, 2);// 瀹屾垚鍑虹墖闃熷垪浠诲姟
+ System.out.println("鍑虹墖浠诲姟|" + datas);
+ outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
return (200);// 缁撴潫
@@ -203,16 +203,17 @@
datas.add((short) 1);
// 鏇存崲鐜荤拑鐨勭瀛�
String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
- spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdateDBCage(ids, cage, cell, 2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCageState(glassids,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
- spianMapper.Inserttask(2, 0, cageout.getId(), ids, glassid,2);// 鏂板璋冨害浠诲姟
- //spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
+ //spianMapper.UpdataGlassCageState(glassids, 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+ spianMapper.Inserttask(2, 0, cageout.getId(), ids, glassid, 2);// 鏂板璋冨害浠诲姟
+ // spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ System.out.println("鍑虹墖浠诲姟|" + datas);
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids, "DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return (200); // 缁撴潫
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
@@ -231,16 +232,17 @@
datas.add((short) 2);
datas.add((short) 1);
String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
- spianMapper.Inserttask(2, 0, cageout.getId() + 1, ids, glassid,2);// 鏂板璋冨害浠诲姟
- //spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
- spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.Inserttask(2, 0, cageout.getId() + 1, ids, glassid, 2);// 鏂板璋冨害浠诲姟
+ // spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
+ spianMapper.UpdateDBCage(ids, cage, cell, 2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCageState(glassids,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+ //spianMapper.UpdataGlassCageState(glassids, 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ System.out.println("鍑虹墖浠诲姟|" + datas);
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids, "DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return (200);// 缁撴潫
}
@@ -248,57 +250,67 @@
}
}
- //娲惧彂浠诲姟鐜荤拑id
- public void outmesid(String glassid,String address) {
- //System.out.println("outmesid:" + glassid);
+
+ // 娲惧彂浠诲姟鐜荤拑id
+ public void outmesid(String glassid, String address) {
+ // System.out.println("outmesid:" + glassid);
List<Byte> glassidlist = new ArrayList();
- char ds[]=glassid.toCharArray();
+ char ds[] = glassid.toCharArray();
for (char iditem : ds) {
- glassidlist.add((byte)iditem);
+ glassidlist.add((byte) iditem);
}
byte[] bytes = Bytes.toArray(glassidlist);
System.out.println("outmesidbytes:" + bytes.length);
S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
}
- //鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆
- public StringBuilder queGlassid(String address,int count) {
+
+ // 鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆
+ public StringBuilder queGlassid(String address, int count) {
StringBuilder writedstrIdOut = new StringBuilder();
byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, count);
- if (writedglassidbytesOut != null) {
- // 鑾峰彇鐜荤拑id
- for (byte iditem : writedglassidbytesOut) {
- writedstrIdOut.append((char) iditem);
+ if (writedglassidbytesOut != null) {
+ // 鑾峰彇鐜荤拑id
+ for (byte iditem : writedglassidbytesOut) {
+ writedstrIdOut.append((char) iditem);
+ }
}
- }
return writedstrIdOut;
}
- //char鏁扮粍杞寲鎴恇it鏁扮粍
- public static byte[] toBytes(char[] chars) {
+
+ // char鏁扮粍杞寲鎴恇it鏁扮粍
+ public static byte[] toBytes(char[] chars) {
String s = new String(chars);
return s.getBytes(StandardCharsets.UTF_8);
}
- //bit鏁扮粍杞寲鎴恈har鏁扮粍
+
+ // bit鏁扮粍杞寲鎴恈har鏁扮粍
public static char[] toChars(byte[] bytes) {
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);
+
+ // 鍒ゆ柇闆嗗悎閲屾槸鍚︿负1
+ public boolean listbool(String address) {
+ List<Short> list = S7control.getinstance().ReadWord(address, 1);// 杩斿洖涓簍ure鏃朵负1
+ boolean listbool = list.contains((short) 1);
return listbool;
}
- //鏍规嵁鐜荤拑id瀹屾垚鍦ㄨ繘琛屼腑鐨勪换鍔�
- public void overtask(String glassid){
+
+ // 鏍规嵁鐜荤拑id瀹屾垚鍦ㄨ繘琛屼腑鐨勪换鍔�
+ public void overtask(String glassid) {
spianMapper.UpdateCageOver(glassid, 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
spianMapper.UpdatetaskOut(glassid); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰繘鐗囦换鍔�
spianMapper.OverOutSlice(glassid, 2);// 瀹屾垚鍑虹墖闃熷垪浠诲姟
- spianMapper.UpdataGlassCage(glassid,0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅
- String barcode=spianMapper.SelectBarcode(glassid);//鑾峰彇璇ョ幓鐠冪殑閾濇id
- spianMapper.UpdateAddQueue(glassid);//鎶婅繘鐗囩殑鐜荤拑鏇存柊鍒板嚭鐗囬槦鍒椾腑
- int barcodeState=spianMapper.SelectOverState(barcode);//鑾峰彇璇ラ摑妗嗙殑鐘舵��
- if(barcodeState==2){//褰撹閾濇鎵�鏈夌殑鐜荤拑閮芥槸瀹屾垚鐘舵�佹椂鍒犻櫎鍦ㄥ嚭鐗囬槦鍒楃殑鏁版嵁
- spianMapper.DeleteQueue(barcode);
+ spianMapper.UpdataGlassCage(glassid, 0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.UpdateCageadd(glassid,1);
+ String barcode = spianMapper.SelectBarcode(glassid);// 鑾峰彇璇ョ幓鐠冪殑閾濇id
+ spianMapper.UpdateAddQueue(glassid);// 鎶婅繘鐗囩殑鐜荤拑鏇存柊鍒板嚭鐗囬槦鍒椾腑
+ if (barcode != null) {
+ int barcodeState = spianMapper.SelectOverState(barcode);// 鑾峰彇璇ラ摑妗嗙殑鐘舵��
+ if (barcodeState == 2) {// 褰撹閾濇鎵�鏈夌殑鐜荤拑閮芥槸瀹屾垚鐘舵�佹椂鍒犻櫎鍦ㄥ嚭鐗囬槦鍒楃殑鏁版嵁
+ spianMapper.DeleteQueue(barcode);
+ }
}
+
}
}
--
Gitblit v1.8.0