完善报表接口返回字段，增加品牌和制造商

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java

@@ -72,7 +72,7 @@ public interface DepotItemMapperEx {
             @Param("categoryIdList") List<Long> categoryIdList,
             @Param("endTime") String endTime);
 
-    List<DepotItemVo4WithInfoEx> getListWithBugOrSale(
+    List<DepotItemVo4WithInfoEx> getListWithBuyOrSale(
             @Param("materialParam") String materialParam,
             @Param("billType") String billType,
             @Param("beginTime") String beginTime,
@@ -85,7 +85,7 @@ public interface DepotItemMapperEx {
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    int getListWithBugOrSaleCount(
+    int getListWithBuyOrSaleCount(
             @Param("materialParam") String materialParam,
             @Param("billType") String billType,
             @Param("beginTime") String beginTime,

jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java

@@ -16,6 +16,12 @@ public class DepotHeadVo4InDetail {
 
     private String standard;
 
+    private String color;
+
+    private String brand;
+
+    private String mfrs;
+
     private BigDecimal unitPrice;
 
     private String sku;
@@ -84,6 +90,30 @@ public class DepotHeadVo4InDetail {
         this.standard = standard;
     }
 
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getMfrs() {
+        return mfrs;
+    }
+
+    public void setMfrs(String mfrs) {
+        this.mfrs = mfrs;
+    }
+
     public BigDecimal getUnitPrice() {
         return unitPrice;
     }

jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java

@@ -14,6 +14,12 @@ public class DepotHeadVo4InOutMCount {
 
     private String standard;
 
+    private String color;
+
+    private String brand;
+
+    private String mfrs;
+
     private String categoryName;
 
     private String materialUnit;
@@ -64,6 +70,30 @@ public class DepotHeadVo4InOutMCount {
         this.standard = standard;
     }
 
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getMfrs() {
+        return mfrs;
+    }
+
+    public void setMfrs(String mfrs) {
+        this.mfrs = mfrs;
+    }
+
     public String getCategoryName() {
         return categoryName;
     }

jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemStockWarningCount.java

@@ -21,6 +21,8 @@ public class DepotItemStockWarningCount {
 
     private String MMfrs;
 
+    private String brand;
+
     private String unitName;
 
     private String MaterialOther;
@@ -107,6 +109,14 @@ public class DepotItemStockWarningCount {
         this.MMfrs = MMfrs;
     }
 
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
     public String getUnitName() {
         return unitName;
     }