From 5ef679573ce83c954e9adaa3679240f2aebe4220 Mon Sep 17 00:00:00 2001 From: liupopo Date: Mon, 31 Jul 2023 18:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E7=89=A9=E5=BA=93=E5=AD=98=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/csmcash/CsmCashDifferentService.java | 7 +++ .../customer/biz/csmcash/CsmCashRest.java | 14 +++++- .../supervise-report-biz/pom.xml | 6 ++- .../report/biz/stock/ReportStockDay.java | 36 ++++++++++++++ .../biz/stock/ReportStockDayMapper.java | 8 +++ .../biz/stock/ReportStockDayProduct.java | 37 ++++++++++++++ .../stock/ReportStockDayProductMapper.java | 8 +++ .../stock/ReportStockDayProductService.java | 16 ++++++ .../biz/stock/ReportStockDayService.java | 22 +++++++++ .../report/biz/stock/ReportStockDayStore.java | 32 ++++++++++++ .../biz/stock/ReportStockDayStoreMapper.java | 8 +++ .../biz/stock/ReportStockDayStoreService.java | 18 +++++++ .../report/biz/stock/StockDayRest.java | 49 +++++++++++++++++++ .../src/main/resources/application-devv.yml | 25 +++++++--- 14 files changed, 278 insertions(+), 8 deletions(-) create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDay.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayMapper.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProduct.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProductMapper.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProductService.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStore.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStoreMapper.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStoreService.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/StockDayRest.java diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java index e3cad0b9..357c4796 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java +++ b/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 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(); + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/pom.xml b/yxt_supervise/supervise-report/supervise-report-biz/pom.xml index 38b0133d..81f7c6ba 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/pom.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/pom.xml @@ -127,7 +127,11 @@ - + + com.baomidou + dynamic-datasource-spring-boot-starter + 3.5.2 + diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDay.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDay.java new file mode 100644 index 00000000..fba73396 --- /dev/null +++ b/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', +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayMapper.java new file mode 100644 index 00000000..744565ed --- /dev/null +++ b/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 { +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProduct.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProduct.java new file mode 100644 index 00000000..c084cf1b --- /dev/null +++ b/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; // 货物货值', +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProductMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProductMapper.java new file mode 100644 index 00000000..4d276d2b --- /dev/null +++ b/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 { +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProductService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayProductService.java new file mode 100644 index 00000000..c7ea8d9b --- /dev/null +++ b/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 { + public List listByReportStoreSid(String reportStoreSid) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("reportStoreSid", reportStoreSid); + return baseMapper.selectList(qw); + } +} 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 new file mode 100644 index 00000000..afac40f9 --- /dev/null +++ b/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 { + public ReportStockDay fetchByProjectAndDay(String projectSid, String orderDate) { + + QueryWrapper 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; + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStore.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStore.java new file mode 100644 index 00000000..5696a9b8 --- /dev/null +++ b/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; // 货物货值', +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStoreMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStoreMapper.java new file mode 100644 index 00000000..e56f9e54 --- /dev/null +++ b/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 { +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStoreService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayStoreService.java new file mode 100644 index 00000000..65c75b04 --- /dev/null +++ b/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 { + public List listByProjectAndDay(String projectSid, String orderDate) { + + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("projectSid", projectSid); + qw.eq("orderDate", orderDate); + return baseMapper.selectList(qw); + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/StockDayRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/StockDayRest.java new file mode 100644 index 00000000..a37b702f --- /dev/null +++ b/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 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> getDayStore(@PathVariable("projectSid") String projectSid, @PathVariable("orderDate") String orderDate) { + ResultBean rb = ResultBean.fireFail(); + List pv = reportStockDayStoreService.listByProjectAndDay(projectSid, orderDate); + return rb.success().setData(pv); + } + + @GetMapping("/getDayProduct/{reportStoreSid}") + public ResultBean> getDayProduct(@PathVariable("reportStoreSid") String reportStoreSid) { + ResultBean rb = ResultBean.fireFail(); + List pv = reportStockDayProductService.listByReportStoreSid(reportStoreSid); + return rb.success().setData(pv); + } + + @GetMapping("/buildReport/{projectSid}/{orderDate}") + public ResultBean buildReport(@PathVariable("projectSid") String projectSid, @PathVariable("orderDate") String orderDate) { + ResultBean rb = ResultBean.fireFail(); + ReportStockDay pv = reportStockDayService.buildReportByProjectAndDay(projectSid, orderDate); + + return rb.success().setData(pv); + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-devv.yml index cc8bb1f4..ed0d2bd3 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-devv.yml +++ b/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: