Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java

@@ -936,9 +936,9 @@ public class BlockSoftSwitchEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FTP_CONNECTION_MODE {
         LOCAL_ACTIVE_MODE(10,  "本地主动模式"),
-        LOCAL_PASSIVE_MODE(20, "本地被动模式"),
+        LOCAL_PASSIVE_MODE(20, "本地被动模式");
 //        REMOTE_ACTIVE_MODE(30, "远程主动模式"),
-        REMOTE_PASSIVE_MODE(40, "远程被动模式");
+//        REMOTE_PASSIVE_MODE(40, "远程被动模式");
 
         private final int value;
         private final String description;

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

@@ -127,6 +127,9 @@ public class WmsLocatePart extends BaseBean {
     public double getMinValue(){
         return this.min ==null?0:this.min.doubleValue();
     }
+    public double getSafetyStockVal(){
+        return this.safetyStock ==null?0:this.safetyStock.doubleValue();
+    }
 
     public WmsLocatePart() {
     }

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

@@ -76,6 +76,10 @@ public class WmsStockQuan extends BaseBean {
     private Boolean includeZeroStock = false;
 
     @Transient
+    @ApiParam(value = "无差异库存显示")
+    private Boolean showNoDiffStock = false;
+
+    @Transient
     @ColumnDefault("0")
     @ApiParam(value = "库存数量总和")
     private Double sumQty;