wangrangrang
|
5551a34f67
|
修改开票合计金额为价税的合计相加
|
2 years ago |
|
wangrangrang
|
14ab7d4c83
|
Merge branch 'feature/cpy_splite' into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
|
2 years ago |
|
wangrangrang
|
1ec9780df5
|
修改成品油和非成品油混合预制发票逻辑
|
2 years ago |
gaorl
|
a9fe65ce6e
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
7f9ffd830d
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
bfb037cf46
|
feature：同步公司库返回报错提示语
|
2 years ago |
|
gaorl
|
13163d4a32
|
feature：红字下载修改红字信息表状态
|
2 years ago |
|
王让让
|
2bdb3f2398
|
Merge branch 'feature/cpy_splite' into 'test'
添加日志
See merge request invoice/sims-order!4
|
2 years ago |
|
wangrangrang
|
1e7f4fa3b7
|
添加日志
|
2 years ago |
|
王让让
|
5d0e4df6b3
|
Merge branch 'feature/cpy_splite' into 'test'
添加日志
See merge request invoice/sims-order!3
|
2 years ago |
|
wangrangrang
|
bf3e247f17
|
添加日志
|
2 years ago |
|
王让让
|
40832f3773
|
Merge branch 'feature/cpy_splite' into 'test'
添加日志
See merge request invoice/sims-order!2
|
2 years ago |
|
wangrangrang
|
6ee11546d9
|
添加日志
|
2 years ago |
|
gaorl
|
1714cea1e2
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
fa39deda02
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
4ef9f0ec38
|
feature：客户导入时添加ent_id 的查询校验
|
2 years ago |
|
王让让
|
692475adfe
|
Merge branch 'feature/cpy_splite' into 'test'
修改预制发票自动拆分成品油和非成品油
See merge request invoice/sims-order!1
|
2 years ago |
|
wangrangrang
|
6a4ddb94fb
|
修改预制发票自动拆分成品油和非成品油
|
2 years ago |
|
gaorl
|
e31dfeb857
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
|
2 years ago |
|
gaorl
|
51fba21048
|
feature：1、同步公司库按钮，2、物料功能优化3、智能赋码生成预制强制校验
|
2 years ago |
WangQi
|
10b8e96a69
|
OFD转PNG接口调试
|
2 years ago |
zhenghaiyang@ele-cloud.com
|
c475395dc1
|
Merge remote-tracking branch 'sdny/release' into test
|
2 years ago |
|
WangQi
|
624b44b71c
|
Merge remote-tracking branch 'origin/bugfix_3066' into release
|
2 years ago |
|
WangQi
|
95b48988e2
|
Merge branch 'task_4516_wq' into release
|
2 years ago |
|
WangQi
|
166064928e
|
Merge remote-tracking branch 'origin/task_4530_wq' into release
|
2 years ago |
|
gaorl
|
7aee7498ac
|
feature：购方信息导入
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
2d1d9df9ef
|
Merge remote-tracking branch 'sdny/release' into test
|
2 years ago |
|
WangQi
|
5aedbec1c1
|
Merge remote-tracking branch 'origin/release' into release
|
2 years ago |
|
WangQi
|
a5c13192ec
|
task4216 ofd转png接口使用影像系统接口 增加开关配置
|
2 years ago |
|
WangQi
|
ed691702c3
|
Merge branch 'dev_task_4216' into release
|
2 years ago |
|
gaorl
|
0cb5832401
|
feature：物料逻辑重新梳理
|
2 years ago |
|
gaorl
|
c9064a3997
|
feature：获取mdm物料时，不更新公司库，不更新税收编码
|
2 years ago |
|
gaorl
|
f13a22eac9
|
feature：购方信息导入，buyer_code导入判空
|
2 years ago |
|
WangQi
|
dd5bdb7c2c
|
Merge branch 'dev_task_4216' into test
|
2 years ago |
|
WangQi
|
f21bd058f3
|
task4216 ofd转png接口使用影像系统接口 增加开关配置
|
2 years ago |
|
gaorl
|
48880dc213
|
feature：导入物料规格型号40个字符长度处理
|
2 years ago |
|
gaorl
|
baf36758bb
|
feature：开票组织查询调整，名称和税号取设置默认的行，如果不存在取下标0的展示
|
2 years ago |
|
WangQi
|
b6f6194040
|
Merge remote-tracking branch 'origin/task_4516_wq' into test
|
2 years ago |
|
WangQi
|
c6c68f01fc
|
task4516 sap报账单删除功能
|
2 years ago |
|
WangQi
|
7fb023b5b6
|
task4516 sap报账单删除功能
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
f27bd5c18b
|
feature 1.修复红票清单标志问题
|
2 years ago |
|
WangQi
|
8abef61735
|
Merge remote-tracking branch 'origin/task_4530_wq' into test
|
2 years ago |
|
WangQi
|
a4b75b13e4
|
task4530
|
2 years ago |
|
WangQi
|
95f9424982
|
Merge remote-tracking branch 'origin/task_4530_wq' into test
|
2 years ago |
|
WangQi
|
8b0f11ba2e
|
task4530
|
2 years ago |
|
WangQi
|
ad44adf600
|
Merge remote-tracking branch 'origin/task_4530_wq' into test
|
2 years ago |
|
WangQi
|
b5fca06951
|
task4530
|
2 years ago |
|
WangQi
|
c45754fda8
|
Merge remote-tracking branch 'origin/bugfix_3066' into test
|
2 years ago |
|
WangQi
|
cb3863c01d
|
Merge remote-tracking branch 'origin/task_4437' into test
|
2 years ago |
|
WangQi
|
2771b60ca8
|
Merge remote-tracking branch 'origin/task_4437' into release
|
2 years ago |
