0.0
|
5340b4de91
|
1.视图缓存处理
|
2 years ago |
 caoyizhong
|
37da119de8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
caoyizhong
|
0c33073206
|
添加库存品详情记录
|
2 years ago |
pref_mail@163.com
|
bb6dbe0c40
|
欧派工厂数据对接
|
2 years ago |
zhenghaoyu
|
2cd18df858
|
1.修改确定库存品需要增加字段批次号
|
2 years ago |
|
caoyizhong
|
b11da0e847
|
修改备货操作
|
2 years ago |
|
zhenghaoyu
|
5de1e8c32e
|
1.代码还原
|
2 years ago |
|
0.0
|
5e90a4e55e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
0.0
|
c1ec4713d5
|
1.选择查询
|
2 years ago |
|
zhenghaoyu
|
4f7b91ee44
|
1.完成滞留记录
2.修复上架bug
|
2 years ago |
kilo
|
6055844367
|
市配、商配编辑bug调整
|
2 years ago |
|
pref_mail@163.com
|
2eef9b9395
|
欧派的推送入库数据
|
2 years ago |
|
pref_mail@163.com
|
6557ae959a
|
完善志邦的入库数据
|
2 years ago |
|
pref_mail@163.com
|
9361b14082
|
增加Oupai的VO
|
2 years ago |
|
0.0
|
3d34db43ec
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
0.0
|
07b053d569
|
1.加入swagger注解
|
2 years ago |
|
pref_mail@163.com
|
960de51e81
|
删除多余的集合
|
2 years ago |
|
pref_mail@163.com
|
e22bdc64f1
|
志邦数据入库完成
|
2 years ago |
|
kilo
|
288fdf011d
|
市配编辑、商配编辑订单bug修复
|
2 years ago |
|
caoyizhong
|
02c2356d29
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
caoyizhong
|
ac027c15ef
|
修改自提列表查询数量
|
2 years ago |
|
zhenghaoyu
|
1cc6608429
|
1.分拣打托逻辑更新
2.修复没有存入创建用户等数据的bug
|
2 years ago |
|
0.0
|
68bc800846
|
1.统计数量添加缓存
|
2 years ago |
|
caoyizhong
|
b57714f6ee
|
修改自提备货操作2
|
2 years ago |
|
caoyizhong
|
92a16ee459
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
caoyizhong
|
61406324a1
|
修改自提操作
|
2 years ago |
|
kilo
|
e23454e425
|
仓库接口
|
2 years ago |
|
zhenghaoyu
|
e6b42023fb
|
1.托盘码生成逻辑修改
|
2 years ago |
|
pref_mail@163.com
|
4fba0c5b52
|
1.增加欧派工厂数据推送【派车单】
|
2 years ago |
|
caoyizhong
|
62e2ab095c
|
修改订单
|
2 years ago |
|
caoyizhong
|
3517e7db95
|
修改自提修改
|
2 years ago |
|
zhenghaoyu
|
3eb34e8e0a
|
1.代码还原
|
2 years ago |
|
pref_mail@163.com
|
14fbac4d88
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java
|
2 years ago |
|
pref_mail@163.com
|
0b9592de60
|
Merge remote-tracking branch 'remotes/origin/dev-warehouse' into dev
# Conflicts:
# blade-biz-common/src/main/java/org/springblade/common/constant/CommonConstant.java
# blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java
# blade-biz-common/src/main/java/org/springblade/common/utils/TemplateUtil.java
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTrayEntity.java
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java
# blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseParcelListEntity.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseParcelListcopyEntity.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseParcelListClient.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseRetentionRecordClient.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListCopyVO.java
# blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java
# blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java
# blade-service/logpm-basicdata/pom.xml
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTrayService.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.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/IDistributionStockArticleService.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/DistributionStockArticleServiceImpl.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseRetentionRecordController.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleCopyDTO.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseRetentionRecordClient.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionRecordService.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseRetentionRecordWrapper.java
合并代码
|
2 years ago |
|
kilo
|
230e959506
|
增加修改报错
|
2 years ago |
|
kilo
|
48010d695d
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# blade-biz-common/src/main/java/org/springblade/common/constant/stockup/StockupTypeConstant.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
|
2 years ago |
|
kilo
|
3edffa3032
|
增加备货类型字段1
|
2 years ago |
|
caoyizhong
|
be45a36bbc
|
修改自提修改
|
2 years ago |
|
pref_mail@163.com
|
dbeb35c1d3
|
1.修改自提备货的任务列表2
|
2 years ago |
|
zhenghaoyu
|
2d186d8bbb
|
1.代码逻辑优化、
2.滞留功能完成一半
|
2 years ago |
|
pref_mail@163.com
|
9721ccdf90
|
1.修改查看自提备货任务关联查询自提任务
|
2 years ago |
|
caoyizhong
|
1bc069377c
|
修改客户仓库添加
|
2 years ago |
|
0.0
|
d8b1fd36c0
|
1.下架
|
2 years ago |
|
caoyizhong
|
7282d6cf13
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
|
2 years ago |
|
caoyizhong
|
28aab9f5ea
|
订单备货
|
2 years ago |
|
pref_mail@163.com
|
4d83f03910
|
1.修改自提备货的任务列表
|
2 years ago |
|
zhenghaoyu
|
d61751b0c9
|
1.移库功能完成
2.滞留包件功能完成一半
|
2 years ago |
|
pref_mail@163.com
|
9eab6dea7f
|
1.增加自提任务新建备货任务
|
2 years ago |
|
caoyizhong
|
607fef2822
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
caoyizhong
|
432f7b69a9
|
修改签收，装车扫描问题
|
2 years ago |
