gaorl
|
55cb47cf8c
|
feature：物料整体逻辑优化
|
2 years ago |
|
gaorl
|
d58b06f065
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
fdf61aa813
|
feature：客户信息导入报错
|
2 years ago |
|
gaorl
|
0dbf17d48f
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
a0688f9d90
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
aef79e7f70
|
feature：客户信息导入存在失败情况，修改提示语和返回值
|
2 years ago |
wangrangrang
|
e62e9f4be9
|
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
|
4e127b6ca4
|
修改多个结算单一起生成预制发票的逻辑
|
2 years ago |
WangQi
|
6920599842
|
Merge remote-tracking branch 'origin/task_4631_wq' into test
|
2 years ago |
|
WangQi
|
1b03b314ac
|
task4631 修复客户信息推送开票申请单问题
|
2 years ago |
|
WangQi
|
ffada44fa8
|
Merge remote-tracking branch 'origin/task_4631_wq' into test
|
2 years ago |
|
WangQi
|
b1b4c1cf7c
|
task4631校验客户信息完整
|
2 years ago |
|
WangQi
|
eb4a9fd131
|
Merge remote-tracking branch 'origin/task_4631_wq' into test
|
2 years ago |
|
WangQi
|
bce3a2f3c0
|
task4631校验客户信息完整
|
2 years ago |
|
WangQi
|
b0bfb31153
|
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
|
c6bb60c537
|
task4631校验客户信息完整
|
2 years ago |
|
WangQi
|
fbcb9c5f3e
|
Merge remote-tracking branch 'origin/test' into test
|
2 years ago |
|
WangQi
|
fa99906955
|
Merge remote-tracking branch 'origin/task_4631_wq' into test
|
2 years ago |
|
WangQi
|
ee636693f1
|
task4631 客户信息增加校验银行账户标志
|
2 years ago |
|
wangrangrang
|
38314a527f
|
格式化
|
2 years ago |
|
wangrangrang
|
c38da8c964
|
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
|
b893957fe1
|
修改赋值错误问题
|
2 years ago |
|
wangrangrang
|
5d465d2d03
|
添加日志
|
2 years ago |
|
wangrangrang
|
0bdf819f02
|
修改开票合计金额为价税的合计相加
|
2 years ago |
|
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
|
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 |
