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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java

@@ -61,8 +61,4 @@ public class WmsTransType extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long tmId;
 
-    @Column(name = "OP_TYPE_ID")
-    @ApiParam(value = "作业类型编号", example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long opTypeId;
 }

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

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

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.wms.dbinterface;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 回写接口库的值
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UpdateSyncItem {
+
+    /**
+     * 字段名
+     */
+    public String columnName;
+
+    /**
+     * 写入的值
+     * 支持表达式
+     * #sap_date, #sap_time, #guid
+     */
+    public String updateValue;
+}

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

@@ -55,7 +55,7 @@ public class WmsInterfaceDataMapper extends BaseBean {
      * 来源表的查询条件
      */
     @Column(name = "SRC_WHERE", length = 255)
-    public String scrWhere;
+    public String srcWhere;
     /**
      * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔
      * 例如：SYNFLG=Y,SYNDATE={#XX}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1173,8 +1173,8 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result);
         DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result);
-
+        DdlPreparedPack.getNumEqualPack(wmsActionStepType.getIsValid(), "isValid", result);
-        getStringBuilderPack(wmsActionStepType, result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
         return result;
     }