 pref_mail@163.com
|
de2726690a
|
Merge branch 'dev' into dist.1.2.0
# Conflicts:
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java
# blade-service/logpm-distribution/pom.xml
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanService.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanServiceImpl.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
|
7 months ago |
 zhaoqiaobo
|
5019ded949
|
feat(all): 增加日度仓储成本计算
|
7 months ago |
zhenghaoyu
|
5e66fe80f2
|
1.干线bug修复
|
7 months ago |
 汤建军
|
0437c2d2f7
|
库存品回库校验
|
7 months ago |
|
汤建军
|
a9cd68feb8
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 months ago |
|
pref_mail@163.com
|
15d2484eab
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 months ago |
|
pref_mail@163.com
|
d21a0bc761
|
fix:修复商家端入库数量错误的问题
|
7 months ago |
|
汤建军
|
53e5896a15
|
零担维护包件状态
|
7 months ago |
|
汤建军
|
479204640d
|
零担回库
|
7 months ago |
|
zhenghaoyu
|
8f74cc781b
|
1.干线bug修复
|
7 months ago |
|
zhenghaoyu
|
b9fadeee83
|
1.干线bug修复
|
7 months ago |
|
zhenghaoyu
|
e600c1f3b2
|
1.干线bug修复
|
7 months ago |
|
zhenghaoyu
|
adcf2301fb
|
1.干线bug修复
|
7 months ago |
|
zhenghaoyu
|
d43a0bcd5b
|
1.干线bug修复
|
7 months ago |
|
zhenghaoyu
|
31fcce9e89
|
1.干线bug修复
|
7 months ago |
|
汤建军
|
eae5b71ac4
|
增加发车判断接口
|
7 months ago |
|
汤建军
|
37ea52383f
|
装车扫描关闭装车异常、装车计划维护签收表异常状态
|
7 months ago |
|
汤建军
|
7955fbd1df
|
装车、签收增加回库校验，完善异常和回库任务
|
7 months ago |
|
汤建军
|
625a149909
|
异常绑定回库任务
|
7 months ago |
|
zhenghaoyu
|
b2909f4454
|
1.干线bug修复
2.新增运单上签收信息
|
7 months ago |
|
pref_mail@163.com
|
60d724ff55
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 months ago |
|
pref_mail@163.com
|
332815fb51
|
fix:关闭seata代理
|
7 months ago |
|
zhenghaoyu
|
6340357229
|
1.干线测试配置修改
|
7 months ago |
|
zhenghaoyu
|
b763033e7c
|
1.干线bug修复
|
7 months ago |
|
zhenghaoyu
|
9d6739a488
|
1.干线bug修复
2.结算大致版本完成
|
7 months ago |
|
pref_mail@163.com
|
9b37017876
|
fix:增加商家端的PC入库
|
7 months ago |
|
pref_mail@163.com
|
90cdf99a51
|
fix:增加导入的判断规则 成本或者收入的限制条件
|
7 months ago |
|
pref_mail@163.com
|
2c79682174
|
fix:修复商家预入库数量的展示问题
|
7 months ago |
|
zhaoqiaobo
|
c82b474372
|
feat(all): 增加车辆车次统计维度报表
|
7 months ago |
|
pref_mail@163.com
|
c8de296e43
|
fix:增加三方物流限制物料
|
7 months ago |
|
pref_mail@163.com
|
6d1939e9e0
|
fix:优化欧派数据回传
|
7 months ago |
|
pref_mail@163.com
|
59b8ebd599
|
fix:增加零担卸车入库数据
|
7 months ago |
|
zhaoqiaobo
|
6f434eefa8
|
feat(all): 增加配送车次完结计算成本逻辑
|
7 months ago |
|
zhaoqiaobo
|
c08cfb8a71
|
feat(all): 增加配送车次完结计算成本逻辑
|
7 months ago |
|
pref_mail@163.com
|
1b79001389
|
fix:修改节点作业缺少订单号的情况
add:增加商场入库零担的场景
|
7 months ago |
|
pref_mail@163.com
|
5ac28870e0
|
add: 修改配送列表的订单号查询
|
7 months ago |
|
pref_mail@163.com
|
5ebaada552
|
add: 增加对预约单零担的支持
|
7 months ago |
|
汤建军
|
3c5b143610
|
Merge remote-tracking branch 'origin/dist.1.2.0' into dist.1.2.0
|
7 months ago |
|
汤建军
|
1d95038d8c
|
回库任务
|
7 months ago |
|
pref_mail@163.com
|
580104b772
|
add: 增加客户的结算对象类型
|
7 months ago |
|
pref_mail@163.com
|
cd1dbb016a
|
fix: 增加签收节点推送车辆类型
|
7 months ago |
|
pref_mail@163.com
|
687fa9d1ff
|
fix: 修改欧派回传逻辑
|
7 months ago |
|
pref_mail@163.com
|
743883c437
|
fix: 优化市配的列表查询速度，
|
7 months ago |
|
汤建军
|
d55cb13920
|
回库任务扫描、新增。多车辆解决
|
7 months ago |
|
pref_mail@163.com
|
144ae0fc59
|
fix: 增加000000租户获取仓库的判断
|
7 months ago |
|
pref_mail@163.com
|
d77777eef4
|
Merge remote-tracking branch 'origin/dist.1.2.0' into dist.1.2.0
|
7 months ago |
|
pref_mail@163.com
|
ab9cbb342b
|
add:
1.修改bug
2
|
7 months ago |
|
汤建军
|
0fc8dfbd7e
|
回库任务、异常驳回
|
7 months ago |
|
pref_mail@163.com
|
d927fab560
|
add:
1.修改备货
2
|
7 months ago |
|
zhaoqiaobo
|
7992ba34e6
|
feat(all): 修改备货广播报错问题
|
7 months ago |
