Browse Source

仓库库存接口

master
wangpengfei 2 years ago
parent
commit
38a51297a3
  1. 8
      yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
  2. 1
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylog/GdInventoryLogRest.java
  3. 35
      yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java
  4. 33
      yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java
  5. 5
      yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java
  6. 13
      yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java
  7. 40
      yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStore.java
  8. 35
      yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreDto.java
  9. 35
      yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreQuery.java
  10. 41
      yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreVo.java
  11. 4
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java
  12. 6
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreMapper.java
  13. 14
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreService.java
  14. 7
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreMapper.java
  15. 14
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreService.java
  16. 68
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java
  17. 87
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java
  18. 64
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryWxRest.java
  19. 49
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java

8
yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml

@ -123,7 +123,13 @@
<classifier>jdk15</classifier>
<version>2.4</version>
</dependency>
<!-- <dependency>-->
<dependency>
<groupId>com.yxt.supervise</groupId>
<artifactId>supervise-report-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.yxt.supervise</groupId>-->
<!-- <artifactId>supervise-report-api</artifactId>-->
<!-- <version>0.0.1-SNAPSHOT</version>-->

1
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventorylog/GdInventoryLogRest.java

@ -43,4 +43,5 @@ public class GdInventoryLogRest {
return rb.setMsg("未得到上传日志");
return rb.success().setData(log);
}
}

35
yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java

@ -0,0 +1,35 @@
package com.yxt.supervise.report.api.reportinventorydaygather;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
import io.swagger.annotations.Api;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList;
/**
* @author wangpengfei
* @date 2023/6/27 14:05
*/
@Api(tags = "信息")
@FeignClient(
contextId = "supervise-report-reportinventorydaygather",
name = "supervise-report",
path = "reportinventory",
fallback = ReportInventoryDayGatherFeignFallback.class)
public interface ReportInventoryDayGatherFeign {
//
@GetMapping("/getReportInventoryDayGathers")
@ResponseBody
public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGathers(String orderDate);
@GetMapping("/getReportInventoryDayStores")
@ResponseBody
public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStores(String orderDate);
@GetMapping("/getReportInventoryDayToStores")
@ResponseBody
public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(String orderDate);
}

33
yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java

@ -0,0 +1,33 @@
package com.yxt.supervise.report.api.reportinventorydaygather;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.ArrayList;
/**
* @author wangpengfei
* @date 2023/6/27 14:06
*/
@Component
public class ReportInventoryDayGatherFeignFallback implements ReportInventoryDayGatherFeign{
@Override
public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGathers(String orderDate) {
return null;
}
@Override
public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStores(String orderDate) {
return null;
}
@Override
public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(String orderDate) {
return null;
}
}

5
yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java

@ -3,6 +3,7 @@ package com.yxt.supervise.report.api.reportinventorydaygather;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -32,8 +33,8 @@ public class ReportInventoryDayGatherVo implements Vo {
//品种数量
private Integer productCountNumber;
//货值
private double productAmount;
private BigDecimal productAmount;
//合计货值
private double countAmount;
private BigDecimal countAmount;
private List<ReportInventoryDayGatherVo> list;
}

13
yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java

