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 | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 c5759ba..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
@@ -26,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;
@@ -75,6 +77,8 @@
private AdminUserApi adminUserApi;
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private MesArrivalNoticeApi arrivalNoticeApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閲囪喘璁㈠崟")
@@ -186,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);
}
@@ -261,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(
@@ -279,6 +288,12 @@
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()));
+ 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(
--
Gitblit v1.9.3