java
/
crmproject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

收发货统计表问题修改2

This commit is contained in:
liujie 2024-05-20 15:45:38 +08:00
parent 649854a9dc
commit 7fd0a4abb8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crm-admin/src/main/resources/application-dev.yml
View File

@ -2,13 +2,13 @@ spring:
#redis
redis:
# 地址
host: 60.204.129.13
host: 192.168.0.124
# 端口，默认为6379
port: 6379
# 数据库索引
database: 15
# 密码
password: yunjiaokj123
password: 123456
# 连接超时时间
timeout: 1000

18
crm-webapp/src/main/java/com/yb/lb/webapp/record/records/entity/ReceiptRecordsBo.java
View File

@ -34,19 +34,19 @@ public class ReceiptRecordsBo implements java.io.Serializable {
/**
* 商品编码
*/
@Excel(name = "商品编码", width = 15, orderNum = "2")
@Excel(name = "商品编码", width = 15, orderNum = "4")
private String goodsNo;
/**
* 商品名称
*/
@Excel(name = "商品名称", width = 15, orderNum = "2")
@Excel(name = "商品名称", width = 15, orderNum = "5")
private String goodsName;
/**
* 规格
*/
@Excel(name = "规格", width = 15, orderNum = "2")
@Excel(name = "规格", width = 15, orderNum = "6")
private String specification;
/**
@ -104,25 +104,25 @@ public class ReceiptRecordsBo implements java.io.Serializable {
/**
* 应发数量 该经销商发货单的应发数量汇总
*/
@Excel(name = "应发数量", width = 15, orderNum = "4")
@Excel(name = "应发数量", width = 15, orderNum = "7")
private String majorNum;
/**
* 实发数量 仓库扫码条数
*/
@Excel(name = "实发数量", width = 15, orderNum = "5")
@Excel(name = "实发数量", width = 15, orderNum = "8")
private String invoiceNum;
/**
* 入库数量 经销商扫码入库数量汇总
*/
@Excel(name = "入库数量", width = 15, orderNum = "6")
@Excel(name = "入库数量", width = 15, orderNum = "9")
private String receiveNum;
/**
* 出库数量 经销商扫码出库数量汇总
*/
@Excel(name = "出库数量", width = 15, orderNum = "7")
@Excel(name = "出库数量", width = 15, orderNum = "10")
private String deliveryNum;
public String getGoodsNo() {
@ -152,13 +152,13 @@ public class ReceiptRecordsBo implements java.io.Serializable {
/**
* 入库率 入库数量/实发数量*100
*/
@Excel(name = "入库率", width = 15, orderNum = "8")
@Excel(name = "入库率", width = 15, orderNum = "11")
private String receiveRate;
/**
* 出库率 出库数量/实发数量*100
*/
@Excel(name = "出库率", width = 15, orderNum = "9")
@Excel(name = "出库率", width = 15, orderNum = "12")
private String deliveryRate;
public String getClientId() {