wangrangrang
|
e8b272b4de
|
Merge remote-tracking branch 'origin/FI871' into release
# Conflicts:
# order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java
|
2 years ago |
|
wangrangrang
|
fa3612dbbe
|
Merge remote-tracking branch 'origin/hzxxbReceive' into release
|
2 years ago |
|
wangrangrang
|
9421eb1eed
|
Merge remote-tracking branch 'origin/dev-hzxz' into release
|
2 years ago |
|
wangrangrang
|
f17414067f
|
Merge remote-tracking branch 'origin/xingze' into release
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
# order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java
# order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInvoiceInfoMapper.java
# order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/OrderInvoiceInfoService.java
# order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
|
2 years ago |
|
wangrangrang
|
c0c93419bb
|
Merge remote-tracking branch 'origin/dev-chlc' into release
|
2 years ago |
|
wangrangrang
|
12471f5bb5
|
增加商品行序号
|
2 years ago |
路明慧
|
47e31f132c
|
将字符串替换为枚举
|
2 years ago |
|
wangrangrang
|
7cc53267fb
|
校验凭证过账日期不为空才解析
|
2 years ago |
|
路明慧
|
6f0aab4db4
|
修改红字信息表重复更新状态导致状态错误
|
2 years ago |
|
wangrangrang
|
a811e5586f
|
公司代码为空时 才进行下一步查询
|
2 years ago |
高荣琳
|
70305cc1ed
|
feature：红字下载
|
2 years ago |
|
wangrangrang
|
572d3fcc09
|
Merge remote-tracking branch 'origin/dev-blfp' into release
|
2 years ago |
|
高荣琳
|
1f7104a242
|
feature:冲红流程比较剩余金额判断
|
2 years ago |
|
高荣琳
|
fdf707c39a
|
feature:补录报账单号，公司代码填充
|
2 years ago |
|
高荣琳
|
f43be2f9ef
|
feature:补录报账单号，修改order_info、order_invoice_info的订单号
|
2 years ago |
|
高荣琳
|
e309172c37
|
feature:补录报账单号，系统来源默认SAP
|
2 years ago |
zhenghaiyang@ele-cloud.com
|
e81587f1dd
|
feature 1.修复空指针问题
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
fe2438588c
|
feature 1.修复单价赋值未负数的问题
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
a3cf2af3c6
|
feature 1.修复分机号未赋值的情况
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
35cc5c42f1
|
feature 1.修改依赖redisson版本号
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
7a75cb538a
|
feature 1.还源代码
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
f17032b1b4
|
feature 1.更换redis锁
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
ac87ae0232
|
feature 1.更换redis锁
|
2 years ago |
|
路明慧
|
cde377881e
|
修改接口名写错
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
778ddfeae8
|
feature 1.修改查询sql
|
2 years ago |
王琦
|
a38ee502f3
|
Merge branch '瑞丰相关接口改造' into release
|
2 years ago |
kane
|
6d53c11f6f
|
fix:替换报账单号接口状态更新
|
2 years ago |
|
路明慧
|
c5d64d9742
|
添加获取报账单号状态
|
2 years ago |
|
kane
|
956df4911f
|
fix:替换报账单号接口调整
|
2 years ago |
|
路明慧
|
d9441949e2
|
添加获取报账单号状态
|
2 years ago |
|
路明慧
|
e2dbab652d
|
解决缓存问题
|
2 years ago |
|
路明慧
|
c3553876a3
|
解决重复括号
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
b2dbfd87ba
|
feature 1.还原代码
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
15ea77fc28
|
feature 1.还原配置
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
fa01d1dc38
|
feature 1.增加负数冲红流程
|
2 years ago |
|
路明慧
|
cbd3c912e6
|
解决未能同步开票组织管理
|
2 years ago |
|
路明慧
|
3d4f9a5c5c
|
解决未能同步开票组织管理
|
2 years ago |
|
路明慧
|
203f4922ea
|
解决未能同步开票组织管理
|
2 years ago |
|
路明慧
|
22cc583e70
|
解决未能同步开票组织管理
|
2 years ago |
|
kane
|
fc91916c4b
|
fix:查询sap报账单号状态结果解析
|
2 years ago |
|
kane
|
bc96333fb9
|
feature:调用sap入参修改
|
2 years ago |
|
kane
|
7f2bf6076c
|
Merge branch 'test' into xingze
|
2 years ago |
|
kane
|
7fe3edde2e
|
feature:替换报账单号日志修改
|
2 years ago |
|
kane
|
33ac1de0c8
|
feature:替换报账单号接口
|
2 years ago |
|
wangrangrang
|
c219bacd9f
|
Merge remote-tracking branch 'origin/xingze' into test
# Conflicts:
# order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInvoiceInfoMapper.java
# order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
|
2 years ago |
|
wangrangrang
|
582f298eb6
|
Merge remote-tracking branch 'origin/pushInvoice' into test
|
2 years ago |
|
kane
|
906cee4b39
|
feature:替换报账单号测试
|
2 years ago |
|
路明慧
|
afc1287d22
|
解决重复调用影像
|
2 years ago |
|
路明慧
|
71a56f7869
|
添加content-type
|
2 years ago |
|
路明慧
|
349d393de7
|
取消截取影像字段
|
2 years ago |