@ -3,12 +3,16 @@ package com.yxt.supervise.report.api.reportinventorydaystore;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/6/26 17:59
*/
@Data
public class ReportInventoryDayStoreVo implements Vo {
private String id;
private String createTime;
private String remarks;
@ -18,8 +22,9 @@ public class ReportInventoryDayStoreVo implements Vo {
private String warehouseType;
private String storeCode;
private String storeCodeName;
private String productCountNumber;
private String productAmount;
private String countAmount;
private String countProductNumber;
private Integer productCountNumber;
private BigDecimal productAmount;
private BigDecimal countAmount;
private BigDecimal countProductNumber;
private List<ReportInventoryDayStoreVo> list;
}

40
yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStore.java

@ -0,0 +1,40 @@
package com.yxt.supervise.report.api.reportinventorydaytobaccostore;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.EntityWithId;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/6/27 8:48
*/
@ApiModel(value = "仓库库存报表-汇总", description = "仓库库存报表-汇总")
@TableName("report_inventory_day_tobacco_store")
@Data
public class ReportInventoryDayTobaccoStore extends EntityWithId { //记录创建时间
private String createTime;
//备注说明
private String remarks;
//单据日期
private String orderDate;
//编号
private String serialNumber;
//上报时间
private String reportTime;
//仓库类型
private String warehouseType;
//门店编号
private String storeCode;
//[门店编号]门店名称
private String storeCodeName;
//品种数量
private String productCountNumber;
//货值
private String productAmount;
//合计货值
private String countAmount;
//合计品种数量
private String countProductNumber;
}

35
yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreDto.java

@ -0,0 +1,35 @@
package com.yxt.supervise.report.api.reportinventorydaytobaccostore;
import com.yxt.common.core.dto.Dto;
/**
* @author wangpengfei
* @date 2023/6/27 8:48
*/
public class ReportInventoryDayTobaccoStoreDto implements Dto {
//记录创建时间
private String createTime;
//备注说明
private String remarks;
//单据日期
private String orderDate;
//编号
private String serialNumber;
//上报时间
private String reportTime;
//仓库类型
private String warehouseType;
//门店编号
private String storeCode;
//[门店编号]门店名称
private String storeCodeName;
//品种数量
private String productCountNumber;
//货值
private String productAmount;
//合计货值
private String countAmount;
//合计品种数量
private String countProductNumber;
}

35
yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreQuery.java

@ -0,0 +1,35 @@
package com.yxt.supervise.report.api.reportinventorydaytobaccostore;
import com.yxt.common.core.query.Query;
/**
* @author wangpengfei
* @date 2023/6/27 8:49
*/
public class ReportInventoryDayTobaccoStoreQuery implements Query {
//记录创建时间
private String createTime;
//备注说明
private String remarks;
//单据日期
private String orderDate;
//编号
private String serialNumber;
//上报时间
private String reportTime;
//仓库类型
private String warehouseType;
//门店编号
private String storeCode;
//[门店编号]门店名称
private String storeCodeName;
//品种数量
private String productCountNumber;
//货值
private String productAmount;
//合计货值
private String countAmount;
//合计品种数量
private String countProductNumber;
}

41
yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreVo.java

@ -0,0 +1,41 @@
package com.yxt.supervise.report.api.reportinventorydaytobaccostore;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/6/27 8:49
*/
@Data
public class ReportInventoryDayTobaccoStoreVo implements Vo {
private String id;
//记录创建时间
private String createTime;
//备注说明
private String remarks;
//单据日期
private String orderDate;
//编号
private String serialNumber;
//上报时间
private String reportTime;
//仓库类型
private String warehouseType;
//门店编号
private String storeCode;
//[门店编号]门店名称
private String storeCodeName;
//品种数量
private Integer productCountNumber;
//货值
private BigDecimal productAmount;
//合计货值
private BigDecimal countAmount;
//合计品种数量
private BigDecimal countProductNumber;
private List<ReportInventoryDayTobaccoStoreVo> list;
}

4
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherQuery;
import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -84,6 +85,9 @@ public class ReportInventoryDayGatherService extends ServiceImpl<ReportInventory
QueryWrapper<com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGather> qw = new QueryWrapper<>();
ReportInventoryDayGatherVo vo=baseMapper.getReportInventoryDayGather(orderDate);
List<ReportInventoryDayGatherVo> pagging = baseMapper.getReportInventoryDayGathers(orderDate);
if(null==vo){
return vo;
}
vo.setList(pagging);
return vo;
}

6
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreMapper.java

@ -1,6 +1,8 @@
package com.yxt.supervise.report.biz.reportinventory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -22,4 +24,8 @@ public interface ReportInventoryDayStoreMapper extends BaseMapper<ReportInventor
"from gd_inventory_ok gio where warehouseType=2 " +
"group by warehouseCode ")
List<ReportInventoryDayStore> listCountStore();
@Select("select * from report_inventory_day_store where orderDate=#{orderDate}")
List<ReportInventoryDayStoreVo> getReportInventoryDayStores(@Param("orderDate") String orderDate);
@Select("select countAmount,countProductNumber from report_inventory_day_store where orderDate=#{orderDate} limit 1")
ReportInventoryDayStoreVo getReportInventoryDayStore(@Param("orderDate") String orderDate);
}

