库存日报

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

@@ -0,0 +1,41 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+
+@ApiModel(value = "库存日报表-汇总", description = "库存日报表-汇总")
+@TableName("report_inventory_day_gather")
+@Data
+public class ReportInventoryDayGather extends EntityWithId {
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+}

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

@@ -0,0 +1,37 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+@Data
+public class ReportInventoryDayGatherDto implements Dto {
+    private String id;
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+}

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

@@ -0,0 +1,37 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+@Data
+public class ReportInventoryDayGatherQuery implements Query {
+    private String id;
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+}

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

@@ -0,0 +1,39 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+@Data
+public class ReportInventoryDayGatherVo implements Vo {
+    private String id;
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+    private List<ReportInventoryDayGatherVo> list;
+}

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

@@ -0,0 +1,28 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+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/26 17:58
+ */
+@ApiModel(value = "仓库库存报表-汇总", description = "仓库库存报表-汇总")
+@TableName("report_inventory_day_store")
+@Data
+public class ReportInventoryDayStore 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;
+}

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

@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:59
+ */
+@Data
+public class ReportInventoryDayStoreDto implements Dto {
+    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 String productCountNumber;
+    private String productAmount;
+    private String countAmount;
+    private String countProductNumber;
+}

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

@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:59
+ */
+@Data
+public class ReportInventoryDayStoreQuery implements Query {
+    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 String productCountNumber;
+    private String productAmount;
+    private String countAmount;
+    private String countProductNumber;
+}

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

@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:59
+ */
+@Data
+public class ReportInventoryDayStoreVo 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 String productCountNumber;
+    private String productAmount;
+    private String countAmount;
+    private String countProductNumber;
+}

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

@@ -1,6 +1,9 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -76,4 +79,8 @@ public interface ReportInventoryDayGatherMapper extends BaseMapper<ReportInvento
             " sum(prodValue)  " +
             "from gd_inventory_yc giy where warehouseType=2 ")
     double countProductAmountYc();
+    @Select("select * from report_inventory_day_gather where orderDate=#{orderDate}")
+    List<ReportInventoryDayGatherVo> getReportInventoryDayGathers(@Param("orderDate") String orderDate);
+    @Select("select * from report_inventory_day_gather where orderDate=#{orderDate} limit 1")
+    ReportInventoryDayGatherVo getReportInventoryDayGather(@Param("orderDate") String orderDate);
 }

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

@@ -1,7 +1,12 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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 org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -75,4 +80,11 @@ public class ReportInventoryDayGatherService extends ServiceImpl<ReportInventory
 
         super.saveBatch(whInList);
     }
+    public ReportInventoryDayGatherVo getReportInventoryDayGather(String orderDate) {
+        QueryWrapper<com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGather> qw = new QueryWrapper<>();
+        ReportInventoryDayGatherVo vo=baseMapper.getReportInventoryDayGather(orderDate);
+        List<ReportInventoryDayGatherVo> pagging = baseMapper.getReportInventoryDayGathers(orderDate);
+        vo.setList(pagging);
+        return vo;
+    }
 }

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

@@ -1,12 +1,12 @@
 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.ReportInventoryDayGatherQuery;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController("com.yxt.supervise.report.biz.reportinventory.reportInventoryRest")
 @RequestMapping("/reportinventory")
@@ -14,6 +14,8 @@ public class ReportInventoryRest {
 
     @Autowired
     private ReportInventoryService reportInventoryService;
+    @Autowired
+    private ReportInventoryDayGatherService reportInventoryDayGatherService;
 
     @GetMapping("/kcReport")
     public ResultBean kcReport(@RequestParam("orderDate") String orderDate) {
@@ -27,4 +29,10 @@ 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);
+        return rb.success().setData(pv);
+    }
 }

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

@@ -86,8 +86,8 @@ public class WechatRest {
         String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken);
         List<String> openIds=new ArrayList<>();
         openIds.add("otnrM57kui-WCUmRtChhb1HguOgw");
-        openIds.add("otnrM544hxIgkMOfaDU8VpJhj_6k");
-        openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk");
+        openIds.add("otnrM521f8KcCsRfL2Jj4Tk8np1g");
+//        openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk");
         JSONObject jsonObject=new JSONObject();
         for(String openId:openIds){
             sendMag.put("thing3", new Template(csmCashReportVo.getCompanyName()));