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 |
WangQi
|
e495ea99cc
|
购方信息查不到跳过校验
|
2 years ago |
|
WangQi
|
9287cdb4b6
|
Merge remote-tracking branch 'origin/test' into test
|
2 years ago |
|
WangQi
|
9e8df35bea
|
购方信息查不到跳过校验
|
2 years ago |
|
gaorl
|
e59e248b19
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
2e8ae0ee17
|
feature：明细合并名称、规格型号、单位判空，转换为空字符串
|
2 years ago |
|
gaorl
|
452b86bfc4
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
511dd166c5
|
Merge branch 'release' into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
|
2 years ago |
|
gaorl
|
956d66287a
|
feature：生成预制不校验容差
|
2 years ago |
|
gaorl
|
669a2dea7b
|
Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release
|
2 years ago |
|
WangQi
|
db5cc20186
|
购方信息查不到跳过校验
|
2 years ago |
|
WangQi
|
55061b56f8
|
购方信息查不到跳过校验
|
2 years ago |
|
gaorl
|
bab99e5a7d
|
Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release
|
2 years ago |
|
wangrangrang
|
f7b85a3c7b
|
合并拆分成品油分支
|
2 years ago |
|
wangrangrang
|
77f44ffa35
|
Merge branch 'feature/cpy_splite' into release
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
|
2 years ago |
|
gaorl
|
3a1670ea2d
|
feature：更新物料优惠政策变更
|
2 years ago |
|
gaorl
|
a90e8564f7
|
feature：开票后保存客商信息
|
2 years ago |
