Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 2 years ago
parent
commit
afb1d97b83
  1. 5
      supervise-customer-ui/src/views/kucun/xssjgl/index.vue
  2. 2
      warehousing-system/project/wh-manage/src/main/resources/application.yml
  3. 2
      warehousing-system/project_web/.gitignore
  4. 15594
      warehousing-system/project_web/package-lock.json
  5. 3
      warehousing-system/project_web/src/main.js
  6. 5
      warehousing-system/project_web/vue.config.js
  7. BIN
      yxt-portal-ui/src/assets/home/bbicon.png
  8. 14
      yxt-portal-ui/src/views/Home/Home.vue
  9. 4
      yxt_supervise/gateway/src/main/resources/application.yml
  10. 2
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application-test.yml
  11. 4
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
  12. 57
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java
  13. 4
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdMapper.java
  14. 21
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdService.java
  15. 28
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java
  16. 29
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportRest.java
  17. 3
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml
  18. 12
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml
  19. 4
      yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application-test.yml

5
supervise-customer-ui/src/views/kucun/xssjgl/index.vue

@ -81,8 +81,9 @@
<div>共导入数据{{ currentLog.allNum }} 符合监管条件的数据{{ currentLog.validNum }} 用时{{ currentLog.durations }} 毫秒</div>
</el-card>
</div>
<div><el-button :disabled="filecandown" size="small" type="primary" @click="doDownloadHz">下载销售报表文件</el-button>
<!-- <el-button :disabled="filecandown" size="small" type="primary" @click="doDownloadHzYc">下载烟草分销数据文件</el-button> -->
<div>
<el-button :disabled="filecandown" size="small" type="primary" @click="doDownloadHz">下载销售报表文件</el-button>
<el-button :disabled="filecandown" size="small" type="primary" @click="doDownloadHzYc">下载加盟店商品入库记录</el-button>
</div>
</el-card>
<span slot="footer" class="dialog-footer"><el-button @click="dialogClose"> </el-button></span>

2
warehousing-system/project/wh-manage/src/main/resources/application.yml

@ -6,7 +6,7 @@ spring:
datasource:
url: jdbc:mysql://127.0.0.1:3306/warehouse2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true
username: root
password: root
password: 1LAiGz$t1*Iw
#mybatis-plush配置

2
warehousing-system/project_web/.gitignore

@ -21,3 +21,5 @@ pnpm-debug.log*
*.njsproj
*.sln
*.sw?
warehouse-ui/

15594
warehousing-system/project_web/package-lock.json

File diff suppressed because it is too large

3
warehousing-system/project_web/src/main.js

@ -16,7 +16,8 @@ import 'quill/dist/quill.bubble.css' // for bubble theme
import axios from 'axios'
/* 设定axios的请求根目录 */
axios.defaults.baseURL = 'http://192.168.3.183:9050/'
axios.defaults.baseURL = 'http://8.130.39.13:9050/'
// axios.defaults.baseURL = 'http://192.168.3.183:9050/'
// axios.defaults.baseURL = 'http://manage.jt.com/'
// axios.defaults.baseURL = 'http://yichuwh.com/'

5
warehousing-system/project_web/vue.config.js

@ -1,3 +1,8 @@
module.exports = {
publicPath: process.env.NODE_ENV === 'production' ? '/warehouse/' : '/',
outputDir: 'warehouse-ui',
assetsDir: 'static',
lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false,
lintOnSave: false
}

BIN
yxt-portal-ui/src/assets/home/bbicon.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

14
yxt-portal-ui/src/views/Home/Home.vue

