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 |
|
gaorl
|
ef265204eb
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
e1b11052a7
|
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
|
67cf6050d3
|
feature：修改优惠政策标识
|
2 years ago |
|
gaorl
|
c97b036ef2
|
Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release
|
2 years ago |
|
WangQi
|
e9977aefc8
|
Merge remote-tracking branch 'origin/task_4631_wq' into release
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
|
2 years ago |
|
WangQi
|
ce980ebd0c
|
Merge branch 'bugfix_3491_wq' into test
|
2 years ago |
|
WangQi
|
ad36b5ea68
|
bugfix:3491
|
2 years ago |
|
WangQi
|
10a5481afe
|
Merge remote-tracking branch 'origin/bugfix_3491_wq' into test
|
2 years ago |
|
WangQi
|
ef576fd4b3
|
bugfix:3491
|
2 years ago |
|
gaorl
|
b4fd3e8f1b
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
0bbe339c17
|
Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release
|
2 years ago |
|
gaorl
|
b614cd2fd6
|
feature：开票后保存客商信息
|
2 years ago |
|
gaorl
|
0a6c515a17
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
2e7de81f6b
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
d7f5214188
|
feature：新增客户信息 用客户编码 + ent_id 校验重复性
|
2 years ago |
zhenghaiyang@ele-cloud.com
|
f001bf9a6b
|
feature 1.电商逻辑
|
2 years ago |
|
WangQi
|
3d48a23aa5
|
Merge remote-tracking branch 'origin/test' into test
|
2 years ago |
|
WangQi
|
c6a2f07c44
|
Merge remote-tracking branch 'origin/task_4631_wq' into test
|
2 years ago |
|
WangQi
|
80edb696d2
|
task4631 开票申请单详情接口增加是否校验客户信息字段
|
2 years ago |
|
gaorl
|
b65af212bf
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
f1a2ec0730
|
feature：税编列设置为文本
|
2 years ago |
|
gaorl
|
b2843c6cbc
|
Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release
|
2 years ago |
|
WangQi
|
c5fde31a0c
|
Merge remote-tracking branch 'origin/task_4631_wq' into test
|
2 years ago |
|
WangQi
|
ed5386eeb9
|
task4631 开票申请单详情接口增加是否校验客户信息字段
|
2 years ago |
|
WangQi
|
d345caa22a
|
Merge remote-tracking branch 'origin/task_4631_wq' into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
|
2 years ago |
|
WangQi
|
d9a5e8f070
|
task4631 开票申请单详情接口增加是否校验客户信息字段
|
2 years ago |
|
gaorl
|
8d4f1435a9
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
7ab10f950c
|
feature：同步公司库不存在时生成自定义物料编码
|
2 years ago |
|
WangQi
|
753d545fde
|
Merge remote-tracking branch 'origin/task_4575_wq' into release
|
2 years ago |
|
gaorl
|
99dc6c6e99
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
4ed87ad083
|
feature：物料导入存储报错返回9999
|
2 years ago |
|
gaorl
|
e7b62fc2a6
|
feature：获取mdm数据设置公司代码为空
|
2 years ago |
|
gaorl
|
2d1c18407b
|
Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release
|
2 years ago |
|
gaorl
|
53f11c9ed2
|
feature：开票后更新物料逻辑调整
|
2 years ago |
|
gaorl
|
ee6de0d14a
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
018fd392f1
|
feature：新增物料时控制更新时间和创建时间，发票开具后更新物料逻辑
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
175f40cd3d
|
feature 1.修改判断逻辑
|
2 years ago |
|
gaorl
|
bd60274b45
|
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
|
66943ad3c5
|
feature：引用物料时添加特殊物料字段、生成预制是判断成品的标识bug修复
|
2 years ago |