14
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayStoreService.java

@ -1,6 +1,9 @@
package com.yxt.supervise.report.biz.reportinventory;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
import org.springframework.stereotype.Service;
import java.util.List;
@ -28,4 +31,15 @@ public class ReportInventoryDayStoreService extends ServiceImpl<ReportInventoryD
super.saveBatch(list);
}
public ReportInventoryDayStoreVo getReportInventoryDayStore(String orderDate) {
QueryWrapper<com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStore> qw = new QueryWrapper<>();
ReportInventoryDayStoreVo vo=baseMapper.getReportInventoryDayStore(orderDate);
List<ReportInventoryDayStoreVo> pagging = baseMapper.getReportInventoryDayStores(orderDate);
if(null==vo){
return vo;
}
vo.setList(pagging);
return vo;
}
}

7
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreMapper.java

@ -1,6 +1,9 @@
package com.yxt.supervise.report.biz.reportinventory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -22,4 +25,8 @@ public interface ReportInventoryDayTobaccoStoreMapper extends BaseMapper<ReportI
"from gd_inventory_yc giy where warehouseType=2 " +
"group by warehouseCode ")
List<ReportInventoryDayTobaccoStore> listCountStore();
@Select("select * from report_inventory_day_tobacco_store where orderDate=#{orderDate}")
List<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(@Param("orderDate") String orderDate);
@Select("select countAmount,countProductNumber from report_inventory_day_tobacco_store where orderDate=#{orderDate} limit 1")
ReportInventoryDayTobaccoStoreVo getReportInventoryDayToStore(@Param("orderDate") String orderDate);
}

14
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayTobaccoStoreService.java

@ -1,6 +1,10 @@
package com.yxt.supervise.report.biz.reportinventory;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStore;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
import org.springframework.stereotype.Service;
import java.util.List;
@ -28,4 +32,14 @@ public class ReportInventoryDayTobaccoStoreService extends ServiceImpl<ReportInv
super.saveBatch(list);
}
public ReportInventoryDayTobaccoStoreVo getReportInventoryDayToStore(String orderDate) {
QueryWrapper<com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStore> qw = new QueryWrapper<>();
ReportInventoryDayTobaccoStoreVo vo=baseMapper.getReportInventoryDayToStore(orderDate);
List<ReportInventoryDayTobaccoStoreVo> pagging = baseMapper.getReportInventoryDayToStores(orderDate);
if(null==vo){
return vo;
}
vo.setList(pagging);
return vo;
}
}

68
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java

