kilo
|
23b4150a3b
|
补交Service
|
1 year ago |
|
kilo
|
04f43d10c0
|
自主创建预约进入确认列表；签收管理、配送计划列表搜索栏
|
1 year ago |
pref_mail@163.com
|
1ac5eca9cb
|
1.合并志邦 合并欧派的数推推送分支
|
1 year ago |
|
pref_mail@163.com
|
90a0a3b088
|
Merge branch 'zhibang-dev' into dev
|
1 year ago |
|
pref_mail@163.com
|
0fbf3e629d
|
1.增加欧派的数据解析和同步老系统1.2
|
1 year ago |
|
pref_mail@163.com
|
549c8e72ee
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
zhenghaoyu
|
c11b671344
|
1.库内作业逻辑优化
|
1 year ago |
0.0
|
4b5139d723
|
1.生成扫描记录,修改DTO
|
1 year ago |
|
pref_mail@163.com
|
effd8b718e
|
1.增加欧派的数据解析和同步老系统
|
1 year ago |
 caoyizhong
|
92ab56c72b
|
修改备货区域修改
|
1 year ago |
|
caoyizhong
|
030f8970f0
|
修改备货客户查询操作
|
1 year ago |
|
zhenghaoyu
|
46fc1860ad
|
1.欧派工厂对接数据拉取及处理到数据库
|
1 year ago |
|
pref_mail@163.com
|
942d486382
|
1.修改梦天的包间品类
|
1 year ago |
|
0.0
|
e494bc2eca
|
1.修改签收明细字段
|
1 year ago |
|
pref_mail@163.com
|
f14ed75088
|
1.修改欧派工厂实体
|
1 year ago |
|
kilo
|
54ca14b2b7
|
扫描装车状态维护、签收列表字段调整
|
1 year ago |
|
0.0
|
5340b4de91
|
1.视图缓存处理
|
1 year ago |
|
caoyizhong
|
37da119de8
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
0c33073206
|
添加库存品详情记录
|
1 year ago |
|
pref_mail@163.com
|
bb6dbe0c40
|
欧派工厂数据对接
|
1 year ago |
|
zhenghaoyu
|
2cd18df858
|
1.修改确定库存品需要增加字段批次号
|
1 year ago |
|
caoyizhong
|
b11da0e847
|
修改备货操作
|
1 year ago |
|
zhenghaoyu
|
5de1e8c32e
|
1.代码还原
|
1 year ago |
|
0.0
|
5e90a4e55e
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
0.0
|
c1ec4713d5
|
1.选择查询
|
1 year ago |
|
zhenghaoyu
|
4f7b91ee44
|
1.完成滞留记录
2.修复上架bug
|
1 year ago |
|
kilo
|
6055844367
|
市配、商配编辑bug调整
|
1 year ago |
|
pref_mail@163.com
|
2eef9b9395
|
欧派的推送入库数据
|
1 year ago |
|
pref_mail@163.com
|
6557ae959a
|
完善志邦的入库数据
|
1 year ago |
|
pref_mail@163.com
|
9361b14082
|
增加Oupai的VO
|
1 year ago |
|
0.0
|
3d34db43ec
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
0.0
|
07b053d569
|
1.加入swagger注解
|
1 year ago |
|
pref_mail@163.com
|
960de51e81
|
删除多余的集合
|
1 year ago |
|
pref_mail@163.com
|
e22bdc64f1
|
志邦数据入库完成
|
1 year ago |
|
kilo
|
288fdf011d
|
市配编辑、商配编辑订单bug修复
|
1 year ago |
|
caoyizhong
|
02c2356d29
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
ac027c15ef
|
修改自提列表查询数量
|
1 year ago |
|
zhenghaoyu
|
1cc6608429
|
1.分拣打托逻辑更新
2.修复没有存入创建用户等数据的bug
|
1 year ago |
|
0.0
|
68bc800846
|
1.统计数量添加缓存
|
1 year ago |
|
caoyizhong
|
b57714f6ee
|
修改自提备货操作2
|
1 year ago |
|
caoyizhong
|
92a16ee459
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
61406324a1
|
修改自提操作
|
1 year ago |
|
kilo
|
e23454e425
|
仓库接口
|
1 year ago |
|
zhenghaoyu
|
e6b42023fb
|
1.托盘码生成逻辑修改
|
1 year ago |
|
pref_mail@163.com
|
4fba0c5b52
|
1.增加欧派工厂数据推送【派车单】
|
1 year ago |
|
caoyizhong
|
62e2ab095c
|
修改订单
|
1 year ago |
|
caoyizhong
|
3517e7db95
|
修改自提修改
|
1 year ago |
|
zhenghaoyu
|
3eb34e8e0a
|
1.代码还原
|
1 year 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
|
1 year 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
合并代码
|
1 year ago |
