分页查询列表、ams取消任务同步

warewms-ams/src/main/java/com/warewms/ams/common/AmsConstant.java

@@ -45,7 +45,11 @@ public class AmsConstant {
         /**
          * 未下发
          */
-        N(0);
+        N(0),
+        /**
+         * 已取消
+         */
+        D(2);
 
         private Integer value;
 

warewms-ams/src/main/java/com/warewms/ams/ndc/service/impl/AmsTaskServiceImpl.java

@@ -282,7 +282,7 @@ public class AmsTaskServiceImpl extends CrudServiceImpl<AmsTaskMapper, AmsTask,
     @Override
     public Boolean cancelAmsTask(AmsTaskCancelDTO amsTaskCancelDTO) {
         String id = amsTaskCancelDTO.getTaskNo();
-        String remark = StringUtils.isNotBlank(amsTaskCancelDTO.getReason()) ? amsTaskCancelDTO.getReason() : null;
+        String remark = StringUtils.isNotBlank(amsTaskCancelDTO.getReason()) ? amsTaskCancelDTO.getReason() : StringUtils.EMPTY;
         AmsTask amsTask = getAmsTaskById(id);
         Assert.isTrue(ObjectUtil.isNotNull(amsTask), "任务不存在！");
         //请求ams 取消任务
@@ -291,15 +291,19 @@ public class AmsTaskServiceImpl extends CrudServiceImpl<AmsTaskMapper, AmsTask,
         return amsTaskMapper.update(new AmsTask(), Wrappers.<AmsTask>lambdaUpdate()
                 .eq(AmsTask::getId, id)
                 .set(AmsTask::getIsDelete, AmsConstant.DELETE_STATUS.Y.getValue())
-                .set(AmsTask::getAciAccept, AmsConstant.ACI_ACCEPT_STATUS.N.getValue())
-                .set(AmsTask::getRemark, "下发超时1分钟未接收自动取消, 取消原因为：" + remark)) > 0;
+                .set(AmsTask::getAciAccept, AmsConstant.ACI_ACCEPT_STATUS.D.getValue())
+                .set(AmsTask::getEvent, AmsConstant.TASK_STS.TASK7.getKey())
+                .set(AmsTask::getSystemStatus, AmsConstant.TASK_STS.TASK7.getValue())
+                .set(AmsTask::getRemark, "任务取消原因为：" + remark)) > 0;
     }
 
     @Override
     public void cancelAmsTaskToWms(AmsTaskCancelToWmsDTO amsTaskCancelToWmsDTO) {
         AmsTaskDTO amsTaskDTO = get(amsTaskCancelToWmsDTO.getId());
-        AmsTaskCancelDTO amsTaskCancelDTO = ConvertUtils.sourceToTarget(amsTaskCancelToWmsDTO, AmsTaskCancelDTO.class);
+        AmsTaskCancelDTO amsTaskCancelDTO = new AmsTaskCancelDTO();
         amsTaskCancelDTO.setTaskNo(amsTaskCancelToWmsDTO.getId().toString());
+        amsTaskCancelDTO.setReason("AMS申请取消, ".concat(StringUtils.isNotBlank(amsTaskCancelToWmsDTO.getReason()) ?
+                amsTaskCancelToWmsDTO.getReason() : StringUtils.EMPTY));
         cancelAmsTask(amsTaskCancelDTO);
         amsStateFeedbackToWms(AmsConstant.TASK_STS.TASK7.getValue(), amsTaskDTO.getId().toString(), amsTaskDTO.getTaskNo(),null);
     }
@@ -369,8 +373,12 @@ public class AmsTaskServiceImpl extends CrudServiceImpl<AmsTaskMapper, AmsTask,
         Integer aciIndex = StringUtils.isNotBlank((String) params.get("aciIndex")) ? Integer.parseInt((String) params.get("aciIndex")) : null;
         Integer stFrom = StringUtils.isNotBlank((String) params.get("stFrom")) ? Integer.parseInt((String) params.get("stFrom")) : null;
         Integer stTo = StringUtils.isNotBlank((String) params.get("stTo")) ? Integer.parseInt((String) params.get("stTo")) : null;
-        Date beginTime = StringUtils.isNotBlank((String) params.get("beginTime")) ? DateUtil.parse((String) params.get("beginTime"), DateUtils.YYYY_MM_DD_HH_MM_SS) : null;
-        Date endTime = StringUtils.isNotBlank((String) params.get("endTime")) ? DateUtil.parse((String) params.get("endTime"), DateUtils.YYYY_MM_DD_HH_MM_SS) : DateUtils.getNowDate();
+        //如果不传则默认起始时间为去年今日
+        Date beginTime = StringUtils.isNotBlank((String) params.get("beginTime")) ?
+                DateUtil.parse((String) params.get("beginTime"), DateUtils.YYYY_MM_DD_HH_MM_SS) : DateUtils.offsetYear(DateUtils.getNowDate(), -1);
+        //如果不传则默认结束时间为今日
+        Date endTime = StringUtils.isNotBlank((String) params.get("endTime")) ?
+                DateUtil.parse((String) params.get("endTime"), DateUtils.YYYY_MM_DD_HH_MM_SS) : DateUtils.getNowDate();
         queryWrapper.lambda().eq(ObjectUtil.isNotNull(taskNo), AmsTask::getTaskNo, taskNo)
                 .eq(ObjectUtil.isNotNull(aciIndex), AmsTask::getAciIndex, aciIndex)
                 .eq(ObjectUtil.isNotNull(stFrom), AmsTask::getStFrom, stFrom)

warewms-ams/src/main/java/com/warewms/common/utils/DateUtils.java

@@ -1,5 +1,7 @@
 package com.warewms.common.utils;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import java.lang.management.ManagementFactory;
@@ -153,4 +155,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         // long sec = diff % nd % nh % nm / ns;
         return day + "天" + hour + "小时" + min + "分钟";
     }
+
+    public static Date offsetYear(Date date, int offset){
+        return DateUtil.offset(date, DateField.YEAR, offset);
+    }
+
 }