@ -2,20 +2,29 @@ package com.yxt.supervise.report.biz.reportinventory;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherFeign;
import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherQuery;
import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@RestController("com.yxt.supervise.report.biz.reportinventory.reportInventoryRest")
@RequestMapping("/reportinventory")
public class ReportInventoryRest {
public class ReportInventoryRest implements ReportInventoryDayGatherFeign {
@Autowired
private ReportInventoryService reportInventoryService;
@Autowired
private ReportInventoryDayGatherService reportInventoryDayGatherService;
@Autowired
private ReportInventoryDayStoreService reportInventoryDayStoreService;
@Autowired
private ReportInventoryDayTobaccoStoreService reportInventoryDayTobaccoStoreService;
@GetMapping("/kcReport")
public ResultBean kcReport(@RequestParam("orderDate") String orderDate) {
@ -29,10 +38,67 @@ public class ReportInventoryRest {
reportInventoryService.buildInventoryReportByDay(orderDate);
return rb.success();
}
//
@GetMapping("/getReportInventoryDayGather/{orderDate}")
public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGather(@PathVariable("orderDate") String orderDate){
ResultBean rb = ResultBean.fireFail();
ReportInventoryDayGatherVo pv = reportInventoryDayGatherService.getReportInventoryDayGather(orderDate);
if(null==pv){
return rb.success().setData(new ArrayList<>());
}
return rb.success().setData(pv);
}
@GetMapping("/getReportInventoryDayStore/{orderDate}")
public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStore(@PathVariable("orderDate") String orderDate){
ResultBean rb = ResultBean.fireFail();
ReportInventoryDayStoreVo pv = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate);
if(null==pv){
return rb.success().setData(new ArrayList<>());
}
return rb.success().setData(pv);
}
@GetMapping("/getReportInventoryDayToStore/{orderDate}")
public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStore(@PathVariable("orderDate") String orderDate){
ResultBean rb = ResultBean.fireFail();
ReportInventoryDayTobaccoStoreVo pv = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate);
if(null==pv){
return rb.success().setData(new ArrayList<>());
}
return rb.success().setData(pv);
}
//
@GetMapping("/getReportInventoryDayGathers")
public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGathers(String orderDate){
ResultBean rb = ResultBean.fireFail();
ReportInventoryDayGatherVo pv = reportInventoryDayGatherService.getReportInventoryDayGather(orderDate);
if(null==pv){
return rb.success().setData(new ArrayList<>());
}
return rb.success().setData(pv);
}
@GetMapping("/getReportInventoryDayStores")
public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStores(String orderDate){
ResultBean rb = ResultBean.fireFail();
ReportInventoryDayStoreVo pv = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate);
if(null==pv){
return rb.success().setData(new ArrayList<>());
}
return rb.success().setData(pv);
}
@GetMapping("/getReportInventoryDayToStores")
public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStores(String orderDate){
ResultBean rb = ResultBean.fireFail();
ReportInventoryDayTobaccoStoreVo pv = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate);
if(null==pv){
return rb.success().setData(new ArrayList<>());
}
return rb.success().setData(pv);
}
//下载excel
@GetMapping("/downloadExcel/{orderDate}")
public ResultBean<String> downloadExcel(@PathVariable("orderDate") String orderDate) {
ResultBean rb = ResultBean.fireFail();
String log = reportInventoryService.buildsExcelById(orderDate);
return rb.success().setData(log);
}
}

87
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java

