From 60a2138e97d9fb6b36c67b9eb2020ca63220cbc7 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 22 Aug 2023 15:05:53 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=B8=85=E6=B4=97=E6=9C=BA=E4=B8=8A?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda_manage/pda/controller/PdaWashController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java index 284fd4bb..cf6cfa50 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java @@ -187,14 +187,12 @@ public class PdaWashController { } Param limit_time = paramService.getOne(new QueryWrapper().eq("code", "pda_wash_time")); //开启清洗上料时间限制 - if (limit_time!=null &&limit_time.getValue().equals("1")){ + if (limit_time!=null && !limit_time.getValue().equals("0")){ SchBaseTask lastTask = taskService.getOne(new QueryWrapper() .eq("task_type", AcsTaskEnum.REQUEST_WASH_SEND_MATERIAL.getCode()).orderByDesc("task_code").last("limit 1")); - String materialId = lastTask.getMaterial_id(); - if (!list.get(0).getMaterial_id().equals(materialId)){ - long between = DateUtil.between(new Date(), lastTask.getCreate_time(), DateUnit.MINUTE); - if (between<5){ - throw new BadRequestException("不同物料任务间隔小于5分钟,任务:"+lastTask.getTask_code()); + if (lastTask!=null){ + if (DateUtil.between(new Date(), lastTask.getCreate_time(), DateUnit.MINUTE)