Browse Source

报表

master
wangpengfei 2 years ago
parent
commit
050e22735b
  1. 16
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java
  2. 3
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java
  3. 1
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/StoreHouse.java
  4. 7
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/warehouse/WarehouseMapper.java

16
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<ReportStockDayMapper, Rep
//获取该项目详细信息 //获取该项目详细信息
ProjectInfo pi = crmMapper.fetchBySid(projectSid); ProjectInfo pi = crmMapper.fetchBySid(projectSid);
//获取该项目下仓库信息 //获取该项目下仓库信息
List<StoreHouse> shList = warehouseMapper.listStoreHouseByProjectSid(projectSid); List<StoreHouse> shList = crmMapper.listStoreHouseByProjectSid(projectSid);
Date currentDate = new Date(); Date currentDate = new Date();
String orderDate = DateUtil.format(currentDate, "yyyy-MM-dd"); String orderDate = DateUtil.format(currentDate, "yyyy-MM-dd");
@ -80,23 +80,25 @@ public class ReportStockDayService extends ServiceImpl<ReportStockDayMapper, Rep
List<ReportStockDayProduct> insertProductList = new ArrayList<>(); List<ReportStockDayProduct> insertProductList = new ArrayList<>();
for (StoreHouse sh : shList) { for (StoreHouse sh : shList) {
ReportStockDayStore rsds = new ReportStockDayStore(); 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.setProductAmount(amount);
rsds.setProjectSid(pi.getSid()); rsds.setProjectSid(pi.getSid());
rsds.setProjectName(pi.getEntryName()); rsds.setProjectName(pi.getEntryName());
rsds.setReportSid(rsd.getSid()); rsds.setReportSid(rsd.getSid());
rsds.setStoreSid(sh.getSid()); rsds.setStoreSid(sh.getShSid());
rsds.setStoreName(sh.getName()); rsds.setStoreName(name);
rsds.setOrderDate(orderDate); rsds.setOrderDate(orderDate);
insertStoreList.add(rsds); insertStoreList.add(rsds);
List<ProdStock> prodStockList = warehouseMapper.listStock(sh.getSid()); List<ProdStock> prodStockList = warehouseMapper.listStock(sh.getShSid());
for (ProdStock ps : prodStockList) { for (ProdStock ps : prodStockList) {
ReportStockDayProduct rsdp = new ReportStockDayProduct(); ReportStockDayProduct rsdp = new ReportStockDayProduct();
rsdp.setProjectSid(pi.getSid()); rsdp.setProjectSid(pi.getSid());
rsdp.setProjectName(pi.getEntryName()); rsdp.setProjectName(pi.getEntryName());
rsdp.setReportSid(rsd.getSid()); rsdp.setReportSid(rsd.getSid());
rsdp.setStoreSid(sh.getSid()); rsdp.setStoreSid(sh.getShSid());
rsdp.setStoreName(sh.getName()); rsdp.setStoreName(name);
rsdp.setProductSid(ps.getSid()); rsdp.setProductSid(ps.getSid());
rsdp.setProductName(ps.getPro_name()); rsdp.setProductName(ps.getPro_name());
rsdp.setReportStoreSid(rsds.getSid()); rsdp.setReportStoreSid(rsds.getSid());

3
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.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
@ -20,4 +21,6 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
List<String> suerList(@Param("projectSid") String projectSid); List<String> suerList(@Param("projectSid") String projectSid);
@Select("select count(*) from user_project where projectSid=#{projectSid} and userSid=#{userSid}") @Select("select count(*) from user_project where projectSid=#{projectSid} and userSid=#{userSid}")
int getCountByUserSidAndProjectSid(@Param("projectSid") String projectSid,@Param("userSid")String userSid); int getCountByUserSidAndProjectSid(@Param("projectSid") String projectSid,@Param("userSid")String userSid);
@Select("select * from storehouse_project where projectSid = #{projectSid} ")
List<StoreHouse> listStoreHouseByProjectSid(@Param("projectSid") String projectSid);
} }

1
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 { public class StoreHouse {
private String sid; private String sid;
private String name; private String name;
private String shSid;
} }

7
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<StoreHouse> { public interface WarehouseMapper extends BaseMapper<StoreHouse> {
// a89c4ec7-d756-4f42-a8e0-c1427b477216 瀚川商贸仓库 236408a1-c36e-416c-9f49-d6caa7671009 // 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<StoreHouse> listStoreHouseByProjectSid(@Param("projectSid") String projectSid);
@Select("select sum(calculated_value) from prod_stock where store_house_sid=#{sid}") @Select("select sum(calculated_value) from prod_stock where store_house_sid=#{sid}")
double sumAmount(String sid); double sumAmount(String sid);
@Select("select sid,pro_name,num,confirmed_price,calculated_value from prod_stock where store_house_sid=#{sid}") @Select("select sid,pro_name,num,confirmed_price,calculated_value from prod_stock where store_house_sid=#{sid}")
List<ProdStock> listStock(String sid); List<ProdStock> listStock(String sid);
@Select("select name from sh_storehouse where sid=#{sid}")
String getNameBySid(String sid);
} }

Loading…
Cancel
Save