@ -257,8 +257,8 @@
title: '企业管理'
},
{
imgUrl: require('@/assets/home/bIcon10.png'),
title: '仓库控'
imgUrl: require('@/assets/home/bbicon.png'),
title: '仓库控'
},
{
imgUrl: require('@/assets/home/bIcon8.png'),
@ -452,14 +452,14 @@
} else if (index === 6) {
window.open('http://jianguan.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 7) {
window.open('http://192.168.3.8:9531/#/' + '?token=' + getStorage(), '_blank')
// window.open('http://jianguan.yyundong.com/organizational/#/' + '?token=' + getStorage(), '_blank')
// window.open('http://192.168.3.8:9531/#/' + '?token=' + getStorage(), '_blank')
window.open('http://jianguan.yyundong.com/organizational/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 8) {
window.open('http://192.168.3.8:9532/#/' + '?token=' + getStorage(), '_blank')
// window.open('http://jianguan.yyundong.com/crm/#/' + '?token=' + getStorage(), '_blank')
// window.open('http://192.168.3.8:9532/#/' + '?token=' + getStorage(), '_blank')
window.open('http://jianguan.yyundong.com/crm/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 9) {
// window.open('http://192.168.3.8:9532/#/' + '?token=' + getStorage(), '_blank')
// window.open('http://jianguan.yyundong.com/crm/#/' + '?token=' + getStorage(), '_blank')
window.open('http://jianguan.yyundong.com/warehouse/#/' + '?token=' + getStorage(), '_blank')
}
}
}

4
yxt_supervise/gateway/src/main/resources/application.yml

@ -12,8 +12,8 @@ spring:
application:
name: gateway-server
profiles:
active: devv
# active: test
# active: devv
active: test
cloud:
gateway:
routes:

2
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:

4
yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml

@ -2,8 +2,8 @@ spring:
application:
name: supervise-customer
profiles:
active: devv
# active: test
# active: devv
active: test
messages:
# 国际化资源文件路径
basename: i18n/messages

57
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java

@ -269,18 +269,57 @@ public class GdInstorageCountService extends ServiceImpl<GdInstorageCountMapper,
double cbilltotalprice = 0, cprodvalue = 0, cwdhjz = 0, ccchjz = 0;
for (int y = 3; y < countRow; y++) {
Map<String, Object> map = list1.get(y - 3);
String codeUnified = "" + map.get("codeUnified");
writer.writeCellValue(0, y, map.get("name"));
// writer.writeCellValue(1, y, "");
writer.writeCellValue(1, y, map.get("billtotalprice"));
cbilltotalprice = cbilltotalprice + ExcelTool.toDouble(map.get("billtotalprice"));
writer.writeCellValue(2, y, map.get("prodvalue"));
cprodvalue = cprodvalue + ExcelTool.toDouble(map.get("prodvalue"));
writer.writeCellValue(3, y, map.get("wdhjz"));
cwdhjz = cwdhjz + ExcelTool.toDouble(map.get("wdhjz"));
writer.writeCellValue(4, y, map.get("cchjz"));
ccchjz = ccchjz + ExcelTool.toDouble(map.get("cchjz"));
writer.writeCellValue(5, y, map.get("arrivaldate"));
writer.writeCellValue(6, y, map.get("sfyq"));
double billtotalprice = ExcelTool.toDouble(map.get("billtotalprice"));
cbilltotalprice = cbilltotalprice + billtotalprice;
double prodvalue = ExcelTool.toDouble(map.get("prodvalue"));
if ("7161704".equals(codeUnified)) { // 7161704 中顺洁柔纸业股份有限公司 346981.6
prodvalue = prodvalue - 346981.6;
} else if ("4101293".equals(codeUnified)) { // 4101293 石家庄市金百利商贸有限公司 157160
prodvalue = prodvalue - 157160;
} else if ("4131802".equals(codeUnified)) { // 4131802 河北晋蒙源食品销售有限公司 280800
prodvalue = prodvalue - 280800;
} else if ("5150611".equals(codeUnified)) { // 5150611 石家庄宝丰源商贸有限公司 87360
prodvalue = prodvalue - 87360;
} else if ("5152001".equals(codeUnified)) { // 5152001 北京统一饮品有限公司石家庄分公司 10764
prodvalue = prodvalue - 10764;
}
cprodvalue = cprodvalue + prodvalue;
// writer.writeCellValue(2, y, map.get("prodvalue"));
writer.writeCellValue(2, y, NumberUtil.roundStr(prodvalue, 2));
// cwdhjz = cwdhjz + ExcelTool.toDouble(map.get("wdhjz"));
// writer.writeCellValue(3, y, map.get("wdhjz"));
// writer.writeCellValue(4, y, map.get("cchjz"));
// ccchjz = ccchjz + ExcelTool.toDouble(map.get("cchjz"));
double wdhjz = 0.0;
if (billtotalprice - prodvalue > 0) {
wdhjz = billtotalprice - prodvalue;
}
cwdhjz = cwdhjz + wdhjz;
writer.writeCellValue(3, y, NumberUtil.roundStr(wdhjz, 2));
double cchjz = 0.0;
if (prodvalue - billtotalprice > 0) {
cchjz = prodvalue - billtotalprice;
}
ccchjz = ccchjz + cchjz;
writer.writeCellValue(4, y, NumberUtil.roundStr(cchjz, 2));
String arrivaldate = "" + map.get("arrivaldate");
writer.writeCellValue(5, y, arrivaldate);
String varrivaldate = arrivaldate.replace(".", "");
if (billtotalprice - prodvalue > 0 && dfmt1.compareTo(varrivaldate) < 0) {
writer.writeCellValue(6, y, "是");
} else {
writer.writeCellValue(6, y, "否");
}
// writer.writeCellValue(6, y, map.get("sfyq"));
}
writer.writeCellValue(0, countRow, "市烟草");
// writer.writeCellValue(1, countRow, "");

4
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdMapper.java

@ -61,4 +61,8 @@ public interface GdInstorageGdMapper extends BaseMapper<GdInstorageGd> {
@Delete("delete from gd_instorage_gd where orderDate=#{orderDate} ")
void clearByOrderDate(@Param("orderDate") String orderDate);
@Select("select * from gd_instorage_gd gi left join store_index si on gi.colb1=si.code " +
"where gi.orderDate=#{orderDate} and (si.`type` ='连锁外加盟(销配结算)' OR si.`type` ='连锁外加盟(销配结算)' )")
List<GdInstorageGd> listJmdOfDay(@Param("orderDate") String orderDate);
}

21
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageGdService.java

@ -159,4 +159,25 @@ public class GdInstorageGdService extends ServiceImpl<GdInstorageGdMapper, GdIns
public void clearByOrderDate(String orderDate) {
baseMapper.clearByOrderDate(orderDate);
}
public List<GdInstorageGd> listJmdOfDay(String orderDate) {
// select
// colb1,
// colc2,
// cold3,
// colex,
// cole4,
// colf5,
// colg6,
// colh7,
// coli8,
// colm12,
// coln13,
// colo14,
// colp15,
// colq16,colr17
// from gd_instorage_gd gi left join store_index si on gi.colb1=si.code
// where gi.orderDate='2023-04-20' and (si.`type` ='连锁外加盟(销配结算)' OR si.`type` ='连锁外加盟(销配结算)' )
return baseMapper.listJmdOfDay(orderDate);
}
}

