CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CaiXiang:a8d3147ac92d93015f503f9eacdecc34d7cd0ba1
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:25d21ef884bba17457a62ebd655cf6f8b84dc96d
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "a8d3147ac92d93015f503f9eacdecc34d7cd0ba1" and "25d21ef884bba17457a62ebd655cf6f8b84dc96d" have entirely different histories.
a8d3147ac9 ... 25d21ef884

3 changed files with 191 additions and 266 deletions
Show Stats Expand all files Collapse all files

376
ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
View File

@ -7,10 +7,6 @@ import com.cnbm.dispatch.enums.kuka.step2.Step2Mes2PlcVar;
import com.cnbm.dispatch.enums.kuka.step2.Step2Plc2MesVar; import com.cnbm.dispatch.enums.kuka.step2.Step2Plc2MesVar;
import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar; import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar;
import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar; import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar;
import com.cnbm.packing.dto.CamlineExtendArgDTO;
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.packing.service.*;
import com.cnbm.s7.s7connector.enmuc.S7Client; import com.cnbm.s7.s7connector.enmuc.S7Client;
import com.cnbm.s7.s7connector.type.PlcVar; import com.cnbm.s7.s7connector.type.PlcVar;
@ -22,8 +18,6 @@ import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
@ -156,191 +150,199 @@ public class KukaJoinThread implements ApplicationRunner {
@Override @Override
public void run(ApplicationArguments args) throws Exception { public void run(ApplicationArguments args) throws Exception {
kukaStep1.scheduleAtFixedRate(new Runnable() { // kukaStep1.scheduleAtFixedRate(new Runnable() {
@Override // @Override
public void run() { // public void run() {
//调度开始
// logger.info("");
// logger.info("================= 现在开始执行 过程一 任务 =================="); // logger.info("================= 现在开始执行 过程一 任务 ==================");
Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true); // }
if(subArrived != 1){ // },1,1, TimeUnit.SECONDS);
logger.info("失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
}
//一. 从plc 中获取 subId 和 lineNum
String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes);
Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum);
//二. MES 业务
//=============== MES 业务 开始 =================
//1. 从comline数据库中获取 实际pmpp
float pmppBySubId = service.getPMPPBySubId(subId);
//2. 匹配和计算补偿功率
float actualPMPP = compensationPowerServiceBiz.calculCompensationPMPP(pmppBySubId,lineNum);
//3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka
WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(actualPMPP, lineNum);
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,Integer.valueOf(argByPMPP.getPowerClass()));
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,argByPMPP.getLableVoc());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp());
logger.info("采集到 基板ID: "+subId+", 线边号："+lineNum+",dLable_Pnom: "+argByPMPP.getPowerClass() +",dLable_Voc: "+argByPMPP.getLableVoc()+",dLable_Isc: "+argByPMPP.getLableIsc()+",dLable_Vmpp: "+argByPMPP.getLableVmpp()+",dLable_Impp: "+argByPMPP.getLableImpp());
// kukaStep1.scheduleAtFixedRate(new Runnable() {
//4. 把基板录到数据库 // @Override
WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate(); // public void run() {
woPackagingBoxSubstrate.setLineBody(lineNum); // //调度开始
woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass()); //// logger.info("");
woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum()); //// logger.info("================= 现在开始执行 过程一 任务 ==================");
woPackagingBoxSubstrate.setWoSubstrateId(subId); // Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true);
// if(subArrived != 1){
//5. 从camline那里获取可变字段 // logger.info("失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId); // }
woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime()); //
woPackagingBoxSubstrate.setPmpp(actualPMPP); // //一. 从plc 中获取 subId 和 lineNum
woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName()); // String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes);
woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1()); // Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum);
woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2()); // logger.info("采集到 基板ID: "+subId+", 线边号："+lineNum);
woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1()); //
woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2()); // //二. MES 业务
woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1()); // //=============== MES 业务 开始 =================
woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2()); // //1. 从comline数据库中获取 实际pmpp
woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1()); // float pmppBySubId = service.getPMPPBySubId(subId);
woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2()); // //2. 匹配和计算补偿功率
woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1()); // float actualPMPP = compensationPowerServiceBiz.calculCompensationPMPP(pmppBySubId,lineNum);
woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2()); // //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka
woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1()); // WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(actualPMPP, lineNum);
woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2()); // write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,Integer.valueOf(argByPMPP.getPowerClass()));
woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1()); // write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,argByPMPP.getLableVoc());
woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2()); // write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc());
woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1()); // write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp());
woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2()); // write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp());
woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1()); //
woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2()); //
woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1()); //
woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2()); // //4. 把基板录到数据库
woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1()); // WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate();
woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2()); // woPackagingBoxSubstrate.setLineBody(lineNum);
woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1()); // woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass());
woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2()); // woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum());
woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1()); // woPackagingBoxSubstrate.setWoSubstrateId(subId);
woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2()); //
woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1()); // //5. 从camline那里获取可变字段
woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2()); // CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId);
woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1()); // woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime());
woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2()); // woPackagingBoxSubstrate.setPmpp(actualPMPP);
// woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName());
substrateServiceBiz.insert(woPackagingBoxSubstrate); // woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1());
//=============== MES 业务 结束 ================= // woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2());
// woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1());
//三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了 // woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true); // woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1());
// woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2());
//四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false // woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1());
Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false); // woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2());
if(subArrived2 != 1){ // woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1());
logger.info("失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败"); // woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2());
} // woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false); // woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2());
} // woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1());
},1,1, TimeUnit.SECONDS); // woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2());
// woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1());
// woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2());
kukaStep2.scheduleAtFixedRate(new Runnable() { // woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1());
@Override // woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2());
public void run() { // woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1());
//调度开始 // woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2());
// woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1());
Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true); // woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2());
if(shelfIsFull != 1){ // woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1());
logger.info("失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败"); // woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2());
} // woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1());
// woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2());
//一. 从plc 中获取 subIdList 和 lineNum // woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1());
String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList); // woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2());
// Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step2Plc2MesVar.LineNum); // woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1());
logger.info("获取到基板列表："+ Arrays.toString(subIdList)); // woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2());
//
//二. MES 业务 // substrateServiceBiz.insert(woPackagingBoxSubstrate);
//=============== MES 业务 开始 ================= // //=============== MES 业务 结束 =================
//1.MES 生成BoxId //
if(subIdList.length<=0){ // //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了
logger.info("失败"+" --- "+"从plc里面获取到的基板列表 为空"); // write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
} //
WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]); // //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
String boxId = getBoxId(bySubId.getSapMaterial()); // Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false);
logger.info("mes 生成的boxId :"+ boxId); // if(subArrived2 != 1){
//2. 依次update 基板表，把boxId 赋予这些基板 // logger.info("失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
for(int i=0;i<subIdList.length;i++){ // }
substrateServiceBiz.updatePackagingBoxIdByWoSubstrateId(boxId,subIdList[i]); // write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false);
} // }
//3.去camline数据库 查询此基板ID 对应的订单 // },1,1, TimeUnit.SECONDS);
String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]); //
//4. box信息录入到box表 //
WoPackagingBox woPackagingBox = new WoPackagingBox(); // kukaStep2.scheduleAtFixedRate(new Runnable() {
woPackagingBox.setBoxNo(boxId); // @Override
woPackagingBox.setPackagingTime(LocalDateTime.now()); // public void run() {
woPackagingBox.setPowerLevel(bySubId.getPowerLevel()); // //调度开始
woPackagingBox.setLineBody(bySubId.getLineBody()); //
woPackagingBox.setSapMaterial(bySubId.getSapMaterial()); // Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true);
woPackagingBox.setOrderNum(orderNameBySubId); // if(shelfIsFull != 1){
//1-手动模式，2-自动模式 // logger.info("失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败");
woPackagingBox.setModel(2); // }
woPackagingBox.setCreateTime(LocalDateTime.now()); //
boxServiceBiz.insert(woPackagingBox); // //一. 从plc 中获取 subIdList 和 lineNum
//=============== MES 业务 结束 ================= // String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList);
//// Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step2Plc2MesVar.LineNum);
//三. 把生成的BoxId 告诉kuka // logger.info("获取到基板列表："+ Arrays.toString(subIdList));
write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId); //
// //二. MES 业务
//四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了 // //=============== MES 业务 开始 =================
write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true); // //1.MES 生成BoxId
// if(subIdList.length<=0){
//四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false // logger.info("失败"+" --- "+"从plc里面获取到的基板列表 为空");
Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false); // }
if(subArrived2 != 1){ // WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]);
logger.info("失败"+" --- "+"步骤1. MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败"); // String boxId = getBoxId(bySubId.getSapMaterial());
} // logger.info("mes 生成的boxId :"+ boxId);
write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false); // //2. 依次update 基板表，把boxId 赋予这些基板
} // for(int i=0;i<subIdList.length;i++){
},1,1, TimeUnit.SECONDS); // substrateServiceBiz.updatePackagingBoxIdByWoSubstrateId(boxId,subIdList[i]);
// }
// //3.去camline数据库 查询此基板ID 对应的订单
kukaStep3.scheduleAtFixedRate(new Runnable() { // String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]);
@Override // //4. box信息录入到box表
public void run() { // WoPackagingBox woPackagingBox = new WoPackagingBox();
//调度开始 // woPackagingBox.setBoxNo(boxId);
Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true); // woPackagingBox.setPackagingTime(LocalDateTime.now());
if(shelfIsFull != 1){ // woPackagingBox.setPowerLevel(bySubId.getPowerLevel());
logger.info("失败"+" --- "+"MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败"); // woPackagingBox.setLineBody(bySubId.getLineBody());
} // woPackagingBox.setSapMaterial(bySubId.getSapMaterial());
// woPackagingBox.setOrderNum(orderNameBySubId);
//一. 从plc 中获取 subIdList 和 lineNum // //1-手动模式，2-自动模式
String boxId = (String)read(S7Client.S7_KUKA,Step3Plc2MesVar.BoxId); // woPackagingBox.setModel(2);
Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step3Plc2MesVar.LineNum); // boxServiceBiz.insert(woPackagingBox);
logger.info("到达站台的boxId :"+boxId); // //=============== MES 业务 结束 =================
//
//二. MES 业务 // //三. 把生成的BoxId 告诉kuka
//=============== MES 业务 开始 ================= // write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId);
//1. box信息录入到box表 //
boxServiceBiz.updateIsArrivedByBoxNo(1,boxId); // //四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了
//=============== MES 业务 结束 ================= // write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true);
//
// //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
//四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了 // Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false);
write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true); // if(subArrived2 != 1){
// logger.info("失败"+" --- "+"步骤1. MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
//四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false // }
Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false); // write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
if(subArrived2 != 1){ // }
logger.info("失败"+" --- "+"步骤1. MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败"); // },1,1, TimeUnit.SECONDS);
} //
write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false); //
// kukaStep3.scheduleAtFixedRate(new Runnable() {
// @Override
} // public void run() {
},1,1, TimeUnit.SECONDS); // //调度开始
// Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true);
// if(shelfIsFull != 1){
// logger.info("失败"+" --- "+"MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
// }
//
// //一. 从plc 中获取 subIdList 和 lineNum
// String boxId = (String)read(S7Client.S7_KUKA,Step3Plc2MesVar.BoxId);
// Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step3Plc2MesVar.LineNum);
// logger.info("到达站台的boxId :"+boxId);
//
// //二. MES 业务
// //=============== MES 业务 开始 =================
// //1. box信息录入到box表
// boxServiceBiz.updateIsArrivedByBoxNo(1,boxId);
// //=============== MES 业务 结束 =================
//
//
// //四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了
// write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
//
// //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
// Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false);
// if(subArrived2 != 1){
// logger.info("失败"+" --- "+"步骤1. MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
// }
// write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false);
//
//
// }
// },1,1, TimeUnit.SECONDS);
} }

