From 72e51a2bf17b51108b9b1eb7fd4296dcc936daa6 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Wed, 5 Mar 2025 15:45:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?45455=20=E8=A3=81=E7=89=87=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=BF=87=E7=A8=8B=E6=8E=A7=E5=88=B6=EF=BC=8C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=8A=A0=E5=B7=A5=E8=AE=B0=E5=BD=95=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=BF=9D=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 --- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java index f23295c..ebbc214 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java @@ -265,7 +265,7 @@ public class MesWorkOrderCutService extends BaseMesService impl if (order.getUnCompleteQty().compareTo(totalQty) >= 0) { workOrderUnCompleteMap.put(order.getWorkOrderNo(), MathOperation.sub(order.getUnCompleteQty(), totalQty)); - workOrderQtyMap.put(order.getWorkOrderNo(), totalQty); + workOrderQtyMap.put(order.getWorkOrderNo(), cutSchemeFg.getQty()); totalQty = 0.0; } else { workOrderUnCompleteMap.put(order.getWorkOrderNo(), 0.0); From ec571d1bbc0675ac79c374cb2bdce0a700115f3b Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Wed, 5 Mar 2025 19:03:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?45455=20=E8=A3=81=E7=89=87=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=BF=87=E7=A8=8B=E6=8E=A7=E5=88=B6=EF=BC=8C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=8A=A0=E5=B7=A5=E8=AE=B0=E5=BD=95=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=BF=9D=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/MesCutSchemeController.java | 9 ++++++++ .../serviceimpl/base/MesCutSchemeService.java | 26 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) 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 2f57f81..94f9629 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,11 +1,20 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; 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.mes.bean.MesCutScheme; +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.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 裁片工单 */ 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 8506c1c..1ab79bc 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 @@ -6,13 +6,16 @@ import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; +import cn.estsh.i3plus.pojo.mes.repository.MesCutSchemeMaterialRepository; import cn.estsh.i3plus.pojo.mes.repository.MesWorkCenterRepository; +import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import org.testng.util.Strings; import java.util.List; import java.util.Map; @@ -24,6 +27,8 @@ 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); @@ -91,4 +96,25 @@ 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(","))); + } + + + } } From 4af1337a7f890742660e13b4c2d47c7917bb24d1 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Wed, 5 Mar 2025 19:23:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?45455=20=E8=A3=81=E7=89=87=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=BF=87=E7=A8=8B=E6=8E=A7=E5=88=B6=EF=BC=8C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=8A=A0=E5=B7=A5=E8=AE=B0=E5=BD=95=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=BF=9D=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 --- .../ext/mes/api/base/IMesWorkOrderService.java | 2 ++ .../controller/base/MesWorkOrderController.java | 25 ++++++++++++++++++++++ .../serviceimpl/base/MesWorkOrderService.java | 10 ++++++++- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java index 8751358..6f0fd9f 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkOrderBoardReqModel; import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkOrderBoardResModel; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.mes.bean.*; @@ -80,4 +81,5 @@ public interface IMesWorkOrderService extends IBaseMesService { @ApiOperation(value = "根据工单状态改变--关闭拉动但") void doCloseKittingOrder(MesWorkOrder mesWorkOrder,String userName); + void setBean(MesWorkOrder bean, DdlPackBean packBean); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java index 6c68dea..6485d44 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel.MesExcelTool; import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -248,5 +249,29 @@ public class MesWorkOrderController extends BaseMesController { } } + /** + * 查询信息 分页 + 组合 + * + * @param bean + * @param pager + * @return + */ + @GetMapping(value = "/order/query") + @ApiOperation(value = "查询信息带分页", notes = "组合查询，外带分页功能") + public ResultBean queryByPager(MesWorkOrder bean, Pager pager) { + try { + bean.setOrganizeCode(AuthUtilExt.getOrganizeCode()); + //bean.setOrganizeCode("ck01"); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); + mesWorkOrderService.setBean(bean, packBean); + ListPager listPager = getBaseService().queryPagerWhere(pager, packBean); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setListPager(listPager); + } catch (ImppBusiException e) { + return ResultBean.fail(e); + } + } } 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 5ba6f4c..8640ae7 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 @@ -342,12 +342,20 @@ public class MesWorkOrderService extends BaseMesService implements } } } + public void setBean(MesWorkOrder bean, DdlPackBean packBean) { + setPackQueryBean(bean, packBean); + } + @Override protected void setPackQueryBean(MesWorkOrder bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getWorkOrderNo(), MesExtConstWords.WORK_ORDER_NO, packBean); DdlPreparedPack.getStringLikerPack(bean.getPartName(), MesExtConstWords.PART_NAME, packBean); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), MesExtConstWords.CREATE_USER, packBean); - DdlPreparedPack.getStringLikerPack(bean.getPartNo(), MesExtConstWords.PART_NO, packBean); + String partNo = bean.getPartNo(); + if (!StringUtil.isEmpty(partNo)) { + List partNoList = Arrays.asList(partNo.split(",")); + DdlPreparedPack.getInPackList(partNoList, MesExtConstWords.PART_NO, packBean); + } DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), MesExtConstWords.CUST_PART_NO, packBean); DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean); DdlPreparedPack.getStringLikerPack(bean.getVinCode(), MesExtConstWords.VIN_CODE, packBean); From 66f4b12999d967fa283e466224338d64de563a6f Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Thu, 6 Mar 2025 15:36:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?45455=20=E8=A3=81=E7=89=87=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=BF=87=E7=A8=8B=E6=8E=A7=E5=88=B6=EF=BC=8C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=8A=A0=E5=B7=A5=E8=AE=B0=E5=BD=95=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=BF=9D=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 --- .../ext/mes/apiservice/controller/base/MesWorkOrderController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java index 6485d44..fa138ac 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java @@ -256,9 +256,9 @@ public class MesWorkOrderController extends BaseMesController { * @param pager * @return */ - @GetMapping(value = "/order/query") + @GetMapping(value = "/queryAll") @ApiOperation(value = "查询信息带分页", notes = "组合查询，外带分页功能") - public ResultBean queryByPager(MesWorkOrder bean, Pager pager) { + public ResultBean queryAll(MesWorkOrder bean, Pager pager) { try { bean.setOrganizeCode(AuthUtilExt.getOrganizeCode()); //bean.setOrganizeCode("ck01");