现场问题修复

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java

@@ -38,7 +38,7 @@ public class InstructionController {
     //@PreAuthorize("@el.check('instruction:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
         if(ObjectUtil.isEmpty(whereJson.get("status"))) {
-            whereJson.put("status", "0");
+            whereJson.put("status", "1");
         }
         return new ResponseEntity<>(instructionService.queryAll(whereJson, page), HttpStatus.OK);
     }

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

@@ -239,6 +239,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         if (!StrUtil.isEmpty(create_time) && !StrUtil.isEmpty(end_time)) {
            wrapper.between(InstructionMybatis::getCreate_time,create_time,end_time);
         }
+        wrapper.orderByDesc(InstructionMybatis::getCreate_time);
         IPage<InstructionMybatis> insPage = instructionMapper.selectPage(queryPage,wrapper);
         final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(insPage, InstructionDto.class));
         return json;

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java

@@ -416,6 +416,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
         if (!StrUtil.isEmpty(create_time) && !StrUtil.isEmpty(end_time)) {
             wrapper.between(Task::getCreate_time,create_time,end_time);
         }
+        wrapper.orderByDesc(Task::getCreate_time);
         IPage<Task> taskPage = taskMapper.selectPage(queryPage,wrapper);
         final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(taskPage, TaskDto.class));
         JSONArray array = json.getJSONArray("content");

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java

@@ -35,6 +35,7 @@ import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper;
 import org.nl.wms.util.PointUtils;
 import org.nl.wms.util.TaskUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -54,6 +55,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Slf4j
 @Service
+@Lazy
 public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     // 反射类方法的缓存
@@ -150,9 +152,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         AbstractTask abstractTask = taskFactory.getTask(processingClass);
         // 更新任务
         try {
-            abstractTask.updateTaskStatus(taskId, status);
+            abstractTask.updateTaskStatus(taskObj.getTask_id(), status);
         } catch (Exception e) {
-            log.error("任务状态更新失败: {}", message);
+            log.error("任务状态更新失败: {}{}", e,e.getMessage());
             return BaseResponse.responseError(requestNo, "任务:[" + taskId + "]状态更新失败," + message);
         }
         return BaseResponse.responseOk(requestNo, "任务状态反馈成功！");

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java

@@ -18,6 +18,7 @@ import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task_manage.GeneralDefinition;
 import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 /**
@@ -27,6 +28,7 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
+@Lazy
 public class PdaServiceImpl implements PdaService {
     @Autowired
     private PdaMapper pdaMapper;

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java

@@ -12,6 +12,7 @@ import org.nl.common.logging.annotation.Log;
 import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task.service.dao.SchBaseTask;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -28,6 +29,7 @@ import java.util.Set;
 @RestController
 @Api(tags = "任务管理管理")
 @RequestMapping("/api/schBaseTask")
+
 public class SchBaseTaskController {
 
     @Autowired

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java

@@ -22,6 +22,7 @@ import org.nl.wms.sch.task_manage.AbstractTask;
 import org.nl.wms.sch.task_manage.task.TaskFactory;
 import org.nl.wms.sch.task_manage.task.core.TaskStatus;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -37,6 +38,7 @@ import java.util.stream.Collectors;
  **/
 @Slf4j
 @Service
+@Lazy
 public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBaseTask> implements ISchBaseTaskService {
 
     @Autowired

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java

@@ -224,7 +224,11 @@ public class MJXLTask extends AbstractTask {
             param.put("device_code",device_code);
             param.put("request_medthod_code","TBXBKJTask");
             param.put("request_medthod_name","涂板线补空架");
-            acsToWmsService.acsApply(param);
+            try {
+                acsToWmsService.acsApply(param);
+            }catch (Exception e){
+                log.error("涂板线下料任务自动创建涂板线补空架任务失败{}",e.getMessage());
+            }
         }
         if (status.equals(TaskStatus.CANCELED)) { // 取消
             // 终点解锁

lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -37,7 +37,7 @@ https://juejin.cn/post/6844903775631572999
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>20MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>20GB</totalSizeCap>
         </rollingPolicy>