From 6a837edbb818c7ad2ef3bae7b3c260632fa4bace Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 25 Jun 2024 15:52:50 +0800 Subject: [PATCH] =?UTF-8?q?41603=20=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B7=A5=E5=8D=95=E6=97=B6=EF=BC=8C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=8C=BA=E5=88=86=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E7=9A=84=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 6781aff..519fdd1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -26,6 +26,7 @@ import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.map.CaseInsensitiveMap; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -518,7 +519,12 @@ public class MesWorkOrderService extends BaseMesService implements String nowDate = TimeTool.getNowTime(true); //获取产线信息 List workCenterCodeList = mesWorkOrderList.stream().map(MesWorkOrder::getWorkCenterCode).distinct().collect(Collectors.toList()); - Map workCenterMap = BeanMapUtilsExt.getBeanMap(mesWorkCenterRDao, "workCenterCode", organizeCode, workCenterCodeList, "产线信息"); + List mesWorkCenterList = BeanMapUtilsExt.getBeanList(mesWorkCenterRDao, "workCenterCode", organizeCode, workCenterCodeList, "产线信息"); + //产线导入不区分大小小 + Map workCenterMap = new CaseInsensitiveMap(); + for (MesWorkCenter workCenter : mesWorkCenterList) { + workCenterMap.put(workCenter.getWorkCenterCode(), workCenter); + } //获取班次信息 List mesShiftList = getMesShifts(organizeCode, nowDate, workCenterCodeList); Map> mesShiftMap = mesShiftList.stream().collect(Collectors.groupingBy(t -> t.getWorkCenterCode() + t.getShiftCode())); @@ -580,6 +586,7 @@ public class MesWorkOrderService extends BaseMesService implements if (Objects.isNull(mesWorkCenter)) { MesException.throwMesBusiException("产线【%s】不存在", item.getWorkCenterCode()); } + item.setWorkCenterCode(mesWorkCenter.getWorkCenterCode()); item.setErpWorkCenter(mesWorkCenter.getErpWorkCenter()); //获取客户物料信息 MesCustomerPart customerPart = null == mesCustomerPartMap ? null : mesCustomerPartMap.get(item.getPartNo());