From 9fefeffdb76042822420003f18fc91d63b2b415f Mon Sep 17 00:00:00 2001
From: jimmy <1622218722@qq.com>
Date: Thu, 22 Nov 2018 18:04:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java  | 15 +++++++++++++--
 .../pojo/wms/repository/WmsActionStepCallRepository.java  |  8 ++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java
index 7b9f906..942e6a8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java
index 1a6a5c0..6987eb6 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java
+++ b/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);
+
 }