@ -22,4 +22,91 @@ public class ReportInventoryService {
reportInventoryDayStoreService.clearAndBuildOfDay(orderDate);
reportInventoryDayTobaccoStoreService.clearAndBuildOfDay(orderDate);
}
public String buildsExcelById(String orderDate) {
// long millis = System.currentTimeMillis();
// GdInventoryLog gdInventoryLog = baseMapper.selectById(logsid);
// if (gdInventoryLog == null)
// return null;
// String orderDate = gdInventoryLog.getOrderDate();
//
// String xlsxpath = xlsxtmplPath + "库存汇总表模板.xlsx";
// File srcFile = FileUtil.file(xlsxpath);
// String tfile = "kchzb/库存汇总表" + orderDate + ".xlsx";
//
// String url = urlPrefix + tfile;
// String toFileName = uploadPath + tfile;
// File file = FileUtil.file(toFileName);
// FileUtil.copy(srcFile, file, true);
//
// ExcelWriter writer = ExcelUtil.getWriter(file);
//
// ReportInventoryDayGatherVo vo = ReportInventoryDayGatherFeign.getReportInventoryDayGathers(orderDate).getData();
// if (null!=vo) {
// //ReportInventoryDayGather gather = gatherList.get(0);
// // 库存汇总日报表
// writer.setSheet(0);
// writer.writeCellValue(0, 1, "编号:" + vo.getSerialNumber());
// writer.writeCellValue(3, 1, vo.getReportTime());
// int countRow = vo.getList().size() + 3;
// for (int y = 3; y < countRow; y++) {
// ReportInventoryDayGatherVo map = vo.getList().get(y - 3);
// writer.writeCellValue(0, y, map.getStoreType());
// writer.writeCellValue(1, y, map.getStoreNumber());
// writer.writeCellValue(2, y, map.getProductCountNumber());
// writer.writeCellValue(3, y, map.getProductAmount());
// }
// writer.writeCellValue(0, countRow, "合计");
// writer.writeCellValue(1, countRow, "");
// writer.writeCellValue(2, countRow, "");
// writer.writeCellValue(3, countRow, vo.getCountAmount());
// }
//
// ReportInventoryDayStoreVo storeVo = ReportInventoryDayGatherFeign.getReportInventoryDayStores(orderDate).getData();
// if (null !=storeVo) {
// //ReportInventoryDayStore store = storeList.get(0);
// // 仓库库存明细表
// writer.setSheet(1);
// int countRow = storeVo.getList().size() + 1;
// for (int y = 1; y < countRow; y++) {
// ReportInventoryDayStoreVo map = storeVo.getList().get(y - 1);
// writer.writeCellValue(0, y, map.getStoreCodeName());
// writer.writeCellValue(1, y, map.getProductCountNumber());
// writer.writeCellValue(2, y, map.getProductAmount());
// }
// writer.writeCellValue(0, countRow, "总计");
// writer.writeCellValue(1, countRow, storeVo.getCountProductNumber());
// writer.writeCellValue(2, countRow, storeVo.getCountAmount());
// }
//
// ReportInventoryDayTobaccoStoreVo ycVo = ReportInventoryDayGatherFeign.getReportInventoryDayToStores(orderDate).getData();
// if (null != ycVo) {
// //ReportInventoryDayTobaccoStore store = ycList.get(0);
// // 烟草仓库库存明细表
// writer.setSheet(2);
// int countRow = ycVo.getList().size() + 1;
// for (int y = 1; y < countRow; y++) {
// ReportInventoryDayTobaccoStoreVo map = ycVo.getList().get(y - 1);
// writer.writeCellValue(0, y, map.getStoreCodeName());
// writer.writeCellValue(1, y, map.getProductCountNumber());
// writer.writeCellValue(2, y, map.getProductAmount());
// }
// writer.writeCellValue(0, countRow, "总计");
// writer.writeCellValue(1, countRow, ycVo.getCountProductNumber());
// writer.writeCellValue(2, countRow, ycVo.getCountAmount());
// }
//
// writer.flush();
// writer.close();
//
// gdInventoryLog.setOutFilePath(tfile);
// gdInventoryLog.setFileUrl(url);
// gdInventoryLog.setState(4);
//
// gdInventoryLog.setRemarks(gdInventoryLog.getRemarks() + ";创建Excel用时:" + (System.currentTimeMillis() - millis));
// baseMapper.updateById(gdInventoryLog);
//暂定直接拼url
String url="http://8.130.39.13:7003/upload/kchzb/库存汇总表"+orderDate+".xlsx";
return url;
}
}

64
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryWxRest.java

@ -0,0 +1,64 @@
package com.yxt.supervise.report.biz.reportinventory;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo;
import com.yxt.supervise.report.api.reportinventorydaytobaccostore.ReportInventoryDayTobaccoStoreVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/6/27 17:43
*/
@RestController("com.yxt.supervise.report.biz.reportinventory.reportInventoryWxRest")
@RequestMapping("reportwxmpapi/reportinventory")
public class ReportInventoryWxRest {
@Autowired
private ReportInventoryDayGatherService reportInventoryDayGatherService;
@Autowired
private ReportInventoryDayStoreService reportInventoryDayStoreService;
@Autowired
private ReportInventoryDayTobaccoStoreService reportInventoryDayTobaccoStoreService;
//
@GetMapping("/getReportInventoryDayGather/{orderDate}")
public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGather(@PathVariable("orderDate") String orderDate){
ResultBean rb = ResultBean.fireFail();
ReportInventoryDayGatherVo gather = reportInventoryDayGatherService.getReportInventoryDayGather(orderDate);
ReportInventoryDayStoreVo store = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate);
ReportInventoryDayTobaccoStoreVo tobaccoStore = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate);
List<Object> list =new ArrayList<>();
list.add(gather);
list.add(store);
list.add(tobaccoStore);
// if(null==pv){
// return rb.success().setData(new ArrayList<>());
// }
return rb.success().setData(list);
}
@GetMapping("/getReportInventoryDayStore/{orderDate}")
public ResultBean<ReportInventoryDayStoreVo> getReportInventoryDayStore(@PathVariable("orderDate") String orderDate){
ResultBean rb = ResultBean.fireFail();
ReportInventoryDayStoreVo pv = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate);
if(null==pv){
return rb.success().setData(new ArrayList<>());
}
return rb.success().setData(pv);
}
@GetMapping("/getReportInventoryDayToStore/{orderDate}")
public ResultBean<ReportInventoryDayTobaccoStoreVo> getReportInventoryDayToStore(@PathVariable("orderDate") String orderDate){
ResultBean rb = ResultBean.fireFail();
ReportInventoryDayTobaccoStoreVo pv = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate);
if(null==pv){
return rb.success().setData(new ArrayList<>());
}
return rb.success().setData(pv);
}
}

