Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java

@@ -197,7 +197,7 @@ public class StorageMonitoringServiceImpl implements IStorageMonitoringService {
                         locationCode, AgvConstant.EQUIPMENT_TYPE_CTU);
 
                 //调用成功 添加任务
-                if(null != ctuSchedulingTask){
+                if(null != ctuSchedulingTask && ctuSchedulingTask.getCode().equals("0")){
                     // 添加任务
                     boolean record = taskExecuteRecordService.inboundRecord(ctuSchedulingTask, firstTask,null);
                 }

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java

@@ -394,7 +394,7 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
                     AgvConstant.EQUIPMENT_TYPE_CTU
             );
 
-            if(null == ctuSchedulingTask){
+            if(!ctuSchedulingTask.getCode().equals("0")){
                 log.error("生成CTU调度任务失败，taskCode：{}", taskCode);
                 return false;
             }