From 4fd6bc3d8e3b7e981c92504eed1bf30114083f55 Mon Sep 17 00:00:00 2001 From: yangwl <1726150332@qq.com> Date: Mon, 5 Sep 2022 11:20:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E8=BD=AC=E8=BF=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=94=9F=E6=88=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/InspectionTaskManageServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java index 57d775f5..0b43eb5a 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java @@ -175,10 +175,10 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ SfcDispatch nextsfcDispatch=sfcDispatchService.getOne(queryWrapper); //判断下道工序是否为空 if (nextsfcDispatch!=null && !nextsfcDispatch.getOperation().equals("HJ_6106JYGX") && !nextsfcDispatch.getOperation().equals("HJ_6106JRGX")){ - logger.info("质检工序合格"+sfcDispatchById.getOperation()+"的下道工序不为空,下道工序为"+nextsfcDispatch.getOperation()); + logger.error("质检工序合格"+sfcDispatchById.getOperation()+"的下道工序不为空,下道工序为"+nextsfcDispatch.getOperation()); //如果不等于空，判断下道工序的工作中心和质检完的工作中心是否一致 if (!sfcDispatchById.getWorkCenter().equals(nextsfcDispatch.getWorkCenter())){ - logger.info("下道工序和质检工序的工作中心不相同"); + logger.error("下道工序和质检工序的工作中心不相同"); //如果不相等的话 插入周转任务表 LogisticsTurnover logisticsTurnover=new LogisticsTurnover(); logisticsTurnover.setHandle("LogisticsBO:1000"+","+UUID.randomUUID().toString()); @@ -198,7 +198,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ logger.error("周转任务表插入出错"+e.getMessage()); } } - }else if (Constants.RK.equals(sfcDispatchById.getOther2())){ + }else if (Constants.RK.equals(sfcDispatchById.getOther2()) && nextsfcDispatch ==null){ //如果为空值 则判断下道工序的入库标识是否入库 LogisticsTurnover logisticsTurnover=new LogisticsTurnover(); logisticsTurnover.setHandle("LogisticsBO:1000"+","+UUID.randomUUID().toString()); @@ -273,7 +273,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ } //质检合格后判断下道工序是否需要跨车间转运，如果是则生成转运待办任务 - if("OK".equals(result)){ + if("OK".equals(result) && inspectionTaskManage.getOperationType().equals("SUBMIT")){ /** * 1、先查询派工表（Z_SFC_DISPATCH）里的派工数据 * 2、根据派工表里的派工序号查找下道工序 @@ -291,10 +291,10 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ SfcDispatch nextsfcDispatch=sfcDispatchService.getOne(queryWrapper); //判断下道工序是否为空 if (nextsfcDispatch!=null && !nextsfcDispatch.getOperation().equals("HJ_6106JYGX") && !nextsfcDispatch.getOperation().equals("HJ_6106JRGX")){ - logger.info("质检工序合格"+sfcDispatchById.getOperation()+"的下道工序不为空,下道工序为"+nextsfcDispatch.getOperation()); + logger.error("质检工序合格"+sfcDispatchById.getOperation()+"的下道工序不为空,下道工序为"+nextsfcDispatch.getOperation()); //如果不等于空，判断下道工序的工作中心和质检完的工作中心是否一致 if (!sfcDispatchById.getWorkCenter().equals(nextsfcDispatch.getWorkCenter())){ - logger.info("下道工序和质检工序的工作中心不相同"); + logger.error("下道工序和质检工序的工作中心不相同"); //如果不相等的话 插入周转任务表 LogisticsTurnover logisticsTurnover=new LogisticsTurnover(); logisticsTurnover.setHandle("LogisticsBO:1000"+","+UUID.randomUUID().toString()); @@ -314,7 +314,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ logger.error("周转任务表插入出错"+e.getMessage()); } } - }else if (Constants.RK.equals(sfcDispatchById.getOther2())){ + }else if (Constants.RK.equals(sfcDispatchById.getOther2()) && nextsfcDispatch ==null){ //如果为空值 则判断下道工序的入库标识是否入库 LogisticsTurnover logisticsTurnover=new LogisticsTurnover(); logisticsTurnover.setHandle("LogisticsBO:1000"+","+UUID.randomUUID().toString());