修改时区

shkj-admin/pom.xml

@@ -59,12 +59,14 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.33</version>
         </dependency>
 
         <!-- 核心模块-->
         <dependency>
             <groupId>com.shkj</groupId>
             <artifactId>shkj-framework</artifactId>
+
         </dependency>
 
         <!-- 定时任务-->

shkj-admin/src/main/resources/application-dev.yml

@@ -12,7 +12,8 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://127.0.0.1:3306/sc_wcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B7
+        url: jdbc:mysql://127.0.0.1:3306/sc_wcs?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://127.0.0.1:3306/sc_wcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
         #url: jdbc:mysql://120.77.94.227:3306/mjk_wcs_2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         #password: CTlTwKgIrRVTsEHqxxx

shkj-admin/src/main/resources/application-pro.yml

@@ -12,7 +12,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://10.0.152.244:3306/sc_wcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B7
+        url: jdbc:mysql://10.0.152.244:3306/sc_wcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
         password: sc@2025
       # 从库数据源

shkj-common/src/main/java/com/shkj/common/core/domain/entity/BaseBranch.java

@@ -110,7 +110,7 @@ public class BaseBranch implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -126,7 +126,7 @@ public class BaseBranch implements Serializable {
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-common/src/main/java/com/shkj/common/core/domain/entity/BaseConsignor.java

@@ -145,7 +145,7 @@ public class BaseConsignor implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -161,7 +161,7 @@ public class BaseConsignor implements Serializable {
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-common/src/main/java/com/shkj/common/utils/DateUtils.java

@@ -36,7 +36,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      */
     public static Date getNowDate()
     {
-        return new Date();
+        return Calendar.getInstance().getTime();
     }
 
     /**

shkj-framework/src/main/java/com/shkj/framework/config/SecurityConfig.java

@@ -114,6 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/**/common/**").permitAll()
                 /*第三方回调接口   这里修改为permitAll 目的是不管请求的时候头部是否带了token都可以请求 不然的话anonymous时如果有token但是不对会报403*/
                 .antMatchers("/api/**/**").permitAll()
+                .antMatchers("/wms/**/**").permitAll()
 
 //                .antMatchers("/**/wms/**").permitAll()
                 .antMatchers("/agvapi/**").permitAll()

shkj-generator/src/main/resources/vm/java/addBo.java.vm

@@ -41,7 +41,7 @@ private static final long serialVersionUID=1L;
     @TableLogic
 #end
 #if($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
 #end
 #if($column.javaType == 'Integer' || $column.javaType == 'BigDecimal' || $column.javaType == 'Long' )
     @NotNull(message = "${column.columnComment}不得为空")

shkj-generator/src/main/resources/vm/java/domain.java.vm

@@ -39,7 +39,7 @@ private static final long serialVersionUID=1L;
     @TableId(value = "$column.columnName", type = IdType.AUTO)
 #end
 #if($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
 #end
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)

shkj-generator/src/main/resources/vm/java/editBo.java.vm

@@ -40,7 +40,7 @@ private static final long serialVersionUID=1L;
     @TableLogic
 #end
 #if($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
 #end
 #if($column.javaType == 'Integer' || $column.javaType == 'BigDecimal' || $column.javaType == 'Long' )
     @NotNull(message = "${column.columnComment}不得为空")

shkj-generator/src/main/resources/vm/java/queryBo.java.vm

@@ -42,7 +42,7 @@ public class ${ClassName}QueryBo extends ${Entity} {
 	 * $column.columnComment
 	 */
 #if($column.javaType == 'Date')
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
 #end
 	private $column.javaType $column.javaField;
 

shkj-wms/src/main/java/com/shkj/wcs/bo/BasePunchRecordAddBo.java

@@ -47,7 +47,7 @@ public class BasePunchRecordAddBo implements Serializable{
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 

shkj-wms/src/main/java/com/shkj/wcs/bo/WcsPlcConnectAddBo.java

@@ -59,7 +59,7 @@ public class WcsPlcConnectAddBo implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
     /**

shkj-wms/src/main/java/com/shkj/wcs/controller/busin/AgvTaskContorller.java

@@ -1,34 +1,21 @@
 package com.shkj.wcs.controller.busin;
 
-import com.alibaba.fastjson.JSONObject;
+
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.shkj.common.annotation.Log;
 import com.shkj.common.annotation.RepeatSubmit;
-import com.shkj.common.constant.RedisConstant;
 import com.shkj.common.core.domain.Result;
 import com.shkj.common.enums.BusinessType;
-import com.shkj.common.utils.DateUtils;
 import com.shkj.wcs.bo.AGVFeedbackBo;
-import com.shkj.wcs.bo.AGVFeedbackDepBo;
-import com.shkj.wcs.bo.ExtraData;
 import com.shkj.wcs.bo.WcsRequestBo;
-import com.shkj.wcs.domain.BusinDataTask;
 import com.shkj.wcs.service.IBusinDataTaskService;
 import com.shkj.wcs.third.rcs.RCSUtil;
 import com.shkj.wcs.third.rcs.dto.RcsCreateTaskDto;
 import com.shkj.wcs.third.rcs.vo.RcsResponseVo;
-import com.shkj.wcs.third.workbinWcs.WCSUtil;
-import com.shkj.wcs.third.workbinWcs.dto.UploadWCSTaskStatusBody;
-import com.shkj.wcs.third.workbinWcs.dto.UploadWCSTaskStatusDto;
-import com.shkj.wcs.third.workbinWcs.dto.WcsCreateTaskHeader;
 import com.shkj.wcs.vo.QueryAreaStatusVo;
 import com.shkj.wcs.vo.WcsResponseVo;
-import com.shkj.wms.enums.TaskStatusEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.exceptions.TooManyResultsException;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -36,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 @Slf4j

shkj-wms/src/main/java/com/shkj/wcs/controller/busin/WcsTaskController.java

@@ -1,24 +1,16 @@
 package com.shkj.wcs.controller.busin;
 
-import com.alibaba.fastjson.JSONObject;
+
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.shkj.common.annotation.Log;
 import com.shkj.common.annotation.RepeatSubmit;
 import com.shkj.common.enums.BusinessType;
-import com.shkj.common.utils.DateUtils;
 import com.shkj.wcs.service.IBusinDataTaskService;
 import com.shkj.wcs.third.rcs.RCSUtil;
-import com.shkj.wcs.third.rcs.dto.RcsCreateTaskDto;
-import com.shkj.wcs.third.rcs.dto.RcsIdList;
-import com.shkj.wcs.third.rcs.enums.RCSOperation;
-import com.shkj.wcs.third.rcs.enums.RCSTaskTypeEnum;
 import com.shkj.wcs.third.workbinWcs.WCSUtil;
 import com.shkj.wcs.third.workbinWcs.dto.*;
 import com.shkj.wcs.vo.TaskStatusBody;
 import com.shkj.wcs.vo.WcsResponseVo;
-import com.shkj.wcs.domain.BusinDataTask;
-import com.shkj.wms.enums.TaskStatusEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,8 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
+
-import java.util.List;
 
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ =@Autowired)

shkj-wms/src/main/java/com/shkj/wcs/domain/BasePoint.java

@@ -73,7 +73,7 @@ public class BasePoint implements Serializable
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -89,7 +89,7 @@ public class BasePoint implements Serializable
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wcs/domain/BasePointGroup.java

@@ -66,7 +66,7 @@ public class BasePointGroup implements Serializable
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -82,7 +82,7 @@ public class BasePointGroup implements Serializable
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wcs/domain/BusinDataTask.java

@@ -34,7 +34,7 @@ public class BusinDataTask implements Serializable {
     private String taskCode;
 
     /** 状态 0 未下发 1 执行中  2已完成   3已取消 -1异常 */
-    @Excel(name = "状态 0 未下发 1 执行中  2已完成   3已取消 -1异常")
+    @Excel(name = "状态 1 未下发 2 执行中   3已完成 4取消")
     private String taskStatus;
 
     /** 任务类型 0 正常入库 1维修异常 2扫码异常  3入库冲孔 4 正常出库 5紧急出库 6越库出库 7手工入库 8呼叫空治具 9移库 */
@@ -75,12 +75,12 @@ public class BusinDataTask implements Serializable {
 
 
     /** 任务开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @Excel(name = "任务开始时间", width = 30)
     private Date taskStarttime;
 
     /** 任务结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @Excel(name = "任务结束时间", width = 30)
     private Date taskEntime;
 
@@ -106,14 +106,14 @@ public class BusinDataTask implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
     /**
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
     /**

shkj-wms/src/main/java/com/shkj/wcs/domain/WcsDevice.java

@@ -67,7 +67,7 @@ public class WcsDevice  implements Serializable
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -83,7 +83,7 @@ public class WcsDevice  implements Serializable
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wcs/domain/WcsPlcConnect.java

@@ -78,7 +78,7 @@ public class WcsPlcConnect  implements Serializable
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -94,7 +94,7 @@ public class WcsPlcConnect  implements Serializable
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java

@@ -83,7 +83,7 @@ public class PlcEventTask {
     @Autowired
     WCSUtil wcsUtil;
 
-    @Scheduled(fixedDelay = 5000)
+    @Scheduled(fixedDelay = 2000)
     public void init() {
         //查询需要连接的PLC,初始化连接对象
         List<WcsPlcConnectVo> plcList = (List<WcsPlcConnectVo>) redisTemplate.opsForValue().get(RedisConstant.redisPlcListConnect);
@@ -105,7 +105,7 @@ public class PlcEventTask {
 
 
     //输送线心跳
-    @Scheduled(fixedDelay = 5000)
+    @Scheduled(fixedDelay = 2000)
     public void writePlcheartbeatDps() {
         PlcOperate plcOperate = plcInit.getPlcOperate_dps();
         if (plcOperate != null) {
@@ -136,7 +136,7 @@ public class PlcEventTask {
     }
 
     //叠盘机心跳
-    @Scheduled(fixedDelay = 5000)
+    @Scheduled(fixedDelay = 2000)
     public void writePlcheartbeatStk() {
         //根据连接的plcId获取属性
         PlcOperate plcOperate = plcInit.getPlcOperate_dpj();

shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinDataTaskServiceImpl.java

@@ -12,15 +12,11 @@ import com.shkj.common.utils.DateUtils;
 import com.shkj.wcs.bo.AGVFeedbackBo;
 import com.shkj.wcs.bo.AGVFeedbackDepBo;
 import com.shkj.wcs.bo.ExtraData;
-import com.shkj.wcs.bo.WcsPlcPropertyQueryBo;
 import com.shkj.wcs.domain.BusinDataTask;
-import com.shkj.wcs.domain.WcsPlcProperty;
 import com.shkj.wcs.mapper.BusinDataTaskMapper;
-import com.shkj.wcs.mapper.WcsPlcPropertyMapper;
 import com.shkj.wcs.plc.PlcEventTask;
 import com.shkj.wcs.service.IBusinDataTaskService;
 import com.shkj.wcs.service.IBusinTaskService;
-import com.shkj.wcs.service.IWcsPlcPropertyService;
 import com.shkj.wcs.third.rcs.CounterService;
 import com.shkj.wcs.third.rcs.RCSUtil;
 import com.shkj.wcs.third.rcs.dto.CarrierInfoList;
@@ -28,17 +24,13 @@ import com.shkj.wcs.third.rcs.dto.RcsCancelTaskDto;
 import com.shkj.wcs.third.rcs.dto.RcsCreateTaskDto;
 import com.shkj.wcs.third.rcs.dto.RcsIdList;
 import com.shkj.wcs.third.rcs.enums.RCSOperation;
-import com.shkj.wcs.third.rcs.enums.RCSTaskTypeEnum;
 import com.shkj.wcs.third.rcs.vo.RcsResponseVo;
 import com.shkj.wcs.third.workbinWcs.WCSUtil;
 import com.shkj.wcs.third.workbinWcs.dto.*;
-import com.shkj.wcs.vo.WcsPlcConnectVo;
 import com.shkj.wcs.vo.WcsResponseVo;
 import com.shkj.wms.enums.MapEnum;
 import com.shkj.wms.enums.TaskStatusEnum;
-import com.shkj.wms.enums.TaskTypeEnum;
 import com.shkj.wms.enums.WayEnum;
-import com.shkj.wms.utils.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.exceptions.TooManyResultsException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,7 +93,7 @@ public class BusinDataTaskServiceImpl extends ServiceImpl<BusinDataTaskMapper, B
 
                     LambdaQueryWrapper<BusinDataTask> lqwDataTask1 = new LambdaQueryWrapper<BusinDataTask>()
                             .eq(BusinDataTask::getTaskCode, taskId)
-                            .in(BusinDataTask::getTaskStatus, TaskStatusEnum.wait_put.getValue(), TaskStatusEnum.wait_callback.getValue());
+                            .ne(BusinDataTask::getTaskStatus,TaskStatusEnum.clean.getValue());
                     BusinDataTask one1 = this.getOne(lqwDataTask1);
                     if (dataChange.equals("1")) {
                         if (one != null) {
@@ -109,8 +101,8 @@ public class BusinDataTaskServiceImpl extends ServiceImpl<BusinDataTaskMapper, B
                             return WcsResponseVo.error(500, "该托盘" + trayCode + "存在未完成的任务");
                         }
                         if (one1 != null) {
-                            log.info("该任务id" + taskId + "存在未完成的任务");
+                            log.info("该任务id" + taskId + "重复推送");
-                            return WcsResponseVo.error(500, "该任务id" + taskId + "存在未完成的任务");
+                            return WcsResponseVo.error(500, "该任务id" + taskId + "重复推送");
                         }
                         BusinDataTask businDataTask = new BusinDataTask();
                         businDataTask.setTaskCode(taskId);
@@ -138,12 +130,12 @@ public class BusinDataTaskServiceImpl extends ServiceImpl<BusinDataTaskMapper, B
                             businDataTask.setTaskStatus(TaskStatusEnum.wait_callback.getValue());
                             businDataTask.setTaskStarttime(DateUtils.getNowDate());
                             iBusinDataTaskService.updateById(businDataTask);
-                            if (fromBinCode.equals("SC-G2-00-00-2003")) {
+//                            if (fromBinCode.equals("SC-G2-00-00-2003")) {
-                                Boolean aBoolean = plcEventTask.plcExecWrite(2);
+//                                Boolean aBoolean = plcEventTask.plcExecWrite(2);
-                                if (!aBoolean) {
+//                                if (!aBoolean) {
-                                    return WcsResponseVo.error(200, "接受成功但给plc回传任务失败");
+//                                    return WcsResponseVo.error(200, "接受成功但给plc回传任务失败");
-                                }
+//                                }
-                            }
+//                            }
                         }else{
                             return WcsResponseVo.error(500, "任务存储失败");
                         }
@@ -157,7 +149,8 @@ public class BusinDataTaskServiceImpl extends ServiceImpl<BusinDataTaskMapper, B
                         if(one.getTaskStatus().equals(TaskStatusEnum.wait_callback.getValue())){
                             RcsCancelTaskDto rcsCancelTaskDto = new RcsCancelTaskDto();
                             rcsCancelTaskDto.setRobotTaskCode(taskId);
-                            rcsCancelTaskDto.setCancelType("DROP");
+                            rcsCancelTaskDto.setCancelType("cancel");
+                            rcsCancelTaskDto.setReason("上游取消");
                             Result result = rcsUtil.rcsTaskCancel(rcsCancelTaskDto);
                             if (!Result.isOk(result)) {
                                 one.setExceptionMsg(WayEnum.agv_task_cancel.getValue());
@@ -188,8 +181,8 @@ public class BusinDataTaskServiceImpl extends ServiceImpl<BusinDataTaskMapper, B
             slotName = "SC-G2-00-00-43022";
         }
         LambdaQueryWrapper<BusinDataTask> queryWrapper = new LambdaQueryWrapper<BusinDataTask>()
-                .eq(BusinDataTask::getTaskCode, robotTaskCode);
+                .eq(BusinDataTask::getTaskCode, robotTaskCode)
-//                .eq(BusinDataTask::getContainerCode, carrierCode);
+                .eq(BusinDataTask::getTaskStatus, TaskStatusEnum.wait_callback.getValue());
         BusinDataTask businDataTask;
         try {
             businDataTask = iBusinDataTaskService.getOne(queryWrapper, true);

shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinTaskServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 
 import com.shkj.common.core.domain.Result;
-import com.shkj.common.utils.DateUtils;
 import com.shkj.wcs.domain.BusinDataTask;
 import com.shkj.wcs.domain.BusinTask;
 import com.shkj.wcs.mapper.BusinTaskMapper;
@@ -17,16 +16,15 @@ import com.shkj.wcs.service.IBusinTaskService;
 import com.shkj.wcs.third.rcs.vo.RcsResponseVo;
 import com.shkj.wcs.vo.BusinTaskVo;
 import com.shkj.wms.bo.BusinTaskQueryBo;
-import com.shkj.wms.enums.TaskStatusEnum;
+
 import com.shkj.wms.enums.WayEnum;
-import com.shkj.wms.service.ISysThirdExceptionRequestService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 /**
@@ -52,7 +50,12 @@ public class BusinTaskServiceImpl extends ServiceImpl<BusinTaskMapper, BusinTask
         lqw.eq(StrUtil.isNotBlank(bo.getTaskStatus()), BusinDataTask::getTaskStatus, bo.getTaskStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getTaskType()), BusinDataTask::getTaskType, bo.getTaskType());
         lqw.eq(StrUtil.isNotBlank(bo.getContainerCode()), BusinDataTask::getContainerCode, bo.getContainerCode());
-        lqw.ge(bo.getBeginDate() != null, BusinDataTask::getCreateTime, bo.getBeginDate());
+        if (bo.getCreateTimeS() != null && bo.getCreateTimeE() != null ) {
+            LocalDateTime start = LocalDateTime.parse(bo.getCreateTimeS() + "T00:00:00");
+            LocalDateTime end = LocalDateTime.parse(bo.getCreateTimeE() + "T23:59:59");
+            lqw.ge(BusinDataTask::getCreateTime, start)
+                    .le(BusinDataTask::getCreateTime, end);
+        }
         lqw.orderByDesc(BusinDataTask::getCreateTime);
         List<BusinTaskVo> voList = entity2Vo(iBusinDataTaskService.list(lqw));
         return voList;

shkj-wms/src/main/java/com/shkj/wcs/third/rcs/dto/RcsCancelTaskDto.java

@@ -26,4 +26,9 @@ public class RcsCancelTaskDto implements Serializable {
      * 任务取消类型
      */
     private String cancelType;
+
+    /**
+     * 取消原因
+     */
+    private String reason;
 }

shkj-wms/src/main/java/com/shkj/wms/bo/BaseAddressEditBo.java

@@ -219,7 +219,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -235,7 +235,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseAreaAddBo.java

@@ -136,7 +136,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -152,7 +152,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseAreaEditBo.java

@@ -142,7 +142,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -158,7 +158,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseAreaReplenishRuleAddBo.java

@@ -73,7 +73,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -89,7 +89,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseAreaReplenishRuleEditBo.java

@@ -79,7 +79,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -95,7 +95,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseCompanyAddBo.java

@@ -185,7 +185,7 @@ public class BaseCompanyAddBo implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -201,7 +201,7 @@ public class BaseCompanyAddBo implements Serializable {
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseCompanyEditBo.java

@@ -190,7 +190,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -206,7 +206,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseConsignorAddBo.java

@@ -102,7 +102,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -118,7 +118,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseConsignorEditBo.java

@@ -109,7 +109,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -125,7 +125,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseContainerAddBo.java

@@ -115,7 +115,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -131,7 +131,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseContainerEditBo.java

@@ -121,7 +121,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -137,7 +137,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseDeriveAddBo.java

@@ -69,7 +69,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseDeriveEditBo.java

@@ -97,7 +97,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
     /**

shkj-wms/src/main/java/com/shkj/wms/bo/BaseLocationAddBo.java

@@ -248,7 +248,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -264,7 +264,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseLocationEditBo.java

@@ -254,7 +254,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -270,7 +270,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseStorageAddBo.java

@@ -107,7 +107,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -123,7 +123,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BaseStorageEditBo.java

@@ -112,7 +112,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -128,7 +128,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/BusinTaskAddBo.java

@@ -53,11 +53,11 @@ public class BusinTaskAddBo implements Serializable {
     private int priority;
 
     /** 任务开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date taskStarttime;
 
     /** 任务结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date taskEntime;
 
     /** 治具编号 */
@@ -79,6 +79,6 @@ public class BusinTaskAddBo implements Serializable {
     private String isDown;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 }

shkj-wms/src/main/java/com/shkj/wms/bo/BusinTaskQueryBo.java

@@ -31,11 +31,10 @@ public class BusinTaskQueryBo implements Serializable {
     /**
      * 开始日期 格式 YY-MM-dd
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String createTimeS;
-    private Date beginDate;
 
     /** 结束时间 */
-    private String  taskEDate;
+    private String  createTimeE;
 
     /** 托盘编号*/
     private String containerCode;

shkj-wms/src/main/java/com/shkj/wms/bo/JimuReportTypeConfigAddBo.java

@@ -52,7 +52,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 }

shkj-wms/src/main/java/com/shkj/wms/bo/SysBatchAddBo.java

@@ -58,14 +58,14 @@ private static final long serialVersionUID=1L;
     /**
      * 生产日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date productionDate;
 
 
     /**
      * 有效期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date expiredDate;
 
 
@@ -101,7 +101,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -117,7 +117,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/SysBatchEditBo.java

@@ -64,14 +64,14 @@ private static final long serialVersionUID=1L;
     /**
      * 生产日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date productionDate;
 
 
     /**
      * 有效期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date expiredDate;
 
 
@@ -107,7 +107,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -123,7 +123,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/bo/SysBatchQueryBo.java

@@ -54,13 +54,13 @@ public class SysBatchQueryBo extends BaseEntity {
 	/**
 	 * 生产日期
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
 	private Date productionDate;
 
 	/**
 	 * 有效期
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
 	private Date expiredDate;
 
 	/**

shkj-wms/src/main/java/com/shkj/wms/bo/baseAddresssAddBo.java

@@ -213,7 +213,7 @@ public class baseAddresssAddBo implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -229,7 +229,7 @@ public class baseAddresssAddBo implements Serializable {
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/BasRule.java

@@ -47,7 +47,7 @@ public class BasRule implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -63,7 +63,7 @@ public class BasRule implements Serializable {
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/BasRuleDetail.java

@@ -56,7 +56,7 @@ public class BasRuleDetail {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -72,7 +72,7 @@ public class BasRuleDetail {
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/BaseAddress.java

@@ -221,7 +221,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -237,7 +237,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/BaseArea.java

@@ -148,7 +148,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -164,7 +164,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/BaseCompany.java

@@ -124,7 +124,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -140,7 +140,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/BaseContainer.java

@@ -120,7 +120,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -136,7 +136,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/BaseLocation.java

@@ -270,7 +270,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -286,7 +286,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/BaseLogicArea.java

@@ -57,7 +57,7 @@ public class BaseLogicArea implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -73,7 +73,7 @@ public class BaseLogicArea implements Serializable {
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/BaseStorage.java

@@ -122,7 +122,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -138,7 +138,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/InStockReport.java

@@ -222,7 +222,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -238,7 +238,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/JimuReportTypeConfig.java

@@ -65,7 +65,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/SysAppVersion.java

@@ -60,7 +60,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/SysBatch.java

@@ -63,14 +63,14 @@ private static final long serialVersionUID=1L;
     /**
      * 生产日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date productionDate;
 
 
     /**
      * 有效期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date expiredDate;
 
 
@@ -106,7 +106,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -122,7 +122,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/SysSeqMana.java

@@ -122,7 +122,7 @@ private static final long serialVersionUID=1L;
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -138,7 +138,7 @@ private static final long serialVersionUID=1L;
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/SysThirdExceptionRequest.java

@@ -83,7 +83,7 @@ public class SysThirdExceptionRequest implements Serializable {
      * 创建时间
      */
 //    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -99,7 +99,7 @@ public class SysThirdExceptionRequest implements Serializable {
      * 修改时间
      */
 //    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 
@@ -114,7 +114,7 @@ public class SysThirdExceptionRequest implements Serializable {
     /**
      * 计划执行时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date planTime;
 
     /**

shkj-wms/src/main/java/com/shkj/wms/domain/TableHeader.java

@@ -120,7 +120,7 @@ public class TableHeader implements Serializable {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -128,7 +128,7 @@ public class TableHeader implements Serializable {
      * 更新时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
 

shkj-wms/src/main/java/com/shkj/wms/domain/WcsBasePoint.java

@@ -73,7 +73,7 @@ public class WcsBasePoint implements Serializable
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
 
@@ -89,7 +89,7 @@ public class WcsBasePoint implements Serializable
      * 修改时间
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;