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

commit for pull

Browse Source
This commit is contained in:
caixiang 2023-05-12 16:21:41 +08:00
parent d70f19adcd
commit 72aae5c439
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@ public class KukaJoinThread implements ApplicationRunner {
String powerLevel = substrateServiceBiz.getBySubId(subIds[i]).getPowerLevel(); String powerLevel = substrateServiceBiz.getBySubId(subIds[i]).getPowerLevel();
if(!powerLevel.equals(correctLevel)){ if(!powerLevel.equals(correctLevel)){
errMsg+="基板ID:"+subIds[i]+" 档位："+powerLevel+", "; errMsg += "基板ID:"+subIds[i]+" 档位："+powerLevel+", ";
res = true; res = true;
} }
} }
@ -203,6 +203,7 @@ public class KukaJoinThread implements ApplicationRunner {
return res; return res;
} }
@Override @Override
public void run(ApplicationArguments args) throws Exception { public void run(ApplicationArguments args) throws Exception {
@ -343,7 +344,10 @@ public class KukaJoinThread implements ApplicationRunner {
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]);
logger.info("bySubId"+ bySubId.toString()); if(bySubId==null){
logger.info("BOXID生成Event-------数据库中 无subId："+ subIdList[0]);
}
//如果我们系统中找不到这块基板那么就去camline里面找 //如果我们系统中找不到这块基板那么就去camline里面找
if(bySubId == null){ if(bySubId == null){

1
ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java
View File

@ -58,6 +58,7 @@ public class PrintModelController {
return new Result<PageData<PrintModelDTO>>().ok(page); return new Result<PageData<PrintModelDTO>>().ok(page);
} }
@GetMapping("{id}") @GetMapping("{id}")
@ApiOperation("信息") @ApiOperation("信息")
@PreAuthorize("@ex.hasAuthority('packing:printModel:info')") @PreAuthorize("@ex.hasAuthority('packing:printModel:info')")