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 2ef1bd6..5cc186c 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 @@ -2306,8 +2306,8 @@ public class DailyPlanServiceImpl implements DailyPlanService { }); } //如果传了工序号 就校验下 - if(soToolData.getSeqNo()!=null){ - String fifoFlag = outboundLabelScanMapper.getSysParamenter(toolingHistDataList.get(0).getSite(), "205"); + if(soToolData.getSeqNo()!=null && null != toolingHistDataList && !toolingHistDataList.isEmpty()){ + String fifoFlag = outboundLabelScanMapper.getSysParamenter(soToolData.getSite(), "205"); if ("Y".equalsIgnoreCase(String.valueOf(fifoFlag).trim())){ // 参数205=Y时:校验工具实例当前领用派工单(ToolDetail.now_seq_no)必须等于本次报工派工单 - rqrq if(toolDetailData.getNowSeqNo()!=soToolData.getSeqNo()){