diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 8d4b7cf0e..d27b7d03a 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -50,6 +50,7 @@ import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.jetbrains.annotations.Nullable; import org.mapstruct.factory.Mappers; +import org.springblade.common.cache.CacheNames; import org.springblade.common.constant.RedisKeyConstant; import org.springblade.common.constant.common.IsOrNoConstant; import org.springblade.common.exception.CustomerException; @@ -196,8 +197,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl i.getTrayId().equals(String.valueOf(a.getId()) )); -// log.info("托盘是否有值>>>>>>>>>>{}",b); -// Optional first = trayEntityList.stream().filter(t -> i.getTrayId().equals(String.valueOf(t.getId()))).findFirst(); -// if (first.isPresent()) { -// BasicdataTrayEntity basicdataTrayEntity = first.get(); -// detailEntity.setTrayName(basicdataTrayEntity.getPalletName()); -// } - } + Integer conditions = i.getConditions(); - if (conditions.equals(1)) { + if (1==conditions) { detailEntity.setQuestTarget(1); - } else if (conditions.equals(2)) { + + } else if (2==conditions) { detailEntity.setQuestTarget(3); - } - if (ObjectUtils.isNotNull(i.getConditions()) && i.getConditions().equals(1)) { - detailEntity.setQuestTarget(i.getConditions()); - } else if (ObjectUtils.isNotNull(i.getConditions()) && i.getConditions().equals(2)) { - detailEntity.setQuestTarget(3); // 库存品 - } else { - log.info("包件信息！数据信息不存在！！"); + }else if( 3==conditions){ + detailEntity.setQuestTarget(2); + }else{ + log.warn(">>>>>>>>>>> 警告 错误的包件数据类型 ,{}",i); return null; } + + // detailEntity.setQuestTarget(1); detailEntity.setOrderPackageCode(i.getOrderPackageCode()); detailEntity.setWaybillNumber(i.getWaybillNumber()); @@ -306,11 +299,32 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailList = baseMapper.selectTaskInfoForIds(questNum, quest, taskSearchDTO.getQuestDetailIds()); +// List questDetailList = baseMapper.selectTaskInfoForIds(questNum, quest, taskSearchDTO.getQuestDetailIds()); log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> tag {}", 1); List list = new ArrayList<>(); @@ -950,7 +963,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl { - if (i.getQuestStatus() == 1) { - yi.updateAndGet(v1 -> v1 + 1); - q.setQuestStatusName("部分盘点"); - User user = UserCache.getUser(i.getUpdateUser()); - q.setUpdateUser(user.getAccount()); - q.setUpdateTime(i.getUpdateTime()); - } + if (i.getQuestStatus() == 1) { + yi.updateAndGet(v1 -> v1 + 1); + q.setQuestStatusName("部分盘点"); + User user = UserCache.getUser(i.getUpdateUser()); + q.setUpdateUser(user.getAccount()); + q.setUpdateTime(i.getUpdateTime()); + } q.setOrderCode(i.getOrderCode()); if (ObjectUtils.isNull(i.getGroundingPositionCode())) { q.setGroundingPositionCode("无更新"); @@ -1269,7 +1282,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl collect = trayEntityList.stream().filter(w -> w.getId().equals(Long.valueOf(s))).collect(Collectors.toList()); //托盘 if (ObjectUtils.isNull(collect)) { @@ -1554,10 +1567,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl byPacketBarCode = distributionParcelListClient.findByPacketBarCode(packageListVO.getOrderPackageCode()); for (DistributionParcelListEntity distributionParcelListEntity : byPacketBarCode) { - if(distributionParcelListEntity.getWarehouseId().equals(taskSearchDTO.getWarehouseId())){ - QuestDetailEntity questDetailEntity= buildQuestDetailEntity(taskSearchDTO.getQuestId(),distributionParcelListEntity,user,null); + if (distributionParcelListEntity.getWarehouseId().equals(taskSearchDTO.getWarehouseId())) { + QuestDetailEntity questDetailEntity = buildQuestDetailEntity(taskSearchDTO.getQuestId(), distributionParcelListEntity, user, null); questDetailEntities.add(questDetailEntity); - baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(),questDetailEntities); + baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(), questDetailEntities); } } } @@ -1652,24 +1665,24 @@ public class TaskQuestServiceImpl extends BaseServiceImpl byPacketBarCode = distributionParcelListClient.findEntityListByOrderCode(byPacketBarCodeAndWarehouseId.getOrderCode(), taskSearchDTO.getWarehouseId()); - if(ObjectUtils.isEmpty(byPacketBarCode)){ + if (ObjectUtils.isEmpty(byPacketBarCode)) { throw new ServiceException("包件信息不存在"); - }else{ + } else { List list1 = new ArrayList<>(); for (DistributionParcelListEntity distributionParcelListEntity : byPacketBarCode) { - if(distributionParcelListEntity.getWarehouseId().equals(taskSearchDTO.getWarehouseId())){ + if (distributionParcelListEntity.getWarehouseId().equals(taskSearchDTO.getWarehouseId())) { QuestDetailEntity questDetailEntity1 = buildQuestDetailEntity(taskSearchDTO.getQuestId(), distributionParcelListEntity, user, null); // 这里新增2 questDetailEntity1.setIsNew(1); list1.add(questDetailEntity1); } } - baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(),list1); + baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(), list1); // return taskPageList.setRecords(list); questDetailEntityList = list1; } @@ -1855,7 +1868,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl byPacketBarCode = distributionParcelListClient.findByPacketBarCode(questDetail.getOrderPackageCode()); - if(ObjectUtils.isEmpty(byPacketBarCode)){ + if (ObjectUtils.isEmpty(byPacketBarCode)) { return R.fail(5000, "包件信息不存在！！"); - }else{ + } else { for (DistributionParcelListEntity distributionParcelListEntity : byPacketBarCode) { - if(distributionParcelListEntity.getWarehouseId().equals(warehouseId)){ + if (distributionParcelListEntity.getWarehouseId().equals(warehouseId)) { QuestDetailEntity questDetailEntity1 = buildQuestDetailEntity(questId, distributionParcelListEntity, user, null); // 这里新增2 questDetailEntity1.setIsNew(1); List list = Arrays.asList(questDetailEntity1); - baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(),list); + baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(), list); return R.data(list); } } - } - } for (QuestDetailEntity i : questDetailEntityList) { if (i.getQuestStatus().equals(1)) { @@ -3459,7 +3469,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl exportContrastStockInfo(QuestDetailDTO questDetailDTO) { - List datas = baseMapper.selectContrastStockInfo(questDetailDTO.getQuestNum(),questDetailDTO.getQuestStatus()); + List datas = baseMapper.selectContrastStockInfo(questDetailDTO.getQuestNum(), questDetailDTO.getQuestStatus()); return datas;