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

@@ -130,10 +130,14 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam("交易类型名称")
     private String transTypeName;
 
+    @Column(name="FIX_ID")
+    @ApiParam(value = "设备编号")
+    public String fixId;
+
     public WmsMoveMaster(){};
 
     public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
-                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) {
+                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId) {
         this.id = id;
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
@@ -149,7 +153,7 @@ public class WmsMoveMaster extends BaseBean {
         this.destZoneNo = destZoneNo;
         this.transQty = transQty;
         this.rejectQty = rejectQty;
-
+        this.fixId = fixId;
 
     }