From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
index c7ccb51..9082005 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
@@ -27,6 +27,8 @@
     ErrorCode PURCHASE_ORDER_PROCESS_FAIL_EXISTS_RETURN = new ErrorCode(1_030_101_010, "鍙嶅鏍稿け璐ワ紝宸插瓨鍦ㄥ搴旂殑閲囪喘閫�璐у崟");
     ErrorCode PURCHASE_ORDER_BPM_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_101_011, "閲囪喘瀹℃牳鍒嗙被涓嶅瓨鍦紝璇峰厛鍦˙PM妯″潡鍒涘缓閲囪喘瀹℃牳娴佺▼鍒嗙被");
     ErrorCode PURCHASE_ORDER_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_030_101_012, "閲囪喘瀹℃牳鍒嗙被涓嬫病鏈夊彲鐢ㄧ殑娴佺▼妯″瀷锛岃鍏堝垱寤哄苟鍙戝竷娴佺▼");
+    ErrorCode PURCHASE_ORDER_SUBMIT_FAIL_STATUS = new ErrorCode(1_030_101_013, "鎻愪氦瀹℃壒澶辫触锛屽彧鏈夋湭瀹℃牳鐘舵�佺殑閲囪喘璁㈠崟鎵嶈兘鎻愪氦");
+    ErrorCode PURCHASE_ORDER_ALL_IN = new ErrorCode(1_030_101_014, "閲囪喘璁㈠崟宸插叏閮ㄥ叆搴擄紝鏃犻渶纭鏀惰揣");
 
     // ========== ERP 閲囪喘鍏ュ簱锛�1-030-102-000锛� ==========
     ErrorCode PURCHASE_IN_NOT_EXISTS = new ErrorCode(1_030_102_000, "閲囪喘鍏ュ簱鍗曚笉瀛樺湪");
@@ -78,6 +80,12 @@
     ErrorCode SALE_ORDER_PROCESS_FAIL_EXISTS_OUT = new ErrorCode(1_020_201_008, "鍙嶅鏍稿け璐ワ紝宸插瓨鍦ㄥ搴旂殑閿�鍞嚭搴撳崟");
     ErrorCode SALE_ORDER_ITEM_RETURN_FAIL_OUT_EXCEED = new ErrorCode(1_020_201_009, "閿�鍞鍗曢」({})瓒呰繃鏈�澶у厑璁搁��璐ф暟閲�({})");
     ErrorCode SALE_ORDER_PROCESS_FAIL_EXISTS_RETURN = new ErrorCode(1_020_201_010, "鍙嶅鏍稿け璐ワ紝宸插瓨鍦ㄥ搴旂殑閿�鍞��璐у崟");
+    ErrorCode SALE_ORDER_CANCEL_FAIL_NOT_APPROVE = new ErrorCode(1_020_201_011, "浣滃簾澶辫触锛岄攢鍞鍗�({})鏈鏍革紝鍙湁宸插鏍哥殑璁㈠崟鎵嶈兘浣滃簾");
+    ErrorCode SALE_ORDER_CANCEL_FAIL_EXISTS_OUT = new ErrorCode(1_020_201_012, "浣滃簾澶辫触锛屽凡瀛樺湪瀵瑰簲鐨勯攢鍞嚭搴撳崟");
+    ErrorCode SALE_ORDER_CANCEL_FAIL_EXISTS_RETURN = new ErrorCode(1_020_201_013, "浣滃簾澶辫触锛屽凡瀛樺湪瀵瑰簲鐨勯攢鍞��璐у崟");
+    ErrorCode SALE_ORDER_CANCEL_FAIL = new ErrorCode(1_020_201_014, "浣滃簾澶辫触锛岃鍒锋柊椤甸潰鍚庨噸璇�");
+    ErrorCode SALE_ORDER_ENABLE_FAIL_NOT_CANCEL = new ErrorCode(1_020_201_015, "鍚敤澶辫触锛岄攢鍞鍗�({})鏈綔搴燂紝鍙湁宸蹭綔搴熺殑璁㈠崟鎵嶈兘閲嶆柊鍚敤");
+    ErrorCode SALE_ORDER_ENABLE_FAIL = new ErrorCode(1_020_201_016, "鍚敤澶辫触锛岃鍒锋柊椤甸潰鍚庨噸璇�");
 
     // ========== ERP 閿�鍞嚭搴擄紙1-030-202-000锛� ==========
     ErrorCode SALE_OUT_NOT_EXISTS = new ErrorCode(1_020_202_000, "閿�鍞嚭搴撳崟涓嶅瓨鍦�");
@@ -180,4 +188,8 @@
     ErrorCode FINANCE_RECEIPT_NO_EXISTS = new ErrorCode(1_030_602_004, "鐢熸垚鏀舵鍗曞彿澶辫触锛岃閲嶆柊鎻愪氦");
     ErrorCode FINANCE_RECEIPT_UPDATE_FAIL_APPROVE = new ErrorCode(1_030_602_005, "鏀舵鍗�({})宸插鏍革紝鏃犳硶淇敼");
 
+    // ========== ERP 浠撳簱鏄犲皠 1-030-700-000 ==========
+    ErrorCode WAREHOUSE_MAPPING_NOT_EXISTS = new ErrorCode(1_030_700_000, "浠撳簱鏄犲皠涓嶅瓨鍦�");
+    ErrorCode WAREHOUSE_MAPPING_EXISTS = new ErrorCode(1_030_700_001, "璇RP浠撳簱宸插瓨鍦ㄦ槧灏勯厤缃�");
+
 }

--
Gitblit v1.9.3