From aed953a03e02890d9f6f67d22ecc4f97f51e6fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= <rock.yu@qq.com>
Date: Mon, 24 Jun 2019 16:08:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=20FIFO=20=E6=8E=A8=E8=8D=90=E6=97=B6?=
 =?UTF-8?q?=E8=A6=81=E5=8A=A0=E4=B8=8A=20sn=5Fstatus=20=3D=2040=20?=
 =?UTF-8?q?=E7=9A=84=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java
index 80ccc6e..2bb7afa 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java
@@ -30,7 +30,7 @@ public interface WmsStockSnRepository extends BaseRepository<WmsStockSn, Long> {
      */
     @Query(value = "from WmsStockSn " +
             "where organizeCode=?1 " +
-            "and zoneNo=?2 and partNo=?3 and isValid=?4 and isDeleted=?5 " +
+            "and zoneNo=?2 and partNo=?3 and isValid=?4 and isDeleted=?5 and snStatus=40 " +
             "order by fixLotNo, dateCode, lotNo")
     List<WmsStockSn> findByFifoSNByZoneNo(String organizeCode, String zoneNo, String partNo, int isValid, int isDeleted);
 }

From d4dce362802b2def6d9bced723eff7d00945d5fc Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Mon, 24 Jun 2019 18:57:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 8ddd632..7ee9802 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
@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -42,9 +43,21 @@ public class WmsActionResponseBean<Obj> implements Serializable {
 
     @ApiParam("列表信息")
     public List<String> informations;
+    public void setInformation(List<String> list){
+        if(list == null){
+            list = new ArrayList<>();
+        }
+        informations = list;
+    }
 
     @ApiParam("可选项")
     public List<WmsOptionModel> options;
+    public void setOptions(List<WmsOptionModel> opt){
+        if(opt == null){
+            opt = new ArrayList<>();
+        }
+        options = opt;
+    }
 
     @ApiParam("选中的明细数据")
     public Obj details;