From ba604157629a79b6dd10d5d449eb6c05111bb3ef Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 五月 2024 13:54:20 +0800
Subject: [PATCH] 修改出片队列显示
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 97 +++++++++++++++++++++---------------------------
1 files changed, 43 insertions(+), 54 deletions(-)
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 ffe97fa..1e18bbd 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
@@ -15,6 +15,7 @@
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
+import com.example.springboot.entity.north_frame_buffer1_frames;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
@@ -40,6 +41,8 @@
public static Boolean isConfirm = true;
// 寰呯‘璁ょ殑鍑虹墖闃熷垪
public static List<north_glass_buffer1> AluminumFrame;
+ // 寰呯‘璁ょ殑閾濇淇℃伅
+ public static north_frame_buffer1_frames AluminumFrameInfo=new north_frame_buffer1_frames();
// private Configuration config;
@@ -69,7 +72,7 @@
jsonObject.append("feedglassid", feedglassid);
try {
- Thread.sleep(1000);
+ Thread.sleep(500);
// 娉ㄥ叆mapper
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
@@ -80,7 +83,11 @@
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- // boolean dbconnected = false;
+ // String framenos="X225045101V";
+ // north_frame_buffer1_frames frameInfos=dbserve.SelectFrameBarcode(framenos);
+ // if(frameInfos!=null){
+ // jsonObject.append("frameInfo", frameInfos);
+ // }
try {
dbserve.getConn();
dbconnected = true;
@@ -90,30 +97,7 @@
log.info("dbconnected:" + dbconnected);
}
jsonObject.append("dbconnected", dbconnected);
- // // 鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
- // String CurrrentGlassId = "X22595911002GV";
- // if (CurrrentGlassId.toString() != "" && CurrrentGlassId.toString() != null) {
- // north_glass_buffer1 form6 =
- // dbserve.SelectGlassByGlassIdOrderIdFrameIdouts(CurrrentGlassId, "",
- // "");
- // if (form6.getbarcode() != null) {
- // jsonObject.append("form6", form6);
- // double width = 0;
- // double height = 0;
- // if (form6.getglassheightmm() < form6.getglasslengthmm()) {
- // height = form6.getglassheightmm();
- // width = form6.getglasslengthmm();
- // } else {
- // height = form6.getglasslengthmm();
- // width = form6.getglassheightmm();
- // }
- // if (height < 380 || width < 380 || height > 1810 || width > 2760) {
- // zhi = 600;
- // } else {
- // zhi = spianService.selectAlls(form6);
- // }
- // }
- // }
+
// 绗煎瓙浣跨敤鎯呭喌
List<StorageCage> tableData = homeMapper.selectAll();
@@ -165,8 +149,6 @@
Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
jsonObject.append("CurrentFrame", CurrentFrame);
- // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
- // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
try {
// 閾濇绾夸氦浜�
// if (S7controlLK.getinstance().CheckConnected() == true) {
@@ -257,7 +239,7 @@
height = form6.getglasslengthmm();
width = form6.getglassheightmm();
}
- if (height < 380 || width < 380 || height > 1810 || width > 2760) {
+ if (height < 225 || width < 380 || height > 1810 || width > 2760) {
zhi = 600;
} else {
zhi = spianService.selectAlls(form6);
@@ -296,24 +278,12 @@
if (paramlist != null) {
jsonObject.append("params", paramlist);
}
- // // 鑾峰彇杩涚墖杞︾姸鎬�
- // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
- // 1);// 鑾峰彇杩涚墖杞︾姸鎬�
- // if (datas1ListState != null) {
- // boolean exist1 = datas1ListState.contains((short) 0);
- // jsonObject.append("zhuangtai", exist1);
- // }
-
- // // 鑾峰彇杩涚墖鐜荤拑淇℃伅
- // List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
- // if (inglassInfo != null) {
- // if (inglassInfo.size() > 0) {
- // jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
- // }
- // }
- // // 鑾峰彇閾濇idDB106.DBW64锛屾坊鍔犲埌鍑虹墖闃熷垪
- // String frameno="X21763329601FB";
+
String frameno = spianService.queGlassid("DB103.270", 11).toString();
+ north_frame_buffer1_frames frameInfo=dbserve.SelectFrameBarcode(frameno);
+ if(frameInfo!=null){
+ jsonObject.append("frameInfo", frameInfo);
+ }
if (!frameno.equals(Plchome.FrameNo)) {
Plchome.FrameNo = frameno;
try {
@@ -326,19 +296,32 @@
}
num++;
}
- if (num == north_glass_buffer1s.size()) {
- north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
- } else {
- Plchome.AluminumFrame = north_glass_buffer1s;
+ if(num==0){
+ Plchome.AluminumFrameInfo=dbserve.SelectFrameBarcode(Plchome.FrameNo);
+ if(Plchome.AluminumFrameInfo.getbarcode()!=null){
+ int count=homeMapper.SelectCountFrame(AluminumFrameInfo.getbarcode());
+ if(count==0){
+ int sequence = homeMapper.SelectMaxSquence();
+ homeMapper.AddOutSliceS("", AluminumFrameInfo.getflip().toString(), Plchome.FrameNo, "0", "0", sequence, "0", (short)3, AluminumFrameInfo.getordernumber(),AluminumFrameInfo.getlistnumber() , AluminumFrameInfo.getboxnumber(), "0", "0", AluminumFrameInfo.getframelength().toString(), AluminumFrameInfo.getframeheight().toString());
+ log.info("NoGlass"+AluminumFrameInfo.getbarcode());
+ Plchome.AluminumFrameInfo=new north_frame_buffer1_frames();
+ }
+ }
+ }else{
+ if (num == north_glass_buffer1s.size()) {
+ north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+ } else {
+ Plchome.AluminumFrame = north_glass_buffer1s;
+ Plchome.AluminumFrameInfo=dbserve.SelectFrameBarcode(Plchome.FrameNo);
+ }
}
+
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
- if (AluminumFrame != null) {
- jsonObject.append("AluminumFrame", AluminumFrame);
- }
+
// 澶嶄綅鍊掕鏃�
// 鍦板潃104.9.6
@@ -378,7 +361,7 @@
height = form3.getglasswidth();
width = form3.getglassheight();
}
- if (height < 380 || width < 380 || height > 1810 || width > 2760) {
+ if (height < 225 || width < 380 || height > 1810 || width > 2760) {
zhi = 600;
} else {
if (D01RequestState == true && D01ResponseState != true) {
@@ -391,6 +374,12 @@
plc1=false;
log.info("Plc1" + S7controlLK.getinstance().CheckConnected());
}
+ if (AluminumFrame != null) {
+ jsonObject.append("AluminumFrame", AluminumFrame);
+ }
+ if (AluminumFrameInfo.getbarcode() != null) {
+ jsonObject.append("AluminumFrameInfo", AluminumFrameInfo);
+ }
jsonObject.append("zhi", zhi);
jsonObject.append("Plc1", plc1);
// jsonObject.append("params", new short[] { 30, 40, });
--
Gitblit v1.8.0