From 62718fb62a1fc92ee727ce31e0ca877f3e30f503 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 17 五月 2024 09:41:34 +0800
Subject: [PATCH] 根据客户需求取消操作输入密码
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 211 +++++++++++++++++++---------------------------------
1 files changed, 77 insertions(+), 134 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 e4b097a..bb375db 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
@@ -72,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);
@@ -83,7 +83,9 @@
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- // boolean dbconnected = false;
+
+
+
try {
dbserve.getConn();
dbconnected = true;
@@ -93,67 +95,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);
- // }
- // }
- // }
- // 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();
@@ -204,9 +146,8 @@
// 鏌ヨ褰撳墠閾濇淇℃伅
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) {
@@ -230,6 +171,9 @@
if (CurrentFrame != null) {
S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");
}
+ // else{
+ // S7controlLK.getinstance().writeStrings("", "DB17.0");
+ // }
String J01id = S7controlLK.getinstance().readStrings("DB17.22");
List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1);
Short framerequest = liststate.get(0);
@@ -259,15 +203,6 @@
}
S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
}
-
- String E01id = S7controlLK.getinstance().readStrings("DB17.0");
- // log.info("frameno:" + E01id);
- List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);
- // log.info("frameflip:" + liststates);
- // }else{
- // log.info("Plc2"+S7controlLK.getinstance().CheckConnected());
- // jsonObject.append("Plc2", false);
- // }
} catch (Exception e) {
e.printStackTrace();
}
@@ -284,25 +219,34 @@
// 鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
if (CurrrentGlassId.toString() != "" && CurrrentGlassId.toString() != null) {
- north_glass_buffer1 form6 = dbserve.SelectGlassByGlassIdOrderIdFrameIdouts(CurrrentGlassId, "",
+ north_glass_buffer1 form6=new north_glass_buffer1();
+ try {
+ 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 < 225 || width < 380 || height > 1810 || width > 2760) {
- zhi = 600;
- } else {
- zhi = spianService.selectAlls(form6);
+ } catch (Exception e) {
+ // TODO: handle exception
+ e.printStackTrace();
+ }
+ if(form6!=null){
+ 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 < 225 || width < 380 || height > 1810 || width > 2760) {
+ zhi = 600;
+ } else {
+ zhi = spianService.selectAlls(form6);
+ }
}
}
+
}
jsonObject.append("CurrrentGlassId", CurrrentGlassId);
@@ -336,63 +280,62 @@
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 {
+
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;
+
+ double framewidth=0;
+ double frameheight=0;
+ if(frameInfo!=null){
+ if(frameInfo.getframelengthmm()>frameInfo.getframeheightmm()){
+ framewidth=frameInfo.getframelengthmm();
+ frameheight=frameInfo.getframeheightmm();
+ }else{
+ framewidth=frameInfo.getframeheightmm();
+ frameheight=frameInfo.getframelengthmm();
}
- num++;
- }
- 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();
+ if(framewidth<600||frameheight<400){
+ Plchome.AluminumFrame = north_glass_buffer1s;
+ Plchome.AluminumFrameInfo=frameInfo;
+ }else{
+ for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
+ if (north_glass_buffer1.getstorageCage() == null) {
+ break;
+ }
+ num++;
}
-
- // 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);
+ if(num==0&&north_glass_buffer1s.size()==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();
--
Gitblit v1.8.0