diff --git a/supervise-customer-ui/.env.production b/supervise-customer-ui/.env.production index c4d0fd79..811f3444 100644 --- a/supervise-customer-ui/.env.production +++ b/supervise-customer-ui/.env.production @@ -2,7 +2,7 @@ ENV = 'production' # base api -VUE_APP_BASE_API = '/api' +VUE_APP_BASE_API = '/api/service' ## 配置 正式接口地址 VUE_APP_URL = "http://120.46.131.15:8111" diff --git a/supervise-customer-ui/package.json b/supervise-customer-ui/package.json index 99af34b3..b7226334 100644 --- a/supervise-customer-ui/package.json +++ b/supervise-customer-ui/package.json @@ -17,7 +17,7 @@ "axios": "^0.24.0", "bpmn-js": "^9.2.2", "core-js": "^2.6.12", - "echarts": "^5.4.1", + "echarts": "^5.4.2", "ejs": "^2.7.4", "element-ui": "2.13.2", "js-cookie": "2.2.0", diff --git a/supervise-customer-ui/src/views/kucun/xssjgl/index.vue b/supervise-customer-ui/src/views/kucun/xssjgl/index.vue index 1b636101..29c2ce4e 100644 --- a/supervise-customer-ui/src/views/kucun/xssjgl/index.vue +++ b/supervise-customer-ui/src/views/kucun/xssjgl/index.vue @@ -81,7 +81,8 @@
共导入数据：{{ currentLog.allNum }} 条；符合监管条件的数据：{{ currentLog.validNum }} 条；用时：{{ currentLog.durations }} 毫秒。
-
下载销售报表文件
+
下载销售报表文件 + 下载烟草分销数据文件
关 闭 @@ -250,7 +251,11 @@ export default { }, doDownloadHz() { window.open(this.currentLog.fileUrl, '_blank') - this.dialogClose() + // this.dialogClose() + }, + doDownloadHzYc() { + window.open(this.currentLog.remarks, '_blank') + // this.dialogClose() }, downExcel(row) { if (row.fileUrl) { diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml index e1b5ab04..513ad506 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/supervise_customer?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true + url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true username: root password: 1LAiGz$t1*Iw # cloud: diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java index a44336ed..7d6dc787 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java @@ -367,6 +367,34 @@ public class GdSalesService extends ServiceImpl { String url = urlPrefix + "kchzb/" + newFileName; gdLog.setFileUrl(url); gdLog.setOutFilePath(uploadPath + "kchzb/" + newFileName); + + String newFileNameyc = "kchzb/烟草分销数据" + orderDate + "-" + System.currentTimeMillis() + ".xlsx"; + ExcelWriter writerYcfx = ExcelUtil.getWriter(uploadPath + newFileNameyc); + List gdSalesYcs = gdSalesYcService.listFxOfDay(orderDate); + writerYcfx.addHeaderAlias("orderType", "订单类型"); + writerYcfx.addHeaderAlias("orderNo", "销售订单号"); + writerYcfx.addHeaderAlias("prodCode", "商品编码"); + writerYcfx.addHeaderAlias("prodBarCode", "商品条码"); + writerYcfx.addHeaderAlias("prodName", "商品名称"); + writerYcfx.addHeaderAlias("brandCode", "品牌代码"); + writerYcfx.addHeaderAlias("brandName", "品牌名称"); + writerYcfx.addHeaderAlias("categoryb", "商品大类"); + writerYcfx.addHeaderAlias("categorym", "商品中类"); + writerYcfx.addHeaderAlias("categorys", "商品小类"); + writerYcfx.addHeaderAlias("customerCode", "客户代码"); + writerYcfx.addHeaderAlias("customerName", "客户名称"); + writerYcfx.addHeaderAlias("saleNum", "销售数量"); + writerYcfx.addHeaderAlias("storeCode", "销售渠道"); + writerYcfx.addHeaderAlias("salePrice", "销售价格"); + writerYcfx.addHeaderAlias("saleCost", "销售成本"); + writerYcfx.addHeaderAlias("profit", "利润"); + writerYcfx.addHeaderAlias("dataDate", "数据日期"); + writerYcfx.setOnlyAlias(true); + writerYcfx.write(gdSalesYcs, true); + writerYcfx.close(); + + String urlyc = urlPrefix + newFileNameyc; + gdLog.setRemarks(urlyc); gdSalesLogService.updateById(gdLog); return rb.success().setData(gdLog); @@ -449,6 +477,7 @@ public class GdSalesService extends ServiceImpl { public double amountOfLsnjmDay(String orderDate) { return baseMapper.amountOfLsnjmOnDay(orderDate); } + public double amountOfDay(String orderDate) { return baseMapper.amountOfDay(orderDate); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java index 92093496..2b0e6c46 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcMapper.java @@ -52,32 +52,35 @@ public interface GdSalesYcMapper extends BaseMapper { @Delete("delete from gd_sales_yc where dataDate=#{dataDate} ") void clearByDataDate(@Param("dataDate") String dataDate); - @Select("select count(1) from (select storeCode from gd_sales_yc where dataDate=#{dataDate} group by storeCode) t") + @Select("select count(1) from (select storeCode from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} group by storeCode) t") int countStoreOnDay(@Param("dataDate") String orderDate); @Select("select t2.storeCode,si.name,t2.amount from( " + " select storeCode,sum(t1.price) as amount from( " + - " select storeCode,saleNum*salePrice as price from gd_sales_yc where dataDate=#{dataDate} " + + " select storeCode,saleNum*salePrice as price from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " + " ) t1 group by t1.storeCode " + ") t2 left join store_index si on t2.storecode=si.code ") List> listOfStoreOnDay(@Param("dataDate") String orderDate); - @Select("select count(1) from (select prodCode from gd_sales_yc where dataDate=#{dataDate} group by prodCode) t") + @Select("select count(1) from (select prodCode from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} group by prodCode) t") int countProductOnDay(@Param("dataDate") String orderDate); @Select("select si.name,t1.* from ( " + - " select storeCode,orderType,orderNo,prodCode,prodName,saleNum,salePrice,saleNum*salePrice as amount from gd_sales_yc where dataDate=#{dataDate} " + + " select storeCode,orderType,orderNo,prodCode,prodName,saleNum,salePrice,saleNum*salePrice as amount from gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " + ") t1 left join store_index si on t1.storecode=si.code ") List> listOfProductOnDay(@Param("dataDate") String orderDate); - @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate}") + @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate}") double amountOfDay(@Param("dataDate") String orderDate); - @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate} " + + @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " + " and storeCode in (select code from store_index si where si.`type`='连网连锁店') ") double amountOfLwlsdDay(@Param("dataDate") String orderDate); - @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where dataDate=#{dataDate} " + + @Select("SELECT CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount FROM gd_sales_yc where customerName<>'客户' and customerName<>'客户1' and dataDate=#{dataDate} " + " and storeCode in (select code from store_index si where si.`type`='连锁内加盟') ") - double amountOfLsnjmDay(String orderDate); + double amountOfLsnjmDay(@Param("dataDate") String orderDate); + + @Select("SELECT * FROM gd_sales_yc where orderType='批发' and (customerName='客户' or customerName='客户1') and dataDate=#{dataDate} " ) + List listFxOfDay(@Param("dataDate") String orderDate); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcService.java index 257ed5b9..121e1bbc 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesYcService.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.supervise.portal.biz.gdsales; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -78,4 +79,8 @@ public class GdSalesYcService extends ServiceImpl { public double amountOfLsnjmDay(String orderDate) { return baseMapper.amountOfLsnjmDay(orderDate); } + + public List listFxOfDay(String orderDate) { + return baseMapper.listFxOfDay(orderDate); + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml index fa82aa6e..93daad3b 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml @@ -22,11 +22,11 @@ spring: timeout: 0 # 连接超时时间（毫秒） image: - xlsxtmpl: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/ -# xlsxtmpl: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/ +# xlsxtmpl: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/ + xlsxtmpl: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/ upload: - path: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/ -# path: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/ +# path: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/ + path: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/ url: prefix: http://127.0.0.1:7003/upload/ login: diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml index 3fbea283..d06562ad 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml @@ -3,8 +3,8 @@ spring: 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&allowMultiQueries=true&rewriteBatchedStatements=true username: root - #password: 1LAiGz$t1*Iw - password: root` + password: 1LAiGz$t1*Iw +# password: root` # cloud: # nacos: # discovery: diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml index 71a46344..3a7fbf40 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml @@ -2,8 +2,8 @@ spring: application: name: supervise-portal profiles: - active: devv -# active: test +# active: devv + active: test messages: # 国际化资源文件路径 basename: i18n/messages