From 0417fafe757f09bfb166b1dd1d9f096e966a30d8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 11 五月 2024 09:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 92 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 80 insertions(+), 12 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 237d034..e4b097a 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;
@@ -62,10 +65,12 @@
// b.put()
@Override
public void run() {
+
while (this != null) {
Short zhi = 0;
JSONObject jsonObject = new JSONObject();
jsonObject.append("feedglassid", feedglassid);
+
try {
Thread.sleep(1000);
// 娉ㄥ叆mapper
@@ -112,6 +117,43 @@
// }
// }
// }
+ // String frameno ="X226422133V";
+ // if (!frameno.equals(Plchome.FrameNo)) {
+ // Plchome.FrameNo = frameno;
+ // try {
+ // Short num = 0;
+ // List<north_glass_buffer1> north_glass_buffer1s = north_Glass_Buffer1Service
+ // .SelectAluminumFrameInfoById(Plchome.FrameNo);
+ // for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
+ // if (north_glass_buffer1.getstorageCage() == null) {
+ // break;
+ // }
+ // num++;
+ // }
+ // if(num==0){
+ // Plchome.AluminumFrameInfo=dbserve.SelectFrameBarcode(Plchome.FrameNo);
+ // if(Plchome.AluminumFrameInfo.getbarcode()!=null){
+ // int sequence = homeMapper.SelectMaxSquence();
+ // homeMapper.AddOutSliceS("", AluminumFrameInfo.getflip().toString(), Plchome.FrameNo, "0", "0", sequence, "0", (short)0, AluminumFrameInfo.getordernumber(),AluminumFrameInfo.getlistnumber() , AluminumFrameInfo.getboxnumber(), "0", "0", AluminumFrameInfo.getframelength().toString(), AluminumFrameInfo.getframeheight().toString());
+ // Plchome.AluminumFrameInfo=new north_frame_buffer1_frames();
+ // // void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm,
+ // // int sequence, String position, Short state,
+ // // String orderid, String listid, String boxid, String glasswidth, String glassheight,String framewidthmm,String frameheightmm);
+ // }
+ // }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();
+ // }
+ // }
// 绗煎瓙浣跨敤鎯呭喌
List<StorageCage> tableData = homeMapper.selectAll();
@@ -203,10 +245,10 @@
e.printStackTrace();
}
Short send;
- if (position.equals("0")) {
- send = 2;
- } else {
+ if (position.equals("1")) {
send = 1;
+ } else {
+ send = 2;
}
if (J01id != null) {
int barcodeState = spianMapper.SelectOverState(J01id);// 鑾峰彇璇ラ摑妗嗙殑鐘舵��
@@ -255,7 +297,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);
@@ -311,6 +353,8 @@
// }
// // 鑾峰彇閾濇idDB106.DBW64锛屾坊鍔犲埌鍑虹墖闃熷垪
// String frameno="X21763329601FB";
+
+
String frameno = spianService.queGlassid("DB103.270", 11).toString();
if (!frameno.equals(Plchome.FrameNo)) {
Plchome.FrameNo = frameno;
@@ -324,19 +368,37 @@
}
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();
+ }
+
+
+ // void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm,
+ // int sequence, String position, Short state,
+ // String orderid, String listid, String boxid, String glasswidth, String glassheight,String framewidthmm,String frameheightmm);
+ }
+ }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
@@ -376,7 +438,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) {
@@ -389,6 +451,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