From 0fdd0bf60b7d98d21c9b5ff95bb55f0fa6495007 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 14:20:03 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
index 83b8634..dea60a2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
@@ -13,7 +13,7 @@
/**
* ERP 閿�鍞鍗� DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@TableName(value = "erp_sale_order")
@KeySequence("erp_sale_order_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
@@ -106,31 +106,34 @@
private BigDecimal depositPrice;
/**
- * 闄勪欢鍦板潃
- */
- private String fileUrl;
- /**
* 澶囨敞
*/
private String remark;
// ========== 閿�鍞嚭搴� ==========
+
/**
* 閿�鍞嚭搴撴暟閲�
*/
private BigDecimal outCount;
- // ========== 閿�鍞��璐э紙鍏ュ簱锛夛級 ==========
- /**
- * 閿�鍞��璐ф暟閲�
- */
- private BigDecimal returnCount;
-
/**
* 鍑哄簱鐘舵��
*
- * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpSaleOrderOutStatusEnum}
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum}
*/
private Integer outStatus;
+ // ========== 鐢熶骇鍏宠仈 ==========
+
+ /**
+ * 鐢熶骇鐘舵�侊細0-鏈畬鎴愶紝1-宸插畬鎴�
+ */
+ private Integer productionStatus;
+
+ /**
+ * 鐢熶骇瀹屾垚鏃堕棿
+ */
+ private LocalDateTime productionFinishTime;
+
}
\ No newline at end of file
--
Gitblit v1.9.3