From 6fa82a1ad7c3ae061ef499f0d0806a16846e122b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 16:55:02 +0800
Subject: [PATCH] feat(mes): 来料检验与不合格退货闭环优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
index 7e3bd65..becb815 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.erp.controller.admin.purchase;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
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;
@@ -25,6 +26,8 @@
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
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.arrivalnotice.MesArrivalNoticeApi;
+import cn.iocoder.yudao.module.mes.api.arrivalnotice.dto.MesArrivalNoticeRespDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -74,6 +77,8 @@
private AdminUserApi adminUserApi;
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private MesArrivalNoticeApi arrivalNoticeApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閲囪喘璁㈠崟")
@@ -137,17 +142,24 @@
convertSet(purchaseOrderItemList, ErpPurchaseOrderItemDO::getProductId));
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
convertSet(purchaseOrderItemList, ErpPurchaseOrderItemDO::getProductUnitId));
- return success(BeanUtils.toBean(purchaseOrder, ErpPurchaseOrderRespVO.class, purchaseOrderVO ->
- purchaseOrderVO.setItems(BeanUtils.toBean(purchaseOrderItemList, ErpPurchaseOrderRespVO.Item.class, item -> {
- // 搴撳瓨淇℃伅鏆備笉鏌ヨ锛堜粨鍌ㄧ墿娴佹ā鍧楋級
- item.setStockCount(BigDecimal.ZERO);
- MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
- .setProductBarCode(mdmItem.getBarCode()));
- MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
- item.setProductUnitName(unit.getName()));
- })).setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_order", id))
- .setSourceTypeName(ErpPurchaseOrderSourceTypeEnum.WORK_ORDER.getType()
- .equals(purchaseOrder.getSourceType()) ? "鐢熶骇宸ュ崟" : null)));
+ return success(BeanUtils.toBean(purchaseOrder, ErpPurchaseOrderRespVO.class, purchaseOrderVO -> {
+ purchaseOrderVO.setItems(BeanUtils.toBean(purchaseOrderItemList, ErpPurchaseOrderRespVO.Item.class, item -> {
+ // 搴撳瓨淇℃伅鏆備笉鏌ヨ锛堜粨鍌ㄧ墿娴佹ā鍧楋級
+ item.setStockCount(BigDecimal.ZERO);
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
+ .setProductBarCode(mdmItem.getBarCode()));
+ MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
+ item.setProductUnitName(unit.getName()));
+ // 浜у搧缂栧彿锛氫紭鍏堝彇鏄庣粏琛屽揩鐓э紝鍘嗗彶鏁版嵁鍥為�� MDM 鐗╂枡缂栫爜
+ if (StrUtil.isBlank(item.getProductCode())) {
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductCode(mdmItem.getCode()));
+ }
+ }));
+ purchaseOrderVO.setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_order", id));
+ purchaseOrderVO.setSourceTypeName(resolveSourceTypeName(purchaseOrder.getSourceType()));
+ purchaseOrderVO.setProductCodes(CollUtil.join(purchaseOrderVO.getItems(), "锛�",
+ ErpPurchaseOrderRespVO.Item::getProductCode));
+ }));
}
@GetMapping("/page")
@@ -178,7 +190,7 @@
.no("CGDD20260101000001").supplierName("绀轰緥渚涘簲鍟�")
.orderTime("2026-01-01 10:00:00").productCode("ITEM001").productName("绀轰緥浜у搧A")
.count(new BigDecimal("100")).productPrice(new BigDecimal("10.00"))
- .taxPercent(new BigDecimal("13")).qcCheckFlag("鍚�").remark("绀轰緥").build());
+ .taxPercent(new BigDecimal("13")).remark("绀轰緥").build());
ExcelUtils.write(response, "閲囪喘璁㈠崟瀵煎叆妯℃澘.xls", "閲囪喘璁㈠崟", ErpPurchaseOrderImportExcelVO.class, list);
}
@@ -217,6 +229,18 @@
return success(true);
}
+ /**
+ * 瑙ｆ瀽鏉ユ簮绫诲瀷鍚嶇О
+ */
+ private String resolveSourceTypeName(Integer sourceType) {
+ if (sourceType == null) {
+ return null;
+ }
+ return Arrays.stream(ErpPurchaseOrderSourceTypeEnum.values())
+ .filter(item -> item.getType().equals(sourceType))
+ .map(ErpPurchaseOrderSourceTypeEnum::getName).findFirst().orElse(null);
+ }
+
private PageResult<ErpPurchaseOrderRespVO> buildPurchaseOrderVOPageResult(PageResult<ErpPurchaseOrderDO> pageResult) {
if (CollUtil.isEmpty(pageResult.getList())) {
return PageResult.empty(pageResult.getTotal());
@@ -241,6 +265,11 @@
// 1.6 宸叉潵绁ㄩ噾棰濓細鎸夐噰璐鍗曠粺璁★紝鐢ㄤ簬璁＄畻鍓╀綑鍙紑绁ㄩ噾棰�
Map<Long, BigDecimal> invoicePriceSumMap = purchaseInvoiceService
.getPurchaseInvoicePriceSumMapByOrderIds(convertSet(pageResult.getList(), ErpPurchaseOrderDO::getId));
+ // 1.7 鍒拌揣閫氱煡鍗曪細鐢ㄤ簬鍓嶇鍖哄垎鏄惁宸茬‘璁ゆ敹璐с�侀殣钘忛噸澶嶇殑銆岀‘璁ゆ敹璐с�嶆寜閽�
+ Map<Long, MesArrivalNoticeRespDTO> arrivalNoticeMap = arrivalNoticeApi
+ .getArrivalNoticeListByPurchaseOrderIds(convertSet(pageResult.getList(), ErpPurchaseOrderDO::getId))
+ .stream().collect(java.util.stream.Collectors.toMap(
+ MesArrivalNoticeRespDTO::getPurchaseOrderId, notice -> notice, (a, b) -> a));
// 2. 寮�濮嬫嫾鎺�
return BeanUtils.toBean(pageResult, ErpPurchaseOrderRespVO.class, purchaseOrder -> {
purchaseOrder.setItems(BeanUtils.toBean(
@@ -251,12 +280,21 @@
.setProductBarCode(mdmItem.getBarCode()));
MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
item.setProductUnitName(unit.getName()));
+ if (StrUtil.isBlank(item.getProductCode())) {
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductCode(mdmItem.getCode()));
+ }
}));
purchaseOrder.setProductNames(CollUtil.join(purchaseOrder.getItems(), "锛�", ErpPurchaseOrderRespVO.Item::getProductName));
+ purchaseOrder.setProductCodes(CollUtil.join(purchaseOrder.getItems(), "锛�", ErpPurchaseOrderRespVO.Item::getProductCode));
MapUtils.findAndThen(supplierMap, purchaseOrder.getSupplierId(), supplier -> purchaseOrder.setSupplierName(supplier.getName()));
MapUtils.findAndThen(userMap, Long.parseLong(purchaseOrder.getCreator()), user -> purchaseOrder.setCreatorName(user.getNickname()));
- purchaseOrder.setSourceTypeName(ErpPurchaseOrderSourceTypeEnum.WORK_ORDER.getType()
- .equals(purchaseOrder.getSourceType()) ? "鐢熶骇宸ュ崟" : null);
+ MapUtils.findAndThen(arrivalNoticeMap, purchaseOrder.getId(), notice -> {
+ purchaseOrder.setArrivalNoticeId(notice.getId());
+ purchaseOrder.setArrivalNoticeCode(notice.getCode());
+ purchaseOrder.setArrivalNoticeStatus(notice.getStatus());
+ purchaseOrder.setArrivalNoticeStatusName(notice.getStatusName());
+ });
+ purchaseOrder.setSourceTypeName(resolveSourceTypeName(purchaseOrder.getSourceType()));
// 鍓╀綑鍙紑绁ㄩ噾棰� = 璁㈠崟鎬婚噾棰� - 宸叉潵绁ㄩ噾棰�
purchaseOrder.setRemainInvoicePrice(purchaseOrder.getTotalPrice().subtract(
invoicePriceSumMap.getOrDefault(purchaseOrder.getId(), BigDecimal.ZERO)));
--
Gitblit v1.9.3