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

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java

@@ -1,38 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description : ANDON_动作
- * @Reference :
- * @Author : hansen.ke
- * @CreateDate : 2019-05-13 9:47
- * @Modify:
- **/
-@Data
-@Entity
-@Table(name="ANDON_ACTION")
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Api("ANDON_动作")
-public class AndonAction extends BaseBean {
-
-    @Column(name = "ACTION_CODE")
-    @ApiParam(value = "动作代码")
-    private String actionCode;
-
-    @Column(name = "ACTION_NAME")
-    @ApiParam(value = "动作名称")
-    private String actionName;
-}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java

@@ -28,19 +28,21 @@ import javax.persistence.Table;
 @Api("ANDON_呼叫原因")
 public class AndonAlarmCause extends BaseBean {
 
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
     @Column(name = "AC_CODE")
     @ApiParam(value = "呼叫原因代码")
     private String acCode;
 
+    @Column(name = "PARENT_AC_CODE")
+    @ApiParam(value = "父阶原因代码")
+    private String parentAcCode;
+
     @Column(name = "AC_NAME")
     @ApiParam(value = "呼叫原因描述")
     private String acName;
 
-    @Column(name = "PARENT_AC_CODE")
-    @ApiParam(value = "父阶原因代码")
-    private String parentAcCode;
 
-    @Column(name = "ALARM_CODE")
-    @ApiParam(value = "安灯类型")
-    private String alarmCode;
 }

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java

@@ -1,38 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description : 安灯类型
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2019-05-10 17:16
- * @Modify:
- **/
-@Data
-@Entity
-@Table(name="ANDON_ALARM_TYPE")
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Api("安灯类型")
-public class AndonAlarmType extends BaseBean {
-
-    @Column(name = "ALARM_CODE")
-    @ApiParam(value = "安灯类型代码")
-    private String alarmCode;
-
-    @Column(name = "ALARM_NAME")
-    @ApiParam(value = "安灯类型名称")
-    private String alarmName;
-}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java

@@ -1,38 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description : ANDON_重要度
- * @Reference :
- * @Author : siliter.yuan
- * @CreateDate : 2019-05-31 9:47
- * @Modify:
- **/
-@Data
-@Entity
-@Table(name="ANDON_IMPORTANCE")
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Api("ANDON_事件现象")
-public class AndonImportance extends BaseBean {
-
-    @Column(name = "IMPORTANCE_CODE")
-    @ApiParam(value = "重要等级代码")
-    private String importanceCode;
-
-    @Column(name = "IMPORTANCE_NAME")
-    @ApiParam(value = "重要等级名称")
-    private String importanceName;
-}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -274,6 +274,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "安灯子类型代码")
     private String alarmDetailCode;
 
+    @Column(name = "ALARM_DETAIL_NAME_RDD")
+    @ApiParam(value = "安灯子类型名称")
+    private String alarmDetailNameRdd;
+
     @Column(name = "EPM_CODE")
     @ApiParam(value = "事件现象代码")
     private String epmCode;

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java

@@ -1,38 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description : 安灯通知方式
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2019-05-10 17:16
- * @Modify:
- **/
-@Data
-@Entity
-@Table(name="ANDON_RESPONSE")
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Api("安灯通知方式")
-public class AndonResponse extends BaseBean {
-
-    @Column(name = "RESPONSE_CODE")
-    @ApiParam(value = "通知方式代码")
-    private String responseCode;
-
-    @Column(name = "RESPONSE_NAME")
-    @ApiParam(value = "通知方式名称")
-    private String responseName;
-}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java

@@ -1,38 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description : 安灯状态
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2019-05-10 17:16
- * @Modify:
- **/
-@Data
-@Entity
-@Table(name="ANDON_STATUS")
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Api("安灯状态")
-public class AndonStatus extends BaseBean {
-
-    @Column(name = "STATUS_CODE")
-    @ApiParam(value = "状态代码")
-    private String statusCode;
-
-    @Column(name = "STATUS_NAME")
-    @ApiParam(value = "状态名称")
-    private String statusName;
-}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java

@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.repository;
-
-import cn.estsh.i3plus.pojo.andon.bean.AndonAction;
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description : 对象持久层仓用方法控制（ANDON_动作）
- * @Reference :
- * @Author : hansen.ke
- * @CreateDate : 2019-05-13 11:05
- * @Modify:
- **/
-@Repository
-public interface IAndonActionRepository extends BaseRepository<AndonAction, Long> {
-}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java

