From 8e4eee5ad4d74e1a4e6ab4de3a9c28000700dce0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:49:04 +0800
Subject: [PATCH] 修复采购退货页面 ERP 模块已禁用报错
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java | 54 ++++++++++++++++--------------------------------------
1 files changed, 16 insertions(+), 38 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java
index 84d92fb..93a7e17 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java
@@ -8,6 +8,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
+import java.util.List;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -17,34 +18,11 @@
@ToString(callSuper = true)
public class ErpSaleOrderPageReqVO extends PageParam {
- /**
- * 鍑哄簱鐘舵�� - 鏃�
- */
- public static final Integer OUT_STATUS_NONE = 0;
- /**
- * 鍑哄簱鐘舵�� - 閮ㄥ垎
- */
- public static final Integer OUT_STATUS_PART = 1;
- /**
- * 鍑哄簱鐘舵�� - 鍏ㄩ儴
- */
- public static final Integer OUT_STATUS_ALL = 2;
-
- /**
- * 閫�璐х姸鎬� - 鏃�
- */
- public static final Integer RETURN_STATUS_NONE = 0;
- /**
- * 閫�璐х姸鎬� - 閮ㄥ垎
- */
- public static final Integer RETURN_STATUS_PART = 1;
- /**
- * 閫�璐х姸鎬� - 鍏ㄩ儴
- */
- public static final Integer RETURN_STATUS_ALL = 2;
-
@Schema(description = "閿�鍞崟缂栧彿", example = "XS001")
private String no;
+
+ @Schema(description = "寮�鍗曠被鍨嬶細1 浠ｅ寮�鍗� 2 绐楀彛寮�鍗� 3 澶栧涓嬪崟")
+ private Integer saleType;
@Schema(description = "瀹㈡埛缂栧彿", example = "1724")
private Long customerId;
@@ -59,22 +37,22 @@
@Schema(description = "閿�鍞姸鎬�", example = "2")
private Integer status;
+ @Schema(description = "閿�鍞姸鎬侀泦鍚堬紙椤甸潰椤电锛氬緟瀹℃牳 / 宸插鏍革級", example = "[0,15,35]")
+ private List<Integer> statuses;
+
+ @Schema(description = "鍑哄簱鐘舵��", example = "3")
+ private Integer outStatus;
+
+ @Schema(description = "鐢熶骇鐘舵��", example = "0")
+ private Integer productionStatus;
+
+ @Schema(description = "鏄惁闇�瑕佺敓浜�", example = "1")
+ private Integer needProduction;
+
@Schema(description = "鍒涘缓鑰�")
private String creator;
@Schema(description = "浜у搧缂栧彿", example = "1")
private Long productId;
-
- @Schema(description = "鍑哄簱鐘舵��", example = "2")
- private Integer outStatus;
-
- @Schema(description = "閫�璐х姸鎬�", example = "2")
- private Integer returnStatus;
-
- @Schema(description = "鏄惁鍙嚭搴�", example = "true")
- private Boolean outEnable;
-
- @Schema(description = "鏄惁鍙��璐�", example = "true")
- private Boolean returnEnable;
}
\ No newline at end of file
--
Gitblit v1.9.3