From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java
index 779b0e5..564e497 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorDO.java
@@ -1,13 +1,13 @@
package cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnVendorStatusEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
@@ -39,12 +39,22 @@
private String name;
/**
* 閲囪喘璁㈠崟缂栧彿
+ *
+ * 鍏宠仈 ERP 閲囪喘璁㈠崟 {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO#getId()}
+ */
+ private Long purchaseOrderId;
+ /**
+ * 閲囪喘璁㈠崟缂栫爜锛堝啑浣欏瓧娈碉紝鐢ㄤ簬鏄剧ず锛�
*/
private String purchaseOrderCode;
/**
+ * 閲囪喘鍚堝悓鍙凤紙鍒涘缓鏃朵粠閲囪喘璁㈠崟蹇収锛屾崲璐у叆搴撴部鐢級
+ */
+ private String contractNo;
+ /**
* 渚涘簲鍟� ID
*
- * 鍏宠仈 {@link MesMdVendorDO#getId()}
+ * 鍏宠仈 ERP 渚涘簲鍟� {@link cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO#getId()}
*/
private Long vendorId;
/**
@@ -75,4 +85,34 @@
*/
private String remark;
+ // ========== 瀹℃壒 ==========
+ /**
+ * BPM 娴佺▼瀹炰緥缂栧彿
+ */
+ private String processInstanceId;
+ /**
+ * BPM 娴佺▼瀹氫箟 Key
+ */
+ private String processDefinitionKey;
+
+ // ========== 璐圭敤淇℃伅 ==========
+ /**
+ * 澶勭悊鏂瑰紡
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnVendorHandleTypeEnum}
+ */
+ private Integer handleType;
+ /**
+ * 閫�娆鹃噾棰濓紙榛樿鎸夐噰璐崟浠� 脳 閫�璐ф暟閲忚绠楋紝鍙慨鏀癸級
+ */
+ private BigDecimal refundAmount;
+ /**
+ * 璐熸暟鍐茬孩浠樻鍗曠紪鍙凤紙閫�娆炬椂鐢熸垚锛屽叧鑱� ERP 浠樻鍗曪級
+ */
+ private Long redFlushPaymentId;
+ /**
+ * 鎹㈣揣鍒拌揣閫氱煡鍗曠紪鍙凤紙鎹㈣揣鏃剁敓鎴愶紝鍏宠仈 MES 鍒拌揣閫氱煡鍗曪級
+ */
+ private Long replacementNoticeId;
+
}
--
Gitblit v1.9.3