diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java index f05b04f..1dc1df1 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java @@ -283,7 +283,7 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService { workOrderList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getPartNo()) && !StringUtils.isEmpty(o.getWorkOrderStatus()) && !StringUtils.isEmpty(o.getOrderFlag()) && o.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()) != 0 && !o.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue()))).collect(Collectors.toList()); if (CollectionUtils.isEmpty(workOrderList)) return null; - Map> workOrderMap = workOrderList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrder::getPartNo)); + Map> workOrderMap = workOrderList.stream().filter(o -> null != o).collect(Collectors.groupingBy(o -> o.getPartNo().toUpperCase())); Map controlOrderQtyMap = new HashMap<>(); Double qty; @@ -309,7 +309,7 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService { else DdlPreparedPack.getInPackList(partNoList, MesPcnExtConstWords.PART_NO, packBean); List workOrderControlQtyRecordList = workOrderControlQtyRecordRepository.findByHqlWhere(packBean); return CollectionUtils.isEmpty(workOrderControlQtyRecordList) ? null : - workOrderControlQtyRecordList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrderControlQtyRecord::getPartNo, Collectors.summingDouble(MesWorkOrderControlQtyRecord::getQty))); + workOrderControlQtyRecordList.stream().filter(o -> null != o).collect(Collectors.groupingBy(o -> o.getPartNo().toUpperCase(), Collectors.summingDouble(MesWorkOrderControlQtyRecord::getQty))); } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java index afea123..fa7730b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java @@ -94,7 +94,7 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep //验证是否需要汇报 productionPsOutContextList.stream().filter(o -> null != o).forEach(o -> checkProductionRecordIsReport(reqBean, o, prMap.get(o.getForeignKey()), CollectionUtils.isEmpty(psiMap) ? null : psiMap.get(o.getForeignKey()))); - Map> reportPsMap = productionPsOutContextList.stream().filter(o -> (null != o && o.getIsCalcCompleteQty().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0)).collect(Collectors.groupingBy(MesProductionPsOutContext::getPartNo)); + Map> reportPsMap = productionPsOutContextList.stream().filter(o -> (null != o && o.getIsCalcCompleteQty().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0)).collect(Collectors.groupingBy(o -> o.getPartNo().toUpperCase())); if (CollectionUtils.isEmpty(reportPsMap)) break Loop; @@ -187,7 +187,7 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep if (null == productionPsInContext) return false; if (StringUtils.isEmpty(productionPsInContext.getPartNo())) return false; if (null == productionPsOutContext) return false; - if (!productionPsInContext.getPartNo().equals(productionPsOutContext.getPartNo())) return false; + if (!productionPsInContext.getPartNo().toUpperCase().equals(productionPsOutContext.getPartNo().toUpperCase())) return false; return true; }