From c3d6410e48f8df3a6add21eee53f84b24a854b24 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 10 Apr 2024 20:20:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 294 +++++++++--------- .../DistributionStockArticleServiceImpl.java | 2 +- 2 files changed, 144 insertions(+), 152 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 4df7d21d9..16deb3271 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -104,6 +104,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import java.util.stream.Collectors; @@ -5261,181 +5262,168 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl { - DistributionLoadscanEntity loadscanEntityList = distributionLoadscanService.getOne(Wrappers.query().lambda() +// DistributionDeliverySelfEntity finalDistributionDeliverySelfEntity = distributionDeliverySelfEntity; + List orderCodes = new ArrayList<>(); + BladeUser user = AuthUtil.getUser(); + DistributionSignforEntity signforEntity = distributionSignforMapper.selectOne(Wrappers.query().lambda() + .eq(DistributionSignforEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) + .eq(DistributionSignforEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())); + //查询零担装车 + + if (!parcelNumberDTOS.isEmpty()){ + List packageIds = parcelNumberDTOS.stream().map(DistributionParcelNumberDTO::getParcelListId).collect(Collectors.toList()); + List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) .eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) .eq(DistributionLoadscanEntity::getOrderId, distrilbutionloadingscanDTO.getOrderId()) - .eq(DistributionLoadscanEntity::getPackageId, p.getParcelListId()) + .in(DistributionLoadscanEntity::getPackageId, packageIds) .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); + Map> loadingMap = null; + Map> reservationMap = null; + if (!loadscanEntityList.isEmpty()){ + loadingMap = loadscanEntityList.stream().collect(Collectors.groupingBy(DistributionLoadscanEntity::getPackageId)); + } //查询对应的计划品类 - DistributionReservationZeroPackageEntity reservationZeroPackageEntity = distributionReservationZeroPackageService.getOne(Wrappers.query().lambda() + List reservationZeroPackageEntity = distributionReservationZeroPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationZeroPackageEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) - .eq(DistributionReservationZeroPackageEntity::getStockArticleId, p.getStockArticleId()) - .eq(DistributionReservationZeroPackageEntity::getParcelListId, p.getParcelListId()) + .in(DistributionReservationZeroPackageEntity::getParcelListId, packageIds) .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())); - DistributionParcelNumberEntity parcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.query().lambda() - .eq(DistributionParcelNumberEntity::getParcelListId, p.getParcelListId())); - if (Func.isNotEmpty(loadscanEntityList)) { - BigDecimal handQuantity = new BigDecimal(parcelNumberEntity.getHandQuantity()); - BigDecimal deliveryQuantity = new BigDecimal(parcelNumberEntity.getDeliveryQuantity()); - BigDecimal outboundQuantity = new BigDecimal(parcelNumberEntity.getOutboundQuantity()); - BigDecimal signinQuantity = new BigDecimal(parcelNumberEntity.getSigninQuantity()); - BigDecimal loadedNub = new BigDecimal(loadscanEntityList.getLoadedNub()); - BigDecimal receivedQuantity = new BigDecimal(loadscanEntityList.getReceivedQuantity()); - BigDecimal signingNum = new BigDecimal(p.getSigningNum()); - //判断是否进行装车 - int newDeliveryQuantity = deliveryQuantity.add(loadedNub).subtract(signingNum).intValue(); - int newOunBoundQuantity = outboundQuantity.subtract(loadedNub).add(signingNum).intValue(); - int newHandQuantity = handQuantity.add(loadedNub).subtract(signingNum).intValue(); - if (Func.equals(loadscanEntityList.getSignforState(), LoadScanSigningStatusConstant.weiqianshou.getValue())) { - if (p.getSigningNum() <= reservationZeroPackageEntity.getQuantity()) { - //修改 - if (loadscanEntityList.getReceivedQuantity() <= reservationZeroPackageEntity.getQuantity()) { - if (p.getSigningNum() > 0) { - //存在装车数据，这里对装车数据进行签收数据的填充 - loadscanEntityList.setReceivedQuantity(p.getSigningNum()); - loadscanEntityList.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); - loadscanEntityList.setSigningTime(simpleDateFormat.format(new Date())); -// loadscanEntityList.setSigningUser(AuthUtil.getUser().getUserName()); - loadscanEntityList.setSigningUser(AuthUtil.getUser().getNickName()); - loadscanEntityList.setSigningUserId(AuthUtil.getUser().getUserId()); - //维护装车数量 - if (p.getSigningNum() > loadscanEntityList.getLoadedNub()) { - DistributionSignforEntity signforEntity = distributionSignforMapper.selectOne(Wrappers.query().lambda().eq(DistributionSignforEntity::getDeliveryId, loadscanEntityList.getDeliveryId()).eq(DistributionSignforEntity::getReservationId, loadscanEntityList.getReservationId())); - BigDecimal loadedNumber = new BigDecimal(signforEntity.getLoadedNumber()); - BigDecimal signingNumber = new BigDecimal(signforEntity.getReceivedQuantity()); - loadscanEntityList.setLoadedNub(p.getSigningNum()); - loadscanEntityList.setPackageNub(p.getSigningNum()); - loadscanEntityList.setMsg("签收数量大于装车数"); - parcelNumberEntity.setDeliveryQuantity(newDeliveryQuantity); - parcelNumberEntity.setOutboundQuantity(newOunBoundQuantity); - parcelNumberEntity.setHandQuantity(newHandQuantity); - signforEntity.setLoadedNumber(loadedNumber.subtract(loadedNub).add(signingNum).intValue()); - signforEntity.setReceivedQuantity(signingNumber.add(signingNum).intValue()); - distributionSignforMapper.updateById(signforEntity); - } else { - Integer j = distributionSignforMapper.updateSignforNum(loadscanEntityList.getDeliveryId(), loadscanEntityList.getReservationId(), loadscanEntityList.getPackageNub()); - } - parcelNumberEntity.setSigninQuantity(signinQuantity.add(signingNum).intValue()); - distributionLoadscanService.updateById(loadscanEntityList); - distributionParcelNumberService.updateById(parcelNumberEntity); - distributionAsyncService.checkSignStatus(loadscanEntityList.getPackageId(), loadscanEntityList.getReservationId(), loadscanEntityList.getDeliveryId()); + if (!reservationZeroPackageEntity.isEmpty()){ + reservationMap = reservationZeroPackageEntity.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getParcelListId)); + } + for (DistributionParcelNumberDTO parcelNumberDTO : parcelNumberDTOS) { + List zeroPackageEntities = reservationMap.get(parcelNumberDTO.getParcelListId()); + DistributionParcelNumberEntity distributionParcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.query().lambda() + .eq(DistributionParcelNumberEntity::getParcelListId, parcelNumberDTO.getParcelListId()) + ); + DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(parcelNumberDTO.getParcelListId()); + orderCodes.add(parcelListEntity.getOrderCode()); + packageLockIds.add(parcelListEntity.getId()); + if (zeroPackageEntities.size() == 1){ + DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = zeroPackageEntities.get(0); + //查询是否存在装车 + Integer deliveryNumber = 0 ; + Integer handQuantity = 0 ; + Integer outboundQuantity = 0 ; + Integer signinQuantity = 0 ; + + if (Func.isNotEmpty(loadingMap)){ + //存在装车数据，进行是否签收判断 + List entityList = loadingMap.get(parcelNumberDTO.getParcelListId()); + if (entityList.size() == 1){ + DistributionLoadscanEntity distributionLoadscanEntity = entityList.get(0); + if (parcelNumberDTO.getSigningNum() > distributionReservationZeroPackageEntity.getQuantity()){ + log.info("#############零担签收超过计划数量ParcelListId:{},计划:{}录入,:{}",parcelNumberDTO.getParcelListId(),distributionReservationZeroPackageEntity.getQuantity(),parcelNumberDTO.getSigningNum()); } - } - } - } else { - if (p.getSigningNum() <= reservationZeroPackageEntity.getQuantity()) { - if (p.getSigningNum() >= 0) { - //修改 - if (loadscanEntityList.getReceivedQuantity() <= reservationZeroPackageEntity.getQuantity()) { - //存在签收数据，这里对签收的数量进行修改，修改不得超过计划数 - loadscanEntityList.setReceivedQuantity(signingNum.intValue()); - parcelNumberEntity.setSigninQuantity(signinQuantity.subtract(receivedQuantity).add(signingNum).intValue()); - DistributionSignforEntity signforEntity = distributionSignforMapper.selectOne(Wrappers.query().lambda().eq(DistributionSignforEntity::getDeliveryId, loadscanEntityList.getDeliveryId()).eq(DistributionSignforEntity::getReservationId, loadscanEntityList.getReservationId())); - BigDecimal loadedNumber = new BigDecimal(signforEntity.getLoadedNumber()); - BigDecimal signingNumber = new BigDecimal(signforEntity.getReceivedQuantity()); - if (loadscanEntityList.getLoadedNub() < p.getSigningNum()) { - //这里需要同时维护装车和签收数量 -// loadscanEntityList.setLoadedNub(p.getSigningNum()); -// loadscanEntityList.setPackageNub(p.getSigningNum()); -// loadscanEntityList.setLoadedNub(p.getSigningNum()); -// loadscanEntityList.setPackageNub(p.getSigningNum()); - loadscanEntityList.setMsg("签收数量大于装车数"); - parcelNumberEntity.setDeliveryQuantity(newDeliveryQuantity); - parcelNumberEntity.setOutboundQuantity(newOunBoundQuantity); - parcelNumberEntity.setHandQuantity(newHandQuantity); - signforEntity.setLoadedNumber(loadedNumber.subtract(loadedNub).add(signingNum).intValue()); - } - if (p.getSigningNum() == 0) { - //签收状态 - loadscanEntityList.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue()); - } - signforEntity.setReceivedQuantity(signingNumber.subtract(receivedQuantity).add(signingNum).intValue()); - distributionSignforMapper.updateById(signforEntity); - distributionLoadscanService.updateById(loadscanEntityList); - distributionAsyncService.checkSignStatus(loadscanEntityList.getPackageId(), loadscanEntityList.getReservationId(), loadscanEntityList.getDeliveryId()); - - distributionParcelNumberService.updateById(parcelNumberEntity); + int i1 =parcelNumberDTO.getSigningNum() - distributionLoadscanEntity.getReceivedQuantity() ; + signingNumber += i1; + int i2 = parcelNumberDTO.getSigningNum() -distributionLoadscanEntity.getLoadedNub() ; + loadingNumber += i2; + if (distributionLoadscanEntity.getLoadedNub() < parcelNumberDTO.getSigningNum()){ + //将装车和签收进行统一数量 + distributionLoadscanEntity.setLoadedNub(parcelNumberDTO.getSigningNum()); + distributionLoadscanEntity.setPackageNub(parcelNumberDTO.getSigningNum()); } + deliveryNumber = distributionParcelNumberEntity.getDeliveryQuantity() + distributionLoadscanEntity.getReceivedQuantity() - parcelNumberDTO.getSigningNum(); + handQuantity = distributionParcelNumberEntity.getHandQuantity() + distributionLoadscanEntity.getReceivedQuantity() - parcelNumberDTO.getSigningNum(); + outboundQuantity = distributionParcelNumberEntity.getOutboundQuantity() - distributionLoadscanEntity.getReceivedQuantity() + parcelNumberDTO.getSigningNum(); + signinQuantity = distributionParcelNumberEntity.getSigninQuantity() - distributionLoadscanEntity.getReceivedQuantity() + parcelNumberDTO.getSigningNum(); + + distributionLoadscanEntity.setReceivedQuantity(parcelNumberDTO.getSigningNum()); + distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); + distributionLoadscanEntity.setScanTime(simpleDateFormat.format(new Date())); + distributionLoadscanEntity.setSigningUser(user.getNickName()); + //进行签收数量的统计 + int i = signforEntity.getReceivedQuantity() - distributionLoadscanEntity.getReceivedQuantity() + parcelNumberDTO.getSigningNum(); + distributionLoadscanService.updateById(distributionLoadscanEntity); + }else { + log.info("#############零担签收存在多个装车记录ParcelListId:{}",parcelNumberDTO.getParcelListId()); } - } - } - } else { - if (p.getSigningNum() <= reservationZeroPackageEntity.getQuantity()) { - if (p.getSigningNum() > 0) { - //无装车数据 + }else { + //签收装车数据一起进行补录 DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); - if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getDriverPhone())) { - loadscanEntity.setDriverPhone(finalDistributionDeliverySelfEntity.getDriverPhone()); - } - if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getVehicleNub())) { - loadscanEntity.setVehicleName(finalDistributionDeliverySelfEntity.getVehicleNub()); + loadscanEntity.setPackageId(distributionParcelNumberEntity.getParcelListId()); + loadscanEntity.setOrderId(distributionParcelNumberEntity.getStockArticleId()); + loadscanEntity.setDeliveryId(signforEntity.getDeliveryId()); + loadscanEntity.setReservationId(signforEntity.getReservationId()); + loadscanEntity.setScanUser(user.getNickName()); + loadscanEntity.setScanTime(simpleDateFormat.format(new Date())); + loadscanEntity.setSigningUser(user.getNickName()); + loadscanEntity.setPackageNub(distributionReservationZeroPackageEntity.getQuantity()); + loadscanEntity.setLoadedNub(distributionReservationZeroPackageEntity.getQuantity()); + loadscanEntity.setSigningUserId(user.getUserId()); + assert distributionDeliverySelfEntity != null; + if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverId())) { + loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); } - if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getDriverId())) { - loadscanEntity.setDriverId(finalDistributionDeliverySelfEntity.getDriverId()); + if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverName())) { + loadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); } - if (Func.isNotEmpty(finalDistributionDeliverySelfEntity.getId())) { - loadscanEntity.setLoadingId(finalDistributionDeliverySelfEntity.getId().toString()); + if (Func.isNotEmpty(distributionDeliverySelfEntity.getVehicleId())) { + loadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); } - if (Func.isNotEmpty(finalDistributionDeliverySelfEntity.getDriverName())) { - loadscanEntity.setDriverName(finalDistributionDeliverySelfEntity.getDriverName()); + if (Func.isNotEmpty(distributionDeliverySelfEntity.getVehicleNub())) { + loadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); } - if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getVehicleId())) { - loadscanEntity.setVehicleId(finalDistributionDeliverySelfEntity.getVehicleId()); + if (Func.isNotEmpty(distributionDeliverySelfEntity.getDriverPhone())) { + loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); } - loadscanEntity.setScanTime(simpleDateFormat.format(new Date())); - loadscanEntity.setScanStatus("3"); - loadscanEntity.setScanState(1); + loadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString()); + loadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue()); + loadscanEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue()); + loadscanEntity.setScanType("1"); + loadscanEntity.setType(2); + loadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue()); + loadscanEntity.setIsSignfor(1); + loadscanEntity.setReceivedQuantity(distributionReservationZeroPackageEntity.getQuantity()); + loadscanEntity.setOneClick(2); + loadscanEntity.setOneQclick(2); loadscanEntity.setSigningTime(simpleDateFormat.format(new Date())); - loadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId()); - loadscanEntity.setIsSignfor(2); - loadscanEntity.setIsInsert(2); - //订单签收 - loadscanEntity.setScanType("3"); - loadscanEntity.setTrainNumber(deliveryListEntity.getTrainNumber()); - loadscanEntity.setSignforState(2); - loadscanEntity.setPackageNub(p.getSigningNum()); - loadscanEntity.setPackageId(p.getParcelListId()); - loadscanEntity.setLoadedNub(p.getSigningNum()); - loadscanEntity.setReceivedQuantity(p.getSigningNum()); - loadscanEntity.setOrderId(p.getStockArticleId()); - loadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId()); - loadscanEntity.setDeliveryId(deliveryListEntity.getId()); - loadscanEntity.setScanUser(AuthUtil.getUser().getNickName()); -// loadscanEntity.setScanUser(AuthUtil.getUser().getUserName()); -// loadscanEntity.setSigningUser(AuthUtil.getUser().getUserName()); - loadscanEntity.setSigningUser(AuthUtil.getUser().getNickName()); - loadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId()); distributionLoadscanService.save(loadscanEntity); - distributionAsyncService.checkSignStatus(loadscanEntity.getPackageId(), loadscanEntity.getReservationId(), loadscanEntity.getDeliveryId()); - //进行签收数量的修改 - Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); - //更新装车包件数和签收包件数 - Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub()); - //更新签收人 - Integer k = distributionSignforMapper.updateSignUser(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), AuthUtil.getUser()); - //这里需要维护 - BigDecimal deliveryQuantity = new BigDecimal(parcelNumberEntity.getDeliveryQuantity()); - BigDecimal outboundQuantity = new BigDecimal(parcelNumberEntity.getOutboundQuantity()); - BigDecimal handQuantity = new BigDecimal(parcelNumberEntity.getHandQuantity()); - BigDecimal signNum = new BigDecimal(p.getSigningNum()); - parcelNumberEntity.setHandQuantity(handQuantity.subtract(signNum).intValue()); - parcelNumberEntity.setDeliveryQuantity(deliveryQuantity.subtract(signNum).intValue()); - parcelNumberEntity.setOutboundQuantity(outboundQuantity.add(signNum).intValue()); - packageLockIds.add(loadscanEntity.getPackageId()); + loadingNumber += loadscanEntity.getLoadedNub(); + signingNumber += loadscanEntity.getReceivedQuantity(); + //维护零担品类信息 + deliveryNumber = distributionParcelNumberEntity.getDeliveryQuantity() - parcelNumberDTO.getSigningNum(); + handQuantity = distributionParcelNumberEntity.getHandQuantity() - parcelNumberDTO.getSigningNum(); + outboundQuantity = distributionParcelNumberEntity.getOutboundQuantity() + parcelNumberDTO.getSigningNum(); + signinQuantity = distributionParcelNumberEntity.getSigninQuantity() + parcelNumberDTO.getSigningNum(); + } + //维护订单 + if (outboundQuantity == distributionParcelNumberEntity.getQuantity()){ + parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); + } + if (handQuantity == 0){ + parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue()); + + } + if (signingNumber == distributionParcelNumberEntity.getQuantity()){ + parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); + } + distributionParcelListService.updateById(parcelListEntity); + + DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity(); + parcelNumberEntity.setId(distributionParcelNumberEntity.getId()); + parcelNumberEntity.setDeliveryQuantity(deliveryNumber); + parcelNumberEntity.setOutboundQuantity(outboundQuantity); + parcelNumberEntity.setSigninQuantity(signinQuantity); + parcelNumberEntity.setHandQuantity(handQuantity); + distributionParcelNumberService.updateById(parcelNumberEntity); + }else { + log.info("#############零担签收查询计划错误ParcelListId:{}",parcelNumberDTO.getParcelListId()); } } - distributionParcelNumberService.updateById(parcelNumberEntity); - }); + } + signforEntity.setLoadedNumber(signforEntity.getLoadedNumber() + loadingNumber); + signforEntity.setReceivedQuantity(signforEntity.getReceivedQuantity() + signingNumber); + distributionSignforMapper.updateById(signforEntity); if (!packageLockIds.isEmpty()) { List a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:"); if (Func.isNotEmpty(a)) { @@ -5451,6 +5439,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0) { stockArticleEntity.setGenre(1); } From 355889b3901697b8bb1726be02c1a3c26dd6b447 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 10 Apr 2024 20:38:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E6=94=B6=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockArticleMapper.xml | 8 ++++---- .../service/impl/DistributionStockArticleServiceImpl.java | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 6a7c6b6b1..64aa8d9a0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -1289,16 +1289,16 @@ and DATE(k.earliestWarehouseEntryTime) < #{param.warehouseEntryTimeEnd} - and DATE(m.signing_time) > + and DATE(m.signing_time) >= #{param.signingTimeStart} - and DATE(m.signing_time) < + and DATE(m.signing_time) <= #{param.signingTimeEnd} - and DATE(j.scanSigningTime) > + and DATE(j.scanSigningTime) >= #{param.scanSigningTimeStart} - and DATE(j.scanSigningTime) < + and DATE(j.scanSigningTime) <= #{param.scanSigningTimeEnd} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index ec26e6dee..31e0defe8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1992,6 +1992,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl myWarehouseList = warehouseClient.getMyWarehouseList(); + BasicdataWarehouseEntity currentWarehouse = warehouseClient.getMyCurrentWarehouse(); List collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); if (collect.size() > 1) { @@ -1999,6 +2000,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl distributionStockArticleEntityIPage = baseMapper.pageSignforListOwe(page, stockArticleEntity); //处理创建人 distributionStockArticleEntityIPage.getRecords().forEach(a -> {