修改时区

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-wms/src/main/java/com/shkj/wcs/service/impl/BusinDataTaskServiceImpl.java

@@ -92,7 +92,8 @@ public class BusinDataTaskServiceImpl extends ServiceImpl<BusinDataTaskMapper, B
                     BusinDataTask one = this.getOne(lqwDataTask);
 
                     LambdaQueryWrapper<BusinDataTask> lqwDataTask1 = new LambdaQueryWrapper<BusinDataTask>()
-                            .eq(BusinDataTask::getTaskCode, taskId);
+                            .eq(BusinDataTask::getTaskCode, taskId)
+                            .ne(BusinDataTask::getTaskStatus,TaskStatusEnum.clean.getValue());
                     BusinDataTask one1 = this.getOne(lqwDataTask1);
                     if (dataChange.equals("1")) {
                         if (one != null) {
@@ -148,7 +149,7 @@ 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)) {
@@ -180,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::getContainerCode, carrierCode);
+                .eq(BusinDataTask::getTaskCode, robotTaskCode)
+                .eq(BusinDataTask::getTaskStatus, TaskStatusEnum.wait_callback.getValue());
         BusinDataTask businDataTask;
         try {
             businDataTask = iBusinDataTaskService.getOne(queryWrapper, true);