@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.repository;
-
-import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description :对象持久层仓用方法控制(安灯类型信息)
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2019-05-10 17:27
- * @Modify:
- **/
-@Repository
-public interface IAndonAlarmTypeRepository extends BaseRepository<AndonAlarmType,Long> {
-}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java

@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.repository;
-
-import cn.estsh.i3plus.pojo.andon.bean.AndonImportance;
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description : 对象持久层仓用方法控制（ANDON_重要度）
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2019-05-31 11:05
- * @Modify:
- **/
-@Repository
-public interface IAndonImportanceRepository extends BaseRepository<AndonImportance, Long> {
-}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java

@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.repository;
-
-import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description :对象持久层仓用方法控制(安灯通知方式信息)
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2019-05-10 17:27
- * @Modify:
- **/
-@Repository
-public interface IAndonResponseRepository extends BaseRepository<AndonResponse,Long> {
-}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java

@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.repository;
-
-import cn.estsh.i3plus.pojo.andon.bean.AndonStatus;
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description :对象持久层仓用方法控制(安灯状态信息)
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2019-05-10 17:27
- * @Modify:
- **/
-@Repository
-public interface IAndonStatusRepository extends BaseRepository<AndonStatus,Long> {
-}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -401,45 +401,19 @@ public class AndonHqlPack {
 
         return result;
     }
