diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index 38c30e3..3bd2b71 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -2322,8 +2322,8 @@ public class DailyPlanServiceImpl implements DailyPlanService { String fifoFlag = outboundLabelScanMapper.getSysParamenter(soToolData.getSite(), "205"); if ("Y".equalsIgnoreCase(String.valueOf(fifoFlag).trim())){ // 参数205=Y时:校验工具实例当前领用派工单(ToolDetail.now_seq_no)必须等于本次报工派工单 - rqrq - if(toolDetailData.getNowSeqNo().equals(soToolData.getSeqNo())){ - throw new RuntimeException("本工具"+ "未在本派工单领用"); + if (toolDetailData.getNowSeqNo() == null || !toolDetailData.getNowSeqNo().equals(soToolData.getSeqNo())) { + throw new RuntimeException("本工具未在本派工单领用"); } } }