From b3fe06c151dc8455649bf0a46e481ceb83e3ea2a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 07 十一月 2026 13:37:54 +0800
Subject: [PATCH] feat: 完成好水川 MOM 需求1/2/4/5/8（装箱、BOM成本、销售合同、劳动合同、留样）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
index b174b5a..0f3637a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/mps/MesProMpsController.java
@@ -15,9 +15,13 @@
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.pro.mps.MesProMpsService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -48,6 +52,10 @@
@Resource
private MesMdItemService itemService;
@Resource
+ private MesMdUnitMeasureService unitMeasureService;
+ @Resource
+ private MesProWorkOrderService workOrderService;
+ @Resource
private CrmCustomerApi customerApi;
@PostMapping("/create")
@@ -77,7 +85,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢熶骇涓昏鍒�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-mps:query')")
public CommonResult<MesProMpsRespVO> getMps(@RequestParam("id") Long id) {
MesProMpsDO mps = mpsService.getMps(id);
if (mps == null) {
@@ -88,7 +95,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢熶骇涓昏鍒掑垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:pro-mps:query')")
public CommonResult<PageResult<MesProMpsRespVO>> getMpsPage(@Valid MesProMpsPageReqVO pageReqVO) {
PageResult<MesProMpsDO> pageResult = mpsService.getMpsPage(pageReqVO);
return success(new PageResult<>(buildMpsRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -139,18 +145,40 @@
// 1. 鎵归噺鑾峰彇鍏宠仈鏁版嵁
Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
convertSet(list, MesProMpsDO::getProductId));
+ Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
+ convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(list, MesProMpsDO::getClientId));
+ Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
+ convertSet(list, MesProMpsDO::getWorkOrderId));
// 2. 鎷兼帴 VO
return BeanUtils.toBean(list, MesProMpsRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getProductId(), item -> {
vo.setProductName(item.getName())
.setProductCode(item.getCode())
.setProductSpecification(item.getSpecification());
+ MapUtils.findAndThen(unitMap, item.getUnitMeasureId(),
+ unit -> vo.setUnitMeasureName(unit.getName()));
});
MapUtils.findAndThen(clientMap, vo.getClientId(),
client -> vo.setClientName(client.getName()));
+ // 鎴愭湰鎸� MPS 璁″垝鏁伴噺鍗犲伐鍗曟暟閲忔瘮渚嬪垎鎽婏紙鍚堝苟涓嬪彂鏃跺鏉� MPS 鍏变韩鍚屼竴宸ュ崟锛�
+ MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder -> {
+ if (workOrder.getQuantity() == null || workOrder.getQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
+ return;
+ }
+ java.math.BigDecimal ratio = vo.getQuantity().divide(workOrder.getQuantity(), 8,
+ java.math.RoundingMode.HALF_UP);
+ vo.setStandardMaterialCost(apportion(workOrder.getStandardMaterialCost(), ratio));
+ vo.setActualMaterialCost(apportion(workOrder.getActualMaterialCost(), ratio));
+ vo.setOverConsumeCost(apportion(workOrder.getOverConsumeCost(), ratio));
+ vo.setMaterialUnitCost(workOrder.getMaterialUnitCost());
+ });
});
}
+ private static java.math.BigDecimal apportion(java.math.BigDecimal amount, java.math.BigDecimal ratio) {
+ return amount != null ? amount.multiply(ratio).setScale(6, java.math.RoundingMode.HALF_UP) : null;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3