|
|
|
|
@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.function.Function; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
@Log4j2 |
|
|
|
|
@ -828,19 +829,18 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
|
|
|
|
|
public R upShelfOrder(List<UpShelfOrderDTO> upShelfOrderList, Long allocationId, Long warehouseId, String remrk) { |
|
|
|
|
int num = 0; |
|
|
|
|
String trayCode = null; |
|
|
|
|
WarehouseTrayTypeEntity trayTypeEntity = null; |
|
|
|
|
//判断货位是否有托盘
|
|
|
|
|
BasicdataTrayEntity trayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId); |
|
|
|
|
String trayType = null; |
|
|
|
|
if (!Objects.isNull(trayEntity)) { |
|
|
|
|
trayCode = trayEntity.getPalletCode(); |
|
|
|
|
//如果有托盘
|
|
|
|
|
TrayTypeDataVO entityByTrayCode = warehouseTrayTypeService.getEntityByTrayCodeWithUpdown(trayCode); |
|
|
|
|
trayType = entityByTrayCode.getTrayType(); |
|
|
|
|
// String type = entityByTrayCode.getType();//数据类型 1订制品 2零担 3 4 库存品
|
|
|
|
|
// if(!"1".equals(type)){
|
|
|
|
|
// log.warn("##############upShelfOrder: 库位上的托盘是定制品类型 allocationId={}",allocationId);
|
|
|
|
|
// return R.fail(403,"库位上的托盘是定制品类型");
|
|
|
|
|
// }
|
|
|
|
|
QueryWrapper<WarehouseTrayTypeEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("tray_code", trayCode) |
|
|
|
|
.eq("is_deleted", 0); |
|
|
|
|
trayTypeEntity = warehouseTrayTypeService.getOne(queryWrapper); |
|
|
|
|
trayType = trayTypeEntity.getTrayType(); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -877,46 +877,27 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
|
|
|
|
|
return R.fail(403, "库位不属于当前仓库"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//把upShelfOrderList中的orderCode提取到一个Set集合中
|
|
|
|
|
List<String> orderCodeList = upShelfOrderList.stream().map(UpShelfOrderDTO::getOrderCode).collect(Collectors.toList()); |
|
|
|
|
List<DistributionParcelListEntity> parcelListList = distributionParcelListClient.findALLNoUpShelfPackageByOrderCodeList(orderCodeList, warehouseId); |
|
|
|
|
|
|
|
|
|
for (UpShelfOrderDTO upShelfOrderDTO : upShelfOrderList) { |
|
|
|
|
String orderCode = upShelfOrderDTO.getOrderCode(); |
|
|
|
|
if (StringUtil.isBlank(orderCode)) { |
|
|
|
|
log.warn("##############upShelfOrder: 订单号不存在 orderCode={}", orderCode); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
//查询所有该订单号未上架的数据
|
|
|
|
|
List<DistributionParcelListEntity> parcelListList = distributionParcelListClient.findALLNoUpShelfPackageByOrderCode(orderCode, warehouseId); |
|
|
|
|
for (DistributionParcelListEntity parcelListEntity : parcelListList) { |
|
|
|
|
try { |
|
|
|
|
String orderPackageCode = parcelListEntity.getOrderPackageCode(); |
|
|
|
|
Integer quantity = parcelListEntity.getQuantity(); |
|
|
|
|
|
|
|
|
|
if (StringUtil.hasLength(trayCode)) { |
|
|
|
|
List<UpShelfPackageDTO> upShelfPackageList = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
//存入托盘信息
|
|
|
|
|
warehouseTrayTypeService.orderScanOrderPackageCode(trayType, trayCode, orderPackageCode, warehouseId, remrk + "并上架"); |
|
|
|
|
} |
|
|
|
|
//包件级别的上架
|
|
|
|
|
upShelfPackageNoTray(parcelListEntity, goodsAllocationEntity, goodsShelfEntity, goodsAreaEntity, warehouseId, remrk); |
|
|
|
|
parcelListList.forEach(parcelListEntity -> { |
|
|
|
|
UpShelfPackageDTO upShelfPackageDTO = new UpShelfPackageDTO(); |
|
|
|
|
upShelfPackageDTO.setOrderPackageCode(parcelListEntity.getOrderPackageCode()); |
|
|
|
|
upShelfPackageList.add(upShelfPackageDTO); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
num = num + quantity; |
|
|
|
|
} catch (CustomerException e) { |
|
|
|
|
log.warn(e.message); |
|
|
|
|
continue; |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.warn(e.getMessage()); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return Resp.scanSuccess("上架成功", "成功上架" + num + "条"); |
|
|
|
|
return upShelfPackage(upShelfPackageList, allocationId, warehouseId, remrk); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
|
@Override |
|
|
|
|
public R upShelfPackage(List<UpShelfPackageDTO> upShelfPackageList, Long allocationId, Long warehouseId, String remark) { |
|
|
|
|
int num = 0; |
|
|
|
|
String trayCode = null; |
|
|
|
|
String trayType = null; |
|
|
|
|
WarehouseTrayTypeEntity trayTypeEntity = null; |
|
|
|
|
//判断货位是否有托盘
|
|
|
|
|
BasicdataTrayEntity trayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId); |
|
|
|
|
if (!Objects.isNull(trayEntity)) { |
|
|
|
|
@ -925,8 +906,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
|
|
|
|
|
QueryWrapper<WarehouseTrayTypeEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("tray_code", trayCode) |
|
|
|
|
.eq("is_deleted", 0); |
|
|
|
|
WarehouseTrayTypeEntity trayTypeEntity = warehouseTrayTypeService.getOne(queryWrapper); |
|
|
|
|
trayType = trayTypeEntity.getTrayType(); |
|
|
|
|
trayTypeEntity = warehouseTrayTypeService.getOne(queryWrapper); |
|
|
|
|
// String type = trayTypeEntity.getType();//数据类型 1订制品 2零担 3 4 库存品
|
|
|
|
|
// if(!"1".equals(type)){
|
|
|
|
|
// log.warn("##############upShelfOrder: 库位上的托盘是定制品类型 allocationId={}",allocationId);
|
|
|
|
|
@ -973,60 +953,89 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
|
|
|
|
|
return R.fail(403, "库位不属于本仓库"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//把upShelfPackageList中所有orderPackageCode存入一个List<String>
|
|
|
|
|
List<String> orderPackageCodeList = upShelfPackageList.stream().map(UpShelfPackageDTO::getOrderPackageCode).collect(Collectors.toList()); |
|
|
|
|
log.info("##############upShelfPackage: 当前处理的包件码 orderPackageCodeList={}", orderPackageCodeList); |
|
|
|
|
//判断包件是否已经上架
|
|
|
|
|
List<String> hasOrderPackageCodes = warehouseUpdownGoodsService.findOrderPackageCodesByOrderPackageCodeList(orderPackageCodeList, warehouseId); |
|
|
|
|
orderPackageCodeList.removeAll(hasOrderPackageCodes); |
|
|
|
|
|
|
|
|
|
for (UpShelfPackageDTO upShelfPackageDTO : upShelfPackageList) { |
|
|
|
|
String orderPackageCode = upShelfPackageDTO.getOrderPackageCode(); |
|
|
|
|
log.info("##############upShelfPackage: 当前处理的包件码 orderPackageCode={}", orderPackageCode); |
|
|
|
|
try { |
|
|
|
|
//判断包件是否已经上架
|
|
|
|
|
QueryWrapper<WarehouseUpdownGoodsEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("association_value", orderPackageCode) |
|
|
|
|
.eq("warehouse_id", warehouseId); |
|
|
|
|
WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper); |
|
|
|
|
if (!Objects.isNull(updownGoodsEntity)) { |
|
|
|
|
log.warn("##############upShelfPackage: 包件已上架 orderPackageCode={}", orderPackageCode); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
//判断包件是否有绑托盘，
|
|
|
|
|
QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsQueryWrapper = new QueryWrapper<>(); |
|
|
|
|
trayGoodsQueryWrapper.eq("association_value", orderPackageCode); |
|
|
|
|
WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsQueryWrapper); |
|
|
|
|
if (!Objects.isNull(trayGoodsEntity)) { |
|
|
|
|
// log.warn("##############upShelfPackage: 包件已打托 orderPackageCode={}",orderPackageCode);
|
|
|
|
|
// continue;
|
|
|
|
|
//已打托的数据需要取消托盘绑定
|
|
|
|
|
warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode, "扫描上架:包件下托", warehouseId); |
|
|
|
|
} |
|
|
|
|
//判断包件是否有绑托盘，
|
|
|
|
|
QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsQueryWrapper = new QueryWrapper<>(); |
|
|
|
|
trayGoodsQueryWrapper.in("association_value", orderPackageCodeList); |
|
|
|
|
List<WarehouseTrayGoodsEntity> trayGoodsEntityList = warehouseTrayGoodsService.list(trayGoodsQueryWrapper); |
|
|
|
|
if(!trayGoodsEntityList.isEmpty()){ |
|
|
|
|
//把trayGoodsEntityList中的association_value提取出来存入一个List<String>
|
|
|
|
|
List<String> orderPackageCodes = trayGoodsEntityList.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).collect(Collectors.toList()); |
|
|
|
|
warehouseTrayTypeService.downPackageByOrderPackageCodeList(orderPackageCodes,"同步处理:包件解托",warehouseId); |
|
|
|
|
} |
|
|
|
|
List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListClient.findListByOrderPackageCodeList(orderPackageCodeList, warehouseId); |
|
|
|
|
//排除parcelListEntityList中元素orderPackageStatus 不等于20的
|
|
|
|
|
parcelListEntityList = parcelListEntityList.stream().filter(parcelListEntity -> "20".equals(parcelListEntity.getOrderPackageStatus())).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); |
|
|
|
|
Integer conditions = parcelListEntity.getConditions(); |
|
|
|
|
Integer quantity = parcelListEntity.getQuantity(); |
|
|
|
|
String orderPackageStatus = parcelListEntity.getOrderPackageStatus(); |
|
|
|
|
if (!"20".equals(orderPackageStatus)) { |
|
|
|
|
log.warn("##############upShelfPackage: 包件已不在库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId); |
|
|
|
|
return Resp.scanFail(403, "包件已不在库", "包件已不在库"); |
|
|
|
|
} |
|
|
|
|
// if(conditions != 1){
|
|
|
|
|
// log.warn("##############upShelfPackage: 包件已转库存品 orderPackageCode={}",orderPackageCode);
|
|
|
|
|
// continue;
|
|
|
|
|
// }
|
|
|
|
|
if (StringUtil.hasLength(trayCode)) { |
|
|
|
|
//存入托盘信息
|
|
|
|
|
warehouseTrayTypeService.orderScanOrderPackageCode(trayType, trayCode, orderPackageCode, warehouseId, remark + "并打托"); |
|
|
|
|
} |
|
|
|
|
//包件级别的上架
|
|
|
|
|
upShelfPackageNoTray(parcelListEntity, goodsAllocationEntity, goodsShelfEntity, goodsAreaEntity, warehouseId, remark); |
|
|
|
|
num = num + quantity; |
|
|
|
|
} catch (CustomerException e) { |
|
|
|
|
log.warn(e.message); |
|
|
|
|
continue; |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.warn(e.getMessage()); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
if (StringUtil.hasLength(trayCode)) { |
|
|
|
|
//存入托盘信息
|
|
|
|
|
warehouseTrayTypeService.orderScanOrderPackageCodeList(trayTypeEntity, parcelListEntityList, warehouseId, remark + "并打托"); |
|
|
|
|
} |
|
|
|
|
//包件级别的上架
|
|
|
|
|
upShelfPackageListNoTray(parcelListEntityList, goodsAllocationEntity, goodsShelfEntity, goodsAreaEntity, warehouseId, remark); |
|
|
|
|
num = num + parcelListEntityList.size(); |
|
|
|
|
|
|
|
|
|
//更新货位缓存
|
|
|
|
|
warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString()); |
|
|
|
|
|
|
|
|
|
// for (UpShelfPackageDTO upShelfPackageDTO : upShelfPackageList) {
|
|
|
|
|
// String orderPackageCode = upShelfPackageDTO.getOrderPackageCode();
|
|
|
|
|
// log.info("##############upShelfPackage: 当前处理的包件码 orderPackageCode={}", orderPackageCode);
|
|
|
|
|
// try {
|
|
|
|
|
// //判断包件是否已经上架
|
|
|
|
|
// QueryWrapper<WarehouseUpdownGoodsEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
// queryWrapper.eq("association_value", orderPackageCode)
|
|
|
|
|
// .eq("warehouse_id", warehouseId);
|
|
|
|
|
// WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper);
|
|
|
|
|
// if (!Objects.isNull(updownGoodsEntity)) {
|
|
|
|
|
// log.warn("##############upShelfPackage: 包件已上架 orderPackageCode={}", orderPackageCode);
|
|
|
|
|
// continue;
|
|
|
|
|
// }
|
|
|
|
|
// //判断包件是否有绑托盘，
|
|
|
|
|
// QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
// trayGoodsQueryWrapper.eq("association_value", orderPackageCode);
|
|
|
|
|
// WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsQueryWrapper);
|
|
|
|
|
// if (!Objects.isNull(trayGoodsEntity)) {
|
|
|
|
|
//// log.warn("##############upShelfPackage: 包件已打托 orderPackageCode={}",orderPackageCode);
|
|
|
|
|
//// continue;
|
|
|
|
|
// //已打托的数据需要取消托盘绑定
|
|
|
|
|
// warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode, "扫描上架:包件下托", warehouseId);
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
|
|
|
|
|
// Integer conditions = parcelListEntity.getConditions();
|
|
|
|
|
// Integer quantity = parcelListEntity.getQuantity();
|
|
|
|
|
// String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
|
|
|
|
|
// if (!"20".equals(orderPackageStatus)) {
|
|
|
|
|
// log.warn("##############upShelfPackage: 包件已不在库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
|
|
|
|
|
// return Resp.scanFail(403, "包件已不在库", "包件已不在库");
|
|
|
|
|
// }
|
|
|
|
|
//// if(conditions != 1){
|
|
|
|
|
//// log.warn("##############upShelfPackage: 包件已转库存品 orderPackageCode={}",orderPackageCode);
|
|
|
|
|
//// continue;
|
|
|
|
|
//// }
|
|
|
|
|
// if (StringUtil.hasLength(trayCode)) {
|
|
|
|
|
// //存入托盘信息
|
|
|
|
|
// warehouseTrayTypeService.orderScanOrderPackageCodeList(trayTypeEntity, orderPackageCodeList, warehouseId, remark + "并打托");
|
|
|
|
|
// }
|
|
|
|
|
// //包件级别的上架
|
|
|
|
|
// upShelfPackageNoTray(parcelListEntity, goodsAllocationEntity, goodsShelfEntity, goodsAreaEntity, warehouseId, remark);
|
|
|
|
|
// num = num + quantity;
|
|
|
|
|
// } catch (CustomerException e) {
|
|
|
|
|
// log.warn(e.message);
|
|
|
|
|
// continue;
|
|
|
|
|
// } catch (Exception e) {
|
|
|
|
|
// log.warn(e.getMessage());
|
|
|
|
|
// continue;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
return Resp.scanSuccess("上架成功", "成功上架" + num + "条"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -1405,58 +1414,133 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
|
|
|
|
|
@Override |
|
|
|
|
public R downPackage(List<UpShelfPackageDTO> upShelfPackageList, Long warehouseId, String remark) { |
|
|
|
|
int num = 0; |
|
|
|
|
Set<String> orderSet = new TreeSet<>(); |
|
|
|
|
for (UpShelfPackageDTO upShelfPackageDTO : upShelfPackageList) { |
|
|
|
|
String orderPackageCode = upShelfPackageDTO.getOrderPackageCode(); |
|
|
|
|
//查询包件在哪个库位上
|
|
|
|
|
QueryWrapper<WarehouseUpdownGoodsEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("association_type", "3") |
|
|
|
|
.eq("warehouse_id", warehouseId) |
|
|
|
|
.eq("association_value", orderPackageCode); |
|
|
|
|
WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper); |
|
|
|
|
if (Objects.isNull(updownGoodsEntity)) { |
|
|
|
|
log.warn("##############downPackage: 包件没有上架记录 orderPackageCode={}", orderPackageCode); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
Long allocationId = updownGoodsEntity.getAllocationId(); |
|
|
|
|
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId); |
|
|
|
|
Integer quantity = parcelListEntity.getQuantity(); |
|
|
|
|
String orderCode = parcelListEntity.getOrderCode(); |
|
|
|
|
Long updownGoodsId = updownGoodsEntity.getId(); |
|
|
|
|
Long updownTypeId = updownGoodsEntity.getUpdownTypeId(); |
|
|
|
|
WarehouseUpdownTypeEntity updownTypeEntity = baseMapper.selectById(updownTypeId); |
|
|
|
|
Set<String> orderSet = new HashSet<>(); |
|
|
|
|
|
|
|
|
|
//把upShelfPackageList中的orderPackageCde提取到List中
|
|
|
|
|
List<String> orderPackageCodeList = upShelfPackageList.stream().map(UpShelfPackageDTO::getOrderPackageCode).collect(Collectors.toList()); |
|
|
|
|
QueryWrapper<WarehouseUpdownGoodsEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("association_type", "3") |
|
|
|
|
.eq("warehouse_id", warehouseId) |
|
|
|
|
.in("association_value", orderPackageCodeList); |
|
|
|
|
List<WarehouseUpdownGoodsEntity> updownGoodsEntities = warehouseUpdownGoodsService.list(queryWrapper); |
|
|
|
|
|
|
|
|
|
//把updownGoodsEntities的association_value提取到一个List中
|
|
|
|
|
List<String> associationValueList = updownGoodsEntities.stream().map(WarehouseUpdownGoodsEntity::getAssociationValue).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListClient.findListByOrderPackageCodeList(associationValueList, warehouseId); |
|
|
|
|
//把parcelListEntityList转化成orderPackageCode为key的Map
|
|
|
|
|
Map<String, DistributionParcelListEntity> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getOrderPackageCode, Function.identity())); |
|
|
|
|
|
|
|
|
|
//把updownGoodsEntities通过allocatiionId进行分组
|
|
|
|
|
Map<Long, List<WarehouseUpdownGoodsEntity>> map = updownGoodsEntities.stream().collect(Collectors.groupingBy(WarehouseUpdownGoodsEntity::getAllocationId)); |
|
|
|
|
|
|
|
|
|
List<Long> allocationIds = new ArrayList<>(map.keySet()); |
|
|
|
|
|
|
|
|
|
QueryWrapper<WarehouseUpdownTypeEntity> updownTypeEntityQueryWrapper = new QueryWrapper<>(); |
|
|
|
|
updownTypeEntityQueryWrapper.in("allocation_id", allocationIds) |
|
|
|
|
.eq("is_deleted", 0); |
|
|
|
|
List<WarehouseUpdownTypeEntity> updownTypeList = list(updownTypeEntityQueryWrapper); |
|
|
|
|
//把updownTypeList转化成allocationId为key的Map
|
|
|
|
|
Map<Long, WarehouseUpdownTypeEntity> updownTypeMap = updownTypeList.stream().collect(Collectors.toMap(WarehouseUpdownTypeEntity::getAllocationId, Function.identity())); |
|
|
|
|
|
|
|
|
|
List<Long> toNullUpdownTypeIds = new ArrayList<>(); |
|
|
|
|
List<Long> updateAllocationIds = new ArrayList<>(); |
|
|
|
|
List<WarehouseTaryAllocationEntity> deleteTrayAllocationList = new ArrayList<>(); |
|
|
|
|
List<WarehouseUpdownTypeEntity> updateUpdownTypeList = new ArrayList<>(); |
|
|
|
|
List<WarehouseUpdownGoodsLogEntity> updownGoodsLogEntities = new ArrayList<>(); |
|
|
|
|
List<DistributionParcelListEntity> updownParcelEntities = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
map.keySet().forEach(allocationId -> { |
|
|
|
|
QueryWrapper<WarehouseTaryAllocationEntity> taryAllocationEntityQueryWrapper = new QueryWrapper<>(); |
|
|
|
|
taryAllocationEntityQueryWrapper.eq("allocation_id", allocationId) |
|
|
|
|
.eq("is_deleted", 0); |
|
|
|
|
WarehouseTaryAllocationEntity taryAllocationEntity = warehouseTaryAllocationService.getOne(taryAllocationEntityQueryWrapper); |
|
|
|
|
// BasicdataTrayEntity trayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId);
|
|
|
|
|
if (!Objects.isNull(taryAllocationEntity)) { |
|
|
|
|
//有托盘，托盘下托
|
|
|
|
|
warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode, remark + ":同步下托", warehouseId); |
|
|
|
|
List<WarehouseUpdownGoodsEntity> updownGoodsEntities1 = map.get(allocationId); |
|
|
|
|
List<String> orderPackageCodes = updownGoodsEntities1.stream().map(WarehouseUpdownGoodsEntity::getAssociationValue).collect(Collectors.toList()); |
|
|
|
|
if(!Objects.isNull(taryAllocationEntity)){ |
|
|
|
|
warehouseTrayTypeService.downPackageByOrderPackageCodeList(orderPackageCodes, remark, warehouseId); |
|
|
|
|
} |
|
|
|
|
Integer residue = warehouseUpdownGoodsService.deleteByUpdownGoodsId(updownGoodsId); |
|
|
|
|
WarehouseUpdownTypeEntity updownTypeEntity = updownTypeMap.get(allocationId); |
|
|
|
|
Long updownTypeId = updownTypeEntity.getId(); |
|
|
|
|
//把updownGoodsEntities1的id提取到List中
|
|
|
|
|
List<Long> updownGoodsIds = updownGoodsEntities1.stream().map(WarehouseUpdownGoodsEntity::getId).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
Integer residue = warehouseUpdownGoodsService.deleteByUpdownGoodsIds(updownGoodsIds, updownTypeEntity.getId()); |
|
|
|
|
if (residue == 0) { |
|
|
|
|
//删除上架方式
|
|
|
|
|
removeById(updownTypeId); |
|
|
|
|
toNullUpdownTypeIds.add(updownTypeId); |
|
|
|
|
//修改库位状态为空闲
|
|
|
|
|
basicdataGoodsAllocationClient.updateAllocationStatus(allocationId, "1"); |
|
|
|
|
updateAllocationIds.add(allocationId); |
|
|
|
|
// basicdataGoodsAllocationClient.updateAllocationStatus(allocationId, "1");
|
|
|
|
|
//如果有托盘还要删除托盘与库位的绑定
|
|
|
|
|
if (!Objects.isNull(taryAllocationEntity)) { |
|
|
|
|
warehouseTaryAllocationService.deleteById(taryAllocationEntity); |
|
|
|
|
deleteTrayAllocationList.add(taryAllocationEntity); |
|
|
|
|
// warehouseTaryAllocationService.deleteById(taryAllocationEntity);
|
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
updateUpdownTypeList.add(updownTypeEntity); |
|
|
|
|
} |
|
|
|
|
warehouseUpdownGoodsLogService.saveAllocationAndPackage(updownTypeEntity, parcelListEntity, "2", 0, remark + ":包件下架"); |
|
|
|
|
updatePackageGroundingStatus(orderPackageCode, "10", warehouseId); |
|
|
|
|
updateUpdownTypeNum(updownTypeEntity); |
|
|
|
|
orderSet.add(orderCode); |
|
|
|
|
num = num + quantity; |
|
|
|
|
|
|
|
|
|
List<DistributionParcelListEntity> parcelListEntities = new ArrayList<>(); |
|
|
|
|
orderPackageCodes.forEach(orderPackageCode -> { |
|
|
|
|
DistributionParcelListEntity parcelListEntity = parcelListEntityMap.get(orderPackageCode); |
|
|
|
|
if(!Objects.isNull(parcelListEntity)){ |
|
|
|
|
parcelListEntities.add(parcelListEntity); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
parcelListEntities.forEach(parcelListEntity -> { |
|
|
|
|
orderSet.add(parcelListEntity.getOrderCode()); |
|
|
|
|
WarehouseUpdownGoodsLogEntity warehouseUpdownGoodsLogEntity = new WarehouseUpdownGoodsLogEntity(); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setCreateUser(1714696768639311873L); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setUpdateUser(1714696768639311873L); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setCreateDept(1649331096241836033L); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setUpdownTypeId(updownTypeEntity.getId()); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setAreaId(updownTypeEntity.getAreaId()); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setAreaTitle(updownTypeEntity.getAreaTitle()); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setShelfId(updownTypeEntity.getShelfId()); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setShelfTitle(updownTypeEntity.getShelfTitle()); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setAllocationId(updownTypeEntity.getAllocationId()); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setAllocationTitle(updownTypeEntity.getAllocationTitle()); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setPositionCode(updownTypeEntity.getPositionCode()); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setBindingType("2"); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setIsAlltrays(0); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setAssociationId(parcelListEntity.getId()); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setAssociationValue(parcelListEntity.getOrderPackageCode()); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setAssociationType("3"); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setNum(1); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setRemark(remark); |
|
|
|
|
warehouseUpdownGoodsLogEntity.setWarehouseId(updownTypeEntity.getWarehouseId()); |
|
|
|
|
updownGoodsLogEntities.add(warehouseUpdownGoodsLogEntity); |
|
|
|
|
|
|
|
|
|
parcelListEntity.setOrderPackageGroundingStatus("10"); |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
updownParcelEntities.addAll(parcelListEntities); |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
removeByIds(toNullUpdownTypeIds); |
|
|
|
|
basicdataGoodsAllocationClient.updateListAllocationStatus(updateAllocationIds,"1"); |
|
|
|
|
warehouseTaryAllocationService.removeBatchByIds(deleteTrayAllocationList); |
|
|
|
|
|
|
|
|
|
updateUpdownTypeList.forEach(this::updateUpdownTypeNum); |
|
|
|
|
|
|
|
|
|
warehouseUpdownGoodsLogService.saveBatch(updownGoodsLogEntities); |
|
|
|
|
|
|
|
|
|
distributionParcelListClient.updateList(updownParcelEntities); |
|
|
|
|
|
|
|
|
|
map.keySet().forEach(allocationId -> { |
|
|
|
|
warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString()); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
for (String orderCode : orderSet) { |
|
|
|
|
distributionStockArticleClient.updateOrderInfo(orderCode, warehouseId); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
num = num + updownParcelEntities.size(); |
|
|
|
|
|
|
|
|
|
return Resp.scanSuccess("下架成功", "成功下架" + num + "件"); |
|
|
|
|
} |
|
|
|
|
@ -2961,6 +3045,37 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void upShelfPackageListNoTray(List<DistributionParcelListEntity> parcelListEntities, BasicdataGoodsAllocationEntity goodsAllocationEntity, BasicdataGoodsShelfEntity goodsShelfEntity, BasicdataGoodsAreaEntity goodsAreaEntity, Long warehouseId, String remrk) { |
|
|
|
|
log.info("###########upShelfPackageNoTray: 上架包件没有托盘 parcelListEntities={} allocationCode={}", parcelListEntities, goodsAllocationEntity.getGoodsAllocationName()); |
|
|
|
|
//修改上架方式的数量
|
|
|
|
|
|
|
|
|
|
QueryWrapper<WarehouseUpdownTypeEntity> updownTypeEntityQueryWrapper = new QueryWrapper<>(); |
|
|
|
|
updownTypeEntityQueryWrapper.eq("allocation_id", goodsAllocationEntity.getId()) |
|
|
|
|
.eq("is_deleted", 0); |
|
|
|
|
WarehouseUpdownTypeEntity updownTypeEntity = baseMapper.selectOne(updownTypeEntityQueryWrapper); |
|
|
|
|
if (Objects.isNull(updownTypeEntity)) { |
|
|
|
|
updownTypeEntity = createUpdownType("1", goodsAllocationEntity, goodsShelfEntity, goodsAreaEntity, warehouseId); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Long wid = updownTypeEntity.getWarehouseId(); |
|
|
|
|
if (!wid.equals(warehouseId)) { |
|
|
|
|
log.warn("##############upShelfPackageNoTray: 库位不在当前仓库 wid={}", wid); |
|
|
|
|
throw new CustomerException(403, "库位不在当前仓库"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//货物和库位绑定
|
|
|
|
|
warehouseUpdownGoodsService.bindingAllocationAndPackageList(updownTypeEntity, parcelListEntities, "1", 0, remrk); |
|
|
|
|
|
|
|
|
|
distributionParcelListClient.updateList(parcelListEntities); |
|
|
|
|
|
|
|
|
|
//修改上架方式上的数据
|
|
|
|
|
updateUpdownTypeNum(updownTypeEntity); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void updateUpdownTypeNum(WarehouseUpdownTypeEntity updownTypeEntity) { |
|
|
|
|
Long updownTypeId = updownTypeEntity.getId(); |
|
|
|
|
Long warehouseId = updownTypeEntity.getWarehouseId(); |
|
|
|
|
|
zhenghaoyu
10 months ago