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 index c084cf1b..8d9eb203 100644 --- 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 @@ -31,7 +31,7 @@ public class ReportStockDayProduct extends EntityWithId { private String reportStoreSid; // 报表仓库记录Sid', - private int prodNumber = 0; // 货物数量', + private double 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/ReportStockDayService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/stock/ReportStockDayService.java index 4fa7b38b..426dd706 100644 --- 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 @@ -43,10 +43,11 @@ public class ReportStockDayService extends ServiceImpl shList = warehouseMapper.listStoreHouseByProjectSid(projectSid); - Date currentDate = new Date(); String orderDate = DateUtil.format(currentDate, "yyyy-MM-dd"); String reportTime = DateUtil.format(currentDate, "yyyy-MM-dd HH:mm"); @@ -56,33 +57,37 @@ public class ReportStockDayService extends ServiceImpl insertStoreList = new ArrayList<>(); List insertProductList = new ArrayList<>(); - - L.info("PPPPPP:{},{}", pi.getSid(), pi.getEntryName()); for (StoreHouse sh : shList) { - ReportStockDayStore rsds = new ReportStockDayStore(); - double amount = warehouseMapper.sumAmount(sh.getSid()); rsds.setProductAmount(amount); - + rsds.setProjectSid(pi.getSid()); + rsds.setProjectName(pi.getEntryName()); + rsds.setReportSid(rsd.getSid()); + rsds.setStoreSid(sh.getSid()); + rsds.setStoreName(sh.getName()); insertStoreList.add(rsds); - - List prodStockList = warehouseMapper.listStock(sh.getSid()); for (ProdStock ps : prodStockList) { ReportStockDayProduct rsdp = new ReportStockDayProduct(); + rsdp.setProjectSid(pi.getSid()); + rsdp.setProjectName(pi.getEntryName()); + rsdp.setReportSid(rsd.getSid()); + rsdp.setStoreSid(sh.getSid()); + rsdp.setStoreName(sh.getName()); + rsdp.setProductSid(null); + rsdp.setProductName(ps.getPro_name()); rsdp.setReportStoreSid(rsds.getSid()); - + rsdp.setProdNumber(ps.getNum()); + rsdp.setProdPrice(ps.getConfirmed_price()); + rsdp.setProdAmount(ps.getCalculated_value()); insertProductList.add(rsdp); } - countAmount = countAmount + amount; } - - + rsd.setCountAmount(countAmount); baseMapper.insert(rsd); reportStockDayStoreService.saveBatch(insertStoreList); reportStockDayProductService.saveBatch(insertProductList);