From 692d2511ed876d3853feb69e220fae4428fe8f94 Mon Sep 17 00:00:00 2001 From: liujie Date: Wed, 22 May 2024 10:59:58 +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 --- .../webapp/excel/logistics/RecordsExcel.java | 11 +++-- .../records/CrmInvoiceGoodsMapper.xml | 3 ++ .../records/ReceiptRecordsMapper.xml | 46 ++++++++++++++++++- .../service/ReceiptRecordsService.java | 1 + 4 files changed, 55 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 4792776..52b7ad3 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 @@ -121,7 +121,7 @@ public class RecordsExcel { map.put("endCode", endCode); map.put("startTime", startTime); map.put("endTime", endTime); - map.put("goodsNo", goodsNo); + map.put("goodsNo", objectMap.get("goodsNo")+""); List list2 = receiptRecordsService.findGoods(map, ".getMajorNum"); Map map1 = (Map) list2.get(0); if (map1 != null) { @@ -138,7 +138,7 @@ public class RecordsExcel { map.put("endCode", endCode); map.put("invoiceStartTime", startTime); map.put("invoiceEndTime", endTime); - map.put("goodsNo", goodsNo); + map.put("goodsNo", objectMap.get("goodsNo")+""); Integer invoiceNum = receiptRecordsService.countAll(map, ".countRecordsByCondition"); invoiceNum = StringUtil.isNullOrEmpty(invoiceNum)? 0:invoiceNum; receiptRecordsBo.setInvoiceNum(invoiceNum.toString()); @@ -149,7 +149,7 @@ public class RecordsExcel { map.put("endCode", endCode); map.put("receiveStartTime", startTime); map.put("receiveEndTime", endTime); - map.put("goodsNo", goodsNo); + map.put("goodsNo", objectMap.get("goodsNo")+""); map.put("timeFlag", "1"); Integer receiveNum = receiptRecordsService.countAll(map, ".statisticsRecords"); receiveNum = StringUtil.isNullOrEmpty(receiveNum)? 0:receiveNum; @@ -161,7 +161,7 @@ public class RecordsExcel { map.put("endCode", endCode); map.put("deliveryStartTime", startTime); map.put("deliveryEndTime", endTime); - map.put("goodsNo", goodsNo); + map.put("goodsNo", objectMap.get("goodsNo")+""); map.put("timeFlag", "2"); Integer deliveryNum = receiptRecordsService.countAll(map, ".statisticsRecords"); deliveryNum = StringUtil.isNullOrEmpty(deliveryNum)? 0:deliveryNum; @@ -208,10 +208,12 @@ public class RecordsExcel { map.putAll(tranMap); String startTime = tranMap.get("startTime") + ""; String endTime = tranMap.get("endTime") + ""; + String goodsNo = tranMap.get("goodsNo") + ""; // 应发数量 该经销商发货单的应发数量汇总 map.put("startTime", startTime); map.put("endTime", endTime); + map.put("goodsNo", goodsNo); List list2 = receiptRecordsService.findGoods(map, ".getMajorNum"); Map map1 = (Map) list2.get(0); if (map1 != null) { @@ -226,6 +228,7 @@ public class RecordsExcel { map.remove("endTime"); map.put("invoiceStartTime", startTime); map.put("invoiceEndTime", endTime); + map.put("isAll", "1"); Integer invoiceNum = receiptRecordsService.countAll(map, ".countRecordsByCondition"); invoiceNum = StringUtil.isNullOrEmpty(invoiceNum)? 0:invoiceNum; receiptRecordsBo.setInvoiceNum(invoiceNum.toString()); 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 bcb5abd..81008c9 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,6 +124,9 @@ AND a.GOODS_NO = #{goodsNo} + + AND (a.GOODS_NO is null or a.GOODS_NO = '') + AND c.client_id = #{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 d5f6350..75fddaf 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 @@ -264,6 +264,21 @@ AND a.GOODS_NO = #{goodsNo} + + and a.INVOICE_CLIENT_ID in + ( SELECT client_id FROM crm_total_records + + + AND TO_CHAR(TO_DATE(SUBSTR(create_time,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') >= + TO_CHAR(TO_DATE(SUBSTR(#{invoiceStartTime},1,10),'yyyy-MM-dd'),'yyyy-MM-dd') + + + AND TO_CHAR(TO_DATE(SUBSTR(create_time,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') <= + TO_CHAR(TO_DATE(SUBSTR(#{invoiceEndTime},1,10),'yyyy-MM-dd'),'yyyy-MM-dd') + + + ) + AND (a.GOODS_NO is null or a.GOODS_NO = '') @@ -394,7 +409,9 @@ - group by GOODS_NO + + group by GOODS_NO + -- ORDER BY a.create_time DESC @@ -408,6 +425,29 @@ AND a.GOODS_NO = #{goodsNo} + + and a.CLIENT_ID in + ( SELECT client_id FROM crm_total_records + + + AND TO_CHAR(TO_DATE(SUBSTR(create_time,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') >= + TO_CHAR(TO_DATE(SUBSTR(#{receiveStartTime},1,10),'yyyy-MM-dd'),'yyyy-MM-dd') + + + AND TO_CHAR(TO_DATE(SUBSTR(create_time,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') <= + TO_CHAR(TO_DATE(SUBSTR(#{receiveEndTime},1,10),'yyyy-MM-dd'),'yyyy-MM-dd') + + + AND TO_CHAR(TO_DATE(SUBSTR(create_time,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') >= + TO_CHAR(TO_DATE(SUBSTR(#{deliveryStartTime},1,10),'yyyy-MM-dd'),'yyyy-MM-dd') + + + AND TO_CHAR(TO_DATE(SUBSTR(create_time,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') <= + TO_CHAR(TO_DATE(SUBSTR(#{deliveryEndTime},1,10),'yyyy-MM-dd'),'yyyy-MM-dd') + + + ) + AND (a.GOODS_NO is null or a.GOODS_NO = '') @@ -553,7 +593,9 @@ - group by GOODS_NO + + group by GOODS_NO +