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

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

@@ -83,4 +83,8 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @ApiParam("生产日期")
     public String dateCode;
+
+    @ApiParam(value = "散件移库输入移库数量")
+    @Transient
+    public Double inputMoveQty;
 }

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

@@ -56,6 +56,10 @@ public class WmsLocatePart extends BaseBean{
     @ApiParam(value = "是否生成领料单", example = "2")
     private Integer isGeneratePicklist;
 
+    public Double  getMix() {
+        return this.min == null ? 0 : this.min;
+    }
+
     public Integer getIsGeneratePicklist() {
         return this.isGeneratePicklist == null ? 0 : this.isGeneratePicklist;
     }