排序线 加工记录汇报状态 只看当前工位的装配件的汇报状态

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionRecordGenerateStepService.java

@@ -146,7 +146,11 @@ public class MesProductionRecordGenerateStepService extends BaseStepService {
             //排序
             List<MesProductionAssemblySortContext> productionAssemblySortContextList = prodRuleContext.getSortAssemblyDataContext();
             Optional<MesProductionAssemblySortContext> optional = CollectionUtils.isEmpty(productionAssemblySortContextList) ? null :
-                    productionAssemblySortContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getReportType()) && o.getReportType().compareTo(MesExtEnumUtil.MES_REPORT_TYPE.NO_REPORT.getValue()) != 0)).findFirst();
+                    productionAssemblySortContextList.stream().filter(o -> (null != o
+                            && !StringUtils.isEmpty(o.getWorkCellCode()) && !StringUtils.isEmpty(o.getReportType())
+                            && o.getWorkCellCode().equals(reqBean.getWorkCellCode())
+                            && o.getReportType().compareTo(MesExtEnumUtil.MES_REPORT_TYPE.NO_REPORT.getValue()) != 0
+                            && o.getReportType().compareTo(MesPcnExtConstWords.ZERO) != 0)).findFirst();
             if (null == optional || !optional.isPresent()) {
                 productionRecord.setReportType(MesExtEnumUtil.MES_REPORT_TYPE.NO_REPORT.getValue());
                 productionRecord.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue());