Merge branch 'dev' into test

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

@@ -52,7 +52,7 @@ public class SapCyco extends SapBase{
     @AnnoOutputColumn
     private String zxm;
 
-    @ApiParam(value = "库存账冻结标识")
+    @ApiParam(value = "库存账冻结标志")
     @AnnoOutputColumn
     private String zdjbs;
 

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);
 }