From 8bb60b521265561bf4cbfb15534ad1805a3f1c77 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 7 Mar 2024 21:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E5=AE=9A?= =?UTF-8?q?=E7=82=B9=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op-job/src/main/java/com/op/job/task/RyTask.java | 2 +- .../java/com/op/quality/controller/QuaController.java | 6 ++++++ .../service/impl/QcCheckTaskProduceServiceImpl.java | 10 +++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java index f59d6ea5..2868bf0e 100644 --- a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java +++ b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java @@ -155,7 +155,7 @@ public class RyTask { } /************质量管理系统定时任务开始*****************/ - //过程巡检，每15分钟执行一次 + //过程巡检，改为整点08：00-20：00运行 public void createProduceXJTask(){ logger.info("++质量管理系统+过程巡检+开始++createProduceXJTask+++++"); remoteQualityService.createProduceXJTask(); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index fefd949c..38a2a79f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -189,6 +189,12 @@ public class QuaController extends BaseController { if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){ return error("[List]不能为空"); } + if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){ + return error("[updateBy]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateByName())){ + return error("[updateByName]不能为空"); + } return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome)); } /** diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index cb363579..dbc19808 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -383,14 +383,14 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService for(QcCheckTaskProduce productTask:works){ productTask.setCheckType("checkTypeSCXJ");//过程检验-巡检 productTask.setOrderNo(productTask.getWorkorderCode()); - Date nowTime = DateUtils.getNowDate(); - Date startTime = productTask.getCreateTime(); +// Date nowTime = DateUtils.getNowDate(); +// Date startTime = productTask.getCreateTime(); - long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE); - if(mins>=60){ +// long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE); +// if(mins>=60){ int m = insertQcCheckTaskProduce(productTask); logger.info("++++++++++++过程检验巡检任务生成" + m + "++++++++++++++"); - } +// } } logger.info("++++++++++++" + poolName + "++++过程检验巡检结束++++++++++"); }