From 795ed1b363df6e0934fe7b574e2203100f023620 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 7 Jan 2025 08:46:36 +0800
Subject: [PATCH] 01-07

---
 .../aggregation/SmsSalesBillRest.java         |  8 +++-
 .../basegoodsspu/BaseGoodsSpuService.java     |  6 ++-
 .../smssalesbill/SmsSalesBillService.java     | 22 +++++++++++
 .../WarehouseInventoryCountReportQuery.java   | 22 +++++++++++
 .../WarehouseInventoryRecordFeign.java        | 38 +++++++++++++++++++
 .../WarehouseOutReportVo.java                 | 18 +++++++++
 .../warehouseoutbill/WarehouseOutBillDto.java |  2 +
 7 files changed, 113 insertions(+), 3 deletions(-)
 create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryCountReportQuery.java
 create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java
 create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseOutReportVo.java

diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java
index 1f95b6d..902e174 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java
@@ -29,6 +29,8 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.oms.biz.func.smssalesbill.*;
+import com.yxt.oms.feign.warehouse.warehouseinventoryrecord.WarehouseInventoryCountReportQuery;
+import com.yxt.oms.feign.warehouse.warehouseinventoryrecord.WarehouseOutReportVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,7 +64,11 @@ public class SmsSalesBillRest {
     public ResultBean<PagerVo<SmsSalesBillVo>> listPage(@RequestBody PagerQuery<SmsSalesBillQuery> pq) {
         return smsSalesBillService.listPage(pq);
     }
-
+    @ApiOperation("客户销售报表")
+    @PostMapping("/customerSales")
+    public ResultBean<PagerVo<WarehouseOutReportVo>> customerSales(@RequestBody PagerQuery<WarehouseInventoryCountReportQuery> pq) {
+        return smsSalesBillService.customerSales(pq);
+    }
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     public ResultBean save(@RequestBody SmsSalesBillDto dto) {
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java
index 27d5563..a9cd712 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsspu/BaseGoodsSpuService.java
@@ -386,6 +386,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
                 sku.setExternalCode(dto.getBaseGoodsSkus().get(0).getExternalCode());
                 sku.setGoodsSpuSid(sid);
                 sku.setSid(skuSid);
+                sku.setIndexes(dto.getBaseGoodsSkus().get(0).getIndexes());
                 BaseGoodsSkuExtendDto skuExtend = new BaseGoodsSkuExtendDto();
                 skuExtend.setSid(UUID.randomUUID().toString());
                 skuExtend.setGoodsSkuSid(skuSid);
@@ -448,7 +449,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
             String goodsSkuSid = "";
             String goodsSkuCode = StringUtils.isEmpty(arr[18]) ? "" : arr[18];
             String title = StringUtils.isEmpty(arr[19]) ? "" : arr[19];
-            String ownSpec = StringUtils.isEmpty(arr[20]) ? "" : arr[20];
+//            String ownSpec = StringUtils.isEmpty(arr[20]) ? "" : arr[20];
+            String indexes = StringUtils.isEmpty(arr[20]) ? "" : arr[20];
 
             String finalPurchasePrice = StringUtils.isEmpty(arr[21]) ? "" : arr[21];
             String safetyStockDays = StringUtils.isEmpty(arr[22]) ? "" : arr[22];
@@ -496,7 +498,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
             BaseGoodsSkuDto dto1 = new BaseGoodsSkuDto();
             dto1.setGoodsSkuCode(goodsSkuCode);
             dto1.setTitle(title);
-            dto1.setOwnSpec(ownSpec);
+            dto1.setIndexes(indexes);
             BaseGoodsSkuExtendDto dto2 = new BaseGoodsSkuExtendDto();
             dto2.setSortNo("1");
             dto2.setFinalPurchasePrice(finalPurchasePrice);
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
index 1c59274..3a17d8e 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java
@@ -34,8 +34,13 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.crmcustomer.CrmCustomerTemp;
+import com.yxt.oms.feign.customer.customertemp.CrmCustomerTempFeign;
 import com.yxt.oms.feign.sales.smssalesbill.*;
 import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign;
+import com.yxt.oms.feign.warehouse.warehouseinventoryrecord.WarehouseInventoryCountReportQuery;
+import com.yxt.oms.feign.warehouse.warehouseinventoryrecord.WarehouseInventoryRecordFeign;
+import com.yxt.oms.feign.warehouse.warehouseinventoryrecord.WarehouseOutReportVo;
 import com.yxt.oms.feign.warehouse.warehouseoutbill.WarehouseOutBillDetailDto;
 import com.yxt.oms.feign.warehouse.warehouseoutbill.WarehouseOutBillDto;
 import com.yxt.oms.feign.warehouse.warehouseoutbill.WarehouseOutBillFeign;
@@ -74,6 +79,10 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private WarehouseOutBillFeign warehouseOutBillFeign;
+    @Autowired
+    private WarehouseInventoryRecordFeign warehouseInventoryRecordFeign;
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
 
     private QueryWrapper<SmsSalesBill> createQueryWrapper(SmsSalesBillQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -162,6 +171,17 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
     public ResultBean<PagerVo<SmsSalesBillVo>> listPage(PagerQuery<SmsSalesBillQuery> pq) {
         return smsSalesBillFeign.listPage(pq);
     }
+    public ResultBean<PagerVo<WarehouseOutReportVo>> customerSales(PagerQuery<WarehouseInventoryCountReportQuery> pq) {
+//        crmCustomerTempFeign.
+        ResultBean<PagerVo<WarehouseOutReportVo>> pagerVoResultBean = warehouseInventoryRecordFeign.customerSales(pq);
+        for (WarehouseOutReportVo record : pagerVoResultBean.getData().getRecords()) {
+            ResultBean<CrmCustomerTemp> crmCustomerTempResultBean = crmCustomerTempFeign.fetchBySid(record.getCustomerSid());
+            if(crmCustomerTempResultBean.getData()!=null){
+                record.setCustomerCode(crmCustomerTempResultBean.getData().getCustomerNo());
+            }
+        }
+        return warehouseInventoryRecordFeign.customerSales(pq);
+    }
 
     public ResultBean deleteBySids(String[] sids) {
         return smsSalesBillFeign.delBySids(sids);
@@ -217,6 +237,8 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
                 dto.setSourceBillNo(vo.getBillNo());
                 dto.setUseOrgSid(vo.getUseOrgSid());
                 dto.setCreateOrgSid(vo.getCreateOrgSid());
+                dto.setCustomerName(vo.getCustomerName());
+                dto.setCustomerSid(vo.getCustomerSid());
                 if (StringUtils.isNotBlank(vo.getShipperMob())) {
                     dto.setMobile(vo.getShipperMob());
                 }
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryCountReportQuery.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryCountReportQuery.java
new file mode 100644
index 0000000..d26fd4d
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryCountReportQuery.java
@@ -0,0 +1,22 @@
+
+package com.yxt.oms.feign.warehouse.warehouseinventoryrecord;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/8 17:48
+ */
+@Data
+public class WarehouseInventoryCountReportQuery implements Query {
+
+    private String settleTime;
+    private String startDate;
+    private String endDate;
+    private String orgPath;
+    private String customerName;
+    private String customerCode;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java
new file mode 100644
index 0000000..27cce19
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryRecordFeign.java
@@ -0,0 +1,38 @@
+package com.yxt.oms.feign.warehouse.warehouseinventoryrecord;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.smssalesbill.GoodsCountVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "出入库记录")
+@FeignClient(
+        contextId = "ss-common-warehouse-WarehouseInventoryRecord",
+        name = "ss-common-warehouse",
+        path = "/apiadmin/warehouseinventoryrecord/"
+      )
+public interface WarehouseInventoryRecordFeign {
+    @ApiOperation("客户销售统计报表")
+    @PostMapping("/customerSales")
+    public ResultBean<PagerVo<WarehouseOutReportVo>> customerSales(@RequestBody PagerQuery<WarehouseInventoryCountReportQuery> pq);
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseOutReportVo.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseOutReportVo.java
new file mode 100644
index 0000000..8811e1e
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseOutReportVo.java
@@ -0,0 +1,18 @@
+package com.yxt.oms.feign.warehouse.warehouseinventoryrecord;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2025/1/3 16:41
+ */
+@Data
+public class WarehouseOutReportVo {
+    private String sid;
+    private String customerSid;
+    private String customerName;
+    private String customerCode;
+    private String amount;
+    private String count;
+    private String shippingFee;
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillDto.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillDto.java
index d9c53a8..c9a9f51 100644
--- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillDto.java
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillDto.java
@@ -109,6 +109,8 @@ public class WarehouseOutBillDto {
     private String remarks;
     private String userSid;
     private String userName;
+    private String customerSid;
+    private String customerName;
 
     private List<WarehouseOutBillDetailDto> detailsList = new ArrayList<>();