49
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java

@ -87,6 +87,55 @@ public class WechatRest {
List<String> openIds=new ArrayList<>();
openIds.add("otnrM57kui-WCUmRtChhb1HguOgw");
openIds.add("otnrM521f8KcCsRfL2Jj4Tk8np1g");
// openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk");
JSONObject jsonObject=new JSONObject();
for(String openId:openIds){
sendMag.put("thing3", new Template(csmCashReportVo.getCompanyName()));
sendMag.put("time4", new Template(csmCashReportVo.getReportDate()));
Map<String, String> miniprogram = new HashMap<>();
miniprogram.put("appid","wx11565021714ba796");
miniprogram.put("pagepath","pages/index/auditReport?companyName="+csmCashReportVo.getCompanyName()+"&dataDate="+csmCashReportVo.getDataDate());
RestTemplate restTemplate = new RestTemplate();
//拼接base参数
Map<String, Object> sendBody = new HashMap<>();
sendBody.put("miniprogram",miniprogram);
sendBody.put("touser", openId); // openId
sendBody.put("url", ""); // 点击模板信息跳转地址
sendBody.put("topcolor", "#FF0000"); // 顶色
sendBody.put("data", sendMag); // 模板参数
sendBody.put("template_id", templateId);// 模板Id
ResponseEntity<String> forEntity = restTemplate.postForEntity(wxUrl, sendBody, String.class);
jsonObject = JSONObject.parseObject(forEntity.getBody());
}
// 0
String messageCode = jsonObject.getString("errcode");
// 2431260672639467520
String msgId = jsonObject.getString("msgid");
System.out.println("messageCode : " + messageCode + ", msgId: " +msgId);
//return forEntity.getBody();
}
//仓库库存日报推送
@PostMapping("/inventorySendMessage")
public void inventorySendMessage(@RequestBody WeChatTemplateMsg data) throws Exception {
CsmCashReportVo csmCashReportVo=csmCashReportMapper.getCsmCashReport("2023-06-14");
// openId代表一个唯一微信用户,即微信消息的接收人
// String openId="otnrM57kui-WCUmRtChhb1HguOgw";
//郭
// String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
//刘
//String openId ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
//聂总
// otnrM521f8KcCsRfL2Jj4Tk8np1g
// 模板参数
Map<String, Template> sendMag = new HashMap<String, Template>();
// 公众号的模板id(也有相应的接口可以查询到)
String templateId = "CIrhaIkH6vWI4guaPqhDmMjOJkC3dt0Wpxs1JAO86N8";
//微信的基础accessToken
String accessToken=getAccessToken(APP_ID,APPSECRET);
String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken);
List<String> openIds=new ArrayList<>();
openIds.add("otnrM57kui-WCUmRtChhb1HguOgw");
openIds.add("otnrM521f8KcCsRfL2Jj4Tk8np1g");
// openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk");
JSONObject jsonObject=new JSONObject();
for(String openId:openIds){

Loading…
Cancel
Save