 pref_mail@163.com
|
7c5d5f79fc
|
Merge branch 'dev' into pre-production
|
11 months ago |
|
pref_mail@163.com
|
775fec69c6
|
还原分布式事物
|
11 months ago |
|
pref_mail@163.com
|
582aa54257
|
Merge branch 'dev' into pre-production
|
11 months ago |
|
pref_mail@163.com
|
a599bb0e8b
|
增加数据同步仓库
|
11 months ago |
|
pref_mail@163.com
|
10172a668d
|
增加欧派数据重推 走数据库
|
11 months ago |
|
pref_mail@163.com
|
6c3494ac69
|
增加事物
|
11 months ago |
 汤建军
|
48013a82e8
|
PC取消零担配送BUG修复
|
11 months ago |
|
汤建军
|
1984a313c5
|
PC取消零担配送
|
11 months ago |
|
汤建军
|
b9076feaca
|
批量签收维护装车、签收数量，增加异常签收无法批量限制
|
11 months ago |
|
汤建军
|
e2d2f8374f
|
自提编辑修改维护自提订单信息
|
11 months ago |
|
pref_mail@163.com
|
78f9f1e1f2
|
Merge branch 'dev' into pre-production
|
11 months ago |
|
pref_mail@163.com
|
c5d93e5215
|
Merge remote-tracking branch 'origin/dev' into dev
|
11 months ago |
|
pref_mail@163.com
|
3679b706c9
|
增加志邦的入库数据日志
|
11 months ago |
|
汤建军
|
20f67dff3c
|
预约、自提搜索订单查询当前计划可用数
|
11 months ago |
|
汤建军
|
502005d7ad
|
订单搜索录入默认计划数、自提页面取消选择仓库限制
|
11 months ago |
|
pref_mail@163.com
|
84bb7c13e8
|
Merge branch 'dev' into pre-production
|
11 months ago |
|
pref_mail@163.com
|
0fc89ded30
|
还原分布式事物代码
|
11 months ago |
zhenghaoyu
|
9e095eea93
|
Merge remote-tracking branch 'origin/dev' into dev
|
11 months ago |
|
zhenghaoyu
|
4b4d07da3c
|
1.修复老系统包件解托限制问题
|
11 months ago |
|
汤建军
|
9061514a84
|
取消事务引入
|
11 months ago |
|
汤建军
|
46cc093135
|
维护自提打印报错
|
11 months ago |
|
zhenghaoyu
|
64cbfeaba6
|
1.修复订单入库包件入库时间的bug
|
11 months ago |
|
zhenghaoyu
|
66329c7ceb
|
Merge branch 'dev' into pre-production
|
11 months ago |
zhaoqiaobo
|
b197a31e8e
|
fix(all): 修改seata token问题
|
11 months ago |
|
pref_mail@163.com
|
9b9e446156
|
Merge branch 'dev' into pre-production
|
11 months ago |
|
pref_mail@163.com
|
f1466547af
|
fix:上测试 分布式事物2
|
11 months ago |
|
pref_mail@163.com
|
d98998cc28
|
Merge branch 'dev' into pre-production
|
11 months ago |
|
zhaoqiaobo
|
2ff9b8e9ac
|
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logisticsplatform-service into dev
|
11 months ago |
|
zhaoqiaobo
|
7c9eeb1578
|
fix(service): 修改文件乱码问题
|
11 months ago |
|
pref_mail@163.com
|
aa1ce6d307
|
Merge branch 'dev' into pre-production
|
11 months ago |
|
pref_mail@163.com
|
e2b9b19177
|
fix:上测试 分布式事物
|
11 months ago |
|
zhenghaoyu
|
8732eca660
|
1.逻辑修改
|
11 months ago |
|
pref_mail@163.com
|
3f0ba535dc
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java
|
11 months ago |
|
pref_mail@163.com
|
f6c6eda12d
|
fix:修改分布式事物无法获取fegin接口数据问题
|
11 months ago |
|
zhaoqiaobo
|
08ba9490b5
|
fix(all): 修改暂存单保存时的校验问题
|
11 months ago |
|
zhaoqiaobo
|
434859564b
|
Merge branch 'dev' of http://47.108.105.48:3000/java_project/logisticsplatform-service into dev
|
11 months ago |
|
zhaoqiaobo
|
076b557b46
|
feat(service): 修改接收志邦数据时，包件重复则不保存包件数据和不生成包件的暂存单
|
11 months ago |
|
zhenghaoyu
|
31619ae114
|
1.配置开单及入库 功能完成
2.增加暂存单入库更新全库订单数量
3.修复事务问题
4.优化批量入库的逻辑
|
11 months ago |
 zhaoqiaobo
|
3c22548de7
|
Merge pull request 'fix(service): 志邦增加必须节点推送缺失时自动补充' (#30) from dev into pre-production
Reviewed-on: #30
|
11 months ago |
|
zhaoqiaobo
|
41a2646a71
|
fix(service): 志邦增加必须节点推送缺失时自动补充
|
11 months ago |
|
pref_mail@163.com
|
314ec59d2e
|
Merge branch 'dev' into pre-production
|
11 months ago |
|
pref_mail@163.com
|
2288c1a824
|
fix:
修复库存品入库存在空格问题
|
11 months ago |
|
pref_mail@163.com
|
713a0ed4ea
|
Merge remote-tracking branch 'origin/dev' into dev
|
11 months ago |
|
pref_mail@163.com
|
a2a33841f3
|
fix:
增加分布式事务
|
11 months ago |
|
zhaoqiaobo
|
603be1eb79
|
Merge pull request 'fix(service): 修改报表模块启动报错问题' (#29) from dev into pre-production
Reviewed-on: #29
|
11 months ago |
|
zhaoqiaobo
|
bb78ec6e95
|
fix(service): 修改报表模块启动报错问题
|
11 months ago |
|
zhaoqiaobo
|
bf4ef06536
|
Merge pull request 'dev' (#28) from dev into pre-production
Reviewed-on: #28
|
11 months ago |
|
zhaoqiaobo
|
47dbd69865
|
fix(all): 增加枚举
|
11 months ago |
|
zhaoqiaobo
|
6890978355
|
fix(xml): 基础数据增加xxljob
|
11 months ago |
|
zhaoqiaobo
|
f93bb863d9
|
feat(all): 添加价格体系
|
11 months ago |
