Jenkins自动合并

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

@@ -88,22 +88,27 @@ public class WmsCSFactTrans extends BaseBean {
     public String remark;
 
     @Transient
+    @AnnoOutputColumn(hidden = true)
     @ApiParam(value = "剩余数量", example = "1")
     public Double surplusQty;
 
     @Column
+    @AnnoOutputColumn(hidden = true)
     @ApiParam("源库位编号")
     public String srcLocateNo;
 
     @Column
+    @AnnoOutputColumn(hidden = true)
     @ApiParam("源存储区编号")
     public String srcZoneNo;
 
     @Column
+    @AnnoOutputColumn(hidden = true)
     @ApiParam("源仓库编号")
     public String srcWhNo;
 
     @Column
+    @AnnoOutputColumn(hidden = true)
     @ApiParam("是否范围内")
     public Integer isScope;
 
@@ -112,10 +117,12 @@ public class WmsCSFactTrans extends BaseBean {
     public String vendorNo;
 
     @Transient
+    @AnnoOutputColumn(hidden = true)
     @ApiParam(value = "实盘箱数", example = "1")
     public Long countBoxQty;
 
     @Transient
+    @AnnoOutputColumn(hidden = true)
     @ApiParam(value = "物料数量", example = "1")
     public Double sumPartQty;
 
@@ -125,18 +132,22 @@ public class WmsCSFactTrans extends BaseBean {
      * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
      */
     @Transient
+    @AnnoOutputColumn(hidden = true)
     @ApiParam(value = "条码状态", example = "1")
     public Integer snStatus;
 
     @Transient
+    @AnnoOutputColumn(hidden = true)
     @ApiParam(value = "条码状态(冻结时)", example = "1")
     public Integer destSnStatus;
 
     @Transient
+    @AnnoOutputColumn(hidden = true)
     @ApiParam("存储区编号组")
     public String[] zoneNos;
 
     @Transient
+    @AnnoOutputColumn(hidden = true)
     @ApiParam("行号")
     private String item;
 

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

@@ -42,6 +42,7 @@ public class WmsCSOrderDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
+    @AnnoOutputColumn(hidden = true)
     public String item;
 
     @Column(name = "QTY", columnDefinition = "decimal(18,8)")
@@ -112,26 +113,32 @@ public class WmsCSOrderDetails extends BaseBean {
 
     @Transient
     @ApiParam(value = "实盘数量", example = "1")
+    @AnnoOutputColumn(hidden = true)
     public Double factQty;
 
     @Transient
     @ApiParam(value = "剩余数量", example = "1")
+    @AnnoOutputColumn(hidden = true)
     public Double surplusQty;
 
     @Transient
     @ApiParam("目标库位编号")
+    @AnnoOutputColumn(hidden = true)
     public String destLocateNo;
 
     @Transient
     @ApiParam("前端表格编辑使用")
+    @AnnoOutputColumn(hidden = true)
     public Boolean isSet = false;
 
     @Transient
     @ApiParam("源单位")
+    @AnnoOutputColumn(hidden = true)
     public String srcUnit;
 
     @Transient
     @ApiParam("存储区编号")
+    @AnnoOutputColumn(hidden = true)
     public String[] zoneNos;
 
     /**

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -42,6 +43,7 @@ public class WmsCSPart extends BaseBean {
     public String partNameRdd;
 
     @Column(name="IS_ADJUST")
+    @AnnoOutputColumn(hidden = true)
     @ApiParam(value = "调整标识", example = "1")
     public Integer isAdjust;
 }