From d6c9307412ed55f3509d20cdb13c6a6602f2d89b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 16 十一月 2026 09:06:07 +0800
Subject: [PATCH] feat(erp): 销售订单提交即生效,不再走 BPM 审批

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java |   57 +++++++++++++++++++--------------------------------------
 1 files changed, 19 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..c1df63f 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,41 +17,25 @@
 @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 = "瀹㈡埛缂栧彿", example = "1724")
     private Long customerId;
 
+    @Schema(description = "鍚堝悓鍙�", example = "HT001")
+    private String contractNo;
+
+    @Schema(description = "閿�鍞被鍨嬶細1鍐呴攢 2澶栭攢 3鏍峰搧 4鍏朵粬", example = "1")
+    private Integer saleType;
+
     @Schema(description = "涓嬪崟鏃堕棿")
     @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;
@@ -59,22 +43,19 @@
     @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