01/08

src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java

@@ -29,6 +29,8 @@ import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryAgeExportVo;
+import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryAgeQuery;
 import com.yxt.warehouse.biz.warehouseinventoryrecord.*;
 import com.yxt.warehouse.biz.warehouseinventoryrecord.report.*;
 import io.swagger.annotations.Api;
@@ -103,6 +105,36 @@ public class WarehouseInventoryRecordRest {
 		PagerVo<WarehouseOutReportVo> pv = warehouseInventoryRecordService.customerSales(pq);
 		return rb.success().setData(pv);
 	}
+	@ApiOperation("商品采购统计报表")
+	@PostMapping("/goodsPurchase")
+	public ResultBean<PagerVo<WarehouseGoodsPurchaseReportVo>> goodsPurchase(@RequestBody PagerQuery<WarehouseInventoryCountReportQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<WarehouseGoodsPurchaseReportVo> pv = warehouseInventoryRecordService.goodsPurchase(pq);
+		return rb.success().setData(pv);
+	}
+	@ApiOperation("商品销售统计报表")
+	@PostMapping("/goodsSales")
+	public ResultBean<PagerVo<WarehouseGoodsSalesReportVo>> goodsSales(@RequestBody PagerQuery<WarehouseInventoryCountReportQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<WarehouseGoodsSalesReportVo> pv = warehouseInventoryRecordService.goodsSales(pq);
+		return rb.success().setData(pv);
+	}
+	@ApiOperation("商品销售统计报表")
+	@PostMapping("/goodsSalesExport")
+	public List<WarehouseGoodsSalesReportExcelVo> goodsSalesExport(@RequestBody WarehouseInventoryCountReportQuery pq){
+		return warehouseInventoryRecordService.goodsSales(pq);
+	}
+	@PostMapping("/goodsPurchaseExport")
+	@ApiOperation(value = "商品采购统计报表导出")
+	public List<WarehouseGoodsPurchaseReportExcelVo> goodsPurchaseExport(@RequestBody WarehouseInventoryCountReportQuery query) {
+		return warehouseInventoryRecordService.goodsPurchase(query);
+	}
+	@PostMapping("/customerSalesExport")
+	@ApiOperation(value = "客户销售统计报表导出")
+	public List<WarehouseCustomerOutReportExcelVo> customerSalesExport(@RequestBody WarehouseInventoryCountReportQuery query) {
+	 return warehouseInventoryRecordService.customerSales(query);
+	}
+
 	@ApiOperation("根据条件分页查询数据的列表")
 	@PostMapping("/listPage")
 	public ResultBean<PagerVo<WarehouseInventoryRecordVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryRecordQuery> pq){

src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java

@@ -358,6 +358,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
             warehouseInventory.setUseOrgSid(dto.getUseOrgSid());
             warehouseInventory.setCreateOrgSid(dto.getCreateOrgSid());
             warehouseInventory.setGoodsSkuCode(dto2.getGoodsSkuCode());
+            warehouseInventory.setPreBillNo(billNo);
             warehouseInventoryService.saveInventory(warehouseInventory);
         }
         OperationRecordDto dto1 = new OperationRecordDto();

src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java

@@ -119,6 +119,7 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
             warehouseInventory.setCreateOrgSid(p.getCreateOrgSid());
             warehouseInventory.setUserSid(userSid);
             warehouseInventory.setUserName(userName);
+            warehouseInventory.setPreBillNo(p.getBillNo());
             warehouseInventoryService.saveInventory(warehouseInventory);
             baseMapper.insert(purchaseInventoryBillDetail);
         }
@@ -193,6 +194,7 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
             warehouseInventory.setGoodsBrandSid(warehouseAnsBillDetail.getGoodsBrandSid());
             warehouseInventory.setManufacturerName(warehouseAnsBillDetail.getManufacturerName());
             warehouseInventory.setManufacturerSid(warehouseAnsBillDetail.getManufacturerSid());
+            warehouseInventory.setPreBillNo(p.getBillNo());
             warehouseInventoryService.saveInventory(warehouseInventory);
             baseMapper.insert(purchaseInventoryBillDetail);
         }

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryDto.java

@@ -77,5 +77,6 @@ public class WarehouseInventoryDto implements Dto {
     private String goodsTypeName;
     private String unitBarCode;//计量单位条码
     private String tax;//计量单位条码
+    private String preBillNo;//计量单位条码
 
 }

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java

@@ -298,6 +298,7 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
         recordDto.setOperatorSid(dto.getUserSid());
         recordDto.setManufacturerSid(dto.getManufacturerSid());
         recordDto.setManufacturerName(dto.getManufacturerName());
