From eccad5a129106377a275be4f7cdc58e99e9b95d4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 七月 2026 13:45:14 +0800
Subject: [PATCH] feat(mes): 实现库存移库功能
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
index b1374e8..f545a7b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
@@ -33,6 +33,12 @@
@ExcelProperty("瀹㈡埛鍚嶇О")
private String customerName;
+ @Schema(description = "鍏宠仈鍚堝悓缂栧彿", example = "1")
+ private Long contractId;
+ @Schema(description = "鍚堝悓鍗曞彿", example = "HT001")
+ @ExcelProperty("鍚堝悓鍗曞彿")
+ private String contractNo;
+
@Schema(description = "缁撶畻璐︽埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "311.89")
@ExcelProperty("缁撶畻璐︽埛缂栧彿")
private Long accountId;
@@ -92,13 +98,30 @@
// ========== 閿�鍞嚭搴� ==========
- @Schema(description = "閿�鍞嚭搴撴暟閲�", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ @Schema(description = "閿�鍞嚭搴撴暟閲�", example = "100.00")
private BigDecimal outCount;
- // ========== 閿�鍞��璐э紙鍑哄簱锛夛級 ==========
+ @Schema(description = "鍑哄簱鐘舵��", example = "0")
+ private Integer outStatus;
- @Schema(description = "閿�鍞��璐ф暟閲�", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
- private BigDecimal returnCount;
+ // ========== 鍙戣揣閫氱煡 ==========
+
+ @Schema(description = "鏄惁宸茬敓鎴愬彂璐ч�氱煡鍗�", example = "false")
+ private Boolean hasSalesNotice;
+
+ @Schema(description = "鏄惁鍙互鐢熸垚鍙戣揣閫氱煡鍗曪紙鏈夐渶瑕佺敓浜т笖鏈畬鎴愮殑鏄庣粏鏃朵负 false锛�", example = "true")
+ private Boolean canCreateSalesNotice;
+
+ @Schema(description = "鏄惁鏈夐渶瑕佺敓浜х殑鏄庣粏锛�0=鍚� 1=鏄級", example = "1")
+ private Integer needProduction;
+
+ // ========== 鐢熶骇鍏宠仈 ==========
+
+ @Schema(description = "鐢熶骇鐘舵�侊細0-鏈畬鎴愶紝1-宸插畬鎴�", example = "1")
+ private Integer productionStatus;
+
+ @Schema(description = "鐢熶骇瀹屾垚鏃堕棿")
+ private LocalDateTime productionFinishTime;
@Data
public static class Item {
@@ -130,13 +153,16 @@
// ========== 閿�鍞嚭搴� ==========
- @Schema(description = "閿�鍞嚭搴撴暟閲�", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ @Schema(description = "閿�鍞嚭搴撴暟閲�", example = "100.00")
private BigDecimal outCount;
- // ========== 閿�鍞��璐э紙鍏ュ簱锛夛級 ==========
+ // ========== 鐢熶骇鍏宠仈 ==========
- @Schema(description = "閿�鍞��璐ф暟閲�", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
- private BigDecimal returnCount;
+ @Schema(description = "鏄惁闇�瑕佺敓浜э紙0=鍚� 1=鏄級", example = "1")
+ private Integer needProduction;
+
+ @Schema(description = "鍏宠仈鐨� MPS 缂栧彿", example = "1024")
+ private Long mpsId;
// ========== 鍏宠仈瀛楁 ==========
@@ -148,8 +174,8 @@
private String productUnitName;
@Schema(description = "搴撳瓨鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
- private BigDecimal stockCount; // 璇ュ瓧娈典粎浠呭湪鈥滆鎯呪�濆拰鈥滅紪杈戔�濇椂浣跨敤
+ private BigDecimal stockCount; // 璇ュ瓧娈典粎浠呭湪璇︽儏鍜岀紪杈戞椂浣跨敤
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3