From 805ada2d1fcde007a283666ed4f034f3ba55eb01 Mon Sep 17 00:00:00 2001
From: "gragon.xu" <gragon.xu@estsh.com>
Date: Mon, 3 Dec 2018 09:05:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6create?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 8 +++++++-
 .../pojo/wms/repository/WmsActionStepCallParamRepository.java     | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
index 52bdb57..779e1b5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -38,7 +40,7 @@ public class WmsActionResponseBean {
     public List<String> informations;
 
     @ApiParam("可选项")
-    public List<String> options;
+    public Map<String,Boolean> options;
 
     @ApiParam("选中的明细数据")
     public List<Map<String, Object>> details;
@@ -46,6 +48,10 @@ public class WmsActionResponseBean {
     @ApiParam(value = "结果代码")
     public Boolean codeStatus;
 
+    @ApiParam(value = "作业任务编号", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long alId;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java
index b7c78a7..f3cacaf 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java
@@ -1,10 +1,13 @@
 package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData;
 import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @Description :
  * @Reference :
@@ -14,4 +17,6 @@ import org.springframework.stereotype.Repository;
  **/
 @Repository
 public interface WmsActionStepCallParamRepository extends BaseRepository<WmsActionStepCallParam, Long> {
+    @Query("select ascp from wms_action_step_call_param ascp inner join  wms_action_group_details agd on ascp.agdId=agd.id where agd.agId =: agId")
+    List<WmsActionStepCallParam> queryWmsActionStepCallParamsByAgId(@Param("agId") Long agId);
 }