From 050e22735bea6f6f0353fc1663c7989ab2013f48 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 29 Aug 2023 17:40:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/biz/stock/ReportStockDayService.java | 16 +++++++++------- .../yxt/supervise/report/ds/crm/CrmMapper.java | 3 +++ .../report/ds/warehouse/StoreHouse.java | 1 + .../report/ds/warehouse/WarehouseMapper.java | 7 +++---- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java index 9d390e32..484f56be 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java @@ -65,7 +65,7 @@ public class ReportStockDayService extends ServiceImpl shList = warehouseMapper.listStoreHouseByProjectSid(projectSid); + List shList = crmMapper.listStoreHouseByProjectSid(projectSid); Date currentDate = new Date(); String orderDate = DateUtil.format(currentDate, "yyyy-MM-dd"); @@ -80,23 +80,25 @@ public class ReportStockDayService extends ServiceImpl insertProductList = new ArrayList<>(); for (StoreHouse sh : shList) { ReportStockDayStore rsds = new ReportStockDayStore(); - double amount = warehouseMapper.sumAmount(sh.getSid()); + double amount = warehouseMapper.sumAmount(sh.getShSid()); + //根据sid查询仓库名 + String name=warehouseMapper.getNameBySid(sh.getShSid()); rsds.setProductAmount(amount); rsds.setProjectSid(pi.getSid()); rsds.setProjectName(pi.getEntryName()); rsds.setReportSid(rsd.getSid()); - rsds.setStoreSid(sh.getSid()); - rsds.setStoreName(sh.getName()); + rsds.setStoreSid(sh.getShSid()); + rsds.setStoreName(name); rsds.setOrderDate(orderDate); insertStoreList.add(rsds); - List prodStockList = warehouseMapper.listStock(sh.getSid()); + List prodStockList = warehouseMapper.listStock(sh.getShSid()); for (ProdStock ps : prodStockList) { ReportStockDayProduct rsdp = new ReportStockDayProduct(); rsdp.setProjectSid(pi.getSid()); rsdp.setProjectName(pi.getEntryName()); rsdp.setReportSid(rsd.getSid()); - rsdp.setStoreSid(sh.getSid()); - rsdp.setStoreName(sh.getName()); + rsdp.setStoreSid(sh.getShSid()); + rsdp.setStoreName(name); rsdp.setProductSid(ps.getSid()); rsdp.setProductName(ps.getPro_name()); rsdp.setReportStoreSid(rsds.getSid()); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java index e8cb9e4a..37f9e9c4 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java @@ -2,6 +2,7 @@ package com.yxt.supervise.report.ds.crm; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.supervise.report.ds.warehouse.StoreHouse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -20,4 +21,6 @@ public interface CrmMapper extends BaseMapper { List suerList(@Param("projectSid") String projectSid); @Select("select count(*) from user_project where projectSid=#{projectSid} and userSid=#{userSid}") int getCountByUserSidAndProjectSid(@Param("projectSid") String projectSid,@Param("userSid")String userSid); + @Select("select * from storehouse_project where projectSid = #{projectSid} ") + List listStoreHouseByProjectSid(@Param("projectSid") String projectSid); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/StoreHouse.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/StoreHouse.java index a85fdf36..f6ae969e 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/StoreHouse.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/StoreHouse.java @@ -8,4 +8,5 @@ import lombok.Data; public class StoreHouse { private String sid; private String name; + private String shSid; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/WarehouseMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/WarehouseMapper.java index c103efee..bdefb02d 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/WarehouseMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/WarehouseMapper.java @@ -13,14 +13,13 @@ import java.util.List; public interface WarehouseMapper extends BaseMapper { // a89c4ec7-d756-4f42-a8e0-c1427b477216 瀚川商贸仓库 236408a1-c36e-416c-9f49-d6caa7671009 - @Select("select ss.sid,ss.name " + - "from sh_storehouse ss left join storehouse_project sp on sp.sh_sid=ss.sid " + - "where sp.project_sid =#{projectSid} ") - List listStoreHouseByProjectSid(@Param("projectSid") String projectSid); + @Select("select sum(calculated_value) from prod_stock where store_house_sid=#{sid}") double sumAmount(String sid); @Select("select sid,pro_name,num,confirmed_price,calculated_value from prod_stock where store_house_sid=#{sid}") List listStock(String sid); + @Select("select name from sh_storehouse where sid=#{sid}") + String getNameBySid(String sid); }