+        recordDto.setPreBillNo(dto.getPreBillNo());
         warehouseInventoryRecordService.saveRecord(recordDto);
 
         WarehouseInventoryBatch batch=new WarehouseInventoryBatch();

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.java

@@ -30,10 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseInAndOutboundVo;
-import com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseInventoryCountDetailsVo;
-import com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseInventoryDetailsRecordVo;
-import com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseOutReportVo;
+import com.yxt.warehouse.biz.warehouseinventoryrecord.report.*;
 import com.yxt.warehouse.biz.warehouseoldinventory.WarehouseOldInventoryDetailsListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -73,6 +70,11 @@ public interface WarehouseInventoryRecordMapper extends BaseMapper<WarehouseInve
 
     IPage<WarehouseInventoryCountDetailsVo> inventoryInboundAndOutboundStats(IPage<WarehouseInventoryRecord> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryRecord> qw);
     IPage<WarehouseOutReportVo> customerSales(IPage<WarehouseInventoryRecord> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryRecord> qw);
+    IPage<WarehouseGoodsPurchaseReportVo> goodsPurchase(IPage<WarehouseInventoryRecord> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryRecord> qw);
+    IPage<WarehouseGoodsSalesReportVo> goodsSales(IPage<WarehouseInventoryRecord> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryRecord> qw);
+    List<WarehouseGoodsSalesReportExcelVo> goodsSalesE( @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryRecord> qw);
+    List<WarehouseGoodsPurchaseReportExcelVo> goodsPurchaseE(@Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryRecord> qw);
+    List<WarehouseCustomerOutReportExcelVo> customerSalesE(@Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryRecord> qw);
 
     IPage<WarehouseInventoryDetailsRecordVo> inventoryDetailsRecord(IPage<WarehouseInventoryRecord> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryRecord> qw);
 

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml

@@ -52,13 +52,110 @@
         SELECT IFNULL(SUM(r.count), 0) AS `count`,
                r.customerSid,
                r.customerName,
-               IFNULL(SUM(r.amount), 0) as amount
+               IFNULL(SUM(r.amount), 0) as amount,
+        r.cost
         FROM warehouse_inventory_record AS r
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="goodsPurchase"
+            resultType="com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseGoodsPurchaseReportVo">
+        SELECT
+        r.goodsSkuSid,
+        r.goodsSpuSid,
+        r.goodsSpuName as goodsName,
+        r.goodsSkuTitle as title,
+        r.goodsSkuOwnSpec,
+        r.goodsSkuCode,
+        r.goodsSpuCode,
+        r.cost,
+        IFNULL( SUM( r.count ), 0 ) AS `count`,
+        IFNULL( SUM( r.amount ), 0 ) AS amount,
+        d.goodsBrandName,
+        d.goodsTypeName
+        FROM
+        warehouse_inventory_record AS r
+        left join purchase_inventory_bill_detail d on d.sourceBillSid =r.preBillNo and d.goodsSkuSid =r.goodsSkuSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="goodsSales"
+            resultType="com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseGoodsSalesReportVo">
+        SELECT
+        r.goodsSkuSid,
+        r.goodsSpuSid,
+        r.goodsSpuName as goodsName,
+        r.goodsSkuTitle as title,
+        r.goodsSkuOwnSpec,
+        r.goodsSkuCode,
+        r.goodsSpuCode,
+        r.cost,
+        IFNULL( SUM( r.count ), 0 ) AS `count`,
+        IFNULL( SUM( r.amount ), 0 ) AS amount,
+        IFNULL( SUM( r.amount ), 0 )/IFNULL( SUM( r.count ), 0 ) as averageCost
+        FROM
+        warehouse_inventory_record AS r
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="goodsSalesE"
+            resultType="com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseGoodsSalesReportExcelVo">
+        SELECT
+        r.goodsSkuSid,
+        r.goodsSpuSid,
+        r.goodsSpuName as goodsName,
+        r.goodsSkuTitle as title,
+        r.goodsSkuOwnSpec,
+        r.goodsSkuCode,
+        r.goodsSpuCode,
+        r.cost,
+        IFNULL( SUM( r.count ), 0 ) AS `count`,
+        IFNULL( SUM( r.amount ), 0 ) AS amount,
+        IFNULL( SUM( r.amount ), 0 )/IFNULL( SUM( r.count ), 0 ) as averageCost
+        FROM
+        warehouse_inventory_record AS r
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 
+    <select id="goodsPurchaseE"
+            resultType="com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseGoodsPurchaseReportExcelVo">
+        SELECT
+        r.goodsSkuSid,
+        r.goodsSpuSid,
+        r.goodsSpuName as goodsName,
+        r.goodsSkuTitle as title,
+        r.goodsSkuOwnSpec,
+        r.goodsSkuCode,
+        r.goodsSpuCode,
+        r.cost,
+        IFNULL( SUM( r.count ), 0 ) AS `count`,
+        IFNULL( SUM( r.amount ), 0 ) AS amount,
+        d.goodsBrandName,
+        d.goodsTypeName
+        FROM
+        warehouse_inventory_record AS r
+        left join purchase_inventory_bill_detail d on d.sourceBillSid =r.preBillNo and d.goodsSkuSid =r.goodsSkuSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="customerSalesE"
+            resultType="com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseCustomerOutReportExcelVo">
+        SELECT IFNULL(SUM(r.count), 0) AS `count`,
+        r.customerSid,
+        r.customerName,
+        IFNULL(SUM(r.amount), 0) as amount,
+        r.cost
+        FROM warehouse_inventory_record AS r
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
     <select id="inventoryDetailsRecord"
             resultType="com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseInventoryDetailsRecordVo">
         SELECT CASE

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java

