commit for pull

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){
 

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

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