质物库存汇总报表

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java

@@ -17,4 +17,11 @@ public class CsmCashDifferentService extends ServiceImpl<CsmCashDifferentMapper,
         qw.eq("logsid",logsid);
         return baseMapper.selectList(qw);
     }
+
+    public void resetByLog(CsmCashLog log) {
+
+        String dataDate = log.getDataDate();
+
+
+    }
 }

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java

@@ -104,7 +104,7 @@ public class CsmCashRest {
         return rb;
     }
 
-    @ApiOperation("保存回款信息列表")
+    @ApiOperation("保存销售信息列表")
     @PostMapping("/salesListSave")
     public ResultBean salesListSave(@RequestBody List<CsmCashSales> list) {
         ResultBean rb = ResultBean.fireFail();
@@ -113,4 +113,16 @@ public class CsmCashRest {
             return rb.success();
         return rb;
     }
+
+    @GetMapping("/resetDifferentByLogsid")
+    public ResultBean resetDifferentByLogsid(@RequestParam("logsid") String logsid) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(logsid)) {
+            return rb.setMsg("上传日志SID不可为空");
+        }
+
+        CsmCashLog log = csmCashLogService.fetchBySid(logsid);
+        csmCashDifferentService.resetByLog(log);
+        return rb.success();
+    }
 }

yxt_supervise/supervise-report/supervise-report-biz/pom.xml

@@ -127,7 +127,11 @@
 <!--            <groupId>org.springframework.cloud</groupId>-->
 <!--            <artifactId>spring-cloud-stream-binder-kafka</artifactId>-->
 <!--        </dependency>-->
-
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.5.2</version>
+        </dependency>
     </dependencies>
 
     <build>

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDay.java

