From 72aae5c4393f0c6681455bf0b5ea00e171b6288e Mon Sep 17 00:00:00 2001 From: caixiang <939387484@qq.com> Date: Fri, 12 May 2023 16:21:41 +0800 Subject: [PATCH] commit for pull --- .../src/main/java/com/cnbm/dispatch/KukaJoinThread.java | 8 ++++++-- .../com/cnbm/packing/controller/PrintModelController.java | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java index d34116b..a26c3aa 100644 --- a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java +++ b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java @@ -192,7 +192,7 @@ public class KukaJoinThread implements ApplicationRunner { String powerLevel = substrateServiceBiz.getBySubId(subIds[i]).getPowerLevel(); if(!powerLevel.equals(correctLevel)){ - errMsg+="基板ID:"+subIds[i]+" 档位："+powerLevel+", "; + errMsg += "基板ID:"+subIds[i]+" 档位："+powerLevel+", "; res = true; } } @@ -203,6 +203,7 @@ public class KukaJoinThread implements ApplicationRunner { return res; } + @Override public void run(ApplicationArguments args) throws Exception { @@ -343,7 +344,10 @@ public class KukaJoinThread implements ApplicationRunner { logger.info("BOXID生成Event-------获取到基板列表："+ Arrays.toString(subIdList)+",基板数量:"+listSize); WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]); - logger.info("bySubId"+ bySubId.toString()); + if(bySubId==null){ + logger.info("BOXID生成Event-------数据库中 无subId："+ subIdList[0]); + } + //如果我们系统中找不到这块基板那么就去camline里面找 if(bySubId == null){ diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java index 42c02e5..88456be 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java @@ -58,6 +58,7 @@ public class PrintModelController { return new Result>().ok(page); } + @GetMapping("{id}") @ApiOperation("信息") @PreAuthorize("@ex.hasAuthority('packing:printModel:info')")