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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java

@@ -29,6 +29,7 @@ public class MappingItem {
     public String destName;
     /**
      * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确
+     * 默认值中可以使用的动态变量： #sap_date, #sap_time, #date, #time, #guid
      */
     public Object defaultValue;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -39,33 +39,34 @@ public class WmsInterfaceDataMapper extends BaseBean {
     /**
      * 接口数据源编号（在动态表单中配置）
      */
-    @Column(name = "SCR_DATA_SOURCE", length = 50)
+    @Column(name = "SRC_DATA_SOURCE", length = 50)
     public String dataSource;
     /**
      * 来源表名
      */
-    @Column(name = "SCR_TABLE_NAME", length = 50)
+    @Column(name = "SRC_TABLE_NAME", length = 50)
     public String srcTableName;
     /**
      * 来源表的排序条件
      */
-    @Column(name = "SCR_ORDER_BY", length = 50)
+    @Column(name = "SRC_ORDER_BY", length = 50)
     public String srcOrderBy;
     /**
      * 来源表的查询条件
      */
-    @Column(name = "SCR_WHERE", length = 255)
+    @Column(name = "SRC_WHERE", length = 255)
     public String scrWhere;
     /**
      * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔
-     * 例如：SYNFLG=Y,SYNDATE={Date}
+     * 例如：SYNFLG=Y,SYNDATE={#XX}
+     * 可以使用的动态变量： #sap_date, #sap_time, #date, #time, #guid
      */
-    @Column(name = "SCR_UPDATE_SYNC", length = 255)
+    @Column(name = "SRC_UPDATE_SYNC", length = 255)
     public String srcUpdateSync;
     /**
      * 业务表单的主键，多个主键用半角逗号分隔
      */
-    @Column(name = "SCR_PK_COLUMNS", length = 255)
+    @Column(name = "SRC_PK_COLUMNS", length = 255)
     public String srcPkColumns;
     /**
      * 按照组织代码(半角逗号分隔)复制多份到业务表（用于物料、供应商、客户...等集团数据）