From ed415e534fa90ef7e159ac8166566d89455ec634 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 14 Sep 2024 17:09:24 +0800
Subject: [PATCH] =?UTF-8?q?9/11=20=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=B6=E8=B4=A7=E6=96=B9=E9=80=81=E8=B4=A7?=
 =?UTF-8?q?=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/basic/SysWorkplaceDocumentEntity.java  | 15 +++++++++++++++
 .../res/basic/SysWorkplaceDocumentResponse.java   |  2 ++
 src/main/resources/schemas/schema_v2.4.sql        |  6 ++++++
 3 files changed, 23 insertions(+)

diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
index 0d4f99dfa..eca3e5f1e 100644
--- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java
@@ -176,5 +176,20 @@ public class SysWorkplaceDocumentEntity {
     //工位编码
     @TableField(exist = false)
     private Long workplaceCode;
+
+
+    /**
+     * 发货方1:原始单据的发货方 2:原始单据的收货方 3:用户所属仓库
+     */
+    @TableField(value = "shipper")
+    private Integer shipper;
+
+    /**
+     * 收货方1:原始单据的收货方 2:原始单据的发货方 3:供应商,4:客户,5:特殊往来,6:内部科室,7填写
+     */
+    @TableField(value = "consignee")
+    private Integer consignee;
+
+
 }
 
diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java
index e3e16ffa7..dcacbc9a5 100644
--- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java
@@ -138,6 +138,8 @@ public class SysWorkplaceDocumentResponse {
     private Integer orderFinishVerify;
     private Integer number;
     private Integer isPopular;
+    private Integer shipper;
+    private Integer consignee;
 
 
     public String getThrBusName() {
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 493c5bd3a..5f29014a0 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4406,3 +4406,9 @@ CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'shipperName',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''',
                          1);
 
+CALL Pro_Temp_ColumnWork('sys_workplace_document', 'shipper',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''发货方1:原始单据的发货方 2:原始单据的收货方 3:用户所属仓库''',
+                         1);
+CALL Pro_Temp_ColumnWork('sys_workplace_document', 'consignee',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''收货方1:原始单据的收货方 2:原始单据的发货方 3:供应商,4:客户,5:特殊往来,6:内部科室,7填写''',
+                         1);