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 5e904b2..920e62f 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 implements Serializable { @ApiParam("列表信息") public List informations; + public void setInformation(List list){ + if(list == null){ + list = new ArrayList<>(); + } + informations = list; + } @ApiParam("可选项") public List options; + public void setOptions(List opt){ + if(opt == null){ + opt = new ArrayList<>(); + } + options = opt; + } @ApiParam("选中的明细数据") public Obj details; 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 { */ @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 findByFifoSNByZoneNo(String organizeCode, String zoneNo, String partNo, int isValid, int isDeleted); }