diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java index 82be2458..c631e0d0 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java @@ -89,34 +89,31 @@ public interface GdInstorageCountMapper extends BaseMapper { * * @return */ - @Select("select t1.code, t1.ddje,t1.purchasedate,t1.arrivalDate, " + - " IFNULL(t2.dddhjz,0) dddhjz, " + - " IF((t1.ddje-IFNULL(t2.dddhjz,0))>0,(t1.ddje-IFNULL(t2.dddhjz,0)),0) zthjz " + - " from " + - "( select prt.code,prt.purchasedate,CONVERT(sum(prs.price),DECIMAL(12,2)) ddje,prt.arrivalDate " + - " from `purchase_requisition_store` prs left join `purchase_requisition_tobacco` prt on prt.sid=prs.mainsid " + - " group by prt.purchasedate " + - ") t1 left join " + - "( select purchasedate pp, CONVERT(sum(giyy.colq16),DECIMAL(12,2)) dddhjz " + - " from `gd_instorage_yc` giyy where giyy.purchasedate>'2023.01.04' " + - " group by purchasedate " + - ") t2 on t1.purchasedate = t2.pp ") + @Select("SELECT prt.code, " + + "CONVERT(SUM(prs.price),DECIMAL(12,2)) ddje, " + + "prt.purchasedate,prt.arrivaldate, " + + "(SELECT IFNULL(CONVERT(SUM(giyy.colq16),DECIMAL(12,2)),0) FROM `gd_instorage_yc` giyy WHERE giyy.purchasedate=prt.purchasedate ) dddhjz , " + + "IFNULL(CONVERT((CONVERT(SUM(prs.price),DECIMAL(12,2))-(SELECT IFNULL(CONVERT(SUM(giyy.colq16),DECIMAL(12,2)),0) FROM `gd_instorage_yc` giyy WHERE giyy.purchasedate=prt.purchasedate )),DECIMAL(12,2)),0) zthjz " + + "FROM " + + "`purchase_requisition_store` prs " + + "LEFT JOIN " + + "`purchase_requisition_tobacco` prt ON prt.sid=prs.mainsid " + + "GROUP BY prt.code; ") List> ycddmxb(); - @Select("select t1.storeCode, " + - " t2.colc2 xsqd, " + - " t1.ddspjz, " + - " t2.sjdhjz, " + - " IF((t1.ddspjz-t2.sjdhjz)>0,(t1.ddspjz-t2.sjdhjz),0) zthjz, " + - " IF((t2.sjdhjz-t1.ddspjz)>0,(t2.sjdhjz-t1.ddspjz),0) cchjz " + - " from " + - "( select prs.storeCode,CONVERT(sum(prs.price),DECIMAL(12,2)) ddspjz " + - " from `purchase_requisition_store` prs " + - " group by prs.storeCode " + - ") t1 left join " + - "( select colb1,colc2, CONVERT(sum(giyy.colq16),DECIMAL(12,2)) sjdhjz " + - " from `gd_instorage_yc` giyy where giyy.purchasedate>'2023.01.04' " + - " group by colb1,colc2 " + - ") t2 on t1.storeCode = t2.colb1") + @Select("SELECT t.storeName , SUM(t.ddspjz) ddspjz , SUM(t.ddjz) colq16, " + + "CONVERT(IF((SUM(t.ddspjz)-SUM(t.ddjz))>0,SUM(t.ddspjz)-SUM(t.ddjz),0),DECIMAL(12,2)) ztprodValue1, " + + "CONVERT(IF((SUM(t.ddjz)-SUM(t.ddspjz))>0,SUM(t.ddjz)-SUM(t.ddspjz),0),DECIMAL(12,2)) ztprodValue2 FROM( " + + "SELECT " + + "prs.storeCode storeCode, " + + "CONCAT('[',prs.storeCode,']',prs.storeName) storeName , " + + "CONVERT(prs.price,DECIMAL(12,2)) ddspjz , " + + "(SELECT IFNULL(SUM(giyy.colq16),0) FROM gd_instorage_yc giyy WHERE giyy.colb1=prs.storeCode AND giyy.purchasedate=prt.purchasedate ) ddjz " + + "FROM " + + "`purchase_requisition_store` prs " + + "LEFT JOIN " + + "`purchase_requisition_tobacco` prt ON prt.sid=prs.mainsid " + + "GROUP BY prs.storeCode,prt.code) t " + + "GROUP BY t.storeCode;") List> ycspdhmxb(); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java index fcd37b9c..1d2bfc6d 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java @@ -113,7 +113,7 @@ public class GdInstorageCountService extends ServiceImpl> list1 = baseMapper.gysdhhzb(); if (list1 == null || list1.isEmpty()) return rb.setMsg("供应商到货汇总表 数据为空！"); @@ -144,7 +144,7 @@ public class GdInstorageCountService extends ServiceImpl> list2 = baseMapper.spdhmxb(); if (list2 == null || list2.isEmpty()) return rb.setMsg("商品到货明细表 数据为空！"); @@ -184,7 +184,7 @@ public class GdInstorageCountService extends ServiceImpl> list3 = baseMapper.ddmxb(); if (list3 == null || list3.isEmpty()) return rb.setMsg("订单明细表 数据为空！"); @@ -209,7 +209,7 @@ public class GdInstorageCountService extends ServiceImpl> list4 = baseMapper.ycspdhmxb(); if (list4 != null && !list4.isEmpty()) { int size4 = list4.size(); @@ -218,15 +218,15 @@ public class GdInstorageCountService extends ServiceImpl map = list4.get(y - 3); writer.writeCellValue(0, y, "市烟草"); - writer.writeCellValue(1, y, map.get("xsqd")); + writer.writeCellValue(1, y, map.get("storeName")); writer.writeCellValue(2, y, map.get("ddspjz")); ccddspjz = ccddspjz + ExcelTool.toDouble(map.get("ddspjz")); - writer.writeCellValue(3, y, map.get("sjdhjz")); - cccolq16 = cccolq16 + ExcelTool.toDouble(map.get("sjdhjz")); - writer.writeCellValue(4, y, map.get("zthjz")); - ccztprodValue1 = ccztprodValue1 + ExcelTool.toDouble(map.get("zthjz")); - writer.writeCellValue(5, y, map.get("cchjz")); - ccztprodValue2 = ccztprodValue2 + ExcelTool.toDouble(map.get("cchjz")); + writer.writeCellValue(3, y, map.get("colq16")); + cccolq16 = cccolq16 + ExcelTool.toDouble(map.get("colq16")); + writer.writeCellValue(4, y, map.get("ztprodValue1")); + ccztprodValue1 = ccztprodValue1 + ExcelTool.toDouble(map.get("ztprodValue1")); + writer.writeCellValue(5, y, map.get("ztprodValue2")); + ccztprodValue2 = ccztprodValue2 + ExcelTool.toDouble(map.get("ztprodValue2")); } writer.writeCellValue(1, countRow4, "合计"); writer.writeCellValue(2, countRow4, ccddspjz); @@ -238,7 +238,7 @@ public class GdInstorageCountService extends ServiceImpl> list5 = baseMapper.ycddmxb(); if (list5 != null && !list5.isEmpty()) { int size5 = list5.size(); @@ -255,7 +255,7 @@ public class GdInstorageCountService extends ServiceImpl> list = baseMapper.ycddmxb(); + List> list = baseMapper.ycspdhmxb(); for (Map map : list) { - wdhjz = wdhjz + ExcelTool.toDouble(map.get("zthjz")); + wdhjz = wdhjz + ExcelTool.toDouble(map.get("ztprodValue1")); } return wdhjz; } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesReportdayService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesReportdayService.java index 990ab9e9..414c4bad 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesReportdayService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesReportdayService.java @@ -57,7 +57,7 @@ public class GdSalesReportdayService extends ServiceImpl { // writer.writeCellValue(0, 1, "编号：mdxsmxb" + dfmt1); writer.merge(1, 1, 0, 2, "编号：mdxsmxb" + dfmt1, false); writer.writeCellValue(3, 1, "渠道数量： " + storeCount); - writer.writeCellValue(4, 1, " 上报时间：" + dfmt2); + writer.writeCellValue(4, 1, " 上报时间：" + dfmt); int size1 = list1.size(); int countRow1 = size1 + 3; double hj1 = 0; @@ -286,7 +286,7 @@ public class GdSalesService extends ServiceImpl { // writer.writeCellValue(3, 1, "商品数量： " + productCount); writer.merge(1, 1, 3, 4, "商品数量： " + productCount, false); // writer.writeCellValue(4, 1, " 上报时间：" + dfmt2); - writer.merge(1, 1, 5, 7, "上报时间：" + dfmt2, false); + writer.merge(1, 1, 5, 7, "上报时间：" + dfmt, false); int size2 = list2.size(); int countRow2 = size2 + 3; double hj2 = 0; @@ -314,7 +314,7 @@ public class GdSalesService extends ServiceImpl { // writer.writeCellValue(0, 1, "编号：ycmdxsmxb" + dfmt1); writer.merge(1, 1, 0, 2, "编号：ycmdxsmxb" + dfmt1, false); writer.writeCellValue(3, 1, "渠道数量： " + storeCountyc); - writer.writeCellValue(4, 1, " 上报时间：" + dfmt2); + writer.writeCellValue(4, 1, " 上报时间：" + dfmt); int size1yc = list1yc.size(); int countRow1yc = size1yc + 3; double hj1yc = 0; @@ -340,7 +340,7 @@ public class GdSalesService extends ServiceImpl { list2yc.addAll(list2ycjmd); writer.merge(1, 1, 0, 2, "编号：ycmdspxsmxb" + dfmt1, false); writer.merge(1, 1, 3, 4, "商品数量： " + productCountyc, false); - writer.merge(1, 1, 5, 7, "上报时间：" + dfmt2, false); + writer.merge(1, 1, 5, 7, "上报时间：" + dfmt, false); int size2yc = list2yc.size(); int countRow2yc = size2yc + 3; double hj2yc = 0; diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/在途商品汇总统计表.xlsx b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/在途商品汇总统计表.xlsx index b90b51a6..fda601c2 100644 Binary files a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/在途商品汇总统计表.xlsx and b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/在途商品汇总统计表.xlsx differ diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/销售汇总日报表.xlsx b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/销售汇总日报表.xlsx index 1771704f..d9493dfb 100644 Binary files a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/销售汇总日报表.xlsx and b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/销售汇总日报表.xlsx differ