Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物流转运任务生成修改

Browse Source
master
yangwl 3 years ago
parent 55deeefeed
commit 4fd6bc3d8e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java
Unescape Escape View File

@ -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());

Write Preview
Loading…
Cancel
Save