zhenghaoyu
|
5f31d75303
|
Merge remote-tracking branch 'origin/dev' into pre-production
|
4 months ago |
|
zhenghaoyu
|
28498dbbb9
|
1.干线基础数据开发
|
4 months ago |
|
zhenghaoyu
|
8d8a295665
|
Merge remote-tracking branch 'origin/dev' into pre-production
|
4 months ago |
|
zhenghaoyu
|
fbf3b81e7e
|
1.干线基础数据开发
2.干线bug修复，代码优化
|
4 months ago |
 汤建军
|
8201e7b2d1
|
Merge remote-tracking branch 'origin/dev' into pre-production
|
4 months ago |
|
汤建军
|
2f21b3ff85
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 months ago |
|
汤建军
|
3c12a1fa59
|
异常签收增加节点回传数据
|
4 months ago |
 pref_mail@163.com
|
d9620ce4eb
|
Merge branch 'dev' into pre-production
|
4 months ago |
 chenlong
|
790fa56e81
|
Merge branch 'refs/heads/chenglong' into dev
# Conflicts:
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java
|
4 months ago |
|
chenlong
|
1167fdf256
|
修改拆单
|
4 months ago |
|
pref_mail@163.com
|
1dbe0e449e
|
Merge branch 'dev' into pre-production
|
4 months ago |
|
pref_mail@163.com
|
e462b94fe5
|
fix:增加token过期的key
|
4 months ago |
|
pref_mail@163.com
|
123ee184bf
|
Merge branch 'dev' into pre-production
|
4 months ago |
|
pref_mail@163.com
|
350843e1dd
|
fix:增加车牌的判断
|
4 months ago |
|
pref_mail@163.com
|
1fd76ff0af
|
fix:增加车牌信息的判断
|
4 months ago |
|
pref_mail@163.com
|
8e248f6c3a
|
Merge branch 'dev' into pre-production
|
4 months ago |
|
汤建军
|
8560feaf39
|
异常签收增加节点回传数据
|
4 months ago |
|
pref_mail@163.com
|
599de121fa
|
Merge branch 'dev' into pre-production
|
4 months ago |
|
pref_mail@163.com
|
da62c323f9
|
fix:增加trycatch
|
4 months ago |
|
pref_mail@163.com
|
163101a650
|
fix:修改dev配置
|
4 months ago |
|
pref_mail@163.com
|
1b6b4851e4
|
Merge branch 'dev' into pre-production
|
4 months ago |
|
pref_mail@163.com
|
6e9c2ee76e
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 months ago |
|
pref_mail@163.com
|
6c97b6d3d0
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 months ago |
|
汤建军
|
903fe6f60b
|
文员操作配送提示修改
|
4 months ago |
|
汤建军
|
fb43a67341
|
文员操作配送提示修改
|
4 months ago |
|
pref_mail@163.com
|
be7073e5fd
|
fix:修改拆单任务接受数据错误的情况
|
4 months ago |
 zhaoqiaobo
|
47f0a650a4
|
feat(all): 修改配置文件
|
4 months ago |
|
pref_mail@163.com
|
6225e24d35
|
Merge branch 'dev' into pre-production
|
4 months ago |
|
pref_mail@163.com
|
f1da3ec88d
|
fix:删除报错
|
4 months ago |
|
pref_mail@163.com
|
d89192a255
|
Merge branch 'dev' into pre-production
|
4 months ago |
|
pref_mail@163.com
|
ffed70de26
|
Merge branch 'dev' into dist.1.2.0
# Conflicts:
# blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
|
4 months ago |
|
zhaoqiaobo
|
9e911feab0
|
Merge remote-tracking branch 'origin/dist.1.2.0' into dist.1.2.0
|
4 months ago |
|
zhaoqiaobo
|
904de40502
|
feat(all): 修改仓储成本报表
|
4 months ago |
|
pref_mail@163.com
|
7cddd6f7d2
|
fix:增加点击包条码参看包条码二维码内容
复制入库方法 增加商家端入库的特殊内容
|
4 months ago |
|
汤建军
|
b7bbfae737
|
配送增加是否整车字段
|
4 months ago |
|
汤建军
|
de05cf5b0c
|
旧配送逻辑取消装车异常生成
|
4 months ago |
|
汤建军
|
c64ce5d261
|
Merge remote-tracking branch 'origin/dist.1.2.0' into dist.1.2.0
|
4 months ago |
|
汤建军
|
d93d58fecd
|
增加复核签收日志
|
4 months ago |
|
zhaoqiaobo
|
614d09980c
|
feat(all): 修改配送明细报表待入库字段
|
4 months ago |
|
汤建军
|
b1494a58fb
|
回库任务倒序
|
4 months ago |
|
pref_mail@163.com
|
c68bace53b
|
fix:修复问题？
|
4 months ago |
|
汤建军
|
48e094fd36
|
维护异常驳回
|
4 months ago |
|
zhaoqiaobo
|
9a2fb592e7
|
feat(all): 修改仓库日度月度报表查询
|
4 months ago |
|
zhaoqiaobo
|
a0bd7cc32e
|
feat(all): 修改仓库日度月度报表查询
|
4 months ago |
|
汤建军
|
107c645576
|
增加配送计划整车字段、客户地址BUG修复
|
4 months ago |
|
汤建军
|
d0c19f08b4
|
仓库增加法人、法人联系电话、押金字段
|
4 months ago |
|
zhaoqiaobo
|
1bc47a86ac
|
feat(all): 修改仓库租用管理
|
4 months ago |
|
zhaoqiaobo
|
393026cc79
|
feat(all): 修改仓库租用管理
|
4 months ago |
|
zhaoqiaobo
|
86b5b4db64
|
feat(all): 修改仓库租用管理
|
4 months ago |
|
pref_mail@163.com
|
0beada1b77
|
fix:合并代码
2.修改页面入库的没有参数的情况
|
4 months ago |
