王让让
|
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
|
fa841e42dd
|
Merge remote-tracking branch 'sdny/release' into release
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
b58e6acc4c
|
feature 1.修复OFD转png设置默认状态
|
2 years ago |
|
WangQi
|
4c6974414c
|
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 |
|
WangQi
|
ed260e91b1
|
task4437
|
2 years ago |
|
WangQi
|
d7d913b34d
|
Merge remote-tracking branch 'origin/bugfix_3158' into release
|
2 years ago |
|
WangQi
|
079de67787
|
bug3066
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
a57e448fdd
|
Merge remote-tracking branch 'origin/release' into test
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
ffb7d94aa2
|
feature 1.修改规格型号
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
cf7410da07
|
Merge remote-tracking branch 'sdny/test' into test
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
90536c7319
|
feature 1.修改规格型号
|
2 years ago |
|
WangQi
|
c1354cbd9b
|
Merge remote-tracking branch 'origin/bugfix_3158' into test
|
2 years ago |
|
WangQi
|
9c40d64e36
|
bug3158
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
2682670e2a
|
feature 1.修改配置
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
efe9853432
|
feature 1.处理报错问题
|
2 years ago |
|
WangQi
|
a6222d0198
|
Merge remote-tracking branch 'origin/test' into test
|
2 years ago |
|
WangQi
|
2278393973
|
Merge remote-tracking branch 'origin/dev_task_4216' into test
|
2 years ago |
