From 9a432311e3cf7f6bc9c1a7e90a69a7a04ce1e7a1 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Wed, 5 Mar 2025 20:31:20 +0800 Subject: [PATCH] =?UTF-8?q?45455=20=E8=A3=81=E7=89=87=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=8E=A7=E5=88=B6=EF=BC=8C=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=AE=B0=E5=BD=95=E6=95=B0=E9=87=8F=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/BaseMesController.java | 2 +- .../controller/base/MesCutSchemeController.java | 30 ++++++++++++++++++++++ .../serviceimpl/base/MesCutSchemeService.java | 23 ++--------------- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java index 6dd97b8..64a037a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java @@ -169,7 +169,7 @@ public abstract class BaseMesController extends BaseControll try { if (listAllPackBean == null) { //默认查询所有 - listAllPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode()); + listAllPackBean = DdlPackBean.getDdlPackBean(AuthUtilExt.getOrganizeCode()); } List list = getBaseService().findAll(listAllPackBean); afterList(list); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCutSchemeController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCutSchemeController.java index 94f9629..5c9fb89 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCutSchemeController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCutSchemeController.java @@ -1,19 +1,27 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesCutScheme; +import cn.estsh.i3plus.pojo.mes.bean.MesCutSchemeMaterial; +import cn.estsh.i3plus.pojo.mes.repository.MesCutSchemeMaterialRepository; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 裁片工单 @@ -23,4 +31,26 @@ import java.util.List; @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCutScheme") public class MesCutSchemeController extends BaseMesController{ + @Autowired + private MesCutSchemeMaterialRepository cutSchemeMaterialRepository; + //查询后执行 + public void afterList(List mesCutSchemes) { + + List cutCodes = mesCutSchemes.stream().map(MesCutScheme::getCutCode).collect(Collectors.toList()); + + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtilExt.getOrganizeCode()); + DdlPreparedPack.getInPackList(cutCodes, "cutCode", ddlPackBean); + List mesCutSchemeMaterials = cutSchemeMaterialRepository.findByHqlWhere(ddlPackBean); + if (CollectionUtils.isEmpty(mesCutSchemeMaterials)) { + return; + } + Map> materialMap = mesCutSchemeMaterials.stream().collect(Collectors.groupingBy(MesCutSchemeMaterial::getCutCode)); + + for (MesCutScheme mesCutScheme : mesCutSchemes) { + List list = materialMap.get(mesCutScheme.getCutCode()); + mesCutScheme.setPartNos(list.stream().map(MesCutSchemeMaterial::getPartNo).map(String::valueOf).collect(Collectors.joining(","))); + } + + + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCutSchemeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCutSchemeService.java index 1ab79bc..2107814 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCutSchemeService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCutSchemeService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesCutSchemeService; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.ext.mes.apiservice.utils.BeanMapUtilsExt; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; @@ -27,8 +28,7 @@ public class MesCutSchemeService extends BaseMesService implements @Autowired private MesWorkCenterRepository workCenterRepository; - @Autowired - private MesCutSchemeMaterialRepository cutSchemeMaterialRepository; + protected void setPackQueryBean(MesCutScheme bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean); @@ -97,24 +97,5 @@ public class MesCutSchemeService extends BaseMesService implements //} } - //查询后执行 - public void afterList(List mesCutSchemes) { - - List cutCodes = mesCutSchemes.stream().map(MesCutScheme::getCutCode).collect(Collectors.toList()); - - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode()); - DdlPreparedPack.getInPackList(cutCodes, "cutCode", ddlPackBean); - List mesCutSchemeMaterials = cutSchemeMaterialRepository.findByHqlWhere(ddlPackBean); - if (CollectionUtils.isEmpty(mesCutSchemeMaterials)) { - return; - } - Map> materialMap = mesCutSchemeMaterials.stream().collect(Collectors.groupingBy(MesCutSchemeMaterial::getCutCode)); - - for (MesCutScheme mesCutScheme : mesCutSchemes) { - List list = materialMap.get(mesCutScheme.getCutCode()); - mesCutScheme.setPartNos(list.stream().map(MesCutSchemeMaterial::getPartNo).map(String::valueOf).collect(Collectors.joining(","))); - } - - } }