zhenghaoyu
|
f4f99b42e2
|
Merge branch 'dev' into test
|
2 years ago |
|
zhenghaoyu
|
f0b2efeb0d
|
1.代码还原
|
2 years ago |
|
zhenghaoyu
|
f8033f847d
|
Merge branch 'test' into pre-production
# Conflicts:
# blade-service/logpm-distribution/src/main/resources/application-test.yml
|
2 years ago |
|
zhenghaoyu
|
549baf1940
|
1.代码还原
|
2 years ago |
|
zhenghaoyu
|
41b8a6e4ec
|
Merge branch 'dev' into test
# Conflicts:
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
|
2 years ago |
|
zhenghaoyu
|
e604971b28
|
1.推送皮阿诺开单数据逻辑修改
|
2 years ago |
kilo
|
143a3fd8dc
|
预约添加增加订单和库存的数量填写
|
2 years ago |
0.0
|
3215754307
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
0.0
|
4fa4600c37
|
1.配送详情页面
|
2 years ago |
|
zhenghaoyu
|
39b3c9b53f
|
1.在库订书库查询逻辑修改
|
2 years ago |
pref_mail@163.com
|
8f710440f8
|
1.暂时修改让其不要报错
|
2 years ago |
|
kilo
|
42fa0c7a82
|
预约DTO
|
2 years ago |
|
pref_mail@163.com
|
6f854a6438
|
Merge branch 'dev' into test
|
2 years ago |
|
kilo
|
7f353702d8
|
预约订单中间表、预约库存中间表
|
2 years ago |
|
zhenghaoyu
|
df2d2af7a6
|
1.在库订单表加上老系统advanceId
|
2 years ago |
 caoyizhong
|
09cc9cbe63
|
上传表
|
2 years ago |
|
caoyizhong
|
26160c1af4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
caoyizhong
|
9a044cf4d1
|
修改在库订单查询
|
2 years ago |
|
kilo
|
4a72c274b6
|
预约转配送
|
2 years ago |
|
pref_mail@163.com
|
bbaf586ec1
|
1.增加本地测试的nacos账号和密码
|
2 years ago |
|
pref_mail@163.com
|
6773d46deb
|
1.修改配送端口
|
2 years ago |
|
0.0
|
e101994521
|
1.装车扫描
|
2 years ago |
|
zhenghaoyu
|
aefd0763d6
|
Merge branch 'test' into pre-production
|
2 years ago |
|
zhenghaoyu
|
90bbb800f4
|
Merge branch 'dev' into test
|
2 years ago |
|
zhenghaoyu
|
11a935e067
|
1.修改查询到账仓数据
|
2 years ago |
|
zhenghaoyu
|
3fd36d12c3
|
Merge branch 'test' into pre-production
|
2 years ago |
|
zhenghaoyu
|
55958d1b92
|
Merge branch 'dev' into test
|
2 years ago |
|
zhenghaoyu
|
4e7efe3cc5
|
1.查询订单会返回多条订单
|
2 years ago |
|
zhenghaoyu
|
e36a6b54cf
|
Merge branch 'test' into pre-production
|
2 years ago |
|
zhenghaoyu
|
645a267689
|
Merge branch 'dev' into test
|
2 years ago |
|
zhenghaoyu
|
f661a13649
|
1.修改重复订单不同包件的数据保存和推送逻辑
|
2 years ago |
|
zhenghaoyu
|
d98972a0d5
|
Merge branch 'test' into pre-production
|
2 years ago |
|
zhenghaoyu
|
d94dd80cd8
|
Merge branch 'dev' into test
|
2 years ago |
|
zhenghaoyu
|
46743d1ed8
|
1.代码还原
|
2 years ago |
|
zhenghaoyu
|
d2492218a1
|
Merge branch 'test' into pre-production
|
2 years ago |
|
zhenghaoyu
|
e0a5e9ede6
|
Merge branch 'dev' into test
|
2 years ago |
|
zhenghaoyu
|
aba3015f00
|
1.修改同步数据到老系统的bug
|
2 years ago |
|
0.0
|
24460cf178
|
1.车辆字典
|
2 years ago |
|
zhenghaoyu
|
e50594b1e3
|
1.日志修改
|
2 years ago |
|
zhenghaoyu
|
6d4c6e4c50
|
Merge branch 'test' into pre-production
|
2 years ago |
|
zhenghaoyu
|
abe9014ed7
|
Merge branch 'dev' into test
|
2 years ago |
|
zhenghaoyu
|
ae8b8b4a1b
|
1.修复存入在库订单数据bug
|
2 years ago |
|
zhenghaoyu
|
08679b7d79
|
1.配送配置文件修改
|
2 years ago |
|
zhenghaoyu
|
d28e5c49b6
|
1.配置文件修改
|
2 years ago |
|
zhenghaoyu
|
e26901762b
|
Merge branch 'test' into pre-production
|
2 years ago |
|
zhenghaoyu
|
33aa541903
|
Merge branch 'dev' into test
|
2 years ago |
|
zhenghaoyu
|
907da55445
|
1.mq取消手动确认
|
2 years ago |
|
caoyizhong
|
ab40a56674
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
caoyizhong
|
bede041960
|
修改转库存品
|
2 years ago |
|
zhenghaoyu
|
d7b75103b6
|
Merge branch 'test' into pre-production
|
2 years ago |