@@ -207,7 +207,141 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
         PagerVo<WarehouseOutReportVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+    public PagerVo<WarehouseGoodsPurchaseReportVo> goodsPurchase(PagerQuery<WarehouseInventoryCountReportQuery> pq) {
+        WarehouseInventoryCountReportQuery query = pq.getParams();
+        QueryWrapper<WarehouseInventoryRecord> qw = new QueryWrapper<>();
+        qw.apply(StringUtils.isNotBlank(query.getStartDate()), "r.createTime >= '" + query.getStartDate() + "'").
+                apply(StringUtils.isNotBlank(query.getEndDate()), "r.createTime <= '" + query.getEndDate() + "'"
+                );
+        if(StringUtils.isNotBlank(query.getGoodsSid())){
+            qw.eq("r.goodsSpuSid",query.getGoodsSid());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseSid())){
+            qw.eq("r.warehouseSid",query.getWarehouseSid());
+        }
+        if(StringUtils.isNotBlank(query.getSupplierSid())){
+            qw.eq("r.supplierSid",query.getSupplierSid());
+        }
+        if(StringUtils.isNotBlank(query.getBrandSid())){
+            qw.eq("d.goodsBrandSid",query.getBrandSid());
+        }
+        if(StringUtils.isNotBlank(query.getTypeSid())){
+            qw.eq("d.goodsTypeSid",query.getTypeSid());
+        }
+        qw.eq("r.billType", "1");
+        qw.groupBy("r.goodsSpuSid");
+        qw.eq("r.createOrgSid",query.getOrgPath());
+        IPage<WarehouseInventoryRecord> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseGoodsPurchaseReportVo> pagging = baseMapper.goodsPurchase(page, qw);
+        PagerVo<WarehouseGoodsPurchaseReportVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public PagerVo<WarehouseGoodsSalesReportVo> goodsSales(PagerQuery<WarehouseInventoryCountReportQuery> pq) {
+        WarehouseInventoryCountReportQuery query = pq.getParams();
+        QueryWrapper<WarehouseInventoryRecord> qw = new QueryWrapper<>();
+        qw.apply(StringUtils.isNotBlank(query.getStartDate()), "r.createTime >= '" + query.getStartDate() + "'").
+                apply(StringUtils.isNotBlank(query.getEndDate()), "r.createTime <= '" + query.getEndDate() + "'"
+                );
+        if(StringUtils.isNotBlank(query.getGoodsSid())){
+            qw.eq("r.goodsSpuSid",query.getGoodsSid());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseSid())){
+            qw.eq("r.warehouseSid",query.getWarehouseSid());
+        }
+        if(StringUtils.isNotBlank(query.getSupplierSid())){
+            qw.eq("r.supplierSid",query.getSupplierSid());
+        }
+        if(query.getTypeSids()!=null){
+            qw.in("r.goodsSpuSid",query.getTypeSids());
+        }
+        if(query.getBrandSids()!=null){
+            qw.like("r.goodsSpuSid",query.getBrandSids());
+        }
+        qw.apply(StringUtils.isNotBlank(query.getCount()), "r.count >= '" + query.getCount() + "'");
+        qw.eq("r.billType", "0");
+        qw.groupBy("r.goodsSpuSid");
+        qw.eq("r.createOrgSid",query.getOrgPath());
+        IPage<WarehouseInventoryRecord> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseGoodsSalesReportVo> pagging = baseMapper.goodsSales(page, qw);
+        PagerVo<WarehouseGoodsSalesReportVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<WarehouseGoodsSalesReportExcelVo> goodsSales(WarehouseInventoryCountReportQuery query) {
 
+        QueryWrapper<WarehouseInventoryRecord> qw = new QueryWrapper<>();
+        qw.apply(StringUtils.isNotBlank(query.getStartDate()), "r.createTime >= '" + query.getStartDate() + "'").
+                apply(StringUtils.isNotBlank(query.getEndDate()), "r.createTime <= '" + query.getEndDate() + "'"
+                );
+        if(StringUtils.isNotBlank(query.getGoodsSid())){
+            qw.eq("r.goodsSpuSid",query.getGoodsSid());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseSid())){
+            qw.eq("r.warehouseSid",query.getWarehouseSid());
+        }
+        if(StringUtils.isNotBlank(query.getSupplierSid())){
+            qw.eq("r.supplierSid",query.getSupplierSid());
+        }
+        if(query.getTypeSids()!=null){
+            qw.in("r.goodsSpuSid",query.getTypeSids());
+        }
+        if(query.getBrandSids()!=null){
+            qw.like("r.goodsSpuSid",query.getBrandSids());
+        }
+        qw.apply(StringUtils.isNotBlank(query.getCount()), "r.count >= '" + query.getCount() + "'");
+        qw.eq("r.billType", "0");
+        qw.groupBy("r.goodsSpuSid");
+        qw.eq("r.createOrgSid",query.getOrgPath());
+
+        List<WarehouseGoodsSalesReportExcelVo> pagging = baseMapper.goodsSalesE(qw);
+        return pagging;
+    }
+    public List<WarehouseGoodsPurchaseReportExcelVo> goodsPurchase(WarehouseInventoryCountReportQuery query) {
+
+        QueryWrapper<WarehouseInventoryRecord> qw = new QueryWrapper<>();
+        qw.apply(StringUtils.isNotBlank(query.getStartDate()), "r.createTime >= '" + query.getStartDate() + "'").
+                apply(StringUtils.isNotBlank(query.getEndDate()), "r.createTime <= '" + query.getEndDate() + "'"
+                );
+        if(StringUtils.isNotBlank(query.getGoodsSid())){
+            qw.eq("r.goodsSpuSid",query.getGoodsSid());
+        }
+        if (StringUtils.isNotBlank(query.getWarehouseSid())){
+            qw.eq("r.warehouseSid",query.getWarehouseSid());
+        }
+        if(StringUtils.isNotBlank(query.getSupplierSid())){
+            qw.eq("r.supplierSid",query.getSupplierSid());
+        }
+        if(StringUtils.isNotBlank(query.getBrandSid())){
+            qw.eq("d.goodsBrandSid",query.getBrandSid());
+        }
+        if(StringUtils.isNotBlank(query.getTypeSid())){
+            qw.eq("d.goodsTypeSid",query.getTypeSid());
+        }
+        qw.eq("r.billType", "1");
+        qw.groupBy("r.goodsSpuSid");
+        qw.eq("r.createOrgSid",query.getOrgPath());
+
+        List<WarehouseGoodsPurchaseReportExcelVo> pagging = baseMapper.goodsPurchaseE(qw);
+
+        return pagging;
+    }
+    public List<WarehouseCustomerOutReportExcelVo> customerSales(WarehouseInventoryCountReportQuery query) {
+
+        QueryWrapper<WarehouseInventoryRecord> qw = new QueryWrapper<>();
+        qw.apply(StringUtils.isNotBlank(query.getStartDate()), "r.createTime >= '" + query.getStartDate() + "'").
+                apply(StringUtils.isNotBlank(query.getEndDate()), "r.createTime <= '" + query.getEndDate() + "'"
+                );
+        if(query.getSids()!=null){
+            qw.in("customerSid",query.getSids());
+        }
+        if(StringUtils.isNotBlank(query.getCustomerName())){
+            qw.like("customerName",query.getCustomerName());
+        }
+        qw.eq("r.billType", "0");
+        qw.groupBy("r.customerSid");
+        qw.eq("createOrgSid",query.getOrgPath());
+        List<WarehouseCustomerOutReportExcelVo> pagging = baseMapper.customerSalesE(qw);
+        return pagging;
+    }
     public PagerVo<WarehouseInventoryDetailsRecordVo> inventoryDetailsRecord(PagerQuery<WarehouseInventoryDetailsRecordQuery> pq) {
         WarehouseInventoryDetailsRecordQuery query = pq.getParams();
         QueryWrapper<WarehouseInventoryRecord> qw = new QueryWrapper<>();

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/report/WarehouseCustomerOutReportExcelVo.java

@@ -0,0 +1,18 @@
+package com.yxt.warehouse.biz.warehouseinventoryrecord.report;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2025/1/7 9:41
+ */
+@Data
+public class WarehouseCustomerOutReportExcelVo {
+    private String sid;
+    private String customerSid;
+    private String customerName;
+    private String amount;
+    private String count;
+    private String shippingFee;
+}

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/report/WarehouseGoodsPurchaseReportExcelVo.java

@@ -0,0 +1,25 @@
+package com.yxt.warehouse.biz.warehouseinventoryrecord.report;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2025/1/7 14:19
+ */
+@Data
+public class WarehouseGoodsPurchaseReportExcelVo {
+    private String goodsSkuSid;
+    private String goodsSpuSid;
+    private String goodsCode;
+    private String barCode;
+    private String goodsName;
+    private String goodsSkuCode;
+    private String title;
+    private String typeSid;
+    private String typeName;
+    private String brandSid;
+    private String brandName;
+    private String count;
+    private String cost;
+    private String amount;
+}

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/report/WarehouseGoodsPurchaseReportVo.java

@@ -0,0 +1,26 @@
+package com.yxt.warehouse.biz.warehouseinventoryrecord.report;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2025/1/7 10:25
+ */
+@Data
+public class WarehouseGoodsPurchaseReportVo {
+    private String goodsSkuSid;
+    private String goodsSpuSid;
+    private String goodsCode;
+    private String barCode;
+    private String goodsName;
+    private String goodsSkuCode;
+    private String title;
+    private String typeSid;
+    private String typeName;
+    private String brandSid;
+    private String brandName;
+    private String count;
+    private String cost;
+    private String amount;
+
+}

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/report/WarehouseGoodsSalesReportExcelVo.java

@@ -0,0 +1,30 @@
+package com.yxt.warehouse.biz.warehouseinventoryrecord.report;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2025/1/7 17:10
+ */
+@Data
+public class WarehouseGoodsSalesReportExcelVo {
+    private String goodsSkuSid;
+    private String goodsSpuSid;
+    private String goodsCode;
+    private String barCode;
+    private String goodsName;
+    private String goodsSkuCode;
+    private String title;
+    private String typeSid;
+    private String typeName;
+    private String brandSid;
+    private String brandName;
+    private String count;
+    private String averageCost;
+    private String amount;
+    private String cbPrice;
+    private String cbdPrice;
+    private String ml;
+    private String mll;
+    private String cost;
+}

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/report/WarehouseGoodsSalesReportVo.java

@@ -0,0 +1,29 @@
+package com.yxt.warehouse.biz.warehouseinventoryrecord.report;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2025/1/7 15:29
+ */
+@Data
+public class WarehouseGoodsSalesReportVo {
+    private String goodsSkuSid;
+    private String goodsSpuSid;
+    private String goodsCode;
+    private String barCode;
+    private String goodsName;
+    private String goodsSkuCode;
+    private String title;
+    private String typeSid;
+    private String typeName;
+    private String brandSid;
+    private String brandName;
+    private String count;
+    private String averageCost;
+    private String amount;
+    private String cbPrice;
+    private String cbdPrice;
+    private String ml;
+    private String mll;private String cost;
+}

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/report/WarehouseInventoryCountReportQuery.java

@@ -19,5 +19,12 @@ public class WarehouseInventoryCountReportQuery implements Query {
     private String orgPath;
     private String customerName;
     private List<String> sids;
-
+    private String warehouseSid;
+    private String goodsSid;
+    private String supplierSid;
+    private String brandSid;
+    private String typeSid;
+    private List<String> typeSids;
+    private List<String> brandSids;
+    private String count;
 }

src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/report/WarehouseOutReportVo.java

@@ -14,4 +14,5 @@ public class WarehouseOutReportVo {
     private String amount;
     private String count;
     private String shippingFee;
+    private String cost;
 }

src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java

@@ -392,6 +392,7 @@ public class WarehouseOutBillService extends MybatisBaseService<WarehouseOutBill
             warehouseInventoryRecordDto.setUseOrgSid(dto.getUseOrgSid());
             warehouseInventoryRecordDto.setCreateOrgSid(dto.getCreateOrgSid());
             warehouseInventoryRecordDto.setAmount((dto.getCount().multiply(dto.getCost())));
+            warehouseInventoryRecordDto.setPreBillNo(WarehouseOutBill.getBillNo());
             warehouseInventoryRecordService.saveOrUpdateDto(warehouseInventoryRecordDto);
         }
     }