-
+//
-    /**
+//    /**
-     * 安灯类型查询条件封装
+//     * 安灯类型查询条件封装
-     * @param andonAlarmType
+//     * @param andonAlarmType
-     * @return
+//     * @return
-     */
+//     */
-    public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
+//    public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
-        DdlPackBean result = new DdlPackBean();
+//        DdlPackBean result = new DdlPackBean();
-
+//
-        getStringBuilderPack(andonAlarmType, result);
+//        getStringBuilderPack(andonAlarmType, result);
-
+//
-        return result;
+//        return result;
-    }
+//    }
-
-    /**
-     * 安灯状态查询条件封装
-     * @param andonStatus
-     * @return
-     */
-    public static DdlPackBean packAndonStatus(AndonStatus andonStatus) {
-        DdlPackBean result = new DdlPackBean();
-
-        getStringBuilderPack(andonStatus, result);
-
-        return result;
-    }
-
-    /**
-     * ANDON通知方式查询条件封装
-     * @param andonResponse
-     * @return
-     */
-    public static DdlPackBean packAndonResponse(AndonResponse andonResponse){
-        DdlPackBean result = new DdlPackBean();
-
-        getStringBuilderPack(andonResponse, result);
-
-        return result;
-    }
 
     /**
      * ANDON通知对象查询条件封装
@@ -450,7 +424,7 @@ public class AndonHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result);
         DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result);
-        DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
+        DdlPreparedPack.getStringLikerPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
 
         getStringBuilderPack(andonResponseObject, result);
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java

@@ -90,15 +90,14 @@ public class AndonEnumUtil {
      * 10-是，20-否
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum IS_ALARM_STATUS{
+    public enum ALARM_STATUS {
-
         YES(10,"需要按灯"),
         ON(20,"不需要按灯");
 
         private int value;
         private String description;
 
-        IS_ALARM_STATUS(int value, String description) {
+        ALARM_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -128,7 +127,6 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_BUSI_FLAG{
-
         ALARM_FLAG("10","安灯呼叫标识"),
         USER_CODE("20","用户工号"),
         READ_FLAG("30", "安灯读取状态"),
@@ -158,8 +156,7 @@ public class AndonEnumUtil {
      * 1-呼叫，2-签到，3-解决
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ALARM_FLAG{
+    public enum ANDON_ACTION_TAG {
-
         CALL(1,"10","呼叫"),
         SIGN(2,"20","响应"),
         RESOLVE(3,"30","解决"),
@@ -171,7 +168,7 @@ public class AndonEnumUtil {
         private String code;
         private String description;
 
-        ALARM_FLAG(int value,String code, String description) {
+        ANDON_ACTION_TAG(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -198,37 +195,7 @@ public class AndonEnumUtil {
         }
     }
 
-    /**
-     * 按灯动作标志
-     * 10 = 呼叫，20 = 签到，30 = 解决，40 = 撤销，50 = 提交，60 = 审批，70 = 转呼
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ANDON_ACTION_FLAG{
-
-        CALL_ACTION("10","呼叫动作"),
-        SIGN_ACTION("20","签到动作"),
-        RESOLVE_ACTION("30", "解决动作"),
-        CANCEL_ACTION("40", "撤销动作"),
-        COMMIT_ACTION("50","提交动作"),
-        PASS_ACTION("60","审批动作"),
-        SHIFG_CALL_ACTION("70", "转呼动作");
 
-        private String value;
-        private String description;
-
-        ANDON_ACTION_FLAG(String value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-    }
 
     /**
      * 优先级别
@@ -236,7 +203,6 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_PRIORITY{
-
         FIRST(10,"一级"),
         SECOND(20,"二级"),
         THIRD(30,"三级");
@@ -268,52 +234,14 @@ public class AndonEnumUtil {
         }
     }
 
-    /**
-     * 通知级别
-     * 10 - 一级，20 - 二级，30 - 三级，40 - 四级
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum NOTICE_LEVEL{
-
-        FIRST(10,"一级"),
-        SECOND(20,"二级"),
-        THIRD(30,"三级"),
-        FOUTH(40,"四级");
-
-        private int value;
-        private String description;
-
-        NOTICE_LEVEL(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
 
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
 
 
     /**
      * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ALARM_CODE{
+    public enum ALARM_TYPE {
-
         PART("PART_ALARM","物料"),
         QUALITY("QUALITY_ALARM","质量"),
         EQUIP("EQUMENT_ALARM","设备"),
@@ -323,7 +251,7 @@ public class AndonEnumUtil {
         private String value;
         private String description;
 
-        ALARM_CODE(String value, String description) {
+        ALARM_TYPE(String value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -352,7 +280,6 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PROD_ORG_LEVEL{
-
         LEVEL_ONE(1,"一级目录"),
         LEVEL_TWO(2,"二级目录"),
         LEVEL_THREE(3,"三级目录"),
@@ -391,7 +318,6 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOP_LINE_FLAG{
-
         STOP("1","停止产线"),
         RESTART("0","启动产线");
 
@@ -417,15 +343,91 @@ public class AndonEnumUtil {
      * 10-短信，20-邮箱
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum NOTICE_WAYS{
+    public enum NOTICE_MESSAGE_SEND_TYPE {
-
         SMS("10","短信"),
         EMAIL("20","邮箱");
 
         private String value;
         private String description;
 
-        NOTICE_WAYS(String value, String description) {
+        NOTICE_MESSAGE_SEND_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 通知级别
+     * 10 - 一级，20 - 二级，30 - 三级，40 - 四级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NOTICE_MESSAGE_SEND_LEVEL {
+        FIRST(10,"一级"),
+        SECOND(20,"二级"),
+        THIRD(30,"三级"),
+        FOUTH(40,"四级");
+
+        private int value;
+        private String description;
+
+        NOTICE_MESSAGE_SEND_LEVEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 安灯动作
+     * <per>
+     *     <br/> 10 = 呼叫
+     *     <br/> 20 = 签到
+     *     <br/> 30 = 解决
+     *     <br/> 40 = 撤销
+     *     <br/> 50 = 提交
+     *     <br/> 60 = 审批
+     *     <br/> 70 = 转呼
+     * </per>
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_ACTION_FLAG{
+        CALL_ACTION("10","呼叫动作"),
+        SIGN_ACTION("20","签到动作"),
+        RESOLVE_ACTION("30", "解决动作"),
+        CANCEL_ACTION("40", "撤销动作"),
+        COMMIT_ACTION("50","提交动作"),
+        PASS_ACTION("60","审批动作"),
+        SHIFG_CALL_ACTION("70", "转呼动作");
+
+        private String value;
+        private String description;
+
+        ANDON_ACTION_FLAG(String value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -438,4 +440,5 @@ public class AndonEnumUtil {
             return description;
         }
     }
+
 }

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,6 +29,7 @@ public class MappingItem {
     public String destName;
     /**
      * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确
+     * 可以使用的表达式： #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

@@ -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;
+    public String srcWhere;
     /**
      * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔
-     * 例如：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;
     /**
      * 按照组织代码(半角逗号分隔)复制多份到业务表（用于物料、供应商、客户...等集团数据）

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