From c936c29528f74b15cbdc5df775f11a5bc6f5357d Mon Sep 17 00:00:00 2001 From: liujie Date: Tue, 30 Jul 2024 11:11:11 +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=E8=BF=98=E5=8E=9F=E6=9C=AA=E6=8C=89=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=BB=84=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/excel/logistics/RecordsExcel.java | 8 --- .../lb/webapp/records/ReceiptRecordsApi.java | 2 - .../records/ReceiptRecordsController.java | 9 +-- .../records/CrmInvoiceGoodsMapper.xml | 3 - .../records/ReceiptRecordsMapper.xml | 72 +------------------ .../records/entity/ReceiptRecordsBo.java | 42 ----------- .../service/ReceiptRecordsService.java | 6 -- 7 files changed, 3 insertions(+), 139 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 88bc0c2..cbf02e9 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 @@ -63,7 +63,6 @@ public class RecordsExcel { @ApiParam(required = false, value = "业务员名称") @RequestParam(required = false) String staffName, @ApiParam(required = false, value = "营销区域id(逗号分隔)") @RequestParam(required = false) String areaIds, @ApiParam(required = false, value = "业务员id(逗号分隔)") @RequestParam(required = false) String staffIds, - @ApiParam(required = false, value = "商品編碼") @RequestParam(required = false) String goodsNo, @ApiParam(required = false, value = "开始时间") @RequestParam(required = false) String startTime, @ApiParam(required = false, value = "结束时间") @RequestParam(required = false) String endTime, HttpServletResponse response) throws Exception { @@ -81,7 +80,6 @@ public class RecordsExcel { params.put("staffName", staffName); params.put("startTime", startTime); params.put("endTime", endTime); - params.put("goodsNo", goodsNo); if (StringUtil.isNotEmpty(areaIds)) { params.put("areaIds", areaIds.split(",", -1)); } @@ -100,12 +98,6 @@ public class RecordsExcel { receiptRecordsBo.setClientId(String.valueOf(objectMap.get("clientId"))); // 客户U8编码 receiptRecordsBo.setUecode(String.valueOf(objectMap.get("uecode"))); - // 商品编码 - receiptRecordsBo.setGoodsNo(String.valueOf(objectMap.get("goodsNo"))); - // 商品名称 - receiptRecordsBo.setGoodsName(String.valueOf(objectMap.get("goodsName"))); - // 规格 - receiptRecordsBo.setSpecification(String.valueOf(objectMap.get("specification"))); // 营销区域ID receiptRecordsBo.setAreaId(String.valueOf(objectMap.get("areaId"))); // 营销区域名称 diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/records/ReceiptRecordsApi.java b/crm-admin/src/main/java/com/yb/lb/webapp/records/ReceiptRecordsApi.java index 3488501..67fa59d 100644 --- a/crm-admin/src/main/java/com/yb/lb/webapp/records/ReceiptRecordsApi.java +++ b/crm-admin/src/main/java/com/yb/lb/webapp/records/ReceiptRecordsApi.java @@ -567,7 +567,6 @@ public class ReceiptRecordsApi extends BaseController { @ApiParam(required = false, value = "营销区域id") @RequestParam(required = false) String areaId, @ApiParam(required = false, value = "开始时间") @RequestParam(required = false) String startTime, @ApiParam(required = false, value = "结束时间") @RequestParam(required = false) String endTime, - @ApiParam(required = false, value = "商品編碼") @RequestParam(required = false) String goodsNo, @ApiParam(required = false, value = "页码", defaultValue = "1") @RequestParam(required = false, value = "page") Integer page, @ApiParam(required = false, value = "每页条数", defaultValue = "10") @RequestParam(required = false, value = "pageSize") Integer pageSize, HttpServletRequest request) { @@ -590,7 +589,6 @@ public class ReceiptRecordsApi extends BaseController { params.put("areaId", areaId); params.put("page", page); params.put("pageSize", pageSize); - params.put("goodsNo",goodsNo); // 分页查询在发货单或者收发货记录中有记录的经销商 PageInfo pageInfo = receiptRecordsService.pageList(params, ".customerRecords1"); List> list = pageInfo.getList(); diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/records/ReceiptRecordsController.java b/crm-admin/src/main/java/com/yb/lb/webapp/records/ReceiptRecordsController.java index 10fe5b2..5c35b07 100644 --- a/crm-admin/src/main/java/com/yb/lb/webapp/records/ReceiptRecordsController.java +++ b/crm-admin/src/main/java/com/yb/lb/webapp/records/ReceiptRecordsController.java @@ -70,7 +70,7 @@ public class ReceiptRecordsController extends BaseController { @ApiParam(required = false, value = "经销商收货结束时间") @RequestParam(required = false) String endTime, @ApiParam(required = false, value = "经销商出货开始时间") @RequestParam(required = false) String startDate, @ApiParam(required = false, value = "经销商出货结束时间") @RequestParam(required = false) String endDate, - @ApiParam(required = false, value = "商品编码") @RequestParam(required = false) String goodsNo, + @ApiParam(required = false, value = "商品编码") @RequestParam(required = false) String goodsNo, @ApiParam(required = false, value = "商品名称") @RequestParam(required = false) String goodsName, @ApiParam(required = false, value = "商品规格") @RequestParam(required = false) String specifications, @ApiParam(required = true, value = "页码", defaultValue = "1") @RequestParam(value = "page") Integer pageNum, @@ -97,9 +97,6 @@ public class ReceiptRecordsController extends BaseController { params.put("endTime", endTime); params.put("startDate", startDate); params.put("endDate", endDate); - params.put("goodsNo", goodsNo); - params.put("goodsName", goodsName); - params.put("specifications", specifications); params.put("page", pageNum); params.put("pageSize", pageSize); return toPage(receiptRecordsService.pageList(params, ".findRecordsByCondition")); @@ -162,7 +159,6 @@ public class ReceiptRecordsController extends BaseController { @ApiParam(required = false, value = "业务员id(逗号分隔)") @RequestParam(required = false) String staffIds, @ApiParam(required = false, value = "开始时间") @RequestParam(required = false) String startTime, @ApiParam(required = false, value = "结束时间") @RequestParam(required = false) String endTime, - @ApiParam(required = false, value = "商品編碼") @RequestParam(required = false) String goodsNo, @ApiParam(required = false, value = "页码", defaultValue = "1") @RequestParam(required = false, value = "page") Integer page, @ApiParam(required = false, value = "每页条数", defaultValue = "10") @RequestParam(required = false, value = "pageSize") Integer pageSize, HttpServletRequest request) { @@ -183,7 +179,6 @@ public class ReceiptRecordsController extends BaseController { params.put("staffName", staffName); params.put("startTime", startTime); params.put("endTime", endTime); - params.put("goodsNo",goodsNo); if (StringUtil.isNotEmpty(areaIds)) { params.put("areaIds", areaIds.split(",", -1)); } @@ -227,7 +222,6 @@ public class ReceiptRecordsController extends BaseController { @ApiParam(required = false, value = "业务员id(逗号分隔)") @RequestParam(required = false) String staffIds, @ApiParam(required = false, value = "开始时间") @RequestParam(required = false) String startTime, @ApiParam(required = false, value = "结束时间") @RequestParam(required = false) String endTime, - @ApiParam(required = false, value = "商品編碼") @RequestParam(required = false) String goodsNo, HttpServletRequest request) { Map result = new HashMap(); Map params = new HashMap(); @@ -246,7 +240,6 @@ public class ReceiptRecordsController extends BaseController { map.put("endCode", endCode); map.put("clientId", clientId); map.put("clientName", clientName); - map.put("goodsNo", goodsNo); if (StringUtil.isNotEmpty(areaIds)) { map.put("areaIds", areaIds.split(",", -1)); } 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 a794d86..bcb5abd 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,9 +124,6 @@ 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 a47234f..73a8483 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 @@ -261,30 +261,6 @@ AND (a.invoice_time is not null) AND (a.invoice_client_id is not null) - - 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 = '') - - - and a.GOODS_NO is not null - AND a.company_id = #{companyId} @@ -412,10 +388,7 @@ - - group by GOODS_NO - --- ORDER BY a.create_time DESC + ORDER BY a.create_time DESC @@ -425,38 +398,6 @@ FROM crm_receipt_records a LEFT JOIN crm_distributor_user_info b on a.client_id = b.id - - 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 = '') - - - and a.GOODS_NO is not null - AND a.company_id = #{companyId} @@ -599,9 +540,6 @@ - - group by GOODS_NO - diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/record/records/entity/ReceiptRecordsBo.java b/crm-webapp/src/main/java/com/yb/lb/webapp/record/records/entity/ReceiptRecordsBo.java index e05a62b..78fa1a3 100644 --- a/crm-webapp/src/main/java/com/yb/lb/webapp/record/records/entity/ReceiptRecordsBo.java +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/record/records/entity/ReceiptRecordsBo.java @@ -31,24 +31,6 @@ public class ReceiptRecordsBo implements java.io.Serializable { @Excel(name = "U8编码", width = 15, orderNum = "2") private String uecode; - /** - * 商品编码 - */ - @Excel(name = "商品编码", width = 15, orderNum = "4") - private String goodsNo; - - /** - * 商品名称 - */ - @Excel(name = "商品名称", width = 15, orderNum = "5") - private String goodsName; - - /** - * 规格 - */ - @Excel(name = "规格", width = 15, orderNum = "6") - private String specification; - /** * 营销区域id */ @@ -125,30 +107,6 @@ public class ReceiptRecordsBo implements java.io.Serializable { @Excel(name = "出库数量", width = 15, orderNum = "10") private String deliveryNum; - public String getGoodsNo() { - return goodsNo; - } - - public void setGoodsNo(String goodsNo) { - this.goodsNo = goodsNo; - } - - public String getGoodsName() { - return goodsName; - } - - public void setGoodsName(String goodsName) { - this.goodsName = goodsName; - } - - public String getSpecification() { - return specification; - } - - public void setSpecification(String specification) { - this.specification = specification; - } - /** * 入库率 入库数量/实发数量*100 */ 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 5f8b810..237e8c6 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 @@ -259,7 +259,6 @@ public class ReceiptRecordsService { map.put("endCode", endCode); map.put("startTime", startTime); map.put("endTime", endTime); - map.put("goodsNo", objectMap.get("goodsNo")); List list2 = this.findGoods(map, ".getMajorNum"); Map map1 = (Map) list2.get(0); if (map1 != null) { @@ -276,7 +275,6 @@ public class ReceiptRecordsService { map.put("endCode", endCode); map.put("invoiceStartTime", startTime); map.put("invoiceEndTime", endTime); - map.put("goodsNo", objectMap.get("goodsNo")); Integer invoiceNum = this.countAll(map, ".countRecordsByCondition"); invoiceNum = StringUtil.isNullOrEmpty(invoiceNum)? 0:invoiceNum; // receiptRecordsBo.setInvoiceNum(invoiceNum.toString()); @@ -289,7 +287,6 @@ public class ReceiptRecordsService { map.put("receiveStartTime", startTime); map.put("receiveEndTime", endTime); map.put("timeFlag", "1"); - map.put("goodsNo", objectMap.get("goodsNo")); Integer receiveNum = this.countAll(map, ".statisticsRecords"); receiveNum = StringUtil.isNullOrEmpty(receiveNum)? 0:receiveNum; // receiptRecordsBo.setReceiveNum(receiveNum.toString()); @@ -302,7 +299,6 @@ public class ReceiptRecordsService { map.put("deliveryStartTime", startTime); map.put("deliveryEndTime", endTime); map.put("timeFlag", "2"); - map.put("goodsNo", objectMap.get("goodsNo")); Integer deliveryNum = this.countAll(map, ".statisticsRecords"); deliveryNum = StringUtil.isNullOrEmpty(deliveryNum)? 0:deliveryNum; // receiptRecordsBo.setDeliveryNum(deliveryNum.toString()); @@ -334,7 +330,6 @@ 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); @@ -351,7 +346,6 @@ public class ReceiptRecordsService { map.putAll(params); map.put("invoiceStartTime", startTime); map.put("invoiceEndTime", endTime); - map.put("isAll", "1"); Integer invoiceNum = this.countAll(map, ".countRecordsByCondition"); receiptRecordsBo.setInvoiceNum(StringUtil.isNullOrEmpty(invoiceNum) ? "0":invoiceNum+"");