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

 Conflicts:

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

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

@@ -131,4 +131,15 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @ApiParam("打印模板")
     private String templateNo;
+
+    @Transient
+    @ApiParam("剩余箱数量")
+    private Long countBox;
+
+    public WmsDocMovementSn(){}
+
+    public WmsDocMovementSn(Long countBox,String partNo) {
+        this.countBox = countBox;
+        this.partNo = partNo;
+    }
 }

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

@@ -215,6 +215,10 @@ public class WmsStockSn extends BaseBean {
     @Transient
     public String labelNo;
 
+    @Column(name = "PACKAGE_PART_NO")
+    @ApiParam(value = "包装零件号")
+    private String packagePartNo;
+
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;