From 38fb1c8ce501375f4abcdd14ad2ad56f2ea81be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Wed, 22 Apr 2026 16:52:40 +0800
Subject: [PATCH] =?UTF-8?q?oms=E6=8E=A8=E9=80=81wms=E5=8A=A0=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=B8=81=E7=A7=8D=E4=B8=9A=E5=8A=A1=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mhd/system/api/domain/StockInOrder.java  | 6 ++++++
 .../main/java/com/mhd/system/api/domain/StockOutOrder.java | 7 +++++++
 sql/wkx.sql                                                | 6 +++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockInOrder.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockInOrder.java
index f022e8c30..062b19092 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockInOrder.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockInOrder.java
@@ -356,4 +356,10 @@ public class StockInOrder extends BaseVOEntity {
     @ApiModelProperty("oms入库单id")
     @Excel(name = "oms入库单id")
     private String omsStockInOrderId;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }
\ No newline at end of file
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java
index 857e1387c..f1c0d57ed 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java
@@ -395,4 +395,11 @@ public class StockOutOrder extends BaseVOEntity {
     @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date documentDate;
 
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
+
 }
\ No newline at end of file
diff --git a/sql/wkx.sql b/sql/wkx.sql
index e24502278..30729b2bd 100644
--- a/sql/wkx.sql
+++ b/sql/wkx.sql
@@ -457,4 +457,8 @@ COMMENT ON TABLE "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD" IS '
 -- ----------------------------
 -- Primary Key structure for table RESERVATION_INVENTORY_ADJUSTMENT_RECORD
 -- ----------------------------
-ALTER TABLE "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD" ADD PRIMARY KEY ("INVENTORY_ADJUSTMENT_ID");
\ No newline at end of file
+ALTER TABLE "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD" ADD PRIMARY KEY ("INVENTORY_ADJUSTMENT_ID");
+
+ALTER TABLE "NGWL_TEST_OMS"."RESERVATION_STOCK_IN_ORDER" ADD COLUMN "IN_QUANTITY" DECIMAL(20,2) DEFAULT 0.;
+
+COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_STOCK_IN_ORDER"."IN_QUANTITY" IS '计划数量';
\ No newline at end of file