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/WmsLocate.java

@@ -134,6 +134,11 @@ public class WmsLocate extends BaseBean {
         this.destBoxQty = destBoxQty;
     }
 
+    public WmsLocate(Integer boxQty ,  Double partQty,String locateNo){
+        this.boxQty=boxQty;
+        this.partQty=partQty;
+        this.locateNo=locateNo;
+    }
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }

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

@@ -286,6 +286,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("打印模板名称")
     private String templateName;
 
+    @Transient
+    @ApiParam("是否同批次条码")
+    private Integer isSameBatch;
+
     public WmsStockSn() {
     }