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/wm/packages/MesWmPackageLineController.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageLineController.java
index 2b8724a..3482620 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageLineController.java
@@ -8,12 +8,16 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.line.MesWmPackageLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.line.MesWmPackageLineRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.line.MesWmPackageLineSaveReqVO;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+
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.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.packages.MesWmPackageLineDO;
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.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.packages.MesWmPackageLineService;
import io.swagger.v3.oas.annotations.Operation;
@@ -25,9 +29,11 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -41,11 +47,13 @@
@Resource
private MesWmPackageLineService packageLineService;
@Resource
- private MesMdItemService itemService;
+ private MdmItemApi mdmItemApi;
@Resource
- private MesMdUnitMeasureService unitMeasureService;
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private MesProWorkOrderService workOrderService;
+ @Resource
+ private MesMdItemService mdItemService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓瑁呯鏄庣粏")
@@ -74,7 +82,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱瑁呯鏄庣粏")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-package:query')")
public CommonResult<MesWmPackageLineRespVO> getPackageLine(@RequestParam("id") Long id) {
MesWmPackageLineDO line = packageLineService.getPackageLine(id);
if (line == null) {
@@ -85,7 +92,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱瑁呯鏄庣粏鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:wm-package:query')")
public CommonResult<PageResult<MesWmPackageLineRespVO>> getPackageLinePage(
@Valid MesWmPackageLinePageReqVO pageReqVO) {
PageResult<MesWmPackageLineDO> pageResult = packageLineService.getPackageLinePage(pageReqVO);
@@ -99,14 +105,18 @@
return Collections.emptyList();
}
// 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi
.getItemMap(convertSet(list, MesWmPackageLineDO::getItemId));
// 鎵归噺鏌ヨ璁￠噺鍗曚綅
- Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
+ .stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
// 鎵归噺鏌ヨ宸ュ崟
Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
convertSet(list, MesWmPackageLineDO::getWorkOrderId));
+ // 鎵归噺鏌ヨ MES 鐗╂枡锛堝彇姣忕鏁伴噺锛岃绠楀熬绠辨暟閲忥級
+ Map<Long, MesMdItemDO> mdItemMap = mdItemService.getItemMap(
+ convertSet(list, MesWmPackageLineDO::getItemId));
// 鎷兼帴鏁版嵁
return BeanUtils.toBean(list, MesWmPackageLineRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
@@ -118,6 +128,21 @@
MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(),
workOrder -> vo.setWorkOrderCode(workOrder.getCode())
.setBatchCode(workOrder.getBatchCode()));
+ // 灏剧鏁伴噺锛氭渶鍚庝竴绠卞疄闄呰鐨勬暟閲忥紱鍒氬ソ鏁寸鏃跺彇姣忕鏁伴噺锛屽苟鏍囪婊¤
+ MapUtils.findAndThen(mdItemMap, vo.getItemId(), item -> {
+ BigDecimal boxQuantity = item.getBoxQuantity();
+ if (boxQuantity == null || boxQuantity.compareTo(BigDecimal.ZERO) <= 0
+ || vo.getQuantity() == null) {
+ return;
+ }
+ BigDecimal remainder = vo.getQuantity().remainder(boxQuantity);
+ boolean full = remainder.compareTo(BigDecimal.ZERO) == 0;
+ BigDecimal tailBoxQuantity = (full ? boxQuantity : remainder).stripTrailingZeros();
+ if (tailBoxQuantity.scale() < 0) {
+ tailBoxQuantity = tailBoxQuantity.setScale(0);
+ }
+ vo.setTailBoxQuantity(tailBoxQuantity).setTailBoxFull(full);
+ });
});
}
--
Gitblit v1.9.3