@@ -0,0 +1,36 @@
+package com.yxt.supervise.report.biz.stock;
+
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("report_stock_day")
+public class ReportStockDay extends EntityWithId {
+    private String sid = IdUtil.fastSimpleUUID(); // sid
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date createTime = new Date(); // 记录创建时间
+    private String remarks; // 备注说明',
+    private String orderDate; // 单据日期',
+
+    private String projectSid; // 项目Sid',
+    private String projectName; // 项目名称',
+
+    private int stockNumber = 0; // 仓库数量',
+    private String reportTime; // 汇总时间',
+    private int countNumber = 0; // 合计货物数量',
+    private double countAmount = 0; // 合计货值',
+
+    private String fileName; // 文件名',
+    private String fileType; // 文件类型',
+    private String fileSuffix; // 文件后缀',
+    private String filePath; // 文件的相对路径',
+    private String fullUrl; // 文件完整的访问URL',
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayMapper.java

@@ -0,0 +1,8 @@
+package com.yxt.supervise.report.biz.stock;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ReportStockDayMapper extends BaseMapper<ReportStockDay> {
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProduct.java

@@ -0,0 +1,37 @@
+package com.yxt.supervise.report.biz.stock;
+
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("report_stock_day_product")
+public class ReportStockDayProduct extends EntityWithId {
+    private String sid = IdUtil.fastSimpleUUID(); // sid
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date createTime = new Date(); // 记录创建时间
+    private String remarks; // 备注说明',
+    private String orderDate; // 单据日期',
+
+    private String projectSid; // 项目Sid',
+    private String projectName; // 项目名称',
+
+    private String reportSid; // 报表Sid',
+    private String storeSid; // 仓库Sid',
+    private String storeName; // 仓库名称',
+    private String productSid; // 货物Sid',
+    private String productName; // 货物名称',
+
+    private String reportStoreSid; // 报表仓库记录Sid',
+
+    private int prodNumber = 0; // 货物数量',
+    private double prodPrice = 0; // 货物单价',
+    private double prodAmount = 0; // 货物货值',
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProductMapper.java

@@ -0,0 +1,8 @@
+package com.yxt.supervise.report.biz.stock;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ReportStockDayProductMapper extends BaseMapper<ReportStockDayProduct> {
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProductService.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.report.biz.stock;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ReportStockDayProductService extends ServiceImpl<ReportStockDayProductMapper, ReportStockDayProduct> {
+    public List<ReportStockDayProduct> listByReportStoreSid(String reportStoreSid) {
+        QueryWrapper<ReportStockDayProduct> qw = new QueryWrapper<>();
+        qw.eq("reportStoreSid", reportStoreSid);
+        return baseMapper.selectList(qw);
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java

@@ -0,0 +1,22 @@
+package com.yxt.supervise.report.biz.stock;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ReportStockDayService extends ServiceImpl<ReportStockDayMapper, ReportStockDay> {
+    public ReportStockDay fetchByProjectAndDay(String projectSid, String orderDate) {
+
+        QueryWrapper<ReportStockDay> qw = new QueryWrapper<>();
+        qw.eq("projectSid", projectSid);
+        qw.eq("orderDate", orderDate);
+
+        return baseMapper.selectOne(qw);
+    }
+
+    public ReportStockDay buildReportByProjectAndDay(String projectSid, String orderDate) {
+        // TODO: 根据项目Sid获取关联仓库，根据仓库Sid获取库存数据
+        return null;
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStore.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.report.biz.stock;
+
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("report_stock_day_store")
+public class ReportStockDayStore extends EntityWithId {
+    private String sid = IdUtil.fastSimpleUUID(); // sid
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date createTime = new Date(); // 记录创建时间
+    private String remarks; // 备注说明',
+    private String orderDate; // 单据日期',
+
+    private String projectSid; // 项目Sid',
+    private String projectName; // 项目名称',
+
+    private String reportSid; // 报表Sid',
+    private String storeSid; // 仓库Sid',
+    private String storeName; // 仓库名称',
+
+    private int productNumber = 0; // 货物数量',
+    private double productAmount = 0; // 货物货值',
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStoreMapper.java

@@ -0,0 +1,8 @@
+package com.yxt.supervise.report.biz.stock;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ReportStockDayStoreMapper extends BaseMapper<ReportStockDayStore> {
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStoreService.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.report.biz.stock;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ReportStockDayStoreService extends ServiceImpl<ReportStockDayStoreMapper, ReportStockDayStore> {
+    public List<ReportStockDayStore> listByProjectAndDay(String projectSid, String orderDate) {
+
+        QueryWrapper<ReportStockDayStore> qw = new QueryWrapper<>();
+        qw.eq("projectSid", projectSid);
+        qw.eq("orderDate", orderDate);
+        return baseMapper.selectList(qw);
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/StockDayRest.java

@@ -0,0 +1,49 @@
+package com.yxt.supervise.report.biz.stock;
+
+import com.yxt.common.core.result.ResultBean;
+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.RestController;
+
+import java.util.List;
+
+@RestController("/reportstock")
+public class StockDayRest {
+
+    @Autowired
+    private ReportStockDayService reportStockDayService;
+    @Autowired
+    private ReportStockDayStoreService reportStockDayStoreService;
+    @Autowired
+    private ReportStockDayProductService reportStockDayProductService;
+
+    @GetMapping("/getDayGather/{projectSid}/{orderDate}")
+    public ResultBean<ReportStockDay> getDayGather(@PathVariable("projectSid") String projectSid, @PathVariable("orderDate") String orderDate) {
+        ResultBean rb = ResultBean.fireFail();
+        ReportStockDay pv = reportStockDayService.fetchByProjectAndDay(projectSid, orderDate);
+        return rb.success().setData(pv);
+    }
+
+    @GetMapping("/getDayStore/{projectSid}/{orderDate}")
+    public ResultBean<List<ReportStockDayStore>> getDayStore(@PathVariable("projectSid") String projectSid, @PathVariable("orderDate") String orderDate) {
+        ResultBean rb = ResultBean.fireFail();
+        List<ReportStockDayStore> pv = reportStockDayStoreService.listByProjectAndDay(projectSid, orderDate);
+        return rb.success().setData(pv);
+    }
+
+    @GetMapping("/getDayProduct/{reportStoreSid}")
+    public ResultBean<List<ReportStockDayProduct>> getDayProduct(@PathVariable("reportStoreSid") String reportStoreSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<ReportStockDayProduct> pv = reportStockDayProductService.listByReportStoreSid(reportStoreSid);
+        return rb.success().setData(pv);
+    }
+
+    @GetMapping("/buildReport/{projectSid}/{orderDate}")
+    public ResultBean<ReportStockDay> buildReport(@PathVariable("projectSid") String projectSid, @PathVariable("orderDate") String orderDate) {
+        ResultBean rb = ResultBean.fireFail();
+        ReportStockDay pv = reportStockDayService.buildReportByProjectAndDay(projectSid, orderDate);
+
+        return rb.success().setData(pv);
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-devv.yml

@@ -1,11 +1,24 @@
 spring:
   datasource:
-    hikari:
-      max-lifetime: 500000
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
-    username: root
-    password: root
+    dynamic:
+      primary: master #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://127.0.0.1:3306/supervise_report?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+          username: root
+          password: root
+        supplychain:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+          username: root
+          password: root
+        warehouse:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://127.0.0.1:3306/warehouse2?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+          username: root
+          password: root
   cloud:
     nacos:
       discovery: