From b4e2fcc34824b0ba9d76004a626fc40dd2a11bb9 Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Thu, 31 Oct 2024 15:15:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/stock/StockReportController.java | 26 +++++++++++++++++++ .../stock/ClientStockReportMapper.xml | 20 +++++++++++++- .../stock/InventoryDetailMapper.xml | 8 ++++++ .../stock/entity/ClientStockReport.java | 4 +++ .../service/ClientStockReportService.java | 22 ++++++++++++++++ 5 files changed, 79 insertions(+), 1 deletion(-) diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java b/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java index 8f8d6b9..c6cdb93 100644 --- a/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java +++ b/crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java @@ -163,4 +163,30 @@ public class StockReportController extends BaseController { return toPage(clientStockReportService.pageList(params, ".getClientStockReportSql")); } + /** + * @description 客户库存盘点明细的详情 + * @author mzr + * @date 2024/10/31 + **/ + @ApiOperation("客户库存盘点明细的详情") + @PostMapping(value = "/getClientStockDetail") + public Map getClientStockDetail( + @ApiParam(required = true, value = "开始日期") @RequestParam(required = true) String startDate, + @ApiParam(required = true, value = "结束日期") @RequestParam(required = true) String endDate, + @ApiParam(required = true, value = "客户id") @RequestParam(required = true) String clientId, + HttpServletRequest request) { + Map result = new HashMap<>(); + Map params = new HashMap<>(); + String token = request.getHeader("token"); + if (!redisService.isKey(token)) { + return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录"); + } + Map tokenMap = redisService.hmget(token); + params.put("companyId", tokenMap.get("companyId")); + params.put("startDate", startDate); + params.put("endDate", endDate); + params.put("clientId", clientId); + return AjaxResult.success(clientStockReportService.listClientStockDetail(params)); + } + } diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml index dbf9fee..5b8747d 100644 --- a/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml +++ b/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml @@ -15,7 +15,9 @@ + + + \ No newline at end of file diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/stock/InventoryDetailMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/stock/InventoryDetailMapper.xml index c87417b..bdadceb 100644 --- a/crm-common/src/main/resources/mapper/mapper_oracle/stock/InventoryDetailMapper.xml +++ b/crm-common/src/main/resources/mapper/mapper_oracle/stock/InventoryDetailMapper.xml @@ -65,6 +65,14 @@ AND a.company_id = #{companyId} + + AND TO_CHAR(TO_DATE(SUBSTR(a.bill_date,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') >= + TO_CHAR(TO_DATE(SUBSTR(#{startDate},1,10),'yyyy-MM-dd'),'yyyy-MM-dd') + + + AND TO_CHAR(TO_DATE(SUBSTR(a.bill_date,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') <= + TO_CHAR(TO_DATE(SUBSTR(#{endDate},1,10),'yyyy-MM-dd'),'yyyy-MM-dd') + AND TO_CHAR(TO_DATE(SUBSTR(a.prod_date,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') >= TO_CHAR(TO_DATE(SUBSTR(#{startDateP},1,10),'yyyy-MM-dd'),'yyyy-MM-dd') diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java b/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java index a54b74a..95ffeb5 100644 --- a/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/ClientStockReport.java @@ -14,6 +14,10 @@ public class ClientStockReport implements java.io.Serializable { /** 版本号 */ private static final long serialVersionUID = -1267096003093637603L; + /** 客户id */ + @ApiModelProperty(value = "客户id") + private String clientId; + /** 客户编码-u8 */ @ApiModelProperty(value = "客户编码-u8") private String uecode; diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/stock/service/ClientStockReportService.java b/crm-webapp/src/main/java/com/yb/lb/webapp/stock/service/ClientStockReportService.java index c14aaf0..e2bbaeb 100644 --- a/crm-webapp/src/main/java/com/yb/lb/webapp/stock/service/ClientStockReportService.java +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/stock/service/ClientStockReportService.java @@ -6,6 +6,8 @@ import com.yb.lb.webapp.stock.entity.ClientStockReport; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,6 +22,8 @@ public class ClientStockReportService { @Autowired BaseOracleDao dao; + @Autowired + InventoryInfoService inventoryInfoService; /** * @description 分页查询 @@ -39,4 +43,22 @@ public class ClientStockReportService { return dao.list(ClientStockReport.class.getName() + id, params); } + /** + * @description 客户库存盘点明细的详情 + * @author mzr + * @date 2024/10/31 + **/ + public List listClientStockDetail(Map params) { + List> list = new ArrayList<>(); + List> goodsList = this.findList(params, "ListClientStockDetail"); + for (Map goodsMap : goodsList) { + Map selMap = new HashMap<>(params); + selMap.put("goodsNo", goodsMap.get("goodsNo")); + selMap.put("confirmStatus", "1"); + goodsMap.put("pdList", inventoryInfoService.findDetailList(selMap, ".findCrmInventoryDetailByCondition")); + list.add(goodsMap); + } + return list; + } + }