|
|
|
|
@ -20,6 +20,7 @@ import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
|
|
|
|
|
import com.logpm.warehouse.entity.WarehouseTrayGoodsLogEntity; |
|
|
|
|
import com.logpm.warehouse.entity.WarehouseTrayTypeEntity; |
|
|
|
|
import com.logpm.warehouse.mapper.WarehouseTrayTypeMapper; |
|
|
|
|
import com.logpm.warehouse.service.IWarehouseTaryAllocationService; |
|
|
|
|
import com.logpm.warehouse.service.IWarehouseTrayGoodsLogService; |
|
|
|
|
import com.logpm.warehouse.service.IWarehouseTrayGoodsService; |
|
|
|
|
import com.logpm.warehouse.service.IWarehouseTrayTypeService; |
|
|
|
|
@ -65,6 +66,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
|
|
|
|
|
|
|
|
|
|
private final IWarehouseTrayGoodsLogService warehouseTrayGoodsLogService; |
|
|
|
|
|
|
|
|
|
private final IWarehouseTaryAllocationService warehouseTaryAllocationService; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public IPage<WarehouseTrayTypeVO> orderPageList(TrayTypeDTO trayTypeDTO) { |
|
|
|
|
IPage<Object> page = new Page<>(); |
|
|
|
|
@ -1226,6 +1229,329 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
|
|
|
|
|
return R.success("空置成功"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R scanSourceTrayCode(String trayCode) { |
|
|
|
|
log.info("#################scanSourceTrayCode: 合托扫码来源托盘 trayCode={}",trayCode); |
|
|
|
|
BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); |
|
|
|
|
if(Objects.isNull(trayEntity)){ |
|
|
|
|
log.warn("################scanSourceTrayCode: 托盘信息不存在 trayCode={}",trayCode); |
|
|
|
|
return R.fail(403,"托盘信息不存在"); |
|
|
|
|
} |
|
|
|
|
Integer disableType = trayEntity.getDisableType(); |
|
|
|
|
Long trayId = trayEntity.getId(); |
|
|
|
|
if(disableType == 2){ |
|
|
|
|
log.warn("################scanSourceTrayCode: 托盘已禁用 trayCode={}",trayCode); |
|
|
|
|
return R.fail(403,"托盘已禁用"); |
|
|
|
|
} |
|
|
|
|
Long allocationId = warehouseTaryAllocationService.getAllocationIdByTrayId(trayId); |
|
|
|
|
if(!Objects.isNull(allocationId)){ |
|
|
|
|
log.warn("################scanSourceTrayCode: 托盘已上架 trayId={}",trayId); |
|
|
|
|
return R.fail(403,"托盘已上架,请先下架"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
QueryWrapper<WarehouseTrayTypeEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("tray_id",trayId) |
|
|
|
|
.eq("is_deleted",0); |
|
|
|
|
WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); |
|
|
|
|
if(Objects.isNull(trayTypeEntity)){ |
|
|
|
|
log.warn("################scanSourceTrayCode: 托盘没有打托方式 trayId={}",trayId); |
|
|
|
|
return R.fail(403,"托盘未绑定数据"); |
|
|
|
|
} |
|
|
|
|
String type = trayTypeEntity.getType(); |
|
|
|
|
Long trayTypeId = trayTypeEntity.getId(); |
|
|
|
|
|
|
|
|
|
List<ReCheckTrayListVO> trayListVOS = null; |
|
|
|
|
if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){//订制品打托
|
|
|
|
|
trayListVOS = warehouseTrayGoodsService.getReCheckPackageByTrayTypeId(trayTypeId); |
|
|
|
|
}else if(PalletProductTypeConstant.ARTIFICIAL.equals(type)){ |
|
|
|
|
trayListVOS = warehouseTrayGoodsService.getReCheckZeroByTrayTypeId(trayTypeId); |
|
|
|
|
}else if(PalletProductTypeConstant.STOCKDATA.equals(type)){ |
|
|
|
|
trayListVOS = warehouseTrayGoodsService.getReCheckStockByTrayTypeId(trayTypeId); |
|
|
|
|
}else if(PalletProductTypeConstant.STOCKNODATA.equals(type)){ |
|
|
|
|
trayListVOS = warehouseTrayGoodsService.getReCheckStockByTrayTypeId(trayTypeId); |
|
|
|
|
}else { |
|
|
|
|
log.warn("##################getEntityByTrayCode: 未知的打托类型"); |
|
|
|
|
} |
|
|
|
|
return R.data(trayListVOS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R scanTargetTrayCode(String sourceTrayCode,String targetTrayCode) { |
|
|
|
|
log.info("#################scanTargetTrayCode: 合托扫码目标托盘 targetTrayCode={}",targetTrayCode); |
|
|
|
|
BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(targetTrayCode); |
|
|
|
|
if(Objects.isNull(trayEntity)){ |
|
|
|
|
log.warn("################scanTargetTrayCode: 托盘信息不存在 targetTrayCode={}",targetTrayCode); |
|
|
|
|
return R.fail(403,"托盘信息不存在"); |
|
|
|
|
} |
|
|
|
|
Integer disableType = trayEntity.getDisableType(); |
|
|
|
|
Long targetTrayId = trayEntity.getId(); |
|
|
|
|
if(disableType == 2){ |
|
|
|
|
log.warn("################scanTargetTrayCode: 托盘已禁用 targetTrayCode={}",targetTrayCode); |
|
|
|
|
return R.fail(403,"托盘已禁用"); |
|
|
|
|
} |
|
|
|
|
Long allocationId = warehouseTaryAllocationService.getAllocationIdByTrayId(targetTrayId); |
|
|
|
|
if(!Objects.isNull(allocationId)){ |
|
|
|
|
log.warn("################scanTargetTrayCode: 托盘已上架 targetTrayId={}",targetTrayId); |
|
|
|
|
return R.fail(403,"托盘已上架,请先下架"); |
|
|
|
|
} |
|
|
|
|
QueryWrapper<WarehouseTrayTypeEntity> sourceQueryWapper = new QueryWrapper<>(); |
|
|
|
|
sourceQueryWapper.eq("tray_code",sourceTrayCode) |
|
|
|
|
.eq("is_deleted",0); |
|
|
|
|
WarehouseTrayTypeEntity sourceTrayTypeEntity = baseMapper.selectOne(sourceQueryWapper); |
|
|
|
|
if(Objects.isNull(sourceTrayTypeEntity)){ |
|
|
|
|
log.warn("################scanTargetTrayCode: 来源托盘信息有误 sourceTrayCode={}",sourceTrayCode); |
|
|
|
|
return R.fail(403,"来源托盘信息有误"); |
|
|
|
|
} |
|
|
|
|
QueryWrapper<WarehouseTrayTypeEntity> targetQueryWapper = new QueryWrapper<>(); |
|
|
|
|
targetQueryWapper.eq("tray_code",targetTrayCode) |
|
|
|
|
.eq("is_deleted",0); |
|
|
|
|
WarehouseTrayTypeEntity targetTrayTypeEntity = baseMapper.selectOne(targetQueryWapper); |
|
|
|
|
if(Objects.isNull(targetTrayTypeEntity)){ |
|
|
|
|
log.warn("################scanTargetTrayCode: 目标托盘信息有误 targetTrayCode={}",targetTrayCode); |
|
|
|
|
return R.fail(403,"目标托盘信息有误"); |
|
|
|
|
} |
|
|
|
|
String sourceType = sourceTrayTypeEntity.getType(); |
|
|
|
|
String targetType = targetTrayTypeEntity.getType(); |
|
|
|
|
if(!sourceType.equals(targetType)){ |
|
|
|
|
log.warn("################scanTargetTrayCode: 托盘货物类型不同 sourceType={} targetType={}",sourceType,targetType); |
|
|
|
|
return R.fail(403,"托盘货物类型不同"); |
|
|
|
|
} |
|
|
|
|
BasicdataTrayEntity sourceTrayEntity = basicdataTrayClient.getTrayByTrayCode(sourceTrayCode); |
|
|
|
|
if(Objects.isNull(sourceTrayEntity)){ |
|
|
|
|
log.warn("################scanTargetTrayCode: 托盘信息不存在 sourceTrayCode={}",sourceTrayCode); |
|
|
|
|
return R.fail(403,"托盘信息不存在"); |
|
|
|
|
} |
|
|
|
|
Long sourceTrayId = sourceTrayEntity.getId(); |
|
|
|
|
Long sourceTrayTypeId = sourceTrayTypeEntity.getId(); |
|
|
|
|
Long targetTrayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
//先把来源托盘数据合到目标托盘
|
|
|
|
|
copyTrayGoodsToTargetTray(sourceTrayTypeId,targetTrayTypeEntity); |
|
|
|
|
|
|
|
|
|
//空置来源托盘
|
|
|
|
|
downTrayGoodsByTrayId(sourceTrayId,"合托:下托"); |
|
|
|
|
return R.success("合托成功"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void copyTrayGoodsToTargetTray(Long sourceTrayTypeId, WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
QueryWrapper<WarehouseTrayGoodsEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("tray_type_id",sourceTrayTypeId); |
|
|
|
|
List<WarehouseTrayGoodsEntity> sourceTrayGoodsList = warehouseTrayGoodsService.list(queryWrapper); |
|
|
|
|
String type = targetTrayTypeEntity.getType();//数据类型
|
|
|
|
|
String trayType = targetTrayTypeEntity.getTrayType();//打托方式
|
|
|
|
|
Long filterId = targetTrayTypeEntity.getFilterId(); |
|
|
|
|
String filterValue = targetTrayTypeEntity.getFilterValue(); |
|
|
|
|
if("1".equals(type)){ |
|
|
|
|
//订制品
|
|
|
|
|
if("10".equals(trayType)){//服务号
|
|
|
|
|
panduanPackageByService(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity); |
|
|
|
|
}else if("20".equals(trayType)){//订单自编号
|
|
|
|
|
panduanPackageByOrderCode(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity); |
|
|
|
|
}else if("30".equals(trayType)){//商场
|
|
|
|
|
panduanPackageByMarket(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity); |
|
|
|
|
}else if("40".equals(trayType)){//门店
|
|
|
|
|
panduanPackageByStore(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity); |
|
|
|
|
}else if("50".equals(trayType)){//客户
|
|
|
|
|
panduanPackageByCustomer(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity); |
|
|
|
|
}else if("60".equals(trayType)){//仓库
|
|
|
|
|
panduanPackageByWarehouse(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity); |
|
|
|
|
} |
|
|
|
|
}else if("2".equals(type)){ |
|
|
|
|
//零担
|
|
|
|
|
if("10".equals(trayType)){//运单号
|
|
|
|
|
panduanZeroByWaybillNo(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity); |
|
|
|
|
}else if("20".equals(trayType)){//订单自编码（零担）
|
|
|
|
|
panduanZeroByOrderCode(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity); |
|
|
|
|
} |
|
|
|
|
}else if("3".equals(type)){ |
|
|
|
|
//库存品
|
|
|
|
|
if("10".equals(trayType)){//物料名称
|
|
|
|
|
panduanStockByMaterialName(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity); |
|
|
|
|
}else if("20".equals(trayType)){//物料编码
|
|
|
|
|
panduanStockByMaterialId(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
//更新值
|
|
|
|
|
warehouseTrayGoodsService.updateBatchById(sourceTrayGoodsList); |
|
|
|
|
warehouseTrayGoodsLogService.saveLogByTrayGoodsList(sourceTrayGoodsList,"1","合托:绑定","1"); |
|
|
|
|
//更新数量值
|
|
|
|
|
updateNumByTrayTypeId(targetTrayTypeEntity); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void panduanStockByMaterialId(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
Long trayId = targetTrayTypeEntity.getTrayId(); |
|
|
|
|
String trayCode = targetTrayTypeEntity.getTrayCode(); |
|
|
|
|
Long trayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ |
|
|
|
|
String materialCode = trayGoodsEntity.getAssociationValue(); |
|
|
|
|
if(!materialCode.equals(filterValue)){ |
|
|
|
|
trayGoodsEntity.setIsFleeing("1"); |
|
|
|
|
} |
|
|
|
|
trayGoodsEntity.setTrayId(trayId); |
|
|
|
|
trayGoodsEntity.setTrayCode(trayCode); |
|
|
|
|
trayGoodsEntity.setTrayTypeId(trayTypeId); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void panduanStockByMaterialName(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
Long trayId = targetTrayTypeEntity.getTrayId(); |
|
|
|
|
String trayCode = targetTrayTypeEntity.getTrayCode(); |
|
|
|
|
Long trayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ |
|
|
|
|
String materialName = trayGoodsEntity.getAssociationValue(); |
|
|
|
|
if(!materialName.equals(filterValue)){ |
|
|
|
|
trayGoodsEntity.setIsFleeing("1"); |
|
|
|
|
} |
|
|
|
|
trayGoodsEntity.setTrayId(trayId); |
|
|
|
|
trayGoodsEntity.setTrayCode(trayCode); |
|
|
|
|
trayGoodsEntity.setTrayTypeId(trayTypeId); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void panduanZeroByOrderCode(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
Long trayId = targetTrayTypeEntity.getTrayId(); |
|
|
|
|
String trayCode = targetTrayTypeEntity.getTrayCode(); |
|
|
|
|
Long trayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ |
|
|
|
|
Long stockArticleId = trayGoodsEntity.getAssociationId(); |
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId); |
|
|
|
|
Long id = stockArticleEntity.getId(); |
|
|
|
|
if(!id.equals(filterId)){ |
|
|
|
|
trayGoodsEntity.setIsFleeing("1"); |
|
|
|
|
} |
|
|
|
|
trayGoodsEntity.setTrayId(trayId); |
|
|
|
|
trayGoodsEntity.setTrayCode(trayCode); |
|
|
|
|
trayGoodsEntity.setTrayTypeId(trayTypeId); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void panduanZeroByWaybillNo(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
Long trayId = targetTrayTypeEntity.getTrayId(); |
|
|
|
|
String trayCode = targetTrayTypeEntity.getTrayCode(); |
|
|
|
|
Long trayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ |
|
|
|
|
Long stockArticleId = trayGoodsEntity.getAssociationId(); |
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId); |
|
|
|
|
String waybillNumber = stockArticleEntity.getWaybillNumber(); |
|
|
|
|
if(!waybillNumber.equals(filterValue)){ |
|
|
|
|
trayGoodsEntity.setIsFleeing("1"); |
|
|
|
|
} |
|
|
|
|
trayGoodsEntity.setTrayId(trayId); |
|
|
|
|
trayGoodsEntity.setTrayCode(trayCode); |
|
|
|
|
trayGoodsEntity.setTrayTypeId(trayTypeId); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void panduanPackageByWarehouse(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
Long trayId = targetTrayTypeEntity.getTrayId(); |
|
|
|
|
String trayCode = targetTrayTypeEntity.getTrayCode(); |
|
|
|
|
Long trayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ |
|
|
|
|
String orderPackageCode = trayGoodsEntity.getAssociationValue(); |
|
|
|
|
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode); |
|
|
|
|
Long stockArticleId = parcelListEntity.getStockArticleId(); |
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId); |
|
|
|
|
Long warehouseId = stockArticleEntity.getWarehouseId(); |
|
|
|
|
if(!warehouseId.equals(filterId)){ |
|
|
|
|
trayGoodsEntity.setIsFleeing("1"); |
|
|
|
|
} |
|
|
|
|
trayGoodsEntity.setTrayId(trayId); |
|
|
|
|
trayGoodsEntity.setTrayCode(trayCode); |
|
|
|
|
trayGoodsEntity.setTrayTypeId(trayTypeId); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void panduanPackageByCustomer(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
Long trayId = targetTrayTypeEntity.getTrayId(); |
|
|
|
|
String trayCode = targetTrayTypeEntity.getTrayCode(); |
|
|
|
|
Long trayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ |
|
|
|
|
String orderPackageCode = trayGoodsEntity.getAssociationValue(); |
|
|
|
|
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode); |
|
|
|
|
Long stockArticleId = parcelListEntity.getStockArticleId(); |
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId); |
|
|
|
|
String customerName = stockArticleEntity.getCustomerName(); |
|
|
|
|
String customerTelephone = stockArticleEntity.getCustomerTelephone(); |
|
|
|
|
if(!filterValue.equals(customerName+customerTelephone)){ |
|
|
|
|
trayGoodsEntity.setIsFleeing("1"); |
|
|
|
|
} |
|
|
|
|
trayGoodsEntity.setTrayId(trayId); |
|
|
|
|
trayGoodsEntity.setTrayCode(trayCode); |
|
|
|
|
trayGoodsEntity.setTrayTypeId(trayTypeId); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void panduanPackageByStore(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
Long trayId = targetTrayTypeEntity.getTrayId(); |
|
|
|
|
String trayCode = targetTrayTypeEntity.getTrayCode(); |
|
|
|
|
Long trayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ |
|
|
|
|
String orderPackageCode = trayGoodsEntity.getAssociationValue(); |
|
|
|
|
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode); |
|
|
|
|
Long stockArticleId = parcelListEntity.getStockArticleId(); |
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId); |
|
|
|
|
Long storeId = stockArticleEntity.getStoreId(); |
|
|
|
|
if(!storeId.equals(filterId)){ |
|
|
|
|
trayGoodsEntity.setIsFleeing("1"); |
|
|
|
|
} |
|
|
|
|
trayGoodsEntity.setTrayId(trayId); |
|
|
|
|
trayGoodsEntity.setTrayCode(trayCode); |
|
|
|
|
trayGoodsEntity.setTrayTypeId(trayTypeId); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void panduanPackageByMarket(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
Long trayId = targetTrayTypeEntity.getTrayId(); |
|
|
|
|
String trayCode = targetTrayTypeEntity.getTrayCode(); |
|
|
|
|
Long trayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ |
|
|
|
|
String orderPackageCode = trayGoodsEntity.getAssociationValue(); |
|
|
|
|
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode); |
|
|
|
|
Long stockArticleId = parcelListEntity.getStockArticleId(); |
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId); |
|
|
|
|
Long mallId = stockArticleEntity.getMallId(); |
|
|
|
|
if(!mallId.equals(filterId)){ |
|
|
|
|
trayGoodsEntity.setIsFleeing("1"); |
|
|
|
|
} |
|
|
|
|
trayGoodsEntity.setTrayId(trayId); |
|
|
|
|
trayGoodsEntity.setTrayCode(trayCode); |
|
|
|
|
trayGoodsEntity.setTrayTypeId(trayTypeId); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void panduanPackageByOrderCode(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
Long trayId = targetTrayTypeEntity.getTrayId(); |
|
|
|
|
String trayCode = targetTrayTypeEntity.getTrayCode(); |
|
|
|
|
Long trayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ |
|
|
|
|
String orderPackageCode = trayGoodsEntity.getAssociationValue(); |
|
|
|
|
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode); |
|
|
|
|
Long stockArticleId = parcelListEntity.getStockArticleId(); |
|
|
|
|
if(!stockArticleId.equals(filterId)){ |
|
|
|
|
trayGoodsEntity.setIsFleeing("1"); |
|
|
|
|
} |
|
|
|
|
trayGoodsEntity.setTrayId(trayId); |
|
|
|
|
trayGoodsEntity.setTrayCode(trayCode); |
|
|
|
|
trayGoodsEntity.setTrayTypeId(trayTypeId); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void panduanPackageByService(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, Long filterId, String filterValue,WarehouseTrayTypeEntity targetTrayTypeEntity) { |
|
|
|
|
Long trayId = targetTrayTypeEntity.getTrayId(); |
|
|
|
|
String trayCode = targetTrayTypeEntity.getTrayCode(); |
|
|
|
|
Long trayTypeId = targetTrayTypeEntity.getId(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){ |
|
|
|
|
String orderPackageCode = trayGoodsEntity.getAssociationValue(); |
|
|
|
|
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode); |
|
|
|
|
String serviceNumber = parcelListEntity.getServiceNumber(); |
|
|
|
|
if(!serviceNumber.equals(filterValue)){ |
|
|
|
|
trayGoodsEntity.setIsFleeing("1"); |
|
|
|
|
} |
|
|
|
|
trayGoodsEntity.setTrayId(trayId); |
|
|
|
|
trayGoodsEntity.setTrayCode(trayCode); |
|
|
|
|
trayGoodsEntity.setTrayTypeId(trayTypeId); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void saveTrayGoodsLog(List<WarehouseTrayGoodsEntity> trayGoodsList, WarehouseTrayTypeEntity trayTypeEntity, String bindingType, String remark, String palletizingType) { |
|
|
|
|
List<WarehouseTrayGoodsLogEntity> ls = new ArrayList<>(); |
|
|
|
|
for (WarehouseTrayGoodsEntity trayGoodsEntity:trayGoodsList){ |
|
|
|
|
|
zhenghaoyu
2 years ago