 pref_mail@163.com
|
a5114aa2b7
|
合并代码
|
1 year ago |
|
pref_mail@163.com
|
de28699e78
|
Merge branch 'fix_bug_2024-01-22' into dev
# Conflicts:
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
|
1 year ago |
zhenghaoyu
|
8624778eb4
|
1.库内-下架解托优化
|
1 year ago |
 汤建军
|
0a5cd9af5b
|
备货增加warehouseId
|
1 year ago |
|
汤建军
|
a4fdccc17b
|
备货PDA增加仓库、商场过滤
|
1 year ago |
|
汤建军
|
6e6e1823ee
|
待签收列表过滤数量为0的数据
|
1 year ago |
 Diss
|
f0bf9d076a
|
提货状态字段值修改
|
1 year ago |
|
pref_mail@163.com
|
0032732df4
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
pref_mail@163.com
|
875041d61f
|
Merge remote-tracking branch 'origin/fix_bug_2024-01-19' into dev
|
1 year ago |
|
pref_mail@163.com
|
1dee7290c6
|
修改备货的时候 查询货位的问题
|
1 year ago |
|
pref_mail@163.com
|
3727db5296
|
删除修改自提任务中取消的限制代码，增加一个方法 用于提货单的图片上传
|
1 year ago |
|
汤建军
|
edb61c2482
|
增加签收扫描详情、维护商配修改新订单无包件
|
1 year ago |
|
zhenghaoyu
|
3a539c365f
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
2b6b1f32ac
|
1.干线-功能提交
|
1 year ago |
caoyizhong
|
aacc285b01
|
修改工单号判断
|
1 year ago |
|
caoyizhong
|
f75eca0009
|
修改工单号判断
|
1 year ago |
|
caoyizhong
|
18746eadf9
|
Merge remote-tracking branch 'origin/dev' into pre-production
|
1 year ago |
|
caoyizhong
|
b8103e464a
|
修改工单提交
|
1 year ago |
|
Diss
|
ca927b7b95
|
删除重复字段
|
1 year ago |
|
pref_mail@163.com
|
a7f5f35b44
|
修复 创建订单没有创建人和创建时间
|
1 year ago |
|
caoyizhong
|
e1f58cf4aa
|
Merge remote-tracking branch 'origin/dev' into pre-production
|
1 year ago |
|
caoyizhong
|
e9999ecfdf
|
修改启动名称
|
1 year ago |
|
caoyizhong
|
6c28abfa34
|
Merge remote-tracking branch 'origin/dev' into pre-production
|
1 year ago |
|
caoyizhong
|
1ebb5c0700
|
添加工单员工离职提醒
|
1 year ago |
|
pref_mail@163.com
|
d9c04e5f8f
|
修改名称
|
1 year ago |
|
pref_mail@163.com
|
f44a35302b
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
pref_mail@163.com
|
95682b1053
|
Merge remote-tracking branch 'origin/fix_bug_2024-01-18' into dev
|
1 year ago |
|
caoyizhong
|
e39c9726bc
|
修改自提订单取消异常
|
1 year ago |
|
汤建军
|
b72daa9de7
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
汤建军
|
3edde95c61
|
维护包件装车下架、维护包件签收解托、维护完成复核的配送状态
|
1 year ago |
|
汤建军
|
5e2b1f84c0
|
异常审核bug修复
|
1 year ago |
|
zhenghaoyu
|
368d9efdf8
|
1.同步数据取消打托问题
|
1 year ago |
|
caoyizhong
|
cfd906edb8
|
修改工单处理提交问题
|
1 year ago |
|
汤建军
|
724524c500
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
pref_mail@163.com
|
091efcf9a6
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
pref_mail@163.com
|
97f8444153
|
Merge branch 'fix_bug_2024-01-17' into dev
|
1 year ago |
|
汤建军
|
59e8da04c5
|
异常签收下架解托
|
1 year ago |
|
汤建军
|
6a82d212d8
|
异常签收补录状态维护
|
1 year ago |
|
汤建军
|
76493c8168
|
商场PDA查询库存品调整
|
1 year ago |
|
汤建军
|
ac1b0e9f4f
|
增加商场物料查询和修改、库存品查询
|
1 year ago |
|
pref_mail@163.com
|
d92790c86c
|
查看为什么仓库报错 修改判断条件
|
1 year ago |
|
pref_mail@163.com
|
e0c9d77da3
|
查看为什么仓库报错
|
1 year ago |
|
caoyizhong
|
34ca9431f2
|
修改申述编辑
|
1 year ago |
|
caoyizhong
|
1b75a5495f
|
调整查询，超时查询
|
1 year ago |
|
pref_mail@163.com
|
a22065ad20
|
开启梦天的推送 转运仓数据不推送
|
1 year ago |
|
caoyizhong
|
53a9fc15e6
|
调整查询，超时查询
|
1 year ago |
|
pref_mail@163.com
|
c03c115562
|
开启梦天的推送测试
|
1 year ago |
|
zhenghaoyu
|
d165365eb8
|
1.干线-直发商家逻辑优化
|
1 year ago |
|
汤建军
|
20ba4ad569
|
Merge branch 'fix_bug_2024-01-16' into dev
# Conflicts:
# 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/DistributionSignforServiceImpl.java
|
1 year ago |
|
汤建军
|
cb8c5c6094
|
商配计划增加已复核拦截订单追加修复
|
1 year ago |
