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

Compare commits

base: CaiXiang:c284a4b39407b33d8786945d214dbc1d582fb817
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:3b7cc6769023e19a302a396b30fa102b032214c6
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "c284a4b39407b33d8786945d214dbc1d582fb817" and "3b7cc6769023e19a302a396b30fa102b032214c6" have entirely different histories.
c284a4b394 ... 3b7cc67690

6 changed files with 253 additions and 300 deletions
Show Stats Expand all files Collapse all files

26
ym-gateway/src/main/resources/application-dev.yml
View File

@ -2,9 +2,9 @@ spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
#MySQL-local #MySQL-local
url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true # url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: cigs4 # username: cigs4
password: 1qazxsw2 # password: 1qazxsw2
#MySQL-remote #MySQL-remote
# url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true # url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
@ -66,15 +66,15 @@ dynamic:
# username: root # username: root
# password: 1qaz@WSX3edc$RFV # password: 1qaz@WSX3edc$RFV
## camline系统 - remote ## camline系统 - remote
# camline:
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
# username: root
# password: 1qaz@WSX3edc$RFV
#
#camline系统 - local
camline: camline:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: offline_data username: root
password: tpvmfab4 password: 1qaz@WSX3edc$RFV
#
#camline系统 - local
# camline:
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
# username: offline_data
# password: tpvmfab4

5
ym-gateway/src/main/resources/application.yml
View File

@ -33,9 +33,8 @@ spring:
enabled: true enabled: true
redis: redis:
database: 6 database: 6
#host: 127.0.0.1 #host: 10.0.1.249
host: 10.0.1.249 host: 192.168.0.102
#host: 192.168.0.102
port: 6379 port: 6379
password: '' # 密码（默认为空） password: '' # 密码（默认为空）
timeout: 6000ms # 连接超时时长（毫秒） timeout: 6000ms # 连接超时时长（毫秒）

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