28
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java

@ -36,6 +36,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.core.result.FileUploadResult;
import com.yxt.common.core.result.ResultBean;
import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageGd;
import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageGdService;
import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageJmdService;
import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageYcService;
import com.yxt.supervise.portal.biz.gdinventory.GdRescategoryProdService;
@ -97,6 +99,8 @@ public class GdSalesService extends ServiceImpl<GdSalesMapper, GdSales> {
private GdInstorageJmdService gdInstorageJmdService;
@Autowired
private GdInstorageYcService gdInstorageYcService;
@Autowired
private GdInstorageGdService gdInstorageGdService;
public ResultBean<GdSalesLog> uploadAndInsert(MultipartFile file) {
ResultBean rb = ResultBean.fireFail();
@ -395,6 +399,30 @@ public class GdSalesService extends ServiceImpl<GdSalesMapper, GdSales> {
// String urlyc = urlPrefix + newFileNameyc;
// gdLog.setRemarks(urlyc);
String newFileNamejmd = "kchzb/加盟店商品入库" + orderDate + "-" + System.currentTimeMillis() + ".xlsx";
ExcelWriter writerJmd = ExcelUtil.getWriter(uploadPath + newFileNamejmd);
List<GdInstorageGd> gdInstorageGdJmd = gdInstorageGdService.listJmdOfDay(orderDate);
writerJmd.addHeaderAlias("colb1", "仓库/门店编号");
writerJmd.addHeaderAlias("colc2", "仓库/门店名称");
writerJmd.addHeaderAlias("cold3", "入库时间");
writerJmd.addHeaderAlias("colex", "供应商编号");
writerJmd.addHeaderAlias("cole4", "供应商名称");
writerJmd.addHeaderAlias("colf5", "单据号");
writerJmd.addHeaderAlias("colg6", "单据类型");
writerJmd.addHeaderAlias("colh7", "货号");
writerJmd.addHeaderAlias("coli8", "商品名称");
writerJmd.addHeaderAlias("colm12", "类别编号");
writerJmd.addHeaderAlias("coln13", "类别名称");
writerJmd.addHeaderAlias("colo14", "一级类别名称");
writerJmd.addHeaderAlias("colp15", "二级类别名称");
writerJmd.addHeaderAlias("colq16", "入库金额");
writerJmd.addHeaderAlias("colr17", "入库数量");
writerJmd.setOnlyAlias(true);
writerJmd.write(gdInstorageGdJmd, true);
writerJmd.close();
String urljmd = urlPrefix + newFileNamejmd;
gdLog.setRemarks(urljmd);
gdSalesLogService.updateById(gdLog);
return rb.success().setData(gdLog);

29
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportRest.java

@ -1,44 +1,15 @@
package com.yxt.supervise.portal.biz.gdsalesreport;
import cn.hutool.core.io.resource.ClassPathResource;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.util.ListUtils;
import com.alibaba.excel.util.MapUtils;
import com.alibaba.excel.write.builder.ExcelWriterBuilder;
import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.metadata.fill.FillConfig;
import com.alibaba.excel.write.metadata.fill.FillWrapper;
import com.sun.deploy.net.URLEncoder;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.portal.api.gdsalesreport.*;
import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProQuery;
import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProVo;
import io.swagger.annotations.ApiOperation;
import org.apache.catalina.connector.Response;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.poi.ss.util.CellRangeAddress;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import static io.netty.handler.codec.smtp.SmtpRequests.data;
/**
* @author wangpengfei

3
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml

@ -3,8 +3,7 @@ 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
# cloud:
# nacos:
# discovery:

12
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
@ -23,8 +23,16 @@ spring:
server:
port: 7003
max-http-header-size: 102400
connection-timeout: 300000
tomcat:
max-http-form-post-size: -1
accept-count: 1000
max-connections: 2000
max-threads: 300
min-spare-threads: 50
uri-encoding: UTF-8
max-http-post-size: 100MB
#mybatis
mybatis-plus:
# 配置mapper的扫描,找到所有的mapper.xml映射文件

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

@ -4,7 +4,7 @@ spring:
# url: jdbc:mysql://122.14.222.186:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
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: wang0403
password: 1LAiGz$t1*Iw
cloud:
nacos:
discovery:
@ -18,7 +18,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间(毫秒)

Loading…
Cancel
Save