Jenkins自动合并

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java

@@ -155,4 +155,24 @@ public class Material extends BaseCode {
     public List<BaseOrder> getOrders() {
         return BeanRelation.list(this, EMaterial.Orders);
     }
+
+    @JsonBackReference
+    public List<SalesOrder> getSalesOrder() {
+        return BeanRelation.listByClass(this, SalesOrder.class, EMaterial.Orders);
+    }
+
+    @JsonBackReference
+    public List<PurchaseOrder> getPurchaseOrders() {
+        return BeanRelation.listByClass(this, PurchaseOrder.class, EMaterial.Orders);
+    }
+
+    @JsonBackReference
+    public List<Inventory> getInventories() {
+        return BeanRelation.listByClass(this, Inventory.class, EMaterial.Orders);
+    }
+
+    @JsonBackReference
+    public List<ProductOrder> getProductOrders() {
+        return BeanRelation.listByClass(this, ProductOrder.class, EMaterial.Orders);
+    }
 }

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

@@ -55,7 +55,7 @@ public class WmsFile extends BaseBean{
     @ApiParam("关联单据编号")
     private String refSrc;
 
-    @Column(name = "关联单据类型")
-    @ApiParam(value = "REF_TYPE")
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型")
     private String refType;
 }