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-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
index 28239f9..0f654f5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
@@ -12,6 +12,8 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
+import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeLineService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
@@ -45,6 +47,8 @@
@Resource
private MesWmArrivalNoticeService arrivalNoticeService;
+ @Resource
+ private MesWmArrivalNoticeLineService arrivalNoticeLineService;
@Resource
private SrmSupplierApi srmSupplierApi;
@Resource
@@ -114,6 +118,14 @@
return success(true);
}
+ @PostMapping("/create-iqc")
+ @Operation(summary = "鎵ц璐ㄦ锛氫负鍒拌揣閫氱煡鍗曠殑闇�妫�琛岀敓鎴愭潵鏂欐楠屽崟")
+ @Parameter(name = "id", description = "鍒拌揣閫氱煡鍗曠紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-arrival-notice:update')")
+ public CommonResult<Integer> createArrivalNoticeIqc(@RequestParam("id") Long id) {
+ return success(arrivalNoticeService.createIqcForArrivalNotice(id));
+ }
+
@PostMapping("/generate-from-purchase-order")
@Operation(summary = "鏍规嵁閲囪喘璁㈠崟鐢熸垚鍒拌揣閫氱煡鍗�")
@Parameter(name = "purchaseOrderId", description = "閲囪喘璁㈠崟缂栧彿", required = true)
@@ -141,12 +153,29 @@
Map<Long, ErpPurchaseOrderRespDTO> purchaseOrderMap = purchaseOrderApi.getPurchaseOrderList(purchaseOrderIds)
.getCheckedData().stream()
.collect(java.util.stream.Collectors.toMap(ErpPurchaseOrderRespDTO::getId, v -> v, (a, b) -> a));
- // 3. 鏋勫缓缁撴灉
+ // 3. 鑾峰緱璐ㄦ杩涘害锛氶渶妫�琛� / 宸茬敓鎴愭楠屽崟琛� / 宸插畬鎴愭楠岃
+ Map<Long, List<MesWmArrivalNoticeLineDO>> lineMap = arrivalNoticeLineService
+ .getArrivalNoticeLineListByNoticeIds(convertSet(list, MesWmArrivalNoticeDO::getId))
+ .stream().collect(java.util.stream.Collectors.groupingBy(MesWmArrivalNoticeLineDO::getNoticeId));
+ // 4. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmArrivalNoticeRespVO.class, vo -> {
MapUtils.findAndThen(supplierMap, vo.getVendorId(), supplier ->
vo.setVendorName(supplier.getName()));
- MapUtils.findAndThen(purchaseOrderMap, vo.getPurchaseOrderId(), purchaseOrder ->
- vo.setPurchaseOrderNo(purchaseOrder.getNo()));
+ MapUtils.findAndThen(purchaseOrderMap, vo.getPurchaseOrderId(), purchaseOrder -> {
+ vo.setPurchaseOrderNo(purchaseOrder.getNo());
+ // 鍘嗗彶鍗曟嵁鏈揩鐓у悎鍚屽彿鏃讹紝鍥炲～閲囪喘璁㈠崟涓婄殑鍚堝悓鍙�
+ if (cn.hutool.core.util.StrUtil.isBlank(vo.getContractNo())) {
+ vo.setContractNo(purchaseOrder.getContractNo());
+ }
+ });
+ List<MesWmArrivalNoticeLineDO> lines = lineMap.getOrDefault(vo.getId(), Collections.emptyList());
+ List<MesWmArrivalNoticeLineDO> needCheckLines = lines.stream()
+ .filter(line -> Boolean.TRUE.equals(line.getIqcCheckFlag())).toList();
+ vo.setIqcNeedCount(needCheckLines.size());
+ vo.setIqcCreatedCount((int) needCheckLines.stream()
+ .filter(line -> line.getIqcId() != null).count());
+ vo.setIqcInspectedCount((int) needCheckLines.stream()
+ .filter(line -> line.getIqcCheckResult() != null).count());
});
}
--
Gitblit v1.9.3