修改测试环境数据库编码

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.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 : 2018-11-22 9:33
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ACTION_STEP")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="作业步骤信息",description = "作业步骤信息")
+public class WmsActionStep extends BaseBean {
+
+    @Column(name = "AS_NAME_E")
+    @ApiParam(value = "英文类型名称")
+    private String asNameE;
+
+    @Column(name = "AS_DESC_E")
+    @ApiParam(value = "英文类型描述")
+    private String asDescE;
+
+    @Column(name = "AS_NAME_C")
+    @ApiParam(value = "中文类型名称")
+    private String asNameC;
+
+    @Column(name = "AS_DESC_C")
+    @ApiParam(value = "中文类型描述")
+    private String asDescC;
+
+    @Column(name = "AT_NAME_C_RDD")
+    @ApiParam(value = "步骤类型名称")
+    private String atNameCRdd;
+
+    @Column(name = "AT_ID")
+    @ApiParam(value = "步骤类型编号")
+    private String atId;
+}

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

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.wms.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 : 2018-11-22 9:33
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ACTION_TYPE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="作业步骤类型信息",description = "作业步骤类型信息")
+public class WmsActionStepType extends BaseBean {
+
+    @Column(name = "AT_NAME_E")
+    @ApiParam(value = "英文类型名称")
+    private String atNameE;
+
+    @Column(name = "AT_DESC_E")
+    @ApiParam(value = "英文类型描述")
+    private String atDescE;
+
+    @Column(name = "AT_NAME_C")
+    @ApiParam(value = "中文类型名称")
+    private String atNameC;
+
+    @Column(name = "AT_DESC_C")
+    @ApiParam(value = "中文类型描述")
+    private String atDescC;
+
+    @Column(name = "FUN_CALL_NAME")
+    @ApiParam(value = "方法调用名称")
+    private String funCallName;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业步骤操作类
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-22 11:25
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionStepRepository extends BaseRepository<WmsActionStep, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepType;
+import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业步骤类型操作类
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-22 11:25
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionStepTypeRepository extends BaseRepository<WmsActionStepType, Long> {
+}

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

@@ -987,4 +987,38 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 作业步骤类型表信息查询
+     *
+     * @param wmsActionStepType
+     * @return
+     */
+    public static String packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result);
+
+        getStringBuilderPack(wmsActionStepType, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 作业步骤信息查询
+     *
+     * @param wmsActionStep
+     * @return
+     */
+    public static String packHqlWmsActionStep(WmsActionStep wmsActionStep) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result);
+
+        getStringBuilderPack(wmsActionStep, result);
+
+        return result.toString();
+    }
 }