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);