pref_mail@163.com
|
0fbf3e629d
|
1.增加欧派的数据解析和同步老系统1.2
|
1 year ago |
|
pref_mail@163.com
|
effd8b718e
|
1.增加欧派的数据解析和同步老系统
|
1 year ago |
zhenghaoyu
|
46fc1860ad
|
1.欧派工厂对接数据拉取及处理到数据库
|
1 year ago |
|
pref_mail@163.com
|
f14ed75088
|
1.修改欧派工厂实体
|
1 year ago |
|
pref_mail@163.com
|
bb6dbe0c40
|
欧派工厂数据对接
|
1 year ago |
|
pref_mail@163.com
|
2eef9b9395
|
欧派的推送入库数据
|
1 year ago |
|
pref_mail@163.com
|
9361b14082
|
增加Oupai的VO
|
1 year ago |
|
pref_mail@163.com
|
4fba0c5b52
|
1.增加欧派工厂数据推送【派车单】
|
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 |
kilo
|
230e959506
|
增加修改报错
|
1 year 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
|
1 year ago |
|
kilo
|
3edffa3032
|
增加备货类型字段1
|
1 year ago |
|
caoyizhong
|
be45a36bbc
|
修改自提修改
|
1 year ago |
|
pref_mail@163.com
|
dbeb35c1d3
|
1.修改自提备货的任务列表2
|
1 year ago |
|
zhenghaoyu
|
2d186d8bbb
|
1.代码逻辑优化、
2.滞留功能完成一半
|
1 year ago |
|
pref_mail@163.com
|
9721ccdf90
|
1.修改查看自提备货任务关联查询自提任务
|
1 year ago |
|
caoyizhong
|
1bc069377c
|
修改客户仓库添加
|
1 year ago |
0.0
|
d8b1fd36c0
|
1.下架
|
1 year 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
|
1 year ago |
|
caoyizhong
|
28aab9f5ea
|
订单备货
|
1 year ago |
|
pref_mail@163.com
|
4d83f03910
|
1.修改自提备货的任务列表
|
1 year ago |
|
zhenghaoyu
|
d61751b0c9
|
1.移库功能完成
2.滞留包件功能完成一半
|
1 year ago |
|
pref_mail@163.com
|
9eab6dea7f
|
1.增加自提任务新建备货任务
|
1 year ago |
|
caoyizhong
|
607fef2822
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
432f7b69a9
|
修改签收，装车扫描问题
|
1 year ago |
|
kilo
|
3d5e9c9512
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
kilo
|
de2c4f30a3
|
增加备货类型字段
|
1 year ago |
|
pref_mail@163.com
|
01309a316c
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
pref_mail@163.com
|
d9e1889fda
|
1.修复问题
|
1 year ago |
|
zhenghaoyu
|
c6e7fa7628
|
1.合托功能完成
|
1 year ago |
|
caoyizhong
|
f9336c924c
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
baa149d092
|
修改签收，装车查询问题
|
1 year ago |
|
0.0
|
00d8795e07
|
1.托盘二维码类型
|
1 year ago |
|
pref_mail@163.com
|
98d90df44e
|
1.增加仓库的货位码展示
2.增加数据同步
|
1 year ago |
|
0.0
|
669d2cc679
|
1.托盘二维码
|
1 year ago |
|
kilo
|
de182e752b
|
仓库信息设置缓存
|
1 year ago |
|
zhenghaoyu
|
2365e37d94
|
1.修复bug
|
1 year ago |
|
0.0
|
a1bbfc39e8
|
1.库存品包条上架
|
1 year ago |
|
zhenghaoyu
|
8764cedc81
|
1.完成复核功能
2.托盘空置功能
|
1 year ago |
|
caoyizhong
|
162ad6bcc6
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
07924ce3da
|
修改签收，装车查询问题
|
1 year ago |
|
kilo
|
4a259b0bd3
|
市配配送任务编辑、配送任务增加任务号
|
1 year ago |
|
caoyizhong
|
bcd780b86c
|
修改备货查询
|
1 year ago |
|
0.0
|
1cc696ee83
|
1.托盘
|
1 year ago |
|
pref_mail@163.com
|
e3416a205b
|
Merge branch 'dev' into pre-production
# Conflicts:
# blade-service/logpm-basic/src/main/resources/application.yml
# blade-service/logpm-basicdata/src/main/resources/application.yml
# blade-service/logpm-distribution/src/main/resources/application.yml
# blade-service/logpm-factory/src/main/resources/application.yml
# blade-service/logpm-warehouse/src/main/resources/application.yml
|
1 year ago |
|
zhenghaoyu
|
54386eb7ee
|
1.注释不用的方法
|
1 year ago |
|
zhenghaoyu
|
c9907447d0
|
1.修复库位码传值为库位id
|
1 year ago |
