gaorl
|
7c34afcbe3
|
feature：升级base-merge 版本
|
2 years ago |
|
gaorl
|
0108bb2a62
|
feature：升级base的版本
|
2 years ago |
|
gaorl
|
b70bb85eea
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
9d8933529d
|
feature：明细合并
|
2 years ago |
WangQi
|
58002555b7
|
调整日志级别
|
2 years ago |
|
gaorl
|
4a700d8e49
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
6e18397dd4
|
feature：明细合并优化
|
2 years ago |
|
gaorl
|
846a76079e
|
Merge branch 'release' into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
|
2 years ago |
|
gaorl
|
2b28a29b15
|
feature：同步公司库，无自行编码时，生成一个自定义编码
|
2 years ago |
|
gaorl
|
b084fbe10a
|
feature：明细合并
|
2 years ago |
|
gaorl
|
0241ccd285
|
feature：明细合并
|
2 years ago |
|
gaorl
|
c13a9d8941
|
Merge branch 'release' into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
|
2 years ago |
|
gaorl
|
820a6cb4ea
|
feature：明细合并
|
2 years ago |
|
gaorl
|
68cf721c33
|
feature：明细合并
|
2 years ago |
|
gaorl
|
148477fcb1
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
8595556568
|
feature：明细合并
|
2 years ago |
|
gaorl
|
9277fa730a
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
94f51e3011
|
feature：明细合并
|
2 years ago |
|
gaorl
|
edb754ca1e
|
feature：明细合并
|
2 years ago |
|
gaorl
|
46d632327d
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
1ec32c3660
|
feature：明细合并
|
2 years ago |
|
gaorl
|
19fe8050b9
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
fe9e6ff03a
|
feature：明细行合并
|
2 years ago |
|
gaorl
|
e066523aa0
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
6022c58703
|
feature：明细合并
|
2 years ago |
|
gaorl
|
88c2acff9b
|
Merge branch 'release' into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
|
2 years ago |
|
gaorl
|
b7eee49818
|
feature：明细合并
|
2 years ago |
|
gaorl
|
58e29d95d2
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
3fbf33192d
|
feature：回推SAP时，明细行携带结算单号
|
2 years ago |
|
gaorl
|
080a848a71
|
feature：同步公司库时，不更新单价
|
2 years ago |
|
gaorl
|
21e83181fb
|
feature：明细行合并
|
2 years ago |
|
gaorl
|
db118ee8c1
|
feature：合并明细
|
2 years ago |
|
gaorl
|
da1a43b6c8
|
feature：合并名称日志
|
2 years ago |
|
gaorl
|
0a2e034d7c
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
c80c1c6707
|
feature：同步物料至公司库
|
2 years ago |
|
gaorl
|
565b62811e
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
f8e0059fcb
|
feature：同步公司库
|
2 years ago |
|
gaorl
|
bf2aa122c5
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
4865ce282d
|
feature：明细合并
|
2 years ago |
|
gaorl
|
cd4d872c73
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
32e790b7e8
|
feature：电商02回推添加请求头
|
2 years ago |
|
gaorl
|
5e3af15b05
|
Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release
|
2 years ago |
|
gaorl
|
2ecf7e4d8b
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
b1b1e85411
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
e384b7363e
|
feature：物料信息导入调整、接口数据重复数据校验
|
2 years ago |
|
gaorl
|
3f902cb70c
|
feature：物料信息导入计数
|
2 years ago |
wangrangrang
|
44eaa9bca5
|
Merge remote-tracking branch 'origin/release' into release
|
2 years ago |
|
wangrangrang
|
5447484a20
|
修改成品油明细为空问题
|
2 years ago |
|
wangrangrang
|
929e11929a
|
Merge branch 'feature/cpy_splite' into test
|
2 years ago |
|
wangrangrang
|
8c8dc4397b
|
修改成品油明细为空问题
|
2 years ago |
