rev 新增日志

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java

@@ -693,6 +693,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                 apply.put("device_code", device_code);
                 apply.put("task_id", taskDto.getExt_task_id());
                 apply.put("type", "12");
+                logServer.deviceExecuteLog(device_code, "", "", "申请任务请求参数:"+apply);
                 String str = acsToWmsService.applyTaskToWms(apply);
                 JSONObject jo = JSON.parseObject(str);
                 if (ObjectUtil.isEmpty(jo)) {
@@ -708,8 +709,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                         message = "申请AGV任务失败," + jo.get("message").toString();
                     }
                 }
-            } else {
-                logServer.deviceExecuteLog(device_code, "", "", "未申请agv任务，task:"+task);
+                logServer.deviceExecuteLog(device_code, "", "", "申请任务返回参数:"+jo);
             }
             return true;
         }

acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -220,6 +220,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
     public Instruction findByCode(String code) {
         WQLObject wo = WQLObject.getWQLObject("acs_instruction");
         JSONObject json = wo.query("instruction_code ='" + code + "'").uniqueResult(0);
+        if(ObjectUtil.isEmpty(json)){
+            return null;
+        }
         final Instruction obj = json.toJavaObject(Instruction.class);
         return obj;
     }