77
ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java
View File

@ -9,7 +9,6 @@ import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar;
import com.cnbm.packing.service.DynamicDataSourceService; import com.cnbm.packing.service.DynamicDataSourceService;
import com.cnbm.s7.entity.R; import com.cnbm.s7.entity.R;
import com.cnbm.s7.s7connector.enmuc.S7Client; import com.cnbm.s7.s7connector.enmuc.S7Client;
import com.cnbm.s7.s7connector.type.PlcVar;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@ -21,7 +20,6 @@ import com.cnbm.common.utils.Result;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.util.Map; import java.util.Map;
@ -126,34 +124,6 @@ public class TestController {
} }
return R.ok(); return R.ok();
} }
public static void main(String[] args) {
BigDecimal voc = new BigDecimal(59.799);
System.out.println(Float.valueOf(voc.toString()));
}
@PostMapping("/testWrite")
public R testWrite() {
BigDecimal voc = new BigDecimal(59.799);
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_KUKA,Step1Mes2PlcVar.dLable_Voc,voc);
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,isc);
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,vmpp);
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,impp);
write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,"12345678901111111111");
write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
return R.ok();
}
@PostMapping("/testlogger") @PostMapping("/testlogger")
public R testlogger() { public R testlogger() {
logger.info("test logger"); logger.info("test logger");
@ -189,51 +159,4 @@ public class TestController {
return new Result<String>().ok(service.getExtendArgFromCamline(subId.toString()).toString()); return new Result<String>().ok(service.getExtendArgFromCamline(subId.toString()).toString());
} }
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 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 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);
}
}
} }

4
ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java
View File

@ -178,7 +178,7 @@ public enum S7Client {
); );
return type.toObject(read); return type.toObject(read);
} }
}catch (Throwable e) { }catch (Exception e) {
throw new S7CheckResultException("read errMsg : "+e.getMessage()); throw new S7CheckResultException("read errMsg : "+e.getMessage());
} }
@ -293,7 +293,7 @@ public enum S7Client {
); );
} }
return null; return null;
}catch (Throwable e) { }catch (Exception e) {
throw new S7CheckResultException("write errMsg : "+e.getMessage()); throw new S7CheckResultException("write errMsg : "+e.getMessage());
} }
}, },