From 296a094765f656a5520505363371e7f9e62d8f7d Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 8 Nov 2024 16:16:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=9E=E4=BC=A0=E5=8F=82=E6=95=B0=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E3=80=81=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86card?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inv/InvPreinOrderController.java | 1 + .../api/entity/basic/SysWorkplaceDocumentEntity.java | 10 ++++++++++ .../api/res/basic/SysWorkplaceDocumentResponse.java | 11 +++++++++++ .../service/forthird/impl/ForThirdSysApiService.java | 1 + src/main/resources/schemas/schema_v2.4.sql | 9 +++++++++ 5 files changed, 32 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java index a15058644..8a1a77732 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java @@ -19,6 +19,7 @@ import com.glxp.api.res.inv.InvPreinDetailResponse; import com.glxp.api.res.inv.InvPreinOrderResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinOrderService; 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 0b9615ddf..96468234e 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java @@ -197,5 +197,15 @@ public class SysWorkplaceDocumentEntity { private Integer inAndOutType; + /** + * 回传系统 0:内部 1:外部 + */ + @TableField(value = "uploadIsMatching") + private Integer uploadIsMatching; + + + //回传单据编码 + @TableField(value = "uploadDocumentTypeCode") + private String uploadDocumentTypeCode; } 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 fae0172e8..8f2b1822f 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java @@ -153,4 +153,15 @@ public class SysWorkplaceDocumentResponse { } return thrBusName; } + + /** + * 回传系统 0:内部 1:外部 + */ + @TableField(value = "uploadIsMatching") + private Integer uploadIsMatching; + + + //回传单据编码 + @TableField(value = "uploadDocumentTypeCode") + private String uploadDocumentTypeCode; } diff --git a/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java b/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java index 6900d80a2..d496e3a3a 100644 --- a/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java +++ b/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java @@ -33,6 +33,7 @@ import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.UdiRlSupService; import com.glxp.api.service.inout.IoAddInoutService; import com.glxp.api.service.inout.IoCheckInoutService; +import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductService; diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index d398d8cbf..1052adb32 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4693,6 +4693,15 @@ CALL Pro_Temp_ColumnWork('io_code_temp', 'parentCode', 1); +CALL Pro_Temp_ColumnWork('sys_workplace_document', 'uploadIsMatching', + 'int NULL DEFAULT null COMMENT ''回传系统 0:内部 1:外部''', + 1); + +CALL Pro_Temp_ColumnWork('sys_workplace_document', 'uploadDocumentTypeCode', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''回传单据编码''', + 1); + + CALL Pro_Temp_ColumnWork('rel_code_batch', 'erpId', ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''供应商ID''',