From 424f04993ac1fca388e3ed4092244eef2531ff18 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 21 Jun 2024 16:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=98=E7=9B=98=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BusinessPreOrderServiceImpl.java | 130 ++++++++++++------ 1 file changed, 91 insertions(+), 39 deletions(-) diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java index 884c71bb2..0e832fb4e 100644 --- a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java +++ b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java @@ -21,6 +21,8 @@ import com.logpm.trunkline.dto.InComingDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.feign.IInComingClient; import com.logpm.trunkline.feign.ITrunklineAdvanceDetailClient; +import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; +import com.logpm.warehouse.vo.TrayTypeDataVO; import lombok.AllArgsConstructor; import org.jetbrains.annotations.Nullable; import org.springblade.common.annotations.ChangeAsync; @@ -50,6 +52,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl queryWrapper3 = new LambdaQueryWrapper<>(); - queryWrapper3.eq(BusinessPreOrderEntity::getDistrCarNumber, distrCarNumber); - queryWrapper3.eq(BusinessPreOrderEntity::getInWarehouse, 1); - queryWrapper3.eq(BusinessPreOrderEntity::getIsDeleted, 0); - List list3 = baseMapper.selectList(queryWrapper3); - o = 1; - if (!list3.isEmpty()) { - o = list3.size(); + + if(StringUtil.isBlank(businessSanDTO.getTrayCode())){ + //记录当前车次的异常件数 + String key =RedisKeyConstant.BUSINESS_IN_CARNUMBER + businessSanDTO.getDistrCarNumber(); + Object o = bladeRedis.get(key); + if (Objects.isNull(o)) { + + // 查询当前车次的异常入库数量 + LambdaQueryWrapper queryWrapper3 = new LambdaQueryWrapper<>(); + queryWrapper3.eq(BusinessPreOrderEntity::getDistrCarNumber, distrCarNumber); + queryWrapper3.eq(BusinessPreOrderEntity::getInWarehouse, 1); + queryWrapper3.eq(BusinessPreOrderEntity::getIsDeleted, 0); + List list3 = baseMapper.selectList(queryWrapper3); + o = 1; + if (!list3.isEmpty()) { + o = list3.size(); + a = (int) o; + } + bladeRedis.setEx(key, o, 60 * 60 * 24L); + + } else { a = (int) o; + a = a + 1; + bladeRedis.setEx(key, a, 60 * 60 * 24L); } - bladeRedis.setEx(key, o, 60 * 60 * 24L); + }else{ + + String key =RedisKeyConstant.BUSINESS_IN_CARNUMBER + businessSanDTO.getDistrCarNumber()+businessSanDTO.getTrayCode(); + Object o = bladeRedis.get(key); + + if (Objects.isNull(o)) { + // 获取托盘上的数量 + TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeClient.selectListByTrayCode(businessSanDTO.getTrayCode()); + o = 1; + if(!Objects.isNull(trayTypeDataVO)){ + o=trayTypeDataVO.getOrderlNum(); + } + bladeRedis.setEx(key, o, 60 * 60 * 24L); + }else{ + a = (int) o; + a = a + 1; + bladeRedis.setEx(key, a, 60 * 60 * 24L); + } + - } else { - a = (int) o; - a = a + 1; - bladeRedis.setEx(key, a, 60 * 60 * 24L); } + return Resp.scanSuccess("扫描成功", a + "件"); } return null; @@ -360,30 +387,55 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl queryWrapper3 = new LambdaQueryWrapper<>(); - queryWrapper3.eq(BusinessPreOrderEntity::getDistrCarNumber, distrCarNumber); - queryWrapper3.eq(BusinessPreOrderEntity::getOperationStatus, 1); - queryWrapper3.eq(BusinessPreOrderEntity::getInWarehouse, 1); - queryWrapper3.eq(BusinessPreOrderEntity::getIsDeleted, 0); - List list3 = baseMapper.selectList(queryWrapper3); - a = 1; - if (!list3.isEmpty()) { - a = list3.size(); + + + if(StringUtil.isNotBlank(businessSanDTO.getTrayCode())){ + + String key =RedisKeyConstant.BUSINESS_IN_CARNUMBER + businessSanDTO.getDistrCarNumber()+businessSanDTO.getTrayCode(); + Object o = bladeRedis.get(key); + + if (Objects.isNull(o)) { + // 获取托盘上的数量 + TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeClient.selectListByTrayCode(businessSanDTO.getTrayCode()); + o = 1; + if(!Objects.isNull(trayTypeDataVO)){ + o=trayTypeDataVO.getOrderlNum(); + } + bladeRedis.setEx(key, o, 60 * 60 * 24L); + }else{ + a = (int) o; + a = a + 1; + bladeRedis.setEx(key, a, 60 * 60 * 24L); } - bladeRedis.setEx(key, a, 60 * 60 * 24L); - } else { - a = (int) o; - a = a + 1; - bladeRedis.setEx(key, a, 60 * 60 * 24L); + }else{ + //记录当前车次的异常件数 + Object o = bladeRedis.get(RedisKeyConstant.BUSINESS_INEXCE_CARNUMBER + businessSanDTO.getDistrCarNumber()); + String key =RedisKeyConstant.BUSINESS_INEXCE_CARNUMBER + businessSanDTO.getDistrCarNumber()+businessSanDTO.getTrayCode(); + if (Objects.isNull(o)) { + + // 查询当前车次的异常入库数量 + LambdaQueryWrapper queryWrapper3 = new LambdaQueryWrapper<>(); + queryWrapper3.eq(BusinessPreOrderEntity::getDistrCarNumber, distrCarNumber); + queryWrapper3.eq(BusinessPreOrderEntity::getOperationStatus, 1); + queryWrapper3.eq(BusinessPreOrderEntity::getInWarehouse, 1); + queryWrapper3.eq(BusinessPreOrderEntity::getIsDeleted, 0); + List list3 = baseMapper.selectList(queryWrapper3); + a = 1; + if (!list3.isEmpty()) { + a = list3.size(); + } + bladeRedis.setEx(key, a, 60 * 60 * 24L); + + } else { + a = (int) o; + a = a + 1; + bladeRedis.setEx(key, a, 60 * 60 * 24L); + } } + + return Resp.scanSuccess("扫描成功", "异常" + a + "件"); } return null;