wangrangrang
|
371eb3cbc0
|
Merge branch '0906-edit' into test
# Conflicts:
# order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java
# order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
|
2 years ago |
|
wangrangrang
|
1f012bf563
|
注释掉补录报账单后自动回推
|
2 years ago |
高荣琳
|
db5d728f0b
|
feature：补录报账单号
|
2 years ago |
|
wangrangrang
|
e4dcf4c11d
|
Merge remote-tracking branch 'origin/0809-findGroup' into release
|
2 years ago |
|
wangrangrang
|
2cf1d714bc
|
Merge remote-tracking branch 'origin/dev-snyx' into test
|
2 years ago |
|
wangrangrang
|
6bffef7181
|
解决冲突
|
2 years ago |
|
wangrangrang
|
d78fddb2ce
|
Merge remote-tracking branch 'origin/dev-snyx' into release
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
|
2 years ago |
|
wangrangrang
|
d66cb1eff2
|
修改系统类型为空导致空指针问题
|
2 years ago |
|
高荣琳
|
874ab95e53
|
feature：开票组织添加公司代码
|
2 years ago |
|
高荣琳
|
9b69029101
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
高荣琳
|
f8ca14a902
|
feature
|
2 years ago |
|
高荣琳
|
d367b86995
|
Merge branch 'dev-FI871' into test
|
2 years ago |
|
高荣琳
|
5eedab27d6
|
feature:FI871 接口
|
2 years ago |
|
gaorl
|
d6f9bbbb69
|
Merge branch 'dev-detail-split' into test
|
2 years ago |
|
gaorl
|
3cbccfcdf7
|
feature:明细行拆分
|
2 years ago |
|
gaorl
|
d90f56ea10
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
gaorl
|
5613ec42e0
|
feature：冲红开票
|
2 years ago |
|
gaorl
|
2427cebe9a
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
gaorl
|
e287fa1694
|
feature：冲红发票系统来源设置
|
2 years ago |
|
gaorl
|
20a126b0ed
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
gaorl
|
0af27e113c
|
feature：冲红发票系统来源设置
|
2 years ago |
|
gaorl
|
3f58b021ec
|
Merge branch 'dev-gmfsh' into test
|
2 years ago |
|
gaorl
|
d8700ce10c
|
feature：购方默认地址电话更新订单
|
2 years ago |
|
gaorl
|
1085760105
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
858af999f1
|
feature：测试修改active
|
2 years ago |
|
gaorl
|
eae4935f0e
|
Merge branch 'dev-gmfsh' into test
|
2 years ago |
|
gaorl
|
fe50ba78ae
|
feature：客户信息更新为空时，更新订单对应字段为空
|
2 years ago |
|
gaorl
|
21777f81d6
|
feature：测试方法
|
2 years ago |
yishiqihuasheng
|
bafebb8802
|
添加查询所有组织信息的接口
|
2 years ago |
|
yishiqihuasheng
|
78053e7d3e
|
添加查询所有组织信息的接口
|
2 years ago |
|
gaorl
|
73fe5e4a75
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
gaorl
|
5050aee647
|
feature：山能易行冲红提示
|
2 years ago |
|
gaorl
|
0f15555923
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
gaorl
|
d9a7d27491
|
feature：红字开具山能易行校验
|
2 years ago |
|
gaorl
|
ab5f22c979
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
4eb75bb089
|
Merge branch 'dev-snyx' into test
|
2 years ago |
|
gaorl
|
d71543376f
|
feature：红字申请山能易行需要通过报账单和结算单同时开具
|
2 years ago |
WangQi
|
dd051bb2e1
|
Merge remote-tracking branch 'origin/dev-ghfbm' into test
|
2 years ago |
|
WangQi
|
3af685eff2
|
Merge remote-tracking branch 'origin/dev-ghfbm' into release
|
2 years ago |
|
gaorl
|
8727da3539
|
feature：购方编码新增模糊查询添加购方编码
|
2 years ago |
|
gaorl
|
22e737c5e8
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
3d7aa7cfe0
|
Merge branch 'dev-ghfbm' into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
|
2 years ago |
|
gaorl
|
2d0cbc48a2
|
feature：接口开票查询客户信息不查找集团库
|
2 years ago |
|
WangQi
|
e3fb719068
|
bug:物料分类编码导入失败调试
|
2 years ago |
|
WangQi
|
1196d1f90f
|
bug:物料分类编码导入失败调试
|
2 years ago |
|
gaorl
|
a82c3b2c1e
|
feature：开票作废冲红提示
|
2 years ago |
|
WangQi
|
3e843f0c70
|
bug:物料分类编码导入失败调试
|
2 years ago |
|
WangQi
|
d98cb5dc64
|
bug:物料分类编码导入失败
|
2 years ago |
|
yishiqihuasheng
|
96b269ffa6
|
添加查询所有组织信息的接口
|
2 years ago |
|
gaorl
|
43c58fa3de
|
Merge branch 'dev-snyx' into test
|
2 years ago |
