Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

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

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

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''',