Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.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 : dragon.xu
+* @CreateDate : 2018-11-22 16:53
+* @Modify:
+**/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_MODULE")
+@Api("作业步骤处理组")
+public class WmsActionModule extends BaseBean {
+
+    @Column(name="AM_NAME")
+    @ApiParam("组件名称")
+    public String amName;
+
+    @Column(name="AM_DESC")
+    @ApiParam("组件描述")
+    public String amDesc;
+
+    @Column(name="CALL_CLASS")
+    @ApiParam("实现类")
+    public String callClass;
+
+    @Column(name="CALL_FUN")
+    @ApiParam("调用方法")
+    public String callFun;
+
+    @Column(name="AM_TYPE")
+    @ApiParam(value = "组件类型", example = "0")
+    public Integer amType;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.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 : dragon.xu
+* @CreateDate : 2018-11-22 16:53
+* @Modify:
+**/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_MODULE_PARAM")
+@Api("作业步骤处理组参数")
+public class WmsActionModuleParam extends BaseBean {
+
+    @Column(name="AM_ID")
+    @ApiParam("组件ID")
+    public Long amID;
+
+    @Column(name="PARAM_CODE")
+    @ApiParam("参数编码")
+    public String paramCode;
+
+    @Column(name="PARAM_NAME")
+    @ApiParam("参数名称")
+    public String paramName;
+
+    @Column(name="PARAM_VALUE_LIST")
+    @ApiParam("参数可选值列表")
+    public String paramValueList;
+
+    @Column(name="PARAM_TYPE")
+    @ApiParam(value = "参数类型", example = "0")
+    public Integer paramType;
+}

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

@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -29,7 +32,8 @@ import javax.persistence.Table;
 public class WmsActionStepCall extends BaseBean {
 
     @Column(name="AS_ID")
-    @ApiParam("作业步骤ID")
+    @ApiParam(value = "作业步骤ID",example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     public Long asId;
 
     @Column(name="SEQ")
@@ -37,6 +41,13 @@ public class WmsActionStepCall extends BaseBean {
     public Integer seq;
 
     @Column(name="AM_ID")
-    @ApiParam("处理组件ID")
+    @ApiParam(value = "处理组件ID",example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     public Long amId;
+
+    @ApiParam(value = "组件名称")
+    public transient String amName;
+
+    @ApiParam(value = "组件描述")
+    public transient String amDesc;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.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.WmsActionModuleParam;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 作业步骤处理组件参数
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-22 17:01
+* @Modify:
+**/
+@Repository
+public interface WmsActionModuleParamRepository extends BaseRepository<WmsActionModuleParam, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule;
+import org.springframework.stereotype.Repository;
+/**
+* @Description : 作业步骤处理组件
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-22 17:01
+* @Modify:
+**/
+@Repository
+public interface WmsActionModuleRepository extends BaseRepository<WmsActionModule, Long> {
+}

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

@@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
 
 /**
  * @Description : 作业步骤调用信息
@@ -11,4 +15,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall;
  * @Modify:
  **/
 public interface WmsActionStepCallRepository extends BaseRepository<WmsActionStepCall, Long> {
+
+    @Query("from WmsActionStepCall was, WmsActionStep wass where was.amId = wass.id ")
+    List<WmsActionStepCall> findWmsActionStepCallByAmid(@Param("id") long id);
+
 }