diff --git a/ym-gateway/src/main/resources/logback.xml b/ym-gateway/src/main/resources/logback.xml index 9107c9c..5d3e3f5 100644 --- a/ym-gateway/src/main/resources/logback.xml +++ b/ym-gateway/src/main/resources/logback.xml @@ -15,6 +15,7 @@ + @@ -193,6 +194,81 @@ DENY + + + ${logging.eventlog}/event1/kuka-event1-log-info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${logging.eventlog}/kuka-event1-log-info-%d{yyyy-MM-dd}.%i.log + + 100MB + + 999 + 200GB + + + + info + ACCEPT + DENY + + + + + ${logging.eventlog}/event2/kuka-event2-log-info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${logging.eventlog}/kuka-event2-log-info-%d{yyyy-MM-dd}.%i.log + + 100MB + + 999 + 200GB + + + + info + ACCEPT + DENY + + + + + ${logging.eventlog}/event3/kuka-event3-log-info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${logging.eventlog}/kuka-event3-log-info-%d{yyyy-MM-dd}.%i.log + + 100MB + + 999 + 200GB + + + + info + ACCEPT + DENY + + + + + @@ -405,7 +481,17 @@ - + + + + + + + + + + + diff --git a/ym-packing/src/main/java/com/cnbm/dispatch/KukaEvent1Thread.java b/ym-packing/src/main/java/com/cnbm/dispatch/KukaEvent1Thread.java new file mode 100644 index 0000000..6276ca6 --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatch/KukaEvent1Thread.java @@ -0,0 +1,420 @@ +package com.cnbm.dispatch; + +import cn.hutool.core.date.DateUtil; +import com.cnbm.dispatch.enums.kuka.step1.Step1Mes2PlcVar; +import com.cnbm.dispatch.enums.kuka.step1.Step1Plc2MesVar; +import com.cnbm.dispatch.enums.kuka.step2.Step2Mes2PlcVar; +import com.cnbm.dispatch.enums.kuka.step2.Step2Plc2MesVar; +import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar; +import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar; +import com.cnbm.packing.dto.CamlineExtendArgDTO; +import com.cnbm.packing.dto.CamlineSubIdDTO; +import com.cnbm.packing.entity.WoPackagingBox; +import com.cnbm.packing.entity.WoPackagingBoxSubstrate; +import com.cnbm.packing.entity.WoPowerLevel; +import com.cnbm.packing.service.*; +import com.cnbm.s7.s7connector.enmuc.S7Client; +import com.cnbm.s7.s7connector.type.PlcVar; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import java.text.DecimalFormat; +import java.text.Format; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.Date; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2022/12/23 12:33 + */ +@Component +@Order(value = 1) +public class KukaEvent1Thread implements ApplicationRunner { + private static final Logger logger = LoggerFactory.getLogger("EVENT1"); + + @Autowired + DynamicDataSourceService service; + @Autowired + WoPowerLevelServiceBiz levelServiceBiz; + + @Autowired + WoCompensationPowerServiceBiz compensationPowerServiceBiz; + + @Autowired + WoPackagingBoxSubstrateServiceBiz substrateServiceBiz; + + @Autowired + WoPackagingBoxServiceBiz boxServiceBiz; + + public KukaEvent1Thread(){ + this.kukaStep1 = Executors.newScheduledThreadPool(1); + } + + private ScheduledExecutorService kukaStep1; + + + + + /** + * return + * 成功： 返回相应的object对象 + * 失败： 返回null + * */ + private Object read(S7Client s7Client,Step1Plc2MesVar var) { + try { + return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); + }catch (Throwable e){ + logger.info("host:"+s7Client.getHost()+" ; read 操作出现问题: {}",e.getMessage(),e); + return null; + } + } + private void write(S7Client s7Client, Step1Mes2PlcVar var, Object newValue) { + if(var.getType().equals(PlcVar.STRING_Array)){ + String[] s = (String[])newValue; + String[] ss = (String[])newValue; + if(s.length > var.getLength() ){ + ss = new String[var.getLength()]; + for(int i=0;i< var.getLength();i++){ + ss[i] = s[i]; + } + } + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); + }else { + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); + } + } + + private Object read(S7Client s7Client, Step2Plc2MesVar var) { + try { + return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); + }catch (Throwable e){ + logger.info("host:"+s7Client.getHost()+" ; read 操作出现问题: {}",e.getMessage(),e); + return null; + } + } + private void write(S7Client s7Client, Step2Mes2PlcVar var, Object newValue) { + if(var.getType().equals(PlcVar.STRING_Array)){ + String[] s = (String[])newValue; + String[] ss = (String[])newValue; + if(s.length > var.getLength() ){ + ss = new String[var.getLength()]; + for(int i=0;i< var.getLength();i++){ + ss[i] = s[i]; + } + } + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); + }else { + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); + } + } + + private Object read(S7Client s7Client, Step3Plc2MesVar var) { + try { + return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); + }catch (Throwable e){ + logger.info("host:"+s7Client.getHost()+" ; read 操作出现问题: {}",e.getMessage(),e); + return null; + } + } + private void write(S7Client s7Client, Step3Mes2PlcVar var, Object newValue) { + if(var.getType().equals(PlcVar.STRING_Array)){ + String[] s = (String[])newValue; + String[] ss = (String[])newValue; + if(s.length > var.getLength() ){ + ss = new String[var.getLength()]; + for(int i=0;i< var.getLength();i++){ + ss[i] = s[i]; + } + } + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); + }else { + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); + } + } + + + public String getBoxId(String sapMaterial){ + Integer todayBoxNum = service.getTodayBoxNum()+1; + String nowTime = DateUtil.format(new Date(), "yyMMdd"); + + todayBoxNum+=500; + logger.info("BOXID生成Event-------现在生成boxId ，sapMaterial: "+sapMaterial+"，nowTime:"+nowTime+"，todayBoxNum:"+formateString(todayBoxNum)); + String res = "301"+sapMaterial+nowTime+formateString(todayBoxNum); + return res; + } + + + public String getErrorBoxId(String sapMaterial){ + + String nowTime = DateUtil.format(new Date(), "yyMMdd"); + String mixBoxError = "001"; + String res = "444"+sapMaterial+nowTime+mixBoxError; + logger.info("BOXID生成Event-------现在生成errBoxId ，sapMaterial: "+sapMaterial+"，nowTime:"+nowTime); + + return res; + } + + public String removeKG(String str){ + return str.substring(0,17); + } + + public static void main(String[] args) { + Integer a = 102; + Format f1 = new DecimalFormat("000"); + System.out.println(f1.format(a)); + } + public String formateString(Integer a){ + Format f1 = new DecimalFormat("000"); + return f1.format(a); + } + + //return true 出现混档了，return false 没有出现混档 + private boolean isMixLevel(String[] subIds,Integer size){ + String correctLevel = substrateServiceBiz.getBySubId(subIds[0]).getPowerLevel(); + String errMsg = "以下基板ID出现混档："; + boolean res = false; + for(int i=0;i var.getLength() ){ + ss = new String[var.getLength()]; + for(int i=0;i< var.getLength();i++){ + ss[i] = s[i]; + } + } + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); + }else { + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); + } + } + + private Object read(S7Client s7Client, Step2Plc2MesVar var) { + try { + return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); + }catch (Throwable e){ + logger.info("host:"+s7Client.getHost()+" ; read 操作出现问题: {}",e.getMessage(),e); + return null; + } + } + private void write(S7Client s7Client, Step2Mes2PlcVar var, Object newValue) { + if(var.getType().equals(PlcVar.STRING_Array)){ + String[] s = (String[])newValue; + String[] ss = (String[])newValue; + if(s.length > var.getLength() ){ + ss = new String[var.getLength()]; + for(int i=0;i< var.getLength();i++){ + ss[i] = s[i]; + } + } + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); + }else { + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); + } + } + + private Object read(S7Client s7Client, Step3Plc2MesVar var) { + try { + return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); + }catch (Throwable e){ + logger.info("host:"+s7Client.getHost()+" ; read 操作出现问题: {}",e.getMessage(),e); + return null; + } + } + private void write(S7Client s7Client, Step3Mes2PlcVar var, Object newValue) { + if(var.getType().equals(PlcVar.STRING_Array)){ + String[] s = (String[])newValue; + String[] ss = (String[])newValue; + if(s.length > var.getLength() ){ + ss = new String[var.getLength()]; + for(int i=0;i< var.getLength();i++){ + ss[i] = s[i]; + } + } + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); + }else { + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); + } + } + + + public String getBoxId(String sapMaterial){ + Integer todayBoxNum = service.getTodayBoxNum()+1; + String nowTime = DateUtil.format(new Date(), "yyMMdd"); + + todayBoxNum+=500; + logger.info("BOXID生成Event-------现在生成boxId ，sapMaterial: "+sapMaterial+"，nowTime:"+nowTime+"，todayBoxNum:"+formateString(todayBoxNum)); + String res = "301"+sapMaterial+nowTime+formateString(todayBoxNum); + return res; + } + + + public String getErrorBoxId(String sapMaterial){ + + String nowTime = DateUtil.format(new Date(), "yyMMdd"); + String mixBoxError = "001"; + String res = "444"+sapMaterial+nowTime+mixBoxError; + logger.info("BOXID生成Event-------现在生成errBoxId ，sapMaterial: "+sapMaterial+"，nowTime:"+nowTime); + + return res; + } + + public String removeKG(String str){ + return str.substring(0,17); + } + + public static void main(String[] args) { + Integer a = 102; + Format f1 = new DecimalFormat("000"); + System.out.println(f1.format(a)); + } + public String formateString(Integer a){ + Format f1 = new DecimalFormat("000"); + return f1.format(a); + } + + //return true 出现混档了，return false 没有出现混档 + private boolean isMixLevel(String[] subIds,Integer size){ + String correctLevel = substrateServiceBiz.getBySubId(subIds[0]).getPowerLevel(); + String errMsg = "以下基板ID出现混档："; + boolean res = false; + for(int i=0;i var.getLength() ){ + ss = new String[var.getLength()]; + for(int i=0;i< var.getLength();i++){ + ss[i] = s[i]; + } + } + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); + }else { + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); + } + } + + private Object read(S7Client s7Client, Step2Plc2MesVar var) { + try { + return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); + }catch (Throwable e){ + logger.info("host:"+s7Client.getHost()+" ; read 操作出现问题: {}",e.getMessage(),e); + return null; + } + } + private void write(S7Client s7Client, Step2Mes2PlcVar var, Object newValue) { + if(var.getType().equals(PlcVar.STRING_Array)){ + String[] s = (String[])newValue; + String[] ss = (String[])newValue; + if(s.length > var.getLength() ){ + ss = new String[var.getLength()]; + for(int i=0;i< var.getLength();i++){ + ss[i] = s[i]; + } + } + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); + }else { + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); + } + } + + private Object read(S7Client s7Client, Step3Plc2MesVar var) { + try { + return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); + }catch (Throwable e){ + logger.info("host:"+s7Client.getHost()+" ; read 操作出现问题: {}",e.getMessage(),e); + return null; + } + } + private void write(S7Client s7Client, Step3Mes2PlcVar var, Object newValue) { + if(var.getType().equals(PlcVar.STRING_Array)){ + String[] s = (String[])newValue; + String[] ss = (String[])newValue; + if(s.length > var.getLength() ){ + ss = new String[var.getLength()]; + for(int i=0;i< var.getLength();i++){ + ss[i] = s[i]; + } + } + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); + }else { + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); + } + } + + + public String getBoxId(String sapMaterial){ + Integer todayBoxNum = service.getTodayBoxNum()+1; + String nowTime = DateUtil.format(new Date(), "yyMMdd"); + + todayBoxNum+=500; + logger.info("BOXID生成Event-------现在生成boxId ，sapMaterial: "+sapMaterial+"，nowTime:"+nowTime+"，todayBoxNum:"+formateString(todayBoxNum)); + String res = "301"+sapMaterial+nowTime+formateString(todayBoxNum); + return res; + } + + + public String getErrorBoxId(String sapMaterial){ + + String nowTime = DateUtil.format(new Date(), "yyMMdd"); + String mixBoxError = "001"; + String res = "444"+sapMaterial+nowTime+mixBoxError; + logger.info("BOXID生成Event-------现在生成errBoxId ，sapMaterial: "+sapMaterial+"，nowTime:"+nowTime); + + return res; + } + + public String removeKG(String str){ + return str.substring(0,17); + } + + public static void main(String[] args) { + Integer a = 102; + Format f1 = new DecimalFormat("000"); + System.out.println(f1.format(a)); + } + public String formateString(Integer a){ + Format f1 = new DecimalFormat("000"); + return f1.format(a); + } + + //return true 出现混档了，return false 没有出现混档 + private boolean isMixLevel(String[] subIds,Integer size){ + String correctLevel = substrateServiceBiz.getBySubId(subIds[0]).getPowerLevel(); + String errMsg = "以下基板ID出现混档："; + boolean res = false; + for(int i=0;i var.getLength() ){ - ss = new String[var.getLength()]; - for(int i=0;i< var.getLength();i++){ - ss[i] = s[i]; - } - } - s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); - }else { - s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); - } - } - - private Object read(S7Client s7Client, Step2Plc2MesVar var) { - try { - return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); - }catch (Exception e){ - logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage()); - e.printStackTrace(); - return null; - } - } - private void write(S7Client s7Client, Step2Mes2PlcVar var, Object newValue) { - if(var.getType().equals(PlcVar.STRING_Array)){ - String[] s = (String[])newValue; - String[] ss = (String[])newValue; - if(s.length > var.getLength() ){ - ss = new String[var.getLength()]; - for(int i=0;i< var.getLength();i++){ - ss[i] = s[i]; - } - } - s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); - }else { - s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); - } - } - - private Object read(S7Client s7Client, Step3Plc2MesVar var) { - try { - return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); - }catch (Exception e){ - logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage()); - e.printStackTrace(); - return null; - } - } - private void write(S7Client s7Client, Step3Mes2PlcVar var, Object newValue) { - if(var.getType().equals(PlcVar.STRING_Array)){ - String[] s = (String[])newValue; - String[] ss = (String[])newValue; - if(s.length > var.getLength() ){ - ss = new String[var.getLength()]; - for(int i=0;i< var.getLength();i++){ - ss[i] = s[i]; - } - } - s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); - }else { - s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); - } - } - - - public String getBoxId(String sapMaterial){ - Integer todayBoxNum = service.getTodayBoxNum()+1; - String nowTime = DateUtil.format(new Date(), "yyMMdd"); - - todayBoxNum+=500; - String res = "301"+sapMaterial+nowTime+formateString(todayBoxNum); - return res; - } - - - public String getErrorBoxId(String sapMaterial){ - - String nowTime = DateUtil.format(new Date(), "yyMMdd"); - String mixBoxError = "001"; - String res = "Err"+sapMaterial+nowTime+mixBoxError; - return res; - } - - public String removeKG(String str){ - return str.substring(0,17); - } - - public static void main(String[] args) { - Integer a = 102; - Format f1 = new DecimalFormat("000"); - System.out.println(f1.format(a)); - } - public String formateString(Integer a){ - Format f1 = new DecimalFormat("000"); - return f1.format(a); - } - - //return true 出现混档了，return false 没有出现混档 - private boolean isMixLevel(String[] subIds,Integer size){ - String correctLevel = substrateServiceBiz.getBySubId(subIds[0]).getPowerLevel(); - String errMsg = "以下基板ID出现混档："; - boolean res = false; - for(int i=0;i var.getLength() ){ +// ss = new String[var.getLength()]; +// for(int i=0;i< var.getLength();i++){ +// ss[i] = s[i]; +// } +// } +// s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); +// }else { +// s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); +// } +// } +// +// private Object read(S7Client s7Client, Step2Plc2MesVar var) { +// try { +// return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); +// }catch (Throwable e){ +// logger.info("host:"+s7Client.getHost()+" ; read 操作出现问题: {}",e.getMessage(),e); +// return null; +// } +// } +// private void write(S7Client s7Client, Step2Mes2PlcVar var, Object newValue) { +// if(var.getType().equals(PlcVar.STRING_Array)){ +// String[] s = (String[])newValue; +// String[] ss = (String[])newValue; +// if(s.length > var.getLength() ){ +// ss = new String[var.getLength()]; +// for(int i=0;i< var.getLength();i++){ +// ss[i] = s[i]; +// } +// } +// s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); +// }else { +// s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); +// } +// } +// +// private Object read(S7Client s7Client, Step3Plc2MesVar var) { +// try { +// return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); +// }catch (Throwable e){ +// logger.info("host:"+s7Client.getHost()+" ; read 操作出现问题: {}",e.getMessage(),e); +// return null; +// } +// } +// private void write(S7Client s7Client, Step3Mes2PlcVar var, Object newValue) { +// if(var.getType().equals(PlcVar.STRING_Array)){ +// String[] s = (String[])newValue; +// String[] ss = (String[])newValue; +// if(s.length > var.getLength() ){ +// ss = new String[var.getLength()]; +// for(int i=0;i< var.getLength();i++){ +// ss[i] = s[i]; +// } +// } +// s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); +// }else { +// s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); +// } +// } +// +// +// public String getBoxId(String sapMaterial){ +// Integer todayBoxNum = service.getTodayBoxNum()+1; +// String nowTime = DateUtil.format(new Date(), "yyMMdd"); +// +// todayBoxNum+=500; +// logger.info("BOXID生成Event-------现在生成boxId ，sapMaterial: "+sapMaterial+"，nowTime:"+nowTime+"，todayBoxNum:"+formateString(todayBoxNum)); +// String res = "301"+sapMaterial+nowTime+formateString(todayBoxNum); +// return res; +// } +// +// +// public String getErrorBoxId(String sapMaterial){ +// +// String nowTime = DateUtil.format(new Date(), "yyMMdd"); +// String mixBoxError = "001"; +// String res = "444"+sapMaterial+nowTime+mixBoxError; +// logger.info("BOXID生成Event-------现在生成errBoxId ，sapMaterial: "+sapMaterial+"，nowTime:"+nowTime); +// +// return res; +// } +// +// public String removeKG(String str){ +// return str.substring(0,17); +// } +// +// public static void main(String[] args) { +// Integer a = 102; +// Format f1 = new DecimalFormat("000"); +// System.out.println(f1.format(a)); +// } +// public String formateString(Integer a){ +// Format f1 = new DecimalFormat("000"); +// return f1.format(a); +// } +// +// //return true 出现混档了，return false 没有出现混档 +// private boolean isMixLevel(String[] subIds,Integer size){ +// String correctLevel = substrateServiceBiz.getBySubId(subIds[0]).getPowerLevel(); +// String errMsg = "以下基板ID出现混档："; +// boolean res = false; +// for(int i=0;i linkTestRecvListeners = new CopyOnWriteArrayList<>(); + + @Override + public void addRuntimeEQErrListener(RuntimeEQErrListener lstnr) { + linkTestRecvListeners.add(lstnr); + } + + + public void executeLinktestRecvTask(Integer errCode) { + for (RuntimeEQErrListener listener : linkTestRecvListeners) { + listener.received(errCode); + } + } + + +// public void run() { +// CompletableFuture.supplyAsync(() -> { +// System.out.println(""); +// System.out.println("开始执行 ddj1 调度任务 开始 "+ Thread.currentThread().hashCode()); +// executeLinktestRecvTask(1); +// +// System.out.println("开始执行 ddj1 调度任务 结束"+ Thread.currentThread().hashCode()); +// return 1; +// }, QGSThreadPool.ddj1ExecutorService).whenComplete((data, error) -> { +// System.out.println("data:" + data+ Thread.currentThread().hashCode()); +// if (error != null) { +// System.out.println(error); +// } +// }); +// } + + + /* * + * + * status + * 10 初始值 + * -2 s7 数据采集失败 + * 100 任务成功完成 + * 101 任务被人为取消，取消的原因看 content + * */ + public void run(){ + CompletableFuture.supplyAsync(() -> { + logger.info(""); + logger.info("================= 现在开始执行 DDJ1 任务 : "+ taskDTO.toString()+" =================="); + + //构建结果类 + DDJInfoCallBack build = new DDJInfoCallBack(); + build.setStatus(10); + + build.setTaskId(taskDTO.getMissionID()); + //调度逻辑 ------------------------------------- 开始 ------------------------------------- + //todo 这里待定，当出现脱机或者 故障的时候 怎么的一个形式告知 wms + //步骤1 WCS监听 PlcToWcs.Operate_Mode 是否为 1 , ( 1 = 联机 ) + Integer operateMode = waitingForTarget(DDJPlc2WcsVar.Operate_Mode, 1); + if(operateMode!=1){ + logger.info("失败"+" --- "+"步骤1. WCS监听 DDJPlc2WcsVar.Operate_Mode 是否 等于 1 失败"); + build.setContent("失败，步骤1，监听数据异常"); + build.setStatus(-2); + return build; + } + logger.info("成功"+" --- "+"步骤1. WCS监听 DDJPlc2WcsVar.Operate_Mode 等于 1 "); + + + //步骤2 WCS监听 PlcToWcs.Mission_State 是否为 0 , ( 0 = 空闲 ) + Integer missionState = waitingForTarget(DDJPlc2WcsVar.Mission_State, 0); + if(missionState!=1){ + logger.info("失败"+" --- "+"步骤2. WCS监听 PlcToWcs.Mission_State 是否 等于 0 失败"); + build.setContent("失败，步骤2，监听数据异常"); + build.setStatus(-2); + return build; + } + logger.info("成功"+" --- "+"步骤2. WCS监听 PlcToWcs.Mission_State 等于 0 "); + + //步骤3 WCS下发任务 + issueTask(); + logger.info("成功"+" --- "+"步骤3. WCS 下发任务 "); + + + //步骤4 WCS启动任务（WcsToPlc.Command_No 置为 1 ） + write(s7Client,DDJWcs2PlcVar.Command_No,1); + logger.info("成功"+" --- "+"步骤4. WCS启动任务（WcsToPlc.Command_No 置为 1 ）成功 "); + + + //步骤5 WCS 监控PlcToWcs.Mission_State ==2 监控任务是否完成 + Integer missionState2 = waitingForTargetAndLoggerError(DDJPlc2WcsVar.Mission_State,DDJPlc2WcsVar.Operate_Mode, 2); + if(missionState2!=1){ + logger.info("失败"+" --- "+"步骤5. WCS 监控PlcToWcs.Mission_State ==2 监控任务是否完成"); + build.setContent("失败，步骤5，监听数据异常"); + build.setStatus(-2); + return build; + } + logger.info("成功"+" --- "+"步骤5. WCS 监控PlcToWcs.Mission_State ==2 "); + + //步骤6 WCS 把 Command_No 置为 2（重置操作） + write(s7Client,DDJWcs2PlcVar.Command_No,2); + logger.info("成功"+" --- "+"步骤6. WCS 把 Command_No 置为 2（重置操作） "); + build.setStatus(100); + build.setContent("任务成功完成"); + //调度逻辑 ------------------------------------- 结束 + + + return build; + }, QGSThreadPool.ddj1ExecutorService).whenComplete(new BiConsumer() { + //任务完成以后把结果返回给 第调用者 + @Override + public void accept(DDJInfoCallBack agvInfoCallBack, Throwable throwable) { + if(throwable!=null){ + logger.info("whenComplete throwable is " + throwable.getMessage()); + }else { + logger.info("任务执行完成，现在wcs把 结果："+agvInfoCallBack.toString()+", 推送给wms"); + HttpUtil.post(QGSConstant.wmsUrl, JSONObject.toJSONString(agvInfoCallBack)); + logger.info("================= 任务结束 : "+ taskDTO.toString()+" =================="); + logger.info(""); + + } + } + }); + + } + + + + + /** + * desc: 下发任务给电控 + * return： + * true 成功 + * false 失败 + * */ + private void issueTask() { + write(s7Client,DDJWcs2PlcVar.Mission_Type, taskDTO.getMissionType()); + + write(s7Client,DDJWcs2PlcVar.From_Row, taskDTO.getFromRow()); + write(s7Client,DDJWcs2PlcVar.From_Layer, taskDTO.getFromLayer()); + write(s7Client,DDJWcs2PlcVar.From_List, taskDTO.getFromList()); + write(s7Client,DDJWcs2PlcVar.To_Row, taskDTO.getToRow()); + write(s7Client,DDJWcs2PlcVar.To_List, taskDTO.getToList()); + write(s7Client,DDJWcs2PlcVar.To_Layer, taskDTO.getToLayer()); + + write(s7Client,DDJWcs2PlcVar.Goods_Size, taskDTO.getGoodsSiZe()); + write(s7Client,DDJWcs2PlcVar.Coordinate_conversion, taskDTO.getCoordinateConversion()); + write(s7Client,DDJWcs2PlcVar.Mission_ID, taskDTO.getMissionID()); + write(s7Client,DDJWcs2PlcVar.Pallet_Num, taskDTO.getPalletNum()); + } + + /** + * + * arg: + * RGV1Plc2WcsVarEnum 参数类型 + * targetValue 目的值 + * return: + * 2 opc 访问异常; + * 1 成功; + * */ + private Integer waitingForTarget(DDJPlc2WcsVar var, Integer targetValue) { + Integer res = 0; + while (true){ + try { + Integer now = (Integer) read(s7Client,var); + if(targetValue.equals(now)){ + res = 1; + break; + } + Thread.sleep(200); + }catch (Exception e){ + logger.info("S7 数据采集 异常。"); + res = 2; + break; + } + } + return res; + } + + private Integer waitingForTargetAndOperaMode(DDJPlc2WcsVar var, Integer targetValue) { + Integer res = 0; + while (true){ + try { + Integer now = (Integer) read(s7Client,var); + if(targetValue.equals(now)){ + res = 1; + break; + } + Thread.sleep(200); + }catch (Exception e){ + logger.info("S7 数据采集 异常。"); + res = 2; + break; + } + } + return res; + } + + private Integer waitingForTargetAndLoggerError(DDJPlc2WcsVar var,DDJPlc2WcsVar var2, Integer targetValue) { + Integer res = 0; + while (true){ + try { + Integer now = (Integer) read(s7Client,var); + Integer operateMode = (Integer) read(s7Client,var2); + if(targetValue.equals(now)){ + res = 1; + break; + } + if(operateMode.equals(2)){ + Integer faultNo = (Integer) read(s7Client,DDJPlc2WcsVar.Fault_No); + logger.info("步骤5 DDJ在运行的时候出现 fault, fault no = "+faultNo); + //调用上层的 回调方法 开始 + executeLinktestRecvTask(faultNo); + //调用上层的 回调方法 结束 + Thread.sleep(10000); + } + Thread.sleep(200); + }catch (Exception e){ + logger.info("S7 数据采集 异常。"); + res = 2; + break; + } + } + return res; + } + + + /** + * return + * 成功： 返回相应的object对象 + * 失败： 返回null + * */ + private Object read(S7Client s7Client, DDJPlc2WcsVar var) { + try { + return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); + }catch (Exception e){ + logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage()); + e.printStackTrace(); + return null; + } + } + private void write(S7Client s7Client, DDJWcs2PlcVar var, Object newValue) { + if(var.getType().equals(PlcVar.STRING_Array)){ + String[] s = (String[])newValue; + String[] ss = (String[])newValue; + if(s.length > var.getLength() ){ + ss = new String[var.getLength()]; + for(int i=0;i< var.getLength();i++){ + ss[i] = s[i]; + } + } + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss); + }else { + s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue); + } + } + + +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/constant/QGSConstant.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/constant/QGSConstant.java new file mode 100644 index 0000000..3ad7b13 --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/constant/QGSConstant.java @@ -0,0 +1,16 @@ +package com.cnbm.dispatchDDJ.constant; + +/** + * @Author: 蔡翔 + * @Date: 2019/11/3 11:30 + * @Version 1.0 + */ +public class QGSConstant { + public static final Object LOCK = new Object(); + + public static final Long deadLineTime = 300000L; + + //wms 需提供 post 接口 + public static final String wmsUrl = "http://localhost:8089/wms-qy/work/wcs2wms/taskcallback"; +} + diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/entity/DDJInfoCallBack.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/entity/DDJInfoCallBack.java new file mode 100644 index 0000000..dd8329a --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/entity/DDJInfoCallBack.java @@ -0,0 +1,24 @@ +package com.cnbm.dispatchDDJ.entity; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + *

