From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java | 51 +++++++++++++--------------------------------------
1 files changed, 13 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..ddaefc8 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
@@ -17,32 +17,6 @@
@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;
@@ -53,28 +27,29 @@
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] orderTime;
+ @Schema(description = "鏀舵鏃ユ湡")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] receiptDate;
+
@Schema(description = "澶囨敞", example = "浣犵寽")
private String remark;
@Schema(description = "閿�鍞姸鎬�", example = "2")
private Integer status;
+ @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