From 9fed935dc676d043c26b3c2e0969ea4df3ed164a Mon Sep 17 00:00:00 2001
From: mzr <mzr123456>
Date: Wed, 22 May 2024 15:01:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=8F=91=E8=B4=A7=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yb/lb/webapp/excel/logistics/RecordsExcel.java |  7 ++++---
 .../mapper_oracle/records/CrmInvoiceGoodsMapper.xml    |  2 +-
 .../mapper_oracle/records/ReceiptRecordsMapper.xml     | 10 ++++++++--
 .../record/records/service/ReceiptRecordsService.java  |  1 +
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/excel/logistics/RecordsExcel.java b/crm-admin/src/main/java/com/yb/lb/webapp/excel/logistics/RecordsExcel.java
index 52b7ad3..88bc0c2 100644
--- a/crm-admin/src/main/java/com/yb/lb/webapp/excel/logistics/RecordsExcel.java
+++ b/crm-admin/src/main/java/com/yb/lb/webapp/excel/logistics/RecordsExcel.java
@@ -167,9 +167,9 @@ public class RecordsExcel {
                     deliveryNum = StringUtil.isNullOrEmpty(deliveryNum)? 0:deliveryNum;
                     receiptRecordsBo.setDeliveryNum(deliveryNum.toString());
                     // 如果数量都是0,跳出循环
-                    if ("0.00".equals(receiptRecordsBo.getMajorNum()) && (invoiceNum == 0) && (receiveNum == 0) && (deliveryNum == 0)) {
-                        continue;
-                    }
+                    // if ("0.00".equals(receiptRecordsBo.getMajorNum()) && (invoiceNum == 0) && (receiveNum == 0) && (deliveryNum == 0)) {
+                    //     continue;
+                    // }
 
                     if (StringUtil.isNotEmpty(invoiceNum) && (0 != invoiceNum)) {
                         DecimalFormat df = new DecimalFormat("0.00");
@@ -214,6 +214,7 @@ public class RecordsExcel {
         map.put("startTime", startTime);
         map.put("endTime", endTime);
         map.put("goodsNo", goodsNo);
+        map.put("isAll", "1");
         List list2 = receiptRecordsService.findGoods(map, ".getMajorNum");
         Map map1 = (Map) list2.get(0);
         if (map1 != null) {
diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/records/CrmInvoiceGoodsMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/records/CrmInvoiceGoodsMapper.xml
index 81008c9..a794d86 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/records/CrmInvoiceGoodsMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/records/CrmInvoiceGoodsMapper.xml
@@ -124,7 +124,7 @@
             <if test="goodsNo != null and goodsNo != ''">
                 AND a.GOODS_NO = #{goodsNo}
             </if>
-            <if test="goodsNo == null or goodsNo == ''">
+            <if test="(goodsNo == null or goodsNo == '') and (isAll == null or isAll == '')">
                 AND (a.GOODS_NO is null or a.GOODS_NO = '')
             </if>
             <if test="clientId != null and clientId != ''">
diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/records/ReceiptRecordsMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/records/ReceiptRecordsMapper.xml
index 75fddaf..a47234f 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/records/ReceiptRecordsMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/records/ReceiptRecordsMapper.xml
@@ -279,9 +279,12 @@
                 </where>
                 )
             </if>
-            <if test="goodsNo == null or goodsNo == ''">
+            <if test="(goodsNo == null or goodsNo == '') and (isAll == null or isAll == '')">
                 AND (a.GOODS_NO is null or a.GOODS_NO = '')
             </if>
+            <if test="isAll != null and isAll != ''">
+                and a.GOODS_NO is not null
+            </if>
             <if test="companyId != null and companyId != ''">
                 AND a.company_id = #{companyId}
             </if>
@@ -448,9 +451,12 @@
                 </where>
                 )
             </if>
-            <if test="goodsNo == null or goodsNo == ''">
+            <if test="(goodsNo == null or goodsNo == '') and (isAll == null or isAll == '')">
                 AND (a.GOODS_NO is null or a.GOODS_NO = '')
             </if>
+            <if test="isAll != null and isAll != ''">
+                and a.GOODS_NO is not null
+            </if>
             <if test="companyId != null and companyId != ''">
                 AND a.company_id = #{companyId}
             </if>
diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/record/records/service/ReceiptRecordsService.java b/crm-webapp/src/main/java/com/yb/lb/webapp/record/records/service/ReceiptRecordsService.java
index dd33695..5f8b810 100644
--- a/crm-webapp/src/main/java/com/yb/lb/webapp/record/records/service/ReceiptRecordsService.java
+++ b/crm-webapp/src/main/java/com/yb/lb/webapp/record/records/service/ReceiptRecordsService.java
@@ -334,6 +334,7 @@ public class ReceiptRecordsService {
         // 应发数量 发货单的商品的实发数量汇总
         map.put("startTime", startTime);
         map.put("endTime", endTime);
+        map.put("isAll", "1");
         // List list2 = invoiceService.findList(map, ".countNum");
         List list2 = this.findGoods(map, ".getMajorNum");
         Map map1 = (Map) list2.get(0);