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/vo/order/ErpPurchaseOrderRespVO.java | 14 ++
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/dto/MesArrivalNoticeRespDTO.java | 50 ++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeLineMapper.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 7
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrPurchaseSourceValidator.java | 15 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 21 +++-
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApi.java | 13 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticeRespVO.java | 11 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineService.java | 9 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportExcelVO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java | 17 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java | 18 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java | 8 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcPurchaseReturnService.java | 48 +++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApiImpl.java | 35 ++++++
18 files changed, 270 insertions(+), 20 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(
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportExcelVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportExcelVO.java
index 78d3f9f..3ba8c9f 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportExcelVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportExcelVO.java
@@ -76,10 +76,6 @@
@Schema(description = "绋庣巼锛岀櫨鍒嗘瘮锛屼緥濡� 13 琛ㄧず 13%")
private BigDecimal taxPercent;
- @ExcelProperty("鏄惁鏉ユ枡妫�楠�")
- @Schema(description = "鏄惁闇�瑕佹潵鏂欐楠岋細濉�滄槸鈥濅负闇�瑕侊紝鍏跺畠涓轰笉闇�瑕�")
- private String qcCheckFlag;
-
@ExcelProperty("澶囨敞")
@Schema(description = "澶囨敞")
private String remark;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
index 39cbaf2..43067c2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
@@ -147,6 +147,20 @@
@Schema(description = "鍏ュ簱鐘舵�侊紙0:鏈叆搴� 1:閮ㄥ垎鍏ュ簱 2:鍏ㄩ儴鍏ュ簱锛�", example = "0")
private Integer inStatus;
+ // ========== 纭鏀惰揣锛堝埌璐ч�氱煡锛� ==========
+
+ @Schema(description = "鍒拌揣閫氱煡鍗曠紪鍙凤紝宸茬‘璁ゆ敹璐ф椂杩斿洖", example = "15")
+ private Long arrivalNoticeId;
+
+ @Schema(description = "鍒拌揣閫氱煡鍗曞彿", example = "AN1794282646472")
+ private String arrivalNoticeCode;
+
+ @Schema(description = "鍒拌揣閫氱煡鍗曠姸鎬侊紙0:鑽夌 2:寰呰川妫� 3:寰呭叆搴� 4:宸插畬鎴愶級", example = "3")
+ private Integer arrivalNoticeStatus;
+
+ @Schema(description = "鍒拌揣閫氱煡鍗曠姸鎬佸悕绉�", example = "寰呭叆搴�")
+ private String arrivalNoticeStatusName;
+
// ========== 閲囪喘閫�璐э紙鍑哄簱锛夛級 ==========
@Schema(description = "閲囪喘閫�璐ф暟閲�", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index 3e77826..3a95fea 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -300,7 +300,8 @@
itemVO.setCount(row.getCount());
itemVO.setTaxPercent(row.getTaxPercent());
itemVO.setRemark(row.getRemark());
- itemVO.setQcCheckFlag("鏄�".equals(StrUtil.trim(row.getQcCheckFlag())));
+ // 閲囪喘鍙拌处涓嶅啀鎻愪緵銆屾槸鍚﹁川妫�銆嶉�夋嫨锛氬鍏ョ殑鏄庣粏涓�寰嬮渶瑕佹潵鏂欐楠�
+ itemVO.setQcCheckFlag(true);
items.add(itemVO);
}
@@ -611,6 +612,8 @@
private List<ErpPurchaseOrderItemDO> validatePurchaseOrderItems(List<ErpPurchaseOrderSaveReqVO.Item> list) {
// 杞寲涓� ErpPurchaseOrderItemDO 鍒楄〃锛堜骇鍝侀獙璇佸凡绉婚櫎锛�
List<ErpPurchaseOrderItemDO> items = convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseOrderItemDO.class, item -> {
+ // 閲囪喘鍙拌处涓嶅啀鎻愪緵銆屾槸鍚﹁川妫�銆嶉�夋嫨锛氶噰璐槑缁嗕竴寰嬮渶瑕佹潵鏂欐楠�
+ item.setQcCheckFlag(true);
item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
if (item.getTotalPrice() == null) {
return;
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApi.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApi.java
index da950e3..3181970 100644
--- a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApi.java
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApi.java
@@ -1,5 +1,10 @@
package cn.iocoder.yudao.module.mes.api.arrivalnotice;
+import cn.iocoder.yudao.module.mes.api.arrivalnotice.dto.MesArrivalNoticeRespDTO;
+
+import java.util.Collection;
+import java.util.List;
+
/**
* MES 鍒拌揣閫氱煡鍗� API 鎺ュ彛
*/
@@ -13,4 +18,12 @@
*/
Long generateArrivalNoticeFromPurchaseOrder(Long purchaseOrderId);
+ /**
+ * 鏍规嵁閲囪喘璁㈠崟缂栧彿鎵归噺鏌ヨ鍒拌揣閫氱煡鍗�
+ *
+ * @param purchaseOrderIds 閲囪喘璁㈠崟缂栧彿闆嗗悎
+ * @return 鍒拌揣閫氱煡鍗曞垪琛�
+ */
+ List<MesArrivalNoticeRespDTO> getArrivalNoticeListByPurchaseOrderIds(Collection<Long> purchaseOrderIds);
+
}
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/dto/MesArrivalNoticeRespDTO.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/dto/MesArrivalNoticeRespDTO.java
new file mode 100644
index 0000000..f77c5ed
--- /dev/null
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/dto/MesArrivalNoticeRespDTO.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.mes.api.arrivalnotice.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鍒拌揣閫氱煡鍗� Response DTO
+ */
+@Data
+public class MesArrivalNoticeRespDTO {
+
+ private Long id;
+
+ /**
+ * 鍒拌揣閫氱煡鍗曞彿
+ */
+ private String code;
+
+ /**
+ * 鍒拌揣閫氱煡鍗曞悕绉�
+ */
+ private String name;
+
+ /**
+ * 閲囪喘璁㈠崟缂栧彿
+ */
+ private Long purchaseOrderId;
+
+ /**
+ * 閲囪喘璁㈠崟鍙�
+ */
+ private String purchaseOrderCode;
+
+ /**
+ * 鐘舵�侊細0-鑽夌 2-寰呰川妫� 3-寰呭叆搴� 4-宸插畬鎴�
+ */
+ private Integer status;
+
+ /**
+ * 鐘舵�佸悕绉�
+ */
+ private String statusName;
+
+ /**
+ * 鍒拌揣鏃ユ湡
+ */
+ private LocalDateTime arrivalDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApiImpl.java
index 37e7a0e..bd2ac3f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApiImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/arrivalnotice/MesArrivalNoticeApiImpl.java
@@ -1,8 +1,19 @@
package cn.iocoder.yudao.module.mes.api.arrivalnotice;
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.api.arrivalnotice.dto.MesArrivalNoticeRespDTO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.arrivalnotice.MesWmArrivalNoticeMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmArrivalNoticeStatusEnum;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
/**
* MES 鍒拌揣閫氱煡鍗� API 瀹炵幇绫�
@@ -12,10 +23,32 @@
@Resource
private MesWmArrivalNoticeService arrivalNoticeService;
+ @Resource
+ private MesWmArrivalNoticeMapper arrivalNoticeMapper;
@Override
public Long generateArrivalNoticeFromPurchaseOrder(Long purchaseOrderId) {
return arrivalNoticeService.generateArrivalNoticeFromPurchaseOrder(purchaseOrderId);
}
-}
\ No newline at end of file
+ @Override
+ public List<MesArrivalNoticeRespDTO> getArrivalNoticeListByPurchaseOrderIds(Collection<Long> purchaseOrderIds) {
+ if (CollUtil.isEmpty(purchaseOrderIds)) {
+ return List.of();
+ }
+ List<MesWmArrivalNoticeDO> notices = arrivalNoticeMapper.selectListByPurchaseOrderIds(purchaseOrderIds);
+ if (CollUtil.isEmpty(notices)) {
+ return List.of();
+ }
+ return notices.stream().map(notice -> BeanUtils.toBean(notice, MesArrivalNoticeRespDTO.class,
+ resp -> resp.setStatusName(resolveStatusName(notice.getStatus())))).toList();
+ }
+
+ private String resolveStatusName(Integer status) {
+ return Arrays.stream(MesWmArrivalNoticeStatusEnum.values())
+ .filter(item -> Objects.equals(item.getStatus(), status))
+ .map(MesWmArrivalNoticeStatusEnum::getName)
+ .findFirst().orElse(null);
+ }
+
+}
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 c2414c8..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
@@ -149,7 +153,11 @@
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()));
@@ -160,6 +168,14 @@
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());
});
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticeRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticeRespVO.java
index 1a90e17..af62774 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticeRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticeRespVO.java
@@ -70,4 +70,15 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
+ // ========== 璐ㄦ杩涘害锛堝垪琛ㄩ〉鐢ㄤ簬鍖哄垎鏄惁宸茬敓鎴愭潵鏂欐楠屽崟锛� ==========
+
+ @Schema(description = "闇�妫�楠岃鏁帮紙iqcCheckFlag=true 鐨勬槑缁嗚鏁帮級", example = "2")
+ private Integer iqcNeedCount;
+
+ @Schema(description = "宸茬敓鎴愭潵鏂欐楠屽崟鐨勮鏁�", example = "2")
+ private Integer iqcCreatedCount;
+
+ @Schema(description = "宸插畬鎴愭楠岋紙鏈夋楠岀粨鏋滐級鐨勮鏁�", example = "0")
+ private Integer iqcInspectedCount;
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeLineMapper.java
index 5ac266f..7eb992a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeLineMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeLineMapper.java
@@ -7,6 +7,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
import org.apache.ibatis.annotations.Mapper;
+import java.util.Collection;
import java.util.List;
/**
@@ -25,6 +26,11 @@
return selectList(MesWmArrivalNoticeLineDO::getNoticeId, noticeId);
}
+ default List<MesWmArrivalNoticeLineDO> selectListByNoticeIds(Collection<Long> noticeIds) {
+ return selectList(new LambdaQueryWrapperX<MesWmArrivalNoticeLineDO>()
+ .inIfPresent(MesWmArrivalNoticeLineDO::getNoticeId, noticeIds));
+ }
+
default void deleteByNoticeId(Long noticeId) {
delete(MesWmArrivalNoticeLineDO::getNoticeId, noticeId);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java
index 1428d61..87fa825 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java
@@ -7,6 +7,9 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
import org.apache.ibatis.annotations.Mapper;
+import java.util.Collection;
+import java.util.List;
+
/**
* MES 鍒拌揣閫氱煡鍗� Mapper
*/
@@ -37,4 +40,9 @@
return selectOne(MesWmArrivalNoticeDO::getPurchaseOrderId, purchaseOrderId);
}
+ default List<MesWmArrivalNoticeDO> selectListByPurchaseOrderIds(Collection<Long> purchaseOrderIds) {
+ return selectList(new LambdaQueryWrapperX<MesWmArrivalNoticeDO>()
+ .inIfPresent(MesWmArrivalNoticeDO::getPurchaseOrderId, purchaseOrderIds));
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
index 93efc25..e11c611 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
@@ -112,7 +112,7 @@
// 2. 鎻掑叆涓昏〃
MesQcIqcDO iqc = BeanUtils.toBean(createReqVO, MesQcIqcDO.class)
.setTemplateId(null)
- .setCheckQuantity(createReqVO.getQualifiedQuantity().add(createReqVO.getUnqualifiedQuantity()))
+ .setCheckQuantity(resolveCheckQuantity(createReqVO.getQualifiedQuantity(), createReqVO.getUnqualifiedQuantity()))
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
iqcMapper.insert(iqc);
@@ -131,8 +131,18 @@
updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 涓嶅厑璁镐慨鏀规潵婧愬崟鎹�
updateObj.setTemplateId(null); // 涓嶅厑璁镐慨鏀规ā鏉�
updateObj.setItemId(null); // 涓嶅厑璁镐慨鏀圭墿鏂�
- updateObj.setCheckQuantity(updateReqVO.getQualifiedQuantity().add(updateReqVO.getUnqualifiedQuantity()));
+ updateObj.setCheckQuantity(resolveCheckQuantity(updateReqVO.getQualifiedQuantity(), updateReqVO.getUnqualifiedQuantity()));
iqcMapper.updateById(updateObj);
+ }
+
+ /**
+ * 妫�楠屾暟閲� = 鍚堟牸鏁伴噺 + 涓嶅悎鏍兼暟閲忥紱涓よ�呮湭濉叏鏃剁暀绌猴紝绛夋楠屽憳褰曞叆鍚庡啀璁$畻
+ */
+ private BigDecimal resolveCheckQuantity(BigDecimal qualified, BigDecimal unqualified) {
+ if (qualified == null || unqualified == null) {
+ return null;
+ }
+ return qualified.add(unqualified);
}
private void validateIqcSaveData(MesQcIqcSaveReqVO reqVO) {
@@ -393,9 +403,10 @@
}
iqc.setItemId(line.getItemId());
iqc.setReceivedQuantity(line.getArrivalQuantity());
- iqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭~鍐�
- iqc.setQualifiedQuantity(BigDecimal.ZERO); // 寰呭~鍐�
- iqc.setUnqualifiedQuantity(BigDecimal.ZERO); // 寰呭~鍐�
+ // 鍚堟牸/涓嶅悎鏍兼暟閲忕暀绌猴紝鐢辨楠屽憳濉啓鏃跺綍鍏ワ紙涓嶅啀榛樿 0锛岄伩鍏嶈鍒や负銆屽凡妫�楠屽悎鏍� 0銆嶏級
+ iqc.setCheckQuantity(null);
+ iqc.setQualifiedQuantity(null);
+ iqc.setUnqualifiedQuantity(null);
iqc.setReceiveDate(java.time.LocalDateTime.now());
iqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
iqcMapper.insert(iqc);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrPurchaseSourceValidator.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrPurchaseSourceValidator.java
index 137b566..088df3e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrPurchaseSourceValidator.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrPurchaseSourceValidator.java
@@ -43,7 +43,7 @@
.eq(MesWmArrivalNoticeLineDO::getId, iqc.getSourceLineId()).last("FOR UPDATE"));
if (notice == null || line == null || !Objects.equals(line.getNoticeId(), notice.getId())
|| !Objects.equals(line.getIqcId(), iqc.getId())
- || !Objects.equals(notice.getStatus(), MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus())
+ || !isDispositionAllowedNoticeStatus(notice.getStatus())
|| !Objects.equals(line.getItemId(), iqc.getItemId())
|| !Objects.equals(ncr.getItemId(), iqc.getItemId())
|| !samePositive(ncr.getUnqualifiedQuantity(), iqc.getUnqualifiedQuantity())
@@ -52,6 +52,19 @@
return new Source(iqc, notice, line);
}
+ /**
+ * 涓嶅悎鏍煎缃厑璁哥殑鍒拌揣閫氱煡鐘舵�併��
+ *
+ * 鏉ユ枡妫�楠屽畬鎴愭椂锛屽埌璐ч�氱煡浼氬湪鍚屼竴浜嬪姟閲屼粠銆屽緟璐ㄦ銆嶆帹杩涘埌銆屽緟鍏ュ簱銆嶅苟鑷姩鐢熸垚閲囪喘鍏ュ簱鍗�
+ * 锛堝彧鍙栧悎鏍兼暟閲忥級锛岄殢鍚庣‘璁ゅ叆搴撳悗鍙樹负銆屽凡瀹屾垚銆嶃�備笉鍚堟牸閮ㄥ垎鐨勯��璐�/璁╂鐢变笉鍚堟牸鍗曞崟鐙缃紝
+ * 涓嶅啀鍙楅�氱煡鐘舵�侀檺鍒讹紝鍚﹀垯鍗曡閫氱煡锛堟垨鏈�鍚庝竴琛屾楠屽畬鎴愭椂锛夌殑涓嶅悎鏍煎崟灏嗘案杩滄棤娉曞缃��
+ */
+ private boolean isDispositionAllowedNoticeStatus(Integer status) {
+ return Objects.equals(status, MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus())
+ || Objects.equals(status, MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus())
+ || Objects.equals(status, MesWmArrivalNoticeStatusEnum.FINISHED.getStatus());
+ }
+
private boolean samePositive(BigDecimal a, BigDecimal b) {
return a != null && b != null && a.signum() > 0 && a.compareTo(b) == 0;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
index e6b69ea..2eb4407 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
@@ -287,7 +287,8 @@
respVO.setDocId(doc.getId());
respVO.setDocCode(doc.getCode());
respVO.setDocName("閲囪喘閫�璐у崟");
- respVO.setMessage("閲囪喘閫�璐у崟宸茬敓鎴愶紝璇风敱浠撳簱纭閫�璐�");
+ respVO.setMessage("閲囪喘閫�璐у崟 " + doc.getCode()
+ + " 宸茬敓鎴愶細涓嶅悎鏍煎搧鏈叆搴擄紝鏃犻渶鎷h揣锛屽崟鎹凡鐩存帴瀹屾垚锛屽彲鍦ㄣ�愰噰璐粨搴�-閲囪喘閫�璐с�戞煡鐪�");
} else if (Objects.equals(disposeReqVO.getDisposition(), MesNcrDispositionEnum.REPRODUCTION.getType())) {
respVO = processSource != null
? oqcReproductionService.reproduceIpqc(ncr, disposeReqVO.getDisposition(), processSource)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcPurchaseReturnService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcPurchaseReturnService.java
index 1edbd1b..2d2c37d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcPurchaseReturnService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcPurchaseReturnService.java
@@ -5,8 +5,15 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ncr.MesQcNcrDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ncr.MesQcPurchaseReturnDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ncr.MesQcPurchaseReturnMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ncr.MesQcPurchaseConcessionMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorLineMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnVendorStatusEnum;
+import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
+import cn.hutool.core.util.StrUtil;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -16,10 +23,16 @@
@Service
public class MesQcPurchaseReturnService {
+ /** 閲囪喘閫�璐у崟缂栫爜瑙勫垯锛圡esMdAutoCodeRule 涓殑 code锛� */
+ private static final String RETURN_VENDOR_CODE_RULE = "WM_RETURN_VENDOR_CODE";
+
@Resource private MesQcNcrPurchaseSourceValidator sourceValidator;
@Resource private MesQcPurchaseReturnMapper mapper;
@Resource private MesQcPurchaseConcessionMapper concessionMapper;
@Resource private MesQcArrivalDispositionService arrivalDispositionService;
+ @Resource private MesWmReturnVendorMapper returnVendorMapper;
+ @Resource private MesWmReturnVendorLineMapper returnVendorLineMapper;
+ @Resource private MesMdAutoCodeRecordService autoCodeRecordService;
/** 蹇呴』鐢卞凡閿佸畾 NCR 鐨勫缃簨鍔¤皟鐢ㄣ�� */
@Transactional(rollbackFor = Exception.class)
@@ -32,8 +45,35 @@
if (source.notice().getVendorId() == null || source.notice().getPurchaseOrderId() == null
|| source.line().getPurchaseOrderItemId() == null)
throw new ServiceException(400, "鍒拌揣鍗曠己灏戜緵搴斿晢銆侀噰璐鍗曟垨閲囪喘鏄庣粏锛屾棤娉曠敓鎴愬彲杩芥函閫�璐у崟");
+
+ // 1. 鐢熸垚銆屼緵搴斿晢閫�璐у崟銆嶏細涓嶅悎鏍煎搧浠庢湭鍏ュ簱锛屼笉浜х敓搴撳瓨鍑哄簱锛屼篃鏃犻渶鎷h揣涓庡鎵癸紝
+ // 鐩存帴浠ュ凡瀹屾垚鐘舵�佽惤鍒伴噰璐粨搴�-閲囪喘閫�璐у垪琛ㄤ腑锛屼緵浠撳簱/閲囪喘杩芥函骞舵寜瀹炵墿閫�鍥炰緵搴斿晢銆�
+ String code = autoCodeRecordService.generateAutoCode(RETURN_VENDOR_CODE_RULE, null);
+ MesWmReturnVendorDO vendorReturn = new MesWmReturnVendorDO();
+ vendorReturn.setCode(code);
+ vendorReturn.setName("鏉ユ枡涓嶅悎鏍奸��璐�-" + ncr.getCode());
+ vendorReturn.setPurchaseOrderId(source.notice().getPurchaseOrderId());
+ vendorReturn.setPurchaseOrderCode(source.notice().getPurchaseOrderCode());
+ vendorReturn.setContractNo(source.notice().getContractNo());
+ vendorReturn.setVendorId(source.notice().getVendorId());
+ vendorReturn.setReturnDate(LocalDateTime.now());
+ vendorReturn.setReturnReason("鏉ユ枡妫�楠屼笉鍚堟牸");
+ vendorReturn.setStatus(MesWmReturnVendorStatusEnum.FINISHED.getStatus());
+ vendorReturn.setRemark("鐢辨潵鏂欎笉鍚堟牸鍗� " + ncr.getCode() + "锛堟潵鏂欐楠� " + source.iqc().getCode()
+ + "锛夐��璐у缃嚜鍔ㄧ敓鎴愶紱涓嶅悎鏍煎搧鏈叆搴擄紝鏃犻渶鎷h揣锛屽崟鎹洿鎺ュ畬鎴愩��");
+ returnVendorMapper.insert(vendorReturn);
+ MesWmReturnVendorLineDO vendorReturnLine = new MesWmReturnVendorLineDO();
+ vendorReturnLine.setReturnId(vendorReturn.getId());
+ vendorReturnLine.setItemId(ncr.getItemId());
+ vendorReturnLine.setQuantity(ncr.getUnqualifiedQuantity());
+ vendorReturnLine.setBatchCode(StrUtil.blankToDefault(source.iqc().getVendorBatch(), null));
+ vendorReturnLine.setRemark("鏉ユ枡妫�楠� " + source.iqc().getCode() + " 涓嶅悎鏍兼暟閲�");
+ returnVendorLineMapper.insert(vendorReturnLine);
+
+ // 2. 璁板綍璐ㄩ噺渚у缃彴璐︼紙涓庨��璐у崟鍚屽彿锛夛紝鍥犻��璐у崟宸茬洿鎺ュ畬鎴愶紝杩欓噷鍚屾鏍囪涓哄凡纭锛�
+ // 涓嶅悎鏍煎崟鍏抽棴鏃舵牎楠岀殑姝f槸杩欐潯璁板綍銆�
MesQcPurchaseReturnDO doc = new MesQcPurchaseReturnDO();
- doc.setCode("NCR-RET-" + ncr.getId());
+ doc.setCode(code);
doc.setNcrId(ncr.getId());
doc.setIqcId(ncr.getQcId());
doc.setNoticeId(source.notice().getId());
@@ -44,8 +84,12 @@
doc.setItemId(ncr.getItemId());
doc.setVendorBatch(source.iqc().getVendorBatch());
doc.setQuantity(ncr.getUnqualifiedQuantity());
- doc.setStatus(0);
+ doc.setStatus(1);
+ doc.setConfirmedBy(getLoginUserId());
+ doc.setConfirmedAt(LocalDateTime.now());
+ doc.setConfirmationRemark("闅忎笉鍚堟牸澶勭疆鑷姩鐢熸垚閲囪喘閫�璐у崟 " + code + "锛屾湭鍙戠敓搴撳瓨鍑哄簱");
mapper.insert(doc);
+ arrivalDispositionService.refresh(source.notice().getId());
return doc;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
index 32eff6f..733b421 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
@@ -368,9 +368,10 @@
oqc.setBatchCode(line.getBatchCode());
oqc.setReelNo(resolveSalesReelNo(line));
oqc.setOutQuantity(line.getQuantity());
- oqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭~鍐�
- oqc.setQualifiedQuantity(BigDecimal.ZERO); // 寰呭~鍐�
- oqc.setUnqualifiedQuantity(BigDecimal.ZERO); // 寰呭~鍐�
+ // 妫�娴�/鍚堟牸/涓嶅悎鏍兼暟閲忕暀绌猴紝鐢辨楠屽憳濉啓鏃跺綍鍏ワ紙涓嶅啀榛樿 0锛�
+ oqc.setCheckQuantity(null);
+ oqc.setQualifiedQuantity(null);
+ oqc.setUnqualifiedQuantity(null);
MesWmProductSalesDO sales = productSalesService.getProductSales(salesId);
java.time.LocalDateTime businessDate = sales != null && sales.getSalesDate() != null
? sales.getSalesDate() : java.time.LocalDateTime.now();
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineService.java
index 6db9f19..efe8405 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineService.java
@@ -7,6 +7,7 @@
import jakarta.validation.Valid;
import java.math.BigDecimal;
+import java.util.Collection;
import java.util.List;
/**
@@ -61,6 +62,14 @@
List<MesWmArrivalNoticeLineDO> getArrivalNoticeLineListByNoticeId(Long noticeId);
/**
+ * 鎸夐�氱煡鍗曠紪鍙烽泦鍚堟壒閲忚幏寰楄鍒楄〃锛堝垪琛ㄩ〉涓�娆℃�ф煡璇紝閬垮厤閫愬崟鏌ヨ锛�
+ *
+ * @param noticeIds 閫氱煡鍗曠紪鍙烽泦鍚�
+ * @return 琛屽垪琛�
+ */
+ List<MesWmArrivalNoticeLineDO> getArrivalNoticeLineListByNoticeIds(Collection<Long> noticeIds);
+
+ /**
* 鎸夐�氱煡鍗曠紪鍙锋壒閲忓垹闄よ
*
* @param noticeId 閫氱煡鍗曠紪鍙�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java
index ea14127..73162d1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java
@@ -15,6 +15,7 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.util.Collection;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -107,6 +108,11 @@
}
@Override
+ public List<MesWmArrivalNoticeLineDO> getArrivalNoticeLineListByNoticeIds(Collection<Long> noticeIds) {
+ return arrivalNoticeLineMapper.selectListByNoticeIds(noticeIds);
+ }
+
+ @Override
public void deleteArrivalNoticeLineByNoticeId(Long noticeId) {
arrivalNoticeLineMapper.deleteByNoticeId(noticeId);
}
--
Gitblit v1.9.3