From acab4f1c8ae53fdfeed9a0b410de2268cb6c37a1 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 25 Jun 2024 17:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=A5=E8=A1=A8=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/smssalesbill/SmsSalesBillMapper.xml   |  5 ----
 .../biz/smssalesbill/SmsSalesBillService.java | 24 ++++---------------
 .../report/SmsSalesGoodsTotalsQuery.java      |  2 ++
 .../WmsInventoryRecordService.java            |  3 +++
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
index 7ecdb0a4ea..56846dc0a3 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
@@ -68,13 +68,10 @@
     </select>
     <select id="goodsTotalsReport" resultType="com.yxt.sms.biz.smssalesbill.report.SmsSalesGoodsTotalsVo">
         SELECT
-        d.inventorySid,
         d.goodsSpuName,
         d.goodsSkuTitle,
         d.goodsSkuCode,
         d.unit,
-        d.warehouse,
-        d.`subject`,
         d.count,
         d.amount,
         rd.backCount,
@@ -83,10 +80,8 @@
         sms_sales_bill_detail AS d
         LEFT JOIN sms_sales_bill AS s ON d.billSid = s.sid
         LEFT JOIN sms_sales_return AS r ON s.sid = r.sourceBillSid
-        AND r.state = '0'
         LEFT JOIN sms_sales_return_detail AS rd ON r.sid = rd.billSid
         AND d.goodSpuSid = rd.goodSpuSid
-        AND d.inventorySid = rd.inventorySid
         <where>${ew.sqlSegment}</where>
     </select>
     <select id="goodsTrendReport" resultType="com.yxt.sms.biz.smssalesbill.report.SmsSalesTrendVo">
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
index 4640a771ba..8874d97a7b 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
@@ -524,33 +524,19 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
         if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
             qw.like("d.goodsSpuName", query.getGoodsSpuName());
         }
-        if (StringUtils.isNotBlank(query.getWarehouse())) {
-            qw.like("d.warehouse", query.getWarehouse());
-        }
+//        if (StringUtils.isNotBlank(query.getWarehouse())) {
+//            qw.like("d.warehouse", query.getWarehouse());
+//        }
         String startDate = query.getStartDate();
         String endDate = query.getEndDate();
         qw.apply(StringUtils.isNotEmpty(startDate), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(endDate), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
                 );
-        qw.eq("s.state", "0");
-        qw.orderByDesc("s.createTime");
+//        qw.eq("s.state", "0");
+//        qw.orderByDesc("s.createTime");
         IPage<SmsSalesBill> page = PagerUtil.queryToPage(pq);
         IPage<SmsSalesGoodsTotalsVo> pagging = baseMapper.goodsTotalsReport(page, qw);
         List<SmsSalesGoodsTotalsVo> records = pagging.getRecords();
-        records.removeAll(Collections.singleton(null));
-        if (!records.isEmpty()) {
-            for (SmsSalesGoodsTotalsVo record : records) {
-                WmsInventory inventory = wmsInventoryFeign.fetchEntityBySid(record.getInventorySid()).getData();
-                if (null != inventory) {
-                    if (null != inventory.getCount()) {
-                        record.setNowCount(inventory.getCount().toString());
-                    }
-                    if (StringUtils.isNotBlank(inventory.getGoodsSkuOwnSpec())) {
-                        record.setGoodsSkuOwnSpec(inventory.getGoodsSkuOwnSpec());
-                    }
-                }
-            }
-        }
         PagerVo<SmsSalesGoodsTotalsVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/report/SmsSalesGoodsTotalsQuery.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/report/SmsSalesGoodsTotalsQuery.java
index 886700785c..e80173f714 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/report/SmsSalesGoodsTotalsQuery.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/report/SmsSalesGoodsTotalsQuery.java
@@ -22,4 +22,6 @@ public class SmsSalesGoodsTotalsQuery implements Query {
     private String startDate;
     private String endDate;
     private String useOrgSid;
+    private String orgPath;
+
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
index 45e3dc1717..be2d7643e0 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
@@ -125,6 +125,9 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
     public WmsInventoryCountReportVo inventoryStats(PagerQuery<WmsInventoryCountReportQuery> pq) {
         WmsInventoryCountReportVo vo = new WmsInventoryCountReportVo();
         WmsInventoryCountReportQuery query = pq.getParams();
+        if (null == query) {
+            return vo;
+        }
         if (StringUtils.isBlank(query.getStartDate()) || StringUtils.isBlank(query.getEndDate()) || StringUtils.isBlank(query.getSettleTime())) {
             return vo;
         }