+ * 表 + *

+ * + * @author caixiang + * @since 2022-05-31 + */ +@Data +@EqualsAndHashCode(callSuper = false) +public class DDJInfoCallBack implements Serializable { + + private static final long serialVersionUID = 1L; + private Integer status; + private String content; + private Integer taskId; +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/entity/TaskDTO.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/entity/TaskDTO.java new file mode 100644 index 0000000..2188fba --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/entity/TaskDTO.java @@ -0,0 +1,39 @@ +package com.cnbm.dispatchDDJ.entity; + +import lombok.Data; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2021/11/9 20:50 + */ +@Data +public class TaskDTO { + //任务类型 + private Integer missionType; + + //起点-排 + private Integer fromRow; + //起点-列 + private Integer fromList; + //起点-层 + private Integer fromLayer; + + //终点-排 + private Integer toRow; + //终点-列 + private Integer toList; + //终点-层 + private Integer toLayer; + + //货物尺寸 + private Integer goodsSiZe; + //坐标转换 + private Integer coordinateConversion; + + //任务号 + private Integer missionID; + + //条码值 + private Integer palletNum; +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/CodeEnum.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/CodeEnum.java new file mode 100644 index 0000000..d0c4dee --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/CodeEnum.java @@ -0,0 +1,15 @@ +package com.cnbm.dispatchDDJ.enums; + +/** + * @Author: 蔡翔 + * @Date: 2019/10/14 10:07 + * @Version 1.0 + */ +public interface CodeEnum { + Integer getNamespace(); + String getIdentity(); + String getType(); + String getName(); + String getDesc(); + void set(String name,Integer nameSpace,String identity); +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj1/DDJPlc2WcsVar.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj1/DDJPlc2WcsVar.java new file mode 100644 index 0000000..307f9a3 --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj1/DDJPlc2WcsVar.java @@ -0,0 +1,110 @@ +package com.cnbm.dispatchDDJ.enums.ddj.ddj1; + +import com.cnbm.s7.s7connector.api.DaveArea; +import com.cnbm.s7.s7connector.type.PlcVar; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2023/2/21 19:35 + */ +public enum DDJPlc2WcsVar { + + Operate_Mode("Operate_Mode", PlcVar.INT,1, DaveArea.DB,2,0,0), + Mission_State("Mission_State",PlcVar.INT,1,DaveArea.DB,2,2,0), + From_Row("From_Row",PlcVar.INT,1,DaveArea.DB,2,4,0), + From_List("From_List",PlcVar.INT,1,DaveArea.DB,2,6,0), + From_Layer("From_Layer",PlcVar.INT,1,DaveArea.DB,2,8,0), + To_Row("To_Row",PlcVar.INT,1,DaveArea.DB,2,10,0), + To_List("To_List",PlcVar.INT,1,DaveArea.DB,2,12,0), + To_Layer("To_Layer",PlcVar.INT,1,DaveArea.DB,2,14,0), + Mission_Type("Mission_Type",PlcVar.INT,1,DaveArea.DB,2,16,0), + Act_Pos_X("Act_Pos_X", PlcVar.DINT,1, DaveArea.DB,2,18,0), + Act_Pos_Y("Act_Pos_Y", PlcVar.DINT,1, DaveArea.DB,2,22,0), + Act_Speed_X("Act_Speed_X", PlcVar.DINT,1, DaveArea.DB,2,26,0), + Act_Speed_Y("Act_Speed_Y", PlcVar.DINT,1, DaveArea.DB,2,30,0), + Status_bit1("Status_bit1", PlcVar.BOOL_Array,8, DaveArea.DB,2,34,0), + Status_bit2("Status_bit2", PlcVar.BOOL_Array,8, DaveArea.DB,2,35,0), + Fault_No("Fault_No", PlcVar.INT,1, DaveArea.DB,2,36,0), + Now_List("Now_List", PlcVar.INT,1, DaveArea.DB,2,38,0), + Now_Layer("Now_Layer", PlcVar.INT,1, DaveArea.DB,2,40,0), + Mission_ID("Act_Pos_X", PlcVar.INT,1, DaveArea.DB,2,42,0), + Pallet_Num("Pallet_Num", PlcVar.STRING,1, DaveArea.DB,2,44,0), + + + + + + + ; + + private String name; + private DaveArea area; + private Integer areaNumber; + private Integer byteOffset; + private Integer bitOffset; + private PlcVar type; + //length = 1代表 非数组;;; length > 1 代表数组 ;; 注意 length这个参数 是实际plc中 数组的长度，和read操作相关 + //如果是String 类型不用填length 只需要填string类型的起始位置就行了，我会自己去取数据长度（也就是说这里的length并不是string 的长度）。 + private Integer length; + + //这个字段只是给 字符串变量 和 字符串数组 用, 这个字段是plc中设置的最大String长度 + private Integer strSize; + + DDJPlc2WcsVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = 0; + } + DDJPlc2WcsVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset, Integer strSize){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = strSize; + } + + public Integer getStrSize() { + return strSize; + } + + public void setStrSize(Integer strSize) { + this.strSize = strSize; + } + + public String getName() { + return name; + } + + public DaveArea getArea() { + return area; + } + + public Integer getAreaNumber() { + return areaNumber; + } + + public Integer getBitOffset() { + return bitOffset; + } + + public Integer getByteOffset() { + return byteOffset; + } + + public PlcVar getType() { + return type; + } + + public Integer getLength() { + return length; + } +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj1/DDJWcs2PlcVar.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj1/DDJWcs2PlcVar.java new file mode 100644 index 0000000..2d90354 --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj1/DDJWcs2PlcVar.java @@ -0,0 +1,101 @@ +package com.cnbm.dispatchDDJ.enums.ddj.ddj1; + +import com.cnbm.s7.s7connector.api.DaveArea; +import com.cnbm.s7.s7connector.type.PlcVar; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2023/2/21 19:35 + */ +public enum DDJWcs2PlcVar { + + Mission_Count("Mission_Count", PlcVar.INT,1, DaveArea.DB,1,0,0), + Command_No("Command_No", PlcVar.INT,1, DaveArea.DB,1,2,0), + Mission_Type("Mission_Type",PlcVar.INT,1,DaveArea.DB,1,4,0), + From_Row("From_Row",PlcVar.INT,1,DaveArea.DB,1,6,0), + From_List("From_List",PlcVar.INT,1,DaveArea.DB,1,8,0), + From_Layer("From_Layer",PlcVar.INT,1,DaveArea.DB,1,10,0), + To_Row("To_Row",PlcVar.INT,1,DaveArea.DB,1,12,0), + To_List("To_List",PlcVar.INT,1,DaveArea.DB,1,14,0), + To_Layer("To_Layer",PlcVar.INT,1,DaveArea.DB,1,16,0), + Control_bit1("Status_bit1", PlcVar.BOOL_Array,8, DaveArea.DB,1,18,0), + Control_bit2("Status_bit2", PlcVar.BOOL_Array,8, DaveArea.DB,1,19,0), + Goods_Size("Goods_Size", PlcVar.INT,1, DaveArea.DB,1,20,0), + Coordinate_conversion("Coordinate_conversion", PlcVar.INT,1, DaveArea.DB,1,22,0), + Mission_ID("Mission_ID", PlcVar.INT,1, DaveArea.DB,1,24,0), + //todo 条码值 要写长度 + Pallet_Num("Pallet_Num", PlcVar.STRING,1, DaveArea.DB,1,26,0), + + ; + + private String name; + private DaveArea area; + private Integer areaNumber; + private Integer byteOffset; + private Integer bitOffset; + private PlcVar type; + //length = 1代表 非数组;;; length > 1 代表数组 ;; 注意 length这个参数 是实际plc中 数组的长度，和read操作相关 + //如果是String 类型不用填length 只需要填string类型的起始位置就行了，我会自己去取数据长度（也就是说这里的length并不是string 的长度）。 + private Integer length; + + //这个字段只是给 字符串变量 和 字符串数组 用, 这个字段是plc中设置的最大String长度 + private Integer strSize; + + DDJWcs2PlcVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = 0; + } + DDJWcs2PlcVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset, Integer strSize){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = strSize; + } + + public Integer getStrSize() { + return strSize; + } + + public void setStrSize(Integer strSize) { + this.strSize = strSize; + } + + public String getName() { + return name; + } + + public DaveArea getArea() { + return area; + } + + public Integer getAreaNumber() { + return areaNumber; + } + + public Integer getBitOffset() { + return bitOffset; + } + + public Integer getByteOffset() { + return byteOffset; + } + + public PlcVar getType() { + return type; + } + + public Integer getLength() { + return length; + } +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj2/DDJPlc2WcsVar.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj2/DDJPlc2WcsVar.java new file mode 100644 index 0000000..04ed891 --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj2/DDJPlc2WcsVar.java @@ -0,0 +1,110 @@ +package com.cnbm.dispatchDDJ.enums.ddj.ddj2; + +import com.cnbm.s7.s7connector.api.DaveArea; +import com.cnbm.s7.s7connector.type.PlcVar; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2023/2/21 19:35 + */ +public enum DDJPlc2WcsVar { + + Operate_Mode("Operate_Mode", PlcVar.INT,1, DaveArea.DB,2,0,0), + Mission_State("Mission_State",PlcVar.INT,1,DaveArea.DB,2,2,0), + From_Row("From_Row",PlcVar.INT,1,DaveArea.DB,2,4,0), + From_List("From_List",PlcVar.INT,1,DaveArea.DB,2,6,0), + From_Layer("From_Layer",PlcVar.INT,1,DaveArea.DB,2,8,0), + To_Row("To_Row",PlcVar.INT,1,DaveArea.DB,2,10,0), + To_List("To_List",PlcVar.INT,1,DaveArea.DB,2,12,0), + To_Layer("To_Layer",PlcVar.INT,1,DaveArea.DB,2,14,0), + Mission_Type("Mission_Type",PlcVar.INT,1,DaveArea.DB,2,16,0), + Act_Pos_X("Act_Pos_X", PlcVar.DINT,1, DaveArea.DB,2,18,0), + Act_Pos_Y("Act_Pos_Y", PlcVar.DINT,1, DaveArea.DB,2,22,0), + Act_Speed_X("Act_Speed_X", PlcVar.DINT,1, DaveArea.DB,2,26,0), + Act_Speed_Y("Act_Speed_Y", PlcVar.DINT,1, DaveArea.DB,2,30,0), + Status_bit1("Status_bit1", PlcVar.BOOL_Array,8, DaveArea.DB,2,34,0), + Status_bit2("Status_bit2", PlcVar.BOOL_Array,8, DaveArea.DB,2,35,0), + Fault_No("Fault_No", PlcVar.INT,1, DaveArea.DB,2,36,0), + Now_List("Now_List", PlcVar.INT,1, DaveArea.DB,2,38,0), + Now_Layer("Now_Layer", PlcVar.INT,1, DaveArea.DB,2,40,0), + Mission_ID("Act_Pos_X", PlcVar.INT,1, DaveArea.DB,2,42,0), + Pallet_Num("Pallet_Num", PlcVar.STRING,1, DaveArea.DB,2,44,0), + + + + + + + ; + + private String name; + private DaveArea area; + private Integer areaNumber; + private Integer byteOffset; + private Integer bitOffset; + private PlcVar type; + //length = 1代表 非数组;;; length > 1 代表数组 ;; 注意 length这个参数 是实际plc中 数组的长度，和read操作相关 + //如果是String 类型不用填length 只需要填string类型的起始位置就行了，我会自己去取数据长度（也就是说这里的length并不是string 的长度）。 + private Integer length; + + //这个字段只是给 字符串变量 和 字符串数组 用, 这个字段是plc中设置的最大String长度 + private Integer strSize; + + DDJPlc2WcsVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = 0; + } + DDJPlc2WcsVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset, Integer strSize){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = strSize; + } + + public Integer getStrSize() { + return strSize; + } + + public void setStrSize(Integer strSize) { + this.strSize = strSize; + } + + public String getName() { + return name; + } + + public DaveArea getArea() { + return area; + } + + public Integer getAreaNumber() { + return areaNumber; + } + + public Integer getBitOffset() { + return bitOffset; + } + + public Integer getByteOffset() { + return byteOffset; + } + + public PlcVar getType() { + return type; + } + + public Integer getLength() { + return length; + } +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj2/DDJWcs2PlcVar.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj2/DDJWcs2PlcVar.java new file mode 100644 index 0000000..ea833d4 --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj2/DDJWcs2PlcVar.java @@ -0,0 +1,101 @@ +package com.cnbm.dispatchDDJ.enums.ddj.ddj2; + +import com.cnbm.s7.s7connector.api.DaveArea; +import com.cnbm.s7.s7connector.type.PlcVar; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2023/2/21 19:35 + */ +public enum DDJWcs2PlcVar { + + Mission_Count("Mission_Count", PlcVar.INT,1, DaveArea.DB,1,0,0), + Command_No("Command_No", PlcVar.INT,1, DaveArea.DB,1,2,0), + Mission_Type("Mission_Type",PlcVar.INT,1,DaveArea.DB,1,4,0), + From_Row("From_Row",PlcVar.INT,1,DaveArea.DB,1,6,0), + From_List("From_List",PlcVar.INT,1,DaveArea.DB,1,8,0), + From_Layer("From_Layer",PlcVar.INT,1,DaveArea.DB,1,10,0), + To_Row("To_Row",PlcVar.INT,1,DaveArea.DB,1,12,0), + To_List("To_List",PlcVar.INT,1,DaveArea.DB,1,14,0), + To_Layer("To_Layer",PlcVar.INT,1,DaveArea.DB,1,16,0), + Control_bit1("Status_bit1", PlcVar.BOOL_Array,8, DaveArea.DB,1,18,0), + Control_bit2("Status_bit2", PlcVar.BOOL_Array,8, DaveArea.DB,1,19,0), + Goods_Size("Goods_Size", PlcVar.INT,1, DaveArea.DB,1,20,0), + Coordinate_conversion("Coordinate_conversion", PlcVar.INT,1, DaveArea.DB,1,22,0), + Mission_ID("Mission_ID", PlcVar.INT,1, DaveArea.DB,1,24,0), + //todo 条码值 要写长度 + Pallet_Num("Pallet_Num", PlcVar.STRING,1, DaveArea.DB,1,26,0), + + ; + + private String name; + private DaveArea area; + private Integer areaNumber; + private Integer byteOffset; + private Integer bitOffset; + private PlcVar type; + //length = 1代表 非数组;;; length > 1 代表数组 ;; 注意 length这个参数 是实际plc中 数组的长度，和read操作相关 + //如果是String 类型不用填length 只需要填string类型的起始位置就行了，我会自己去取数据长度（也就是说这里的length并不是string 的长度）。 + private Integer length; + + //这个字段只是给 字符串变量 和 字符串数组 用, 这个字段是plc中设置的最大String长度 + private Integer strSize; + + DDJWcs2PlcVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = 0; + } + DDJWcs2PlcVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset, Integer strSize){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = strSize; + } + + public Integer getStrSize() { + return strSize; + } + + public void setStrSize(Integer strSize) { + this.strSize = strSize; + } + + public String getName() { + return name; + } + + public DaveArea getArea() { + return area; + } + + public Integer getAreaNumber() { + return areaNumber; + } + + public Integer getBitOffset() { + return bitOffset; + } + + public Integer getByteOffset() { + return byteOffset; + } + + public PlcVar getType() { + return type; + } + + public Integer getLength() { + return length; + } +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj3/DDJPlc2WcsVar.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj3/DDJPlc2WcsVar.java new file mode 100644 index 0000000..5562ac7 --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj3/DDJPlc2WcsVar.java @@ -0,0 +1,110 @@ +package com.cnbm.dispatchDDJ.enums.ddj.ddj3; + +import com.cnbm.s7.s7connector.api.DaveArea; +import com.cnbm.s7.s7connector.type.PlcVar; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2023/2/21 19:35 + */ +public enum DDJPlc2WcsVar { + + Operate_Mode("Operate_Mode", PlcVar.INT,1, DaveArea.DB,2,0,0), + Mission_State("Mission_State",PlcVar.INT,1,DaveArea.DB,2,2,0), + From_Row("From_Row",PlcVar.INT,1,DaveArea.DB,2,4,0), + From_List("From_List",PlcVar.INT,1,DaveArea.DB,2,6,0), + From_Layer("From_Layer",PlcVar.INT,1,DaveArea.DB,2,8,0), + To_Row("To_Row",PlcVar.INT,1,DaveArea.DB,2,10,0), + To_List("To_List",PlcVar.INT,1,DaveArea.DB,2,12,0), + To_Layer("To_Layer",PlcVar.INT,1,DaveArea.DB,2,14,0), + Mission_Type("Mission_Type",PlcVar.INT,1,DaveArea.DB,2,16,0), + Act_Pos_X("Act_Pos_X", PlcVar.DINT,1, DaveArea.DB,2,18,0), + Act_Pos_Y("Act_Pos_Y", PlcVar.DINT,1, DaveArea.DB,2,22,0), + Act_Speed_X("Act_Speed_X", PlcVar.DINT,1, DaveArea.DB,2,26,0), + Act_Speed_Y("Act_Speed_Y", PlcVar.DINT,1, DaveArea.DB,2,30,0), + Status_bit1("Status_bit1", PlcVar.BOOL_Array,8, DaveArea.DB,2,34,0), + Status_bit2("Status_bit2", PlcVar.BOOL_Array,8, DaveArea.DB,2,35,0), + Fault_No("Fault_No", PlcVar.INT,1, DaveArea.DB,2,36,0), + Now_List("Now_List", PlcVar.INT,1, DaveArea.DB,2,38,0), + Now_Layer("Now_Layer", PlcVar.INT,1, DaveArea.DB,2,40,0), + Mission_ID("Act_Pos_X", PlcVar.INT,1, DaveArea.DB,2,42,0), + Pallet_Num("Pallet_Num", PlcVar.STRING,1, DaveArea.DB,2,44,0), + + + + + + + ; + + private String name; + private DaveArea area; + private Integer areaNumber; + private Integer byteOffset; + private Integer bitOffset; + private PlcVar type; + //length = 1代表 非数组;;; length > 1 代表数组 ;; 注意 length这个参数 是实际plc中 数组的长度，和read操作相关 + //如果是String 类型不用填length 只需要填string类型的起始位置就行了，我会自己去取数据长度（也就是说这里的length并不是string 的长度）。 + private Integer length; + + //这个字段只是给 字符串变量 和 字符串数组 用, 这个字段是plc中设置的最大String长度 + private Integer strSize; + + DDJPlc2WcsVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = 0; + } + DDJPlc2WcsVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset, Integer strSize){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = strSize; + } + + public Integer getStrSize() { + return strSize; + } + + public void setStrSize(Integer strSize) { + this.strSize = strSize; + } + + public String getName() { + return name; + } + + public DaveArea getArea() { + return area; + } + + public Integer getAreaNumber() { + return areaNumber; + } + + public Integer getBitOffset() { + return bitOffset; + } + + public Integer getByteOffset() { + return byteOffset; + } + + public PlcVar getType() { + return type; + } + + public Integer getLength() { + return length; + } +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj3/DDJWcs2PlcVar.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj3/DDJWcs2PlcVar.java new file mode 100644 index 0000000..fbd5b9c --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj3/DDJWcs2PlcVar.java @@ -0,0 +1,101 @@ +package com.cnbm.dispatchDDJ.enums.ddj.ddj3; + +import com.cnbm.s7.s7connector.api.DaveArea; +import com.cnbm.s7.s7connector.type.PlcVar; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2023/2/21 19:35 + */ +public enum DDJWcs2PlcVar { + + Mission_Count("Mission_Count", PlcVar.INT,1, DaveArea.DB,1,0,0), + Command_No("Command_No", PlcVar.INT,1, DaveArea.DB,1,2,0), + Mission_Type("Mission_Type",PlcVar.INT,1,DaveArea.DB,1,4,0), + From_Row("From_Row",PlcVar.INT,1,DaveArea.DB,1,6,0), + From_List("From_List",PlcVar.INT,1,DaveArea.DB,1,8,0), + From_Layer("From_Layer",PlcVar.INT,1,DaveArea.DB,1,10,0), + To_Row("To_Row",PlcVar.INT,1,DaveArea.DB,1,12,0), + To_List("To_List",PlcVar.INT,1,DaveArea.DB,1,14,0), + To_Layer("To_Layer",PlcVar.INT,1,DaveArea.DB,1,16,0), + Control_bit1("Status_bit1", PlcVar.BOOL_Array,8, DaveArea.DB,1,18,0), + Control_bit2("Status_bit2", PlcVar.BOOL_Array,8, DaveArea.DB,1,19,0), + Goods_Size("Goods_Size", PlcVar.INT,1, DaveArea.DB,1,20,0), + Coordinate_conversion("Coordinate_conversion", PlcVar.INT,1, DaveArea.DB,1,22,0), + Mission_ID("Mission_ID", PlcVar.INT,1, DaveArea.DB,1,24,0), + //todo 条码值 要写长度 + Pallet_Num("Pallet_Num", PlcVar.STRING,1, DaveArea.DB,1,26,0), + + ; + + private String name; + private DaveArea area; + private Integer areaNumber; + private Integer byteOffset; + private Integer bitOffset; + private PlcVar type; + //length = 1代表 非数组;;; length > 1 代表数组 ;; 注意 length这个参数 是实际plc中 数组的长度，和read操作相关 + //如果是String 类型不用填length 只需要填string类型的起始位置就行了，我会自己去取数据长度（也就是说这里的length并不是string 的长度）。 + private Integer length; + + //这个字段只是给 字符串变量 和 字符串数组 用, 这个字段是plc中设置的最大String长度 + private Integer strSize; + + DDJWcs2PlcVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = 0; + } + DDJWcs2PlcVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset, Integer strSize){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = strSize; + } + + public Integer getStrSize() { + return strSize; + } + + public void setStrSize(Integer strSize) { + this.strSize = strSize; + } + + public String getName() { + return name; + } + + public DaveArea getArea() { + return area; + } + + public Integer getAreaNumber() { + return areaNumber; + } + + public Integer getBitOffset() { + return bitOffset; + } + + public Integer getByteOffset() { + return byteOffset; + } + + public PlcVar getType() { + return type; + } + + public Integer getLength() { + return length; + } +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj4/DDJPlc2WcsVar.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj4/DDJPlc2WcsVar.java new file mode 100644 index 0000000..25a992c --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj4/DDJPlc2WcsVar.java @@ -0,0 +1,110 @@ +package com.cnbm.dispatchDDJ.enums.ddj.ddj4; + +import com.cnbm.s7.s7connector.api.DaveArea; +import com.cnbm.s7.s7connector.type.PlcVar; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2023/2/21 19:35 + */ +public enum DDJPlc2WcsVar { + + Operate_Mode("Operate_Mode", PlcVar.INT,1, DaveArea.DB,2,0,0), + Mission_State("Mission_State",PlcVar.INT,1,DaveArea.DB,2,2,0), + From_Row("From_Row",PlcVar.INT,1,DaveArea.DB,2,4,0), + From_List("From_List",PlcVar.INT,1,DaveArea.DB,2,6,0), + From_Layer("From_Layer",PlcVar.INT,1,DaveArea.DB,2,8,0), + To_Row("To_Row",PlcVar.INT,1,DaveArea.DB,2,10,0), + To_List("To_List",PlcVar.INT,1,DaveArea.DB,2,12,0), + To_Layer("To_Layer",PlcVar.INT,1,DaveArea.DB,2,14,0), + Mission_Type("Mission_Type",PlcVar.INT,1,DaveArea.DB,2,16,0), + Act_Pos_X("Act_Pos_X", PlcVar.DINT,1, DaveArea.DB,2,18,0), + Act_Pos_Y("Act_Pos_Y", PlcVar.DINT,1, DaveArea.DB,2,22,0), + Act_Speed_X("Act_Speed_X", PlcVar.DINT,1, DaveArea.DB,2,26,0), + Act_Speed_Y("Act_Speed_Y", PlcVar.DINT,1, DaveArea.DB,2,30,0), + Status_bit1("Status_bit1", PlcVar.BOOL_Array,8, DaveArea.DB,2,34,0), + Status_bit2("Status_bit2", PlcVar.BOOL_Array,8, DaveArea.DB,2,35,0), + Fault_No("Fault_No", PlcVar.INT,1, DaveArea.DB,2,36,0), + Now_List("Now_List", PlcVar.INT,1, DaveArea.DB,2,38,0), + Now_Layer("Now_Layer", PlcVar.INT,1, DaveArea.DB,2,40,0), + Mission_ID("Act_Pos_X", PlcVar.INT,1, DaveArea.DB,2,42,0), + Pallet_Num("Pallet_Num", PlcVar.STRING,1, DaveArea.DB,2,44,0), + + + + + + + ; + + private String name; + private DaveArea area; + private Integer areaNumber; + private Integer byteOffset; + private Integer bitOffset; + private PlcVar type; + //length = 1代表 非数组;;; length > 1 代表数组 ;; 注意 length这个参数 是实际plc中 数组的长度，和read操作相关 + //如果是String 类型不用填length 只需要填string类型的起始位置就行了，我会自己去取数据长度（也就是说这里的length并不是string 的长度）。 + private Integer length; + + //这个字段只是给 字符串变量 和 字符串数组 用, 这个字段是plc中设置的最大String长度 + private Integer strSize; + + DDJPlc2WcsVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = 0; + } + DDJPlc2WcsVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset, Integer strSize){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = strSize; + } + + public Integer getStrSize() { + return strSize; + } + + public void setStrSize(Integer strSize) { + this.strSize = strSize; + } + + public String getName() { + return name; + } + + public DaveArea getArea() { + return area; + } + + public Integer getAreaNumber() { + return areaNumber; + } + + public Integer getBitOffset() { + return bitOffset; + } + + public Integer getByteOffset() { + return byteOffset; + } + + public PlcVar getType() { + return type; + } + + public Integer getLength() { + return length; + } +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj4/DDJWcs2PlcVar.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj4/DDJWcs2PlcVar.java new file mode 100644 index 0000000..b3ea34b --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/enums/ddj/ddj4/DDJWcs2PlcVar.java @@ -0,0 +1,101 @@ +package com.cnbm.dispatchDDJ.enums.ddj.ddj4; + +import com.cnbm.s7.s7connector.api.DaveArea; +import com.cnbm.s7.s7connector.type.PlcVar; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2023/2/21 19:35 + */ +public enum DDJWcs2PlcVar { + + Mission_Count("Mission_Count", PlcVar.INT,1, DaveArea.DB,1,0,0), + Command_No("Command_No", PlcVar.INT,1, DaveArea.DB,1,2,0), + Mission_Type("Mission_Type",PlcVar.INT,1,DaveArea.DB,1,4,0), + From_Row("From_Row",PlcVar.INT,1,DaveArea.DB,1,6,0), + From_List("From_List",PlcVar.INT,1,DaveArea.DB,1,8,0), + From_Layer("From_Layer",PlcVar.INT,1,DaveArea.DB,1,10,0), + To_Row("To_Row",PlcVar.INT,1,DaveArea.DB,1,12,0), + To_List("To_List",PlcVar.INT,1,DaveArea.DB,1,14,0), + To_Layer("To_Layer",PlcVar.INT,1,DaveArea.DB,1,16,0), + Control_bit1("Status_bit1", PlcVar.BOOL_Array,8, DaveArea.DB,1,18,0), + Control_bit2("Status_bit2", PlcVar.BOOL_Array,8, DaveArea.DB,1,19,0), + Goods_Size("Goods_Size", PlcVar.INT,1, DaveArea.DB,1,20,0), + Coordinate_conversion("Coordinate_conversion", PlcVar.INT,1, DaveArea.DB,1,22,0), + Mission_ID("Mission_ID", PlcVar.INT,1, DaveArea.DB,1,24,0), + //todo 条码值 要写长度 + Pallet_Num("Pallet_Num", PlcVar.STRING,1, DaveArea.DB,1,26,0), + + ; + + private String name; + private DaveArea area; + private Integer areaNumber; + private Integer byteOffset; + private Integer bitOffset; + private PlcVar type; + //length = 1代表 非数组;;; length > 1 代表数组 ;; 注意 length这个参数 是实际plc中 数组的长度，和read操作相关 + //如果是String 类型不用填length 只需要填string类型的起始位置就行了，我会自己去取数据长度（也就是说这里的length并不是string 的长度）。 + private Integer length; + + //这个字段只是给 字符串变量 和 字符串数组 用, 这个字段是plc中设置的最大String长度 + private Integer strSize; + + DDJWcs2PlcVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = 0; + } + DDJWcs2PlcVar(String name, PlcVar type, Integer length, DaveArea area, Integer areaNumber, Integer byteOffset, Integer bitOffset, Integer strSize){ + this.name = name; + this.type = type; + this.length = length; + this.area = area; + this.areaNumber = areaNumber; + this.byteOffset = byteOffset; + this.bitOffset = bitOffset; + this.strSize = strSize; + } + + public Integer getStrSize() { + return strSize; + } + + public void setStrSize(Integer strSize) { + this.strSize = strSize; + } + + public String getName() { + return name; + } + + public DaveArea getArea() { + return area; + } + + public Integer getAreaNumber() { + return areaNumber; + } + + public Integer getBitOffset() { + return bitOffset; + } + + public Integer getByteOffset() { + return byteOffset; + } + + public PlcVar getType() { + return type; + } + + public Integer getLength() { + return length; + } +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/interfaces/Listener.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/interfaces/Listener.java new file mode 100644 index 0000000..4cb298e --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/interfaces/Listener.java @@ -0,0 +1,10 @@ +package com.cnbm.dispatchDDJ.interfaces; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2023-07-28 14:54 + */ +public interface Listener { + public void addRuntimeEQErrListener(RuntimeEQErrListener errCode); +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/interfaces/RuntimeEQErrListener.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/interfaces/RuntimeEQErrListener.java new file mode 100644 index 0000000..320cf62 --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/interfaces/RuntimeEQErrListener.java @@ -0,0 +1,31 @@ +package com.cnbm.dispatchDDJ.interfaces; + + + + + +import java.util.EventListener; + +/** + * SecsMessage receive Listener. + * + *

+ * This interface is used in {@link #()}
+ * Receive-Message is only Primary-Message.
+ *

+ * + * @author kenta-shimizu + */ +public interface RuntimeEQErrListener extends EventListener { + + /** + * Putter Received Primary-Message. + * + *

+ * Not accept {@code null}.
+ *

+ * + * @param only Primary-Message + */ + public void received(Integer errCode); +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/main/main.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/main/main.java new file mode 100644 index 0000000..d7ebeff --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/main/main.java @@ -0,0 +1,25 @@ +package com.cnbm.dispatchDDJ.main; + +import com.cnbm.dispatchDDJ.DDJ1Task; +import com.cnbm.dispatchDDJ.entity.TaskDTO; +import com.cnbm.s7.s7connector.enmuc.S7Client; +import io.lettuce.core.ScriptOutputType; + +import java.util.concurrent.ExecutionException; + +/** + * @Desc: "" + * @Author: caixiang + * @DATE: 2023-07-28 15:08 + */ +public class main { + public static void main(String[] args) throws ExecutionException, InterruptedException { + DDJ1Task ddj1Task = new DDJ1Task(); + ddj1Task.addRuntimeEQErrListener(errCode -> { + //当设备运行过程中出现告警了，会调用这个函数（可能会重复调用） + //调度程序不会因为 出现告警 就终止此次任务，会等待人工解决告警，然后设备返回给我successCode + System.out.println("errCode : "+errCode); + }); + ddj1Task.run(); + } +} diff --git a/ym-packing/src/main/java/com/cnbm/dispatchDDJ/taskPool/QGSThreadPool.java b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/taskPool/QGSThreadPool.java new file mode 100644 index 0000000..bea8955 --- /dev/null +++ b/ym-packing/src/main/java/com/cnbm/dispatchDDJ/taskPool/QGSThreadPool.java @@ -0,0 +1,42 @@ +package com.cnbm.dispatchDDJ.taskPool; + +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * @Author: 蔡翔 + * @Date: 2019/9/23 9:32 + * @Version 1.0 + */ +public class QGSThreadPool { + public static AtomicInteger threadCount = new AtomicInteger(); + public static ThreadPoolExecutor executor = new ThreadPoolExecutor( + 200, //核心线程数 + 400, //最大线程数。 + 1L, // 空闲线程存活时间 （这里是一分钟） + TimeUnit.MINUTES, // 空闲线程存货的时间单位 + new ArrayBlockingQueue<>(200), //一个指定上限的的阻塞队列，这个队列中存放着待执行的任务 + new ThreadFactory() { + // 自定义一个线程工厂来给线程池里面的线程取名字 + @Override + public Thread newThread(Runnable r) { + return new Thread(r, "threadPool-opc-" + threadCount.incrementAndGet()); + } + }, + new RejectedExecutionHandler() { + // 自定义一个拒绝处理策略，安慰被线程池拒之门外的任务 + @Override + public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) { + System.out.println("opc read err："+r); + } + } + ); + public static ExecutorService ddj1ExecutorService = Executors.newSingleThreadExecutor(); + public static ExecutorService ddj2ExecutorService = Executors.newSingleThreadExecutor(); + public static ExecutorService ddj3ExecutorService = Executors.newSingleThreadExecutor(); + public static ExecutorService ddj4ExecutorService = Executors.newSingleThreadExecutor(); + + /*public ExecutorService getExecutor(){ + return this.executor; + }*/ +} diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java index b09fea2..24cab80 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java @@ -2,7 +2,6 @@ package com.cnbm.packing.controller; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cnbm.admin.annotation.LogOperation; import com.cnbm.dispatch.enums.kuka.step1.Step1Mes2PlcVar; import com.cnbm.dispatch.enums.kuka.step1.Step1Plc2MesVar; import com.cnbm.dispatch.enums.kuka.step2.Step2Mes2PlcVar; @@ -11,16 +10,13 @@ import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar; import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar; import com.cnbm.packing.dto.CamlineSubIdDTO; import com.cnbm.packing.dto.CamlineSubIdForImportDTO; -import com.cnbm.packing.dto.PowerReportDTO; import com.cnbm.packing.dto.WoCompensationPowerDTO; import com.cnbm.packing.entity.WoPackagingBoxSubstrate; import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper; -import com.cnbm.packing.param.PowerReportQueryParam; import com.cnbm.packing.param.SubIdQueryParam; import com.cnbm.packing.service.DynamicDataSourceService; import com.cnbm.packing.service.WoPackagingBoxServiceBiz; import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz; -import com.cnbm.packing.vo.PowerReportVo; import com.cnbm.packing.vo.SubIdPageVo; import com.cnbm.s7.entity.R; import com.cnbm.s7.s7connector.enmuc.S7Client; @@ -130,7 +126,7 @@ public class TestController { } @PostMapping("/forString") public R forString() throws UnsupportedEncodingException, ParseException { - String[] s = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList); + String[] s = (String[])read(S7Client.S7_DDJ1,Step2Plc2MesVar.SubIdList); System.out.println(Step2Plc2MesVar.SubIdList.getName()+" : "+Arrays.toString(s)); return R.ok(); } @@ -241,30 +237,30 @@ public class TestController { @PostMapping("/testReadAll") public R testReadAll() throws UnsupportedEncodingException, ParseException { for(Step1Plc2MesVar actual:Step1Plc2MesVar.values()){ - logger.info(read(S7Client.S7_KUKA,actual).toString()); - System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_KUKA,actual).toString()); + logger.info(read(S7Client.S7_DDJ1,actual).toString()); + System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_DDJ1,actual).toString()); } for(Step1Mes2PlcVar actual:Step1Mes2PlcVar.values()){ - logger.info(read(S7Client.S7_KUKA,actual).toString()); - System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_KUKA,actual).toString()); + logger.info(read(S7Client.S7_DDJ1,actual).toString()); + System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_DDJ1,actual).toString()); } for(Step2Plc2MesVar actual:Step2Plc2MesVar.values()){ - logger.info(read(S7Client.S7_KUKA,actual).toString()); - System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_KUKA,actual).toString()); + logger.info(read(S7Client.S7_DDJ1,actual).toString()); + System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_DDJ1,actual).toString()); } for(Step2Mes2PlcVar actual:Step2Mes2PlcVar.values()){ - logger.info(read(S7Client.S7_KUKA,actual).toString()); - System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_KUKA,actual).toString()); + logger.info(read(S7Client.S7_DDJ1,actual).toString()); + System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_DDJ1,actual).toString()); } for(Step3Plc2MesVar actual:Step3Plc2MesVar.values()){ - logger.info(read(S7Client.S7_KUKA,actual).toString()); - System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_KUKA,actual).toString()); + logger.info(read(S7Client.S7_DDJ1,actual).toString()); + System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_DDJ1,actual).toString()); } for(Step3Mes2PlcVar actual:Step3Mes2PlcVar.values()){ - logger.info(read(S7Client.S7_KUKA,actual).toString()); - System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_KUKA,actual).toString()); + logger.info(read(S7Client.S7_DDJ1,actual).toString()); + System.out.println(actual.getName().toString()+" : "+read(S7Client.S7_DDJ1,actual).toString()); } return R.ok(); } @@ -280,32 +276,32 @@ public class TestController { BigDecimal isc = new BigDecimal(3.799); BigDecimal vmpp = new BigDecimal(46.799); BigDecimal impp = new BigDecimal(3.0799); - write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,new Integer(1)); + write(S7Client.S7_DDJ1,Step1Mes2PlcVar.dLable_Pnom,new Integer(1)); System.out.println(Step1Mes2PlcVar.dLable_Pnom.getName()+" : "+1); - write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,voc); + write(S7Client.S7_DDJ1,Step1Mes2PlcVar.dLable_Voc,voc); System.out.println(Step1Mes2PlcVar.dLable_Voc.getName()+" : "+voc.toPlainString()); - write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,isc); + write(S7Client.S7_DDJ1,Step1Mes2PlcVar.dLable_Isc,isc); System.out.println(Step1Mes2PlcVar.dLable_Isc.getName()+" : "+isc.toPlainString()); - write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,vmpp); + write(S7Client.S7_DDJ1,Step1Mes2PlcVar.dLable_Vmpp,vmpp); System.out.println(Step1Mes2PlcVar.dLable_Vmpp.getName()+" : "+vmpp.toPlainString()); - write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,impp); + write(S7Client.S7_DDJ1,Step1Mes2PlcVar.dLable_Impp,impp); System.out.println(Step1Mes2PlcVar.dLable_Impp.getName()+" : "+impp.toPlainString()); - write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,"12345678901111111111"); + write(S7Client.S7_DDJ1,Step2Mes2PlcVar.BoxId,"12345678901111111111"); System.out.println(Step2Mes2PlcVar.BoxId.getName()+" : "+"12345678901111111111"); - write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true); + write(S7Client.S7_DDJ1,Step1Mes2PlcVar.SubArrivedFinish,true); System.out.println(Step1Mes2PlcVar.SubArrivedFinish.getName()+" : "+"true"); - write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false); + write(S7Client.S7_DDJ1,Step2Mes2PlcVar.ShelfIsFullFinish,false); System.out.println(Step2Mes2PlcVar.ShelfIsFullFinish.getName()+" : "+"false"); - write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true); + write(S7Client.S7_DDJ1,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true); System.out.println(Step3Mes2PlcVar.ShelfIsFullArrivedFinish.getName()+" : "+"true"); diff --git a/ym-s7/pom.xml b/ym-s7/pom.xml index 6145cba..dd7cc87 100644 --- a/ym-s7/pom.xml +++ b/ym-s7/pom.xml @@ -36,5 +36,6 @@ + \ No newline at end of file diff --git a/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java b/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java index 468a855..9406f4d 100644 --- a/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java +++ b/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java @@ -27,7 +27,10 @@ public enum S7Client { // S7_1200("192.168.0.52",0,1,1,PlcVarActual.HeartBeatFor1200), // S7_15001("192.168.0.51",0,1,1), // S7_1500("192.168.0.51",0,1,1), - S7_KUKA("10.10.3.158",0,1,2), + S7_DDJ1("10.10.3.158",0,1,2), + S7_DDJ2("10.10.3.158",0,1,2), + S7_DDJ3("10.10.3.158",0,1,2), + S7_DDJ4("10.10.3.158",0,1,2), //1500 机架-0 插槽-1 //后续 在这里扩展 多PLC应用。 ; diff --git a/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7ParamErrorCode.java b/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7ParamErrorCode.java index 5271f2c..240a70d 100644 --- a/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7ParamErrorCode.java +++ b/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7ParamErrorCode.java @@ -27,6 +27,7 @@ import java.util.Map; */ public enum S7ParamErrorCode { + ERROR_0x0000((short) 0x0000, "No error"), ERROR_0x0110((short) 0x0110, "Invalid block number"), ERROR_0x0111((short) 0x0111, "Invalid request length"), diff --git a/ym-s7/src/main/java/com/cnbm/s7/s7connector/exception/S7CheckResultException.java b/ym-s7/src/main/java/com/cnbm/s7/s7connector/exception/S7CheckResultException.java index e7ca0de..1c79fc1 100644 --- a/ym-s7/src/main/java/com/cnbm/s7/s7connector/exception/S7CheckResultException.java +++ b/ym-s7/src/main/java/com/cnbm/s7/s7connector/exception/S7CheckResultException.java @@ -15,6 +15,8 @@ limitations under the License. */ package com.cnbm.s7.s7connector.exception; +import io.swagger.models.auth.In; + /** * The Class S7Exception is an exception related to S7 Communication */ @@ -23,6 +25,17 @@ public final class S7CheckResultException extends RuntimeException { /** The Constant serialVersionUID. */ private static final long serialVersionUID = -4761415733559374116L; + public static void main(String[] args) { + + try { + String str = null; + + str.substring(0,17); + }catch (Throwable e){ + e.printStackTrace(); + System.out.println("标签打印Event--- 出现异常 :"+e.toString()); + } + } /** * Instantiates a new s7 exception. */