gaorl
|
b4c39527b9
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
688914cb59
|
feature：物料来源变更，导出物料枚举错误
|
2 years ago |
|
gaorl
|
8298aa48a9
|
Merge branch 'release' into test
# Conflicts:
# order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
|
2 years ago |
|
gaorl
|
e821e7f15a
|
feature：克隆物料设置来源、克隆人、克隆时间
|
2 years ago |
|
gaorl
|
840132804d
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
da87c514a0
|
feature：税收物料编码更新
|
2 years ago |
|
gaorl
|
50b4ca5447
|
Merge branch 'release' into test
# Conflicts:
# order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
|
2 years ago |
|
gaorl
|
507ce24ecd
|
feature：集团物料库变更税编
|
2 years ago |
|
gaorl
|
913c91f8ff
|
Merge branch 'release' into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
|
2 years ago |
|
gaorl
|
40226abaf8
|
feature：物料引用优先级高的不更新
|
2 years ago |
|
gaorl
|
d13845e8be
|
feature：
|
2 years ago |
|
gaorl
|
ef3f49d29e
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
6ff9339601
|
Merge branch 'release' into test
|
2 years ago |
|
gaorl
|
86c8b02bdf
|
feature：修改物料规格型号、单位、单价、开票名称修改为空
|
2 years ago |
WangQi
|
4caaf86215
|
Merge remote-tracking branch 'origin/task_4631_wq' into test
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
|
2 years ago |
|
WangQi
|
8c82c95c8e
|
task4631 开票申请单详情接口增加是否校验客户信息字段
|
2 years ago |
zhenghaiyang@ele-cloud.com
|
348104658c
|
feature 1.对接电商
|
2 years ago |
|
WangQi
|
8ccfc92bfb
|
Merge remote-tracking branch 'origin/task_4575_wq' into test
|
2 years ago |
|
WangQi
|
be8875a1ff
|
task4575 PO集成开票购方没有税号的企业类型设置为个人
|
2 years ago |
|
gaorl
|
2952e55bb2
|
Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test
|
2 years ago |
|
gaorl
|
55cb47cf8c
|
feature：物料整体逻辑优化
|
2 years ago |
wangrangrang
|
29e8e7fe76
|
过滤掉为空的集合
|
2 years ago |
|
wangrangrang
|
9b84d9e87c
|
Merge branch 'feature/cpy_splite' into test
|
2 years ago |
|
wangrangrang
|
4b8a269b0c
|
过滤掉为空的集合
|
2 years ago |
|
wangrangrang
|
4d760bf438
|
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
|
300c70e0c3
|
去除测试代码
|
2 years ago |
|
wangrangrang
|
e0e70663fa
|
Merge branch 'feature/cpy_splite' into test
|
2 years ago |
|
wangrangrang
|
7ebb69ff39
|
添加异常，测试回滚
|
2 years ago |
|
wangrangrang
|
fc21499fdf
|
Merge branch 'feature/cpy_splite' into test
|
2 years ago |
|
wangrangrang
|
ef36ca712a
|
添加异常，测试回滚
|
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 |
