From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
index d42cea3..0d46bef 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.erp.controller.admin.sale;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -24,6 +25,7 @@
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.api.mps.MesProMpsApi;
+import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO;
import cn.iocoder.yudao.module.mes.api.productsales.MesWmProductSalesLineApi;
import cn.iocoder.yudao.module.mes.api.salesnotice.MesWmSalesNoticeApi;
import cn.iocoder.yudao.module.mes.api.wms.MesWmStockApi;
@@ -169,6 +171,7 @@
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getId));
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductUnitId));
+ Map<Long, MesProMpsRespDTO> mpsMap = getMpsMap(saleOrderItemList);
// 3. 杞崲璁㈠崟椤�
List<ErpSaleOrderRespVO.Item> itemVOList = BeanUtils.toBean(saleOrderItemList, ErpSaleOrderRespVO.Item.class, item -> {
fillItemPrice(item);
@@ -176,13 +179,22 @@
item.setBatchCode(batchCodeMap.get(item.getId()));
MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
+ .setProductCode(mdmItem.getCode())
.setProductSpecification(mdmItem.getSpecification()));
MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
item.setProductUnitName(unit.getName()));
+ MesProMpsRespDTO mps = mpsMap.get(item.getId());
+ if (mps != null) {
+ item.setQuantityProduced(mps.getQuantityProduced());
+ }
});
// 4. 缁勮鍝嶅簲
ErpSaleOrderRespVO saleOrderVO = BeanUtils.toBean(saleOrder, ErpSaleOrderRespVO.class);
saleOrderVO.setItems(itemVOList);
+ saleOrderVO.setProductCodes(CollUtil.join(itemVOList, "锛�", ErpSaleOrderRespVO.Item::getProductCode));
+ saleOrderVO.setProducedCount(itemVOList.stream()
+ .map(item -> ObjectUtil.defaultIfNull(item.getQuantityProduced(), BigDecimal.ZERO))
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
saleOrderVO.setNeedProduction(itemVOList.stream()
.anyMatch(item -> Integer.valueOf(1).equals(item.getNeedProduction())) ? 1 : 0);
if (saleOrder.getCustomerId() != null) {
@@ -266,6 +278,7 @@
// 1.7 璁￠噺鍗曚綅
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
convertSet(saleOrderItemList, ErpSaleOrderItemDO::getProductUnitId));
+ Map<Long, MesProMpsRespDTO> mpsMap = getMpsMap(saleOrderItemList);
// 1.8 妫�鏌ユ槸鍚﹀彲浠ョ敓鎴愬彂璐ч�氱煡鍗曪紙闇�瑕佺敓浜х殑鏄庣粏瀵瑰簲鐨� MPS 鏄惁宸插畬鎴愶級
// 绛涢�夊嚭闇�瑕佺敓浜х殑鏄庣粏ID
List<Long> needProductionItemIds = saleOrderItemList.stream()
@@ -310,11 +323,20 @@
item.setBatchCode(batchCodeMap.get(item.getId()));
MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem ->
item.setProductName(mdmItem.getName()).setProductBarCode(mdmItem.getBarCode())
+ .setProductCode(mdmItem.getCode())
.setProductSpecification(mdmItem.getSpecification()));
MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
item.setProductUnitName(unit.getName()));
+ MesProMpsRespDTO mps = mpsMap.get(item.getId());
+ if (mps != null) {
+ item.setQuantityProduced(mps.getQuantityProduced());
+ }
}));
saleOrder.setProductNames(CollUtil.join(saleOrder.getItems(), "锛�", ErpSaleOrderRespVO.Item::getProductName));
+ saleOrder.setProductCodes(CollUtil.join(saleOrder.getItems(), "锛�", ErpSaleOrderRespVO.Item::getProductCode));
+ saleOrder.setProducedCount(saleOrder.getItems().stream()
+ .map(item -> ObjectUtil.defaultIfNull(item.getQuantityProduced(), BigDecimal.ZERO))
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
MapUtils.findAndThen(customerMap, saleOrder.getCustomerId(), supplier -> saleOrder.setCustomerName(supplier.getName()));
MapUtils.findAndThen(userMap, Long.parseLong(saleOrder.getCreator()), user -> saleOrder.setCreatorName(user.getNickname()));
// 璁剧疆鏄惁宸茬敓鎴愬彂璐ч�氱煡鍗�
@@ -328,6 +350,20 @@
});
}
+ private Map<Long, MesProMpsRespDTO> getMpsMap(List<ErpSaleOrderItemDO> items) {
+ if (CollUtil.isEmpty(items)) {
+ return java.util.Collections.emptyMap();
+ }
+ List<MesProMpsRespDTO> mpsList = mpsApi.getMpsListBySaleOrderItemIds(
+ items.stream().map(ErpSaleOrderItemDO::getId).toList());
+ if (CollUtil.isEmpty(mpsList)) {
+ return java.util.Collections.emptyMap();
+ }
+ return mpsList.stream().filter(mps -> mps.getSaleOrderItemId() != null)
+ .collect(java.util.stream.Collectors.toMap(MesProMpsRespDTO::getSaleOrderItemId,
+ mps -> mps, (a, b) -> a));
+ }
+
/**
* 濉厖璁㈠崟椤圭殑閲戦瀛楁
*
--
Gitblit v1.9.3