@ -152,7 +152,7 @@ public class KukaJoinThread implements ApplicationRunner {
public String getBoxId(String sapMaterial){ public String getBoxId(String sapMaterial){
Integer todayBoxNum = service.getTodayBoxNum()+1; Integer todayBoxNum = service.getTodayBoxNum();
String nowTime = DateUtil.format(new Date(), "yyMMdd"); String nowTime = DateUtil.format(new Date(), "yyMMdd");
todayBoxNum+=500; todayBoxNum+=500;
@ -160,15 +160,6 @@ public class KukaJoinThread implements ApplicationRunner {
return res; 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){ public String removeKG(String str){
return str.substring(0,17); return str.substring(0,17);
} }
@ -183,270 +174,240 @@ public class KukaJoinThread implements ApplicationRunner {
return f1.format(a); return f1.format(a);
} }
//return true 出现混档了，return false 没有出现混档
private boolean isMixLevel(String[] subIds){
String correctLevel = substrateServiceBiz.getBySubId(subIds[0]).getPowerLevel();
String errMsg = "以下基板ID出现混档：";
boolean res = false;
for(int i=1;i<subIds.length;i++){
String powerLevel = substrateServiceBiz.getBySubId(subIds[i]).getPowerLevel();
if(!powerLevel.equals(correctLevel)){
errMsg+="基板ID:"+subIds[i]+" 档位："+powerLevel+", ";
res = true;
}
}
if(res){
logger.error(errMsg);
}
return res;
}
@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() {
try { // try {
//
//调度开始 // //调度开始
// logger.info(""); //// logger.info("");
// logger.info("================= 现在开始执行 过程一 任务 =================="); //// logger.info("================= 现在开始执行 过程一 任务 ==================");
Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true); // Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true);
if(subArrived != 1){ // if(subArrived != 1){
logger.info("标签打印Event--- 失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败"); // logger.info("标签打印Event--- 失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
} // }
//
//一. 从plc 中获取 subId 和 lineNum // //一. 从plc 中获取 subId 和 lineNum
String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes); // String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes);
Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum); // Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum);
//把基板ID字符串的空格去掉，因为plc中设置的20位，但实际基板ID就是17位，因为带空格去数据库查询 有问题的。 // //把基板ID字符串的空格去掉，因为plc中设置的20位，但实际基板ID就是17位，因为带空格去数据库查询 有问题的。
subId = removeKG(subId); // subId = removeKG(subId);
//
//二. MES 业务 // //二. MES 业务
//=============== MES 业务 开始 ================= // //=============== MES 业务 开始 =================
//1. 从comline数据库中获取 实际pmpp // //1. 从comline数据库中获取 实际pmpp
float pmppActual = service.getPMPPBySubId(subId); // float pmppBySubId = service.getPMPPBySubId(subId);
//2. 匹配和计算补偿功率 // //2. 匹配和计算补偿功率
float pmppCompensation = compensationPowerServiceBiz.calculCompensationPMPP(pmppActual,lineNum); // float actualPMPP = compensationPowerServiceBiz.calculCompensationPMPP(pmppBySubId,lineNum);
//3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka // //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka
WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(pmppCompensation, lineNum); // WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(actualPMPP, lineNum);
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,Integer.valueOf(argByPMPP.getPowerClass())); // 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_Voc,argByPMPP.getLableVoc());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc()); // write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp()); // write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp()); // write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp());
logger.info("标签打印Event--- 采集到 基板ID: "+subId+", 线边号："+lineNum+"，从camline 获取到实际pmpp"+pmppActual+",计算后 补偿功率："+pmppCompensation+",dLable_Pnom: "+argByPMPP.getPowerClass() +",dLable_Voc: "+argByPMPP.getLableVoc()+",dLable_Isc: "+argByPMPP.getLableIsc()+",dLable_Vmpp: "+argByPMPP.getLableVmpp()+",dLable_Impp: "+argByPMPP.getLableImpp()); // logger.info("标签打印Event--- 采集到 基板ID: "+subId+", 线边号："+lineNum+"，从camline 获取到实际pmpp"+pmppBySubId+",计算后 补偿功率："+actualPMPP+",dLable_Pnom: "+argByPMPP.getPowerClass() +",dLable_Voc: "+argByPMPP.getLableVoc()+",dLable_Isc: "+argByPMPP.getLableIsc()+",dLable_Vmpp: "+argByPMPP.getLableVmpp()+",dLable_Impp: "+argByPMPP.getLableImpp());
//
//
//
//4. 把基板录到数据库 // //4. 把基板录到数据库
WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate(); // WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate();
woPackagingBoxSubstrate.setLineBody(lineNum); // woPackagingBoxSubstrate.setLineBody(lineNum);
woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass()); // woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass());
woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum()); // woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum());
woPackagingBoxSubstrate.setWoSubstrateId(subId); // woPackagingBoxSubstrate.setWoSubstrateId(subId);
woPackagingBoxSubstrate.setActualPmpp(pmppActual); // woPackagingBoxSubstrate.setActualPmpp(pmppBySubId);
woPackagingBoxSubstrate.setCreateTime(LocalDateTime.now()); // woPackagingBoxSubstrate.setCreateTime(LocalDateTime.now());
woPackagingBoxSubstrate.setPmpp(pmppCompensation); //
//
// //5. 从camline那里获取可变字段
//5. 从camline那里获取可变字段 // CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId);
CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId); // logger.info("标签打印Event--- 基板ID: "+subId+", 从camline获取PID16~PID22 的实测数据 成功, 数据内容:"+extendArgFromCamline.toString());
logger.info("标签打印Event--- 基板ID: "+subId+", 从camline获取PID16~PID22 的实测数据 成功, 数据内容:"+extendArgFromCamline.toString()); // woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime());
woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime()); // woPackagingBoxSubstrate.setPmpp(actualPMPP);
// woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName());
woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName()); // woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1());
woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1()); // woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2());
woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2()); // woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1());
woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1()); // woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2());
woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2()); // woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1());
woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1()); // woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2());
woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2()); // woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1());
woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1()); // woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2());
woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2()); // woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1());
woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1()); // woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2());
woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2()); // woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1());
woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1()); // woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2());
woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2()); // woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1());
woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1()); // woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2());
woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2()); // woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1());
woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1()); // woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2());
woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2()); // woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1());
woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1()); // woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2());
woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2()); // woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1());
woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1()); // woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2());
woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2()); // woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1());
woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1()); // woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2());
woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2()); // woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1());
woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1()); // woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2());
woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2()); // woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1());
woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1()); // woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2());
woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2()); // woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1());
woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1()); // woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2());
woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2()); // woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1());
woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1()); // woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2());
woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2()); //
// substrateServiceBiz.insert(woPackagingBoxSubstrate);
substrateServiceBiz.insert(woPackagingBoxSubstrate); // logger.info("标签打印Event--- 基板ID: "+subId+", 录入数据库成功");
logger.info("标签打印Event--- 基板ID: "+subId+", 录入数据库成功"); // //=============== MES 业务 结束 =================
//=============== MES 业务 结束 ================= //
// //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了
//三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了 // write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true); // logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为true 成功");
logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为true 成功"); // //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
//四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false // Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false);
Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false); // if(subArrived2 != 1){
if(subArrived2 != 1){ // logger.info("标签打印Event--- 失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
logger.info("标签打印Event--- 失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败"); // }
} //
// write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false);
write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false); // logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为 false 成功, Event1 成功结束");
logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为 false 成功, Event1 成功结束"); //
// }catch (Throwable e){
}catch (Throwable e){ // logger.info("标签打印Event--- :"+e.getMessage());
logger.info("标签打印Event--- :"+e.getMessage()); // }
} // }
} // },1,1, TimeUnit.SECONDS);
},1,1, TimeUnit.SECONDS); //
//
kukaStep2.scheduleAtFixedRate(new Runnable() { // kukaStep2.scheduleAtFixedRate(new Runnable() {
@Override // @Override
public void run() { // public void run() {
try { // try {
//
//调度开始 // //调度开始
Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true); // Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true);
if(shelfIsFull != 1){ // if(shelfIsFull != 1){
logger.info("BOXID生成Event-------失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败"); // logger.info("BOXID生成Event-------失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败");
} // }
//
//一. 从plc 中获取 subIdList 和 lineNum // //一. 从plc 中获取 subIdList 和 lineNum
String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList); // String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList);
Integer listSize = (Integer)read(S7Client.S7_KUKA,Step2Plc2MesVar.PackageNumberSet); // Integer listSize = (Integer)read(S7Client.S7_KUKA,Step2Plc2MesVar.PackageNumberSet);
//
//二. MES 业务 // //二. MES 业务
//=============== MES 业务 开始 ================= // //=============== MES 业务 开始 =================
//1.MES 生成BoxId // //1.MES 生成BoxId
if(subIdList.length<=0){ // if(subIdList.length<=0){
logger.info("BOXID生成Event-------失败"+" --- "+"从plc里面获取到的基板列表 为空"); // logger.info("BOXID生成Event-------失败"+" --- "+"从plc里面获取到的基板列表 为空");
throw new Exception("BOXID生成Event-------kuka机械手 取到了空箱"); // throw new Exception("BOXID生成Event-------kuka机械手 取到了空箱");
} // }
//真实的基板ID 就是17位的，plc读取过来，有空格，要把后面3位空格去掉就行了。 // //真实的基板ID 就是17位的，plc读取过来，有空格，要把后面3位空格去掉就行了。
for(int i=0;i<subIdList.length;i++){ // for(int i=0;i<subIdList.length;i++){
subIdList[i] = removeKG(subIdList[i]); // subIdList[i] = removeKG(subIdList[i]);
} // }
logger.info("BOXID生成Event-------获取到基板列表："+ Arrays.toString(subIdList)+",基板数量:"+listSize); // logger.info("BOXID生成Event-------获取到基板列表："+ Arrays.toString(subIdList)+",基板数量:"+listSize);
//
WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]); // WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]);
//如果我们系统中找不到这块基板那么就去camline里面找 // //如果我们系统中找不到这块基板那么就去camline里面找
if(bySubId == null){ // if(bySubId == null){
//todo // //todo
CamlineSubIdDTO subIdByCamline = service.getSubIdByCamline(subIdList[0]); // CamlineSubIdDTO subIdByCamline = service.getSubIdByCamline(subIdList[0]);
bySubId = new WoPackagingBoxSubstrate(); // bySubId = new WoPackagingBoxSubstrate();
bySubId.setPowerLevel(subIdByCamline.getPowerLevel()); // bySubId.setPowerLevel(subIdByCamline.getPowerLevel());
bySubId.setSapMaterial(subIdByCamline.getSapMaterial()); // bySubId.setSapMaterial(subIdByCamline.getSapMaterial());
bySubId.setLineBody(2); // bySubId.setLineBody(2);
} // }
//
//校验是否存在混档位情况 //
String boxId = ""; // String boxId = getBoxId(bySubId.getSapMaterial());
if(isMixLevel(subIdList)){ // logger.info("BOXID生成Event-------mes 生成的boxId :"+ boxId);
//出现混档 // //2. 依次update 基板表，把boxId 赋予这些基板
boxId = getBoxId(bySubId.getSapMaterial()); // for(int i=0;i<listSize;i++){
}else { // substrateServiceBiz.updatePackagingBoxIdAndSlotByWoSubstrateId(boxId,(i+1),subIdList[i]);
//正常情况 // }
boxId = getErrorBoxId(bySubId.getSapMaterial()); // //3.去camline数据库 查询此基板ID 对应的订单
} // String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]);
// //4. box信息录入到box表
// WoPackagingBox woPackagingBox = new WoPackagingBox();
// woPackagingBox.setBoxNo(boxId);
// woPackagingBox.setPackagingTime(LocalDateTime.now());
logger.info("BOXID生成Event-------mes 生成的boxId :"+ boxId); // woPackagingBox.setPowerLevel(bySubId.getPowerLevel());
//2. 依次update 基板表，把boxId 赋予这些基板 // woPackagingBox.setLineBody(bySubId.getLineBody());
for(int i=0;i<listSize;i++){ // woPackagingBox.setSapMaterial(bySubId.getSapMaterial());
substrateServiceBiz.updatePackagingBoxIdAndSlotByWoSubstrateId(boxId,(i+1),subIdList[i]); // woPackagingBox.setOrderNum(orderNameBySubId);
} // //1-手动模式，2-自动模式
//3.去camline数据库 查询此基板ID 对应的订单 // woPackagingBox.setModel(2);
String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]); // woPackagingBox.setCreateTime(LocalDateTime.now());
//4. box信息录入到box表 // boxServiceBiz.insert(woPackagingBox);
WoPackagingBox woPackagingBox = new WoPackagingBox(); // logger.info("BOXID生成Event-------boxId :"+ boxId+"写入数据库成功");
woPackagingBox.setBoxNo(boxId); // //=============== MES 业务 结束 =================
woPackagingBox.setSubstrateQuantity(listSize); //
woPackagingBox.setPackagingTime(LocalDateTime.now()); // //三. 把生成的BoxId 告诉kuka
woPackagingBox.setPowerLevel(bySubId.getPowerLevel()); // write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId);
woPackagingBox.setLineBody(bySubId.getLineBody()); // logger.info("BOXID生成Event-------boxId :"+ boxId+"传给PLC 成功");
woPackagingBox.setSapMaterial(bySubId.getSapMaterial()); //
woPackagingBox.setOrderNum(orderNameBySubId); // //四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了
//1-手动模式，2-自动模式 // write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true);
woPackagingBox.setModel(2); // logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为true 成功");
woPackagingBox.setCreateTime(LocalDateTime.now()); // //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
boxServiceBiz.insert(woPackagingBox); // Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false);
logger.info("BOXID生成Event-------boxId :"+ boxId+"写入数据库成功"); // if(subArrived2 != 1){
//=============== MES 业务 结束 ================= // logger.info("BOXID生成Event-------失败"+" --- "+"步骤1. MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
// }
//三. 把生成的BoxId 告诉kuka // write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId); // logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为false 成功,Event2 成功结束");
logger.info("BOXID生成Event-------boxId :"+ boxId+"传给PLC 成功"); // }catch (Throwable e){
// logger.info("BOXID生成Event------- :" + e.getMessage());
//四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了 // }
write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true); // }
logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为true 成功"); // },1,1, TimeUnit.SECONDS);
//四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false //
Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false); //
if(subArrived2 != 1){ // kukaStep3.scheduleAtFixedRate(new Runnable() {
logger.info("BOXID生成Event-------失败"+" --- "+"步骤1. MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败"); // @Override
} // public void run() {
write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false); // try {
logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为false 成功,Event2 成功结束"); //
}catch (Throwable e){ // //调度开始
logger.info("BOXID生成Event------- :" + e.getMessage()); // Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true);
} // if(shelfIsFull != 1){
} // logger.info("装箱单打印Event------失败"+" --- "+"MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
},1,1, TimeUnit.SECONDS); // }
//
kukaStep3.scheduleAtFixedRate(new Runnable() { // //一. 从plc 中获取 subIdList 和 lineNum
@Override // String boxId = (String)read(S7Client.S7_KUKA,Step3Plc2MesVar.BoxId);
public void run() { // Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step3Plc2MesVar.LineNum);
try { // logger.info("装箱单打印Event------到达站台的boxId :"+boxId);
//
//调度开始 // //二. MES 业务
Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true); // //=============== MES 业务 开始 =================
if(shelfIsFull != 1){ // //1. box信息录入到box表
logger.info("装箱单打印Event------失败"+" --- "+"MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败"); // boxServiceBiz.updateIsArrivedByBoxNo(1,boxId);
} // logger.info("装箱单打印Event------boxId :"+boxId+"更新数据库成功");
// //=============== MES 业务 结束 =================
//一. 从plc 中获取 subIdList 和 lineNum //
String boxId = (String)read(S7Client.S7_KUKA,Step3Plc2MesVar.BoxId); //
Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step3Plc2MesVar.LineNum); // //四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了
logger.info("装箱单打印Event------到达站台的boxId :"+boxId); // write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
// logger.info("装箱单打印Event------boxId :"+boxId+"， ShelfIsFullArrivedFinish置为true 成功");
//二. MES 业务 // //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
//=============== MES 业务 开始 ================= // Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false);
//1. box信息录入到box表 // if(subArrived2 != 1){
boxServiceBiz.updateIsArrivedByBoxNo(1,boxId); // logger.info("装箱单打印Event------失败"+" --- "+"步骤1. MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
logger.info("装箱单打印Event------boxId :"+boxId+"更新数据库成功"); // }
//=============== MES 业务 结束 ================= // logger.info("装箱单打印Event------boxId :"+boxId+"， 监听到subArrived=false 成功");
// write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false);
// logger.info("装箱单打印Event------boxId :"+boxId+"， Even3 成功");
//四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了 // }catch (Throwable e){
write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true); // logger.info("装箱单打印Event------"+e.getMessage());
logger.info("装箱单打印Event------boxId :"+boxId+"， ShelfIsFullArrivedFinish置为true 成功"); // }
//四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false //
Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false); // }
if(subArrived2 != 1){ // },1,1, TimeUnit.SECONDS);
logger.info("装箱单打印Event------失败"+" --- "+"步骤1. MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
}
logger.info("装箱单打印Event------boxId :"+boxId+"， 监听到subArrived=false 成功");
write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false);
logger.info("装箱单打印Event------boxId :"+boxId+"， Even3 成功");
}catch (Throwable e){
logger.info("装箱单打印Event------"+e.getMessage());
}
}
},1,1, TimeUnit.SECONDS);
} }

6
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
View File

@ -129,7 +129,7 @@ public class WoPackagingBoxSubstrateController {
@PostMapping("/powerReport") @PostMapping("/powerReport")
public Result<PowerReportVo> powerReport(@RequestBody PowerReportQueryParam queryParam){ public Result<PowerReportVo> powerReport(@RequestBody PowerReportQueryParam queryParam){
List<PowerReportDTO> powerReportDTOS = boxServiceBiz.powerReport(queryParam); List<PowerReportDTO> powerReportDTOS = boxServiceBiz.powerReport(queryParam);
System.out.println(powerReportDTOS.toString());
PowerReportVo powerReportVo = new PowerReportVo(); PowerReportVo powerReportVo = new PowerReportVo();
Float totalLevelPower = new Float(0); Float totalLevelPower = new Float(0);
Float totalCompensatePower = new Float(0); Float totalCompensatePower = new Float(0);
@ -144,12 +144,12 @@ public class WoPackagingBoxSubstrateController {
totalSubNum+= subNum; totalSubNum+= subNum;
} }
for(PowerReportDTO power : powerReportDTOS){ for(PowerReportDTO power : powerReportDTOS){
Float prop = (Float.valueOf(power.getSubNum())/Float.valueOf(totalSubNum))*100; Float prop = Float.valueOf(power.getSubNum())/Float.valueOf(totalSubNum);
DecimalFormat df = new DecimalFormat("0.00"); DecimalFormat df = new DecimalFormat("0.00");
String propS = df.format(prop)+"%"; String propS = df.format(prop)+"%";
power.setProportion(propS); power.setProportion(propS);
} }
diversePower = totalCompensatePower - totalLevelPower; diversePower = totalLevelPower - totalCompensatePower;
powerReportVo.setPowerReports(powerReportDTOS); powerReportVo.setPowerReports(powerReportDTOS);
powerReportVo.setDiversePower(diversePower); powerReportVo.setDiversePower(diversePower);
powerReportVo.setTotalCompensatePower(totalCompensatePower); powerReportVo.setTotalCompensatePower(totalCompensatePower);

7
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
View File

@ -46,11 +46,6 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
private WoPackagingBoxSubstrateServiceBiz woPackagingBoxSubstrateServiceBiz; private WoPackagingBoxSubstrateServiceBiz woPackagingBoxSubstrateServiceBiz;
public static void main(String[] args) {
LocalDateTime localDate=LocalDateTime.parse("2023-03-23 09:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
System.out.println(localDate);
}
@Override @Override
public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){ public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){
@ -60,8 +55,6 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
if(params.get("startTime")!=null && params.get("endTime")!=null){ if(params.get("startTime")!=null && params.get("endTime")!=null){
LocalDateTime startTime = LocalDateTime.parse(params.get("startTime").toString(),df); LocalDateTime startTime = LocalDateTime.parse(params.get("startTime").toString(),df);
LocalDateTime endTime = LocalDateTime.parse(params.get("endTime").toString(),df); LocalDateTime endTime = LocalDateTime.parse(params.get("endTime").toString(),df);
wrapper.between(startTime!=null && endTime!=null, WoPackagingBox.CREATE_TIME, startTime, endTime); wrapper.between(startTime!=null && endTime!=null, WoPackagingBox.CREATE_TIME, startTime, endTime);
} }
String boxNo = (String) params.get("boxNo"); String boxNo = (String) params.get("boxNo");

6
ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java
View File

@ -12,9 +12,9 @@ import java.util.List;
*/ */
@Data @Data
public class PowerReportVo { public class PowerReportVo {
private Float totalLevelPower; //档位功率汇总 private Float totalLevelPower;
private Float totalCompensatePower; //补偿功率汇总 private Float totalCompensatePower;
private Float diversePower; //差异功率汇总 private Float diversePower;
private List<PowerReportDTO> powerReports; private List<PowerReportDTO> powerReports;