From 886d6f23d396604f35d98796662275a04553f98d Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 30 Nov 2023 18:47:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=81PDA=E5=A4=87=E8=B4=A7=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E8=B0=83=E6=95=B4+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/app/DistributionAppStockArticleVO.java | 4 +- .../DistributionStockupAppController.java | 315 ++++++++++++------ .../mapper/DistributionReservationMapper.xml | 130 ++++---- .../DistributionDeliveryListServiceImpl.java | 2 +- .../impl/DistributionSignforServiceImpl.java | 8 + .../impl/DistributionStockupServiceImpl.java | 24 +- 6 files changed, 309 insertions(+), 174 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java index be9c98cd5..73c6b3952 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java @@ -39,7 +39,7 @@ public class DistributionAppStockArticleVO extends DistributionStockArticleEntit * 扫描数 */ @ApiModelProperty(value = "扫描数") - private Integer loadingNub; + private Integer loadingNub=0; /** * 订单ID @@ -50,7 +50,7 @@ public class DistributionAppStockArticleVO extends DistributionStockArticleEntit * 签收数 */ @ApiModelProperty(value = "签收(订单)") - private Integer signforNub; + private Integer signforNub=0; /** * 是否存在异常包间 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index e3069830c..a99740618 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -696,11 +696,11 @@ public class DistributionStockupAppController extends BladeController { return Resp.scanFail(60008,"包件不属于此计划!!!","包件不属于此计划!!!",""); case 2: return R.data(60002, distributionStockListEntities.getId(), "当前包件批次号与入库批次号不符，是否确认修改计划批次"); +// case 3: +// //查询其他所用的页面信息 +// DistributionStockupStockListVO distributionStockupStockListVO = distributionReservationService.selectStockupStockListByStockListId(reservationId,distributionStockListEntities.getId()); +// return R.data(200, distributionStockupStockListVO, "扫描成功！"); case 3: - //查询其他所用的页面信息 - DistributionStockupStockListVO distributionStockupStockListVO = distributionReservationService.selectStockupStockListByStockListId(reservationId,distributionStockListEntities.getId()); - return R.data(200, distributionStockupStockListVO, "扫描成功！"); - case 4: return R.data(200, distributionStockListEntities.getId(), "扫描成功！"); } @@ -736,45 +736,54 @@ public class DistributionStockupAppController extends BladeController { } return R.data(200, "", "扫描成功！"); - } private int judgmentIsStockUp(Long reservationId,Long stockListId, DistributionParcelListEntity distributionParcelListEntity, Long warehouseId,String cargoNumber) { List distributionReservationStocklistEntities = distributionReservationMapper.selectStockListByReservationId(reservationId); if (Func.isNotEmpty(distributionReservationStocklistEntities)){ - List stockListIds = distributionReservationStocklistEntities.stream().map(DistributionReservationStocklistEntity::getStocklistId).collect(Collectors.toList()); //查询库存品信息 + List stockListIds = distributionReservationStocklistEntities.stream().map(DistributionReservationStocklistEntity::getStocklistId).collect(Collectors.toList()); + List stockListEntityList = distributionStockListService.list(Wrappers.query().lambda() - .in(DistributionStockListEntity::getId, stockListId) + .in(DistributionStockListEntity::getId, stockListIds) .eq(DistributionStockListEntity::getWarehouseId, warehouseId) .eq(DistributionStockListEntity::getCargoNumber, cargoNumber) ); //判断该库存品包件是否属于计划库存品的物料 + //首先判断包件的物料和此计划中的物料是否一致 +// if (!stockListEntityList.getCargoNumber().equals(distributionParcelListEntity.getMaterialCode())){ +// return 1; +// } +// //查看是否和当前页的计划批次一致 +// if (!stockListEntityList.getIncomingBatch().equals(distributionParcelListEntity.getOrderCode())){ +// //查看计划下是否存在该包件对应批次的计划 +// List reservationStocklistEntityList = distributionReservationMapper.selectStockListByReservationIdAndCargoNumber(reservationId, cargoNumber, stockListId); +// if (Func.isNotEmpty(reservationStocklistEntityList)){ +// List stockListIds = reservationStocklistEntityList.stream().map(DistributionReservationStocklistEntity::getStocklistId).collect(Collectors.toList()); +// List distributionStockListEntities = distributionStockListService.listByIds(stockListIds); +// boolean isHave = distributionStockListEntities.stream().map(DistributionStockListEntity::getIncomingBatch).allMatch(s -> s.contains(distributionParcelListEntity.getOrderCode())); +// if (isHave){ +// return 3; +// } +// }else { +// return 2; +// } +// } + + boolean isHave = stockListEntityList.stream().map(DistributionStockListEntity::getCargoNumber).anyMatch(s -> s.contains(distributionParcelListEntity.getMaterialCode())); if (!isHave){ + //判断包件是否属于计划物料信息 return 1; } //判断该库存品包件是否属于计划的批次 boolean isHaveIncomingBatch = stockListEntityList.stream().map(DistributionStockListEntity::getIncomingBatch).anyMatch(s -> s.contains( distributionParcelListEntity.getOrderCode())); if (!isHaveIncomingBatch){ - //判断计划下是否还存在哟该物料的库存品 - List distributionStockListEntities = distributionStockListService.list(Wrappers.query().lambda() - .in(DistributionStockListEntity::getId, stockListId) - .eq(DistributionStockListEntity::getWarehouseId, warehouseId) - .eq(DistributionStockListEntity::getCargoNumber, cargoNumber) - ); - boolean isOther = distributionStockListEntities.stream().map(DistributionStockListEntity::getCargoNumber).anyMatch(s -> s.contains(distributionParcelListEntity.getMaterialCode())); - if (isOther){ - //是否是计划下同物料的库存品 - return 3; - }else { - //不属于计划中同物料的库存品 - return 2; - } + return 2; } } - return 4; + return 3; } /** @@ -805,9 +814,144 @@ public class DistributionStockupAppController extends BladeController { @ApiOperation(value = "修改批次", notes = "传入stockupDTO") // 修改预约备货信息 需要传入修改的包条 public R updateStockup(@RequestBody StockupDTO stockupDTO) { + List distributionReservationStocklistEntities = distributionReservationMapper.selectStockListByReservationId(stockupDTO.getReservationId()); //当前预约是否存在该批次库存品计划 +// if (stockupDTO.getStockListId().equals(stockupDTO.getNewStockListId())){ +// if (Func.isNotEmpty(distributionReservationStocklistEntities)){ +// boolean isAdd = distributionReservationStocklistEntities.stream().map(DistributionReservationStocklistEntity::getStocklistId).anyMatch(s -> s.equals(stockupDTO.getStockListId())); +// //扣减对应的库存品信息 +//// DistributionStockListEntity newStockListEntity = distributionStockListService.getById(stockupDTO.getStockListId()); +// if (!isAdd){ +// ///先进行对应的扣减 +// //查询该预约该物料的库存品信息 +// List reservationStocklistEntities = distributionReservationMapper.selectInventoryListByIdAndMateriel(stockupDTO.getReservationId(),stockupDTO.getCargoNumber()); +// //可能会出现同一物料不同批次的库存品 +// List reservationStockList = reservationStocklistEntities.stream().filter(drs -> drs.getReservationNum() > 0 && drs.getRealityNum() < drs.getReservationNum()).collect(Collectors.toList()); +// if (Func.isNotEmpty(reservationStockList)){ +// DistributionReservationStocklistEntity oldReservationStocklistEntity = reservationStockList.get(0); +// //扣减计划数量 +// oldReservationStocklistEntity.setReservationNum(oldReservationStocklistEntity.getReservationNum() - 1); +// distributionReservationStocklistService.updateById(oldReservationStocklistEntity); +// +// //维护对应的库存品包件 +// List stockListDetailEntities = disStockListDetailService.list(Wrappers.query().lambda() +// .eq(DisStockListDetailEntity::getReservationId, oldReservationStocklistEntity.getReservationId()) +// .eq(DisStockListDetailEntity::getStockListId, oldReservationStocklistEntity.getStocklistId()) +// .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) +// ); +// +// DistributionStockListEntity oldStockListEntity = distributionStockListService.getById(oldReservationStocklistEntity.getStocklistId()); +// oldStockListEntity.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() - 1); +// distributionStockListService.updateById(oldStockListEntity); +// +// //对指定库存品包件进行库存品ID修改 +// DisStockListDetailEntity disStockListDetailEntity = stockListDetailEntities.stream().filter(sd -> Func.isEmpty(sd.getStockPackageCode())).collect(Collectors.toList()).get(0); +// if (Func.isNotEmpty(disStockListDetailEntity)){ +// disStockListDetailEntity.setStockListId(stockupDTO.getStockListId()); +// disStockListDetailService.updateById(disStockListDetailEntity); +// } +// //维护对应库存品的冻结数量 +// DistributionStockListEntity newStockListEntity = distributionStockListService.getById(stockupDTO.getStockListId()); +// newStockListEntity.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() + 1); +// distributionStockListService.updateById(newStockListEntity); +// } +// +// // 增加实际扫描的包件对应的库存品信息 增加在预约库存品中间表上 +// DistributionReservationStocklistEntity reservationStocklistEntity = new DistributionReservationStocklistEntity(); +// reservationStocklistEntity.setReservationId(stockupDTO.getReservationId()); +// reservationStocklistEntity.setReservationNum(1); +// reservationStocklistEntity.setLoadingStatus("10"); +// reservationStocklistEntity.setSigningStatus("10"); +// reservationStocklistEntity.setStockListStatus("3"); +// DistributionStockListEntity stockListEntity = distributionStockListService.getById(stockupDTO.getStockListId()); +// if(ObjectUtils.isNotNull(stockListEntity)){ +// reservationStocklistEntity.setStocklistId(stockListEntity.getId()); +// reservationStocklistEntity.setUnit(stockListEntity.getCargoUnit()); +// reservationStocklistEntity.setRealityNum(0); +// } +// distributionReservationStocklistService.save(reservationStocklistEntity); +// +// }else { +// //扣减该物料的计划库存品 +// List reservationStocklistEntityList = distributionReservationMapper.selectStockListByReservationIdAndCargoNumber(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getStockListId()); +// List oldReservationStockList = reservationStocklistEntityList.stream().filter(rs -> rs.getReservationNum() > 0 && rs.getRealityNum() < rs.getReservationNum()).collect(Collectors.toList()); +// if (Func.isNotEmpty(oldReservationStockList)){ +// //对老的计划数量进行减少 +// DistributionReservationStocklistEntity reservationStocklistEntity = oldReservationStockList.get(0); +// reservationStocklistEntity.setReservationNum(reservationStocklistEntity.getReservationNum() - 1); +// distributionReservationStocklistService.updateById(reservationStocklistEntity); +// +// +// //维护对应库存品的冻结数量 +// DistributionStockListEntity oldStockListEntity = distributionStockListService.getById(reservationStocklistEntity.getStocklistId()); +// oldStockListEntity.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() - 1); +// distributionStockListService.updateById(oldStockListEntity); +// +// //维护对应的库存品包件 +// List stockListDetailEntities = disStockListDetailService.list(Wrappers.query().lambda() +// .eq(DisStockListDetailEntity::getReservationId, reservationStocklistEntity.getReservationId()) +// .eq(DisStockListDetailEntity::getStockListId, reservationStocklistEntity.getStocklistId()) +// .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) +// ); +// +// //对指定库存品包件进行库存品ID修改 +// DisStockListDetailEntity disStockListDetailEntity = stockListDetailEntities.stream().filter(sd -> Func.isEmpty(sd.getStockPackageCode())).collect(Collectors.toList()).get(0); +// if (Func.isNotEmpty(disStockListDetailEntity)){ +// disStockListDetailEntity.setStockListId(stockupDTO.getStockListId()); +// disStockListDetailService.updateById(disStockListDetailEntity); +// distributionReservationStocklistService.updateById(reservationStocklistEntity); +// } +// +// //新的数量进行增加 +// DistributionReservationStocklistEntity stocklistEntity = distributionReservationStocklistService.getOne(Wrappers.query().lambda() +// .eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId()) +// .eq(DistributionReservationStocklistEntity::getStocklistId, stockupDTO.getStockListId()) +// .ne(DistributionReservationStocklistEntity::getStockListStatus, ReservationOrderStatusConstant.quxiao.getValue()) +// ); +// +// stocklistEntity +// .setReservationNum(stocklistEntity.getReservationNum() + 1); +// distributionReservationStocklistService.updateById(stocklistEntity); +// +// //维护对应库存品的冻结数量 +// DistributionStockListEntity newStockListEntity = distributionStockListService.getById(stockupDTO.getStockListId()); +// newStockListEntity.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() + 1); +// distributionStockListService.updateById(newStockListEntity); +// +// +// +// +// } +// +// +//// List reservationStocklistEntities = stockListMap.get(stockupDTO.getStockListId()); +//// DistributionReservationStocklistEntity reservationStocklistEntity = reservationStocklistEntities.get(0); +//// reservationStocklistEntity.setReservationNum(reservationStocklistEntity.getReservationNum() + 1); +//// distributionReservationStocklistService.updateById(reservationStocklistEntity); +//// if (newStockListEntity.getQuantityOccupied() +1 +newStockListEntity.getQuantityOccupied() <= newStockListEntity.getQuantityStock()){ +//// newStockListEntity.setQuantityOccupied(newStockListEntity.getQuantityStock() + 1); +//// } +//// //修改对应库存品的冻结数量 +//// //查询出原来计划的库存品进行扣减 +//// List distributionReservationStocklistEntityList = distributionReservationMapper.selectStockListByReservationIdAndCargoNumber(stockupDTO.getReservationId(),stockupDTO.getCargoNumber(),stockupDTO.getStockListId()); +//// //过滤备货未完成的计划进行数量扣减 +//// DistributionReservationStocklistEntity reservationStocklist = distributionReservationStocklistEntityList.stream().filter(drs -> drs.getReservationNum() > 0 && drs.getRealityNum() < drs.getReservationNum()).collect(Collectors.toList()).get(0); +//// reservationStocklist.setReservationNum(reservationStocklist.getReservationNum() - 1); +//// distributionReservationStocklistService.updateById(reservationStocklist); +//// +//// //维护库存品对应数量 +//// DistributionStockListEntity stockListEntity = distributionStockListService.getById(reservationStocklist.getStocklistId()); +//// stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() + 1); +//// distributionStockListService.updateById(stockListEntity); +//// //存在 进行新增计划 +// } +// //这里扣减原来的需要排除备货完成的 +// } +// } + if (Func.isNotEmpty(distributionReservationStocklistEntities)){ + boolean isAdd = distributionReservationStocklistEntities.stream().map(DistributionReservationStocklistEntity::getStocklistId).anyMatch(s -> s.equals(stockupDTO.getStockListId())); //扣减对应的库存品信息 // DistributionStockListEntity newStockListEntity = distributionStockListService.getById(stockupDTO.getStockListId()); @@ -842,10 +986,9 @@ public class DistributionStockupAppController extends BladeController { } //维护对应库存品的冻结数量 DistributionStockListEntity newStockListEntity = distributionStockListService.getById(stockupDTO.getStockListId()); - newStockListEntity.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() + 1); + newStockListEntity.setQuantityOccupied(newStockListEntity.getQuantityOccupied() + 1); distributionStockListService.updateById(newStockListEntity); } - // 增加实际扫描的包件对应的库存品信息 增加在预约库存品中间表上 DistributionReservationStocklistEntity reservationStocklistEntity = new DistributionReservationStocklistEntity(); reservationStocklistEntity.setReservationId(stockupDTO.getReservationId()); @@ -861,85 +1004,57 @@ public class DistributionStockupAppController extends BladeController { } distributionReservationStocklistService.save(reservationStocklistEntity); - }else { - //扣减该物料的计划库存品 - List reservationStocklistEntityList = distributionReservationMapper.selectStockListByReservationIdAndCargoNumber(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getStockListId()); - List oldReservationStockList = reservationStocklistEntityList.stream().filter(rs -> rs.getReservationNum() > 0 && rs.getRealityNum() < rs.getReservationNum()).collect(Collectors.toList()); - if (Func.isNotEmpty(oldReservationStockList)){ - //对老的计划数量进行减少 - DistributionReservationStocklistEntity reservationStocklistEntity = oldReservationStockList.get(0); - reservationStocklistEntity.setReservationNum(reservationStocklistEntity.getReservationNum() - 1); - distributionReservationStocklistService.updateById(reservationStocklistEntity); - - - //维护对应库存品的冻结数量 - DistributionStockListEntity oldStockListEntity = distributionStockListService.getById(reservationStocklistEntity.getStocklistId()); - oldStockListEntity.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() - 1); - distributionStockListService.updateById(oldStockListEntity); - - //维护对应的库存品包件 - List stockListDetailEntities = disStockListDetailService.list(Wrappers.query().lambda() - .eq(DisStockListDetailEntity::getReservationId, reservationStocklistEntity.getReservationId()) - .eq(DisStockListDetailEntity::getStockListId, reservationStocklistEntity.getStocklistId()) - .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) - ); - - //对指定库存品包件进行库存品ID修改 - DisStockListDetailEntity disStockListDetailEntity = stockListDetailEntities.stream().filter(sd -> Func.isEmpty(sd.getStockPackageCode())).collect(Collectors.toList()).get(0); - if (Func.isNotEmpty(disStockListDetailEntity)){ - disStockListDetailEntity.setStockListId(stockupDTO.getStockListId()); - disStockListDetailService.updateById(disStockListDetailEntity); - distributionReservationStocklistService.updateById(reservationStocklistEntity); - } - - //新的数量进行增加 - DistributionReservationStocklistEntity stocklistEntity = distributionReservationStocklistService.getOne(Wrappers.query().lambda() - .eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId()) - .eq(DistributionReservationStocklistEntity::getStocklistId, stockupDTO.getStockListId()) - .ne(DistributionReservationStocklistEntity::getStockListStatus, ReservationOrderStatusConstant.quxiao.getValue()) - ); - - stocklistEntity - .setReservationNum(stocklistEntity.getReservationNum() + 1); - distributionReservationStocklistService.updateById(stocklistEntity); - - //维护对应库存品的冻结数量 - DistributionStockListEntity newStockListEntity = distributionStockListService.getById(stockupDTO.getStockListId()); - newStockListEntity.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() + 1); - distributionStockListService.updateById(newStockListEntity); - - - - - } - - -// List reservationStocklistEntities = stockListMap.get(stockupDTO.getStockListId()); -// DistributionReservationStocklistEntity reservationStocklistEntity = reservationStocklistEntities.get(0); -// reservationStocklistEntity.setReservationNum(reservationStocklistEntity.getReservationNum() + 1); -// distributionReservationStocklistService.updateById(reservationStocklistEntity); -// if (newStockListEntity.getQuantityOccupied() +1 +newStockListEntity.getQuantityOccupied() <= newStockListEntity.getQuantityStock()){ -// newStockListEntity.setQuantityOccupied(newStockListEntity.getQuantityStock() + 1); -// } -// //修改对应库存品的冻结数量 -// //查询出原来计划的库存品进行扣减 -// List distributionReservationStocklistEntityList = distributionReservationMapper.selectStockListByReservationIdAndCargoNumber(stockupDTO.getReservationId(),stockupDTO.getCargoNumber(),stockupDTO.getStockListId()); -// //过滤备货未完成的计划进行数量扣减 -// DistributionReservationStocklistEntity reservationStocklist = distributionReservationStocklistEntityList.stream().filter(drs -> drs.getReservationNum() > 0 && drs.getRealityNum() < drs.getReservationNum()).collect(Collectors.toList()).get(0); -// reservationStocklist.setReservationNum(reservationStocklist.getReservationNum() - 1); -// distributionReservationStocklistService.updateById(reservationStocklist); -// -// //维护库存品对应数量 -// DistributionStockListEntity stockListEntity = distributionStockListService.getById(reservationStocklist.getStocklistId()); -// stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() + 1); -// distributionStockListService.updateById(stockListEntity); -// //存在 进行新增计划 } - //这里扣减原来的需要排除备货完成的 +// else { +// //扣减该物料的计划库存品 +// List reservationStocklistEntityList = distributionReservationMapper.selectStockListByReservationIdAndCargoNumber(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getStockListId()); +// List oldReservationStockList = reservationStocklistEntityList.stream().filter(rs -> rs.getReservationNum() > 0 && rs.getRealityNum() < rs.getReservationNum()).collect(Collectors.toList()); +// if (Func.isNotEmpty(oldReservationStockList)){ +// //对老的计划数量进行减少 +// DistributionReservationStocklistEntity reservationStocklistEntity = oldReservationStockList.get(0); +// reservationStocklistEntity.setReservationNum(reservationStocklistEntity.getReservationNum() - 1); +// distributionReservationStocklistService.updateById(reservationStocklistEntity); +// +// +// //维护对应库存品的冻结数量 +// DistributionStockListEntity oldStockListEntity = distributionStockListService.getById(reservationStocklistEntity.getStocklistId()); +// oldStockListEntity.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() - 1); +// distributionStockListService.updateById(oldStockListEntity); +// +// //维护对应的库存品包件 +// List stockListDetailEntities = disStockListDetailService.list(Wrappers.query().lambda() +// .eq(DisStockListDetailEntity::getReservationId, reservationStocklistEntity.getReservationId()) +// .eq(DisStockListDetailEntity::getStockListId, reservationStocklistEntity.getStocklistId()) +// .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) +// ); +// +// //对指定库存品包件进行库存品ID修改 +// DisStockListDetailEntity disStockListDetailEntity = stockListDetailEntities.stream().filter(sd -> Func.isEmpty(sd.getStockPackageCode())).collect(Collectors.toList()).get(0); +// if (Func.isNotEmpty(disStockListDetailEntity)){ +// disStockListDetailEntity.setStockListId(stockupDTO.getStockListId()); +// disStockListDetailService.updateById(disStockListDetailEntity); +// distributionReservationStocklistService.updateById(reservationStocklistEntity); +// } +// +// //新的数量进行增加 +// DistributionReservationStocklistEntity stocklistEntity = distributionReservationStocklistService.getOne(Wrappers.query().lambda() +// .eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId()) +// .eq(DistributionReservationStocklistEntity::getStocklistId, stockupDTO.getStockListId()) +// .ne(DistributionReservationStocklistEntity::getStockListStatus, ReservationOrderStatusConstant.quxiao.getValue()) +// ); +// +// stocklistEntity +// .setReservationNum(stocklistEntity.getReservationNum() + 1); +// distributionReservationStocklistService.updateById(stocklistEntity); +// +// //维护对应库存品的冻结数量 +// DistributionStockListEntity newStockListEntity = distributionStockListService.getById(stockupDTO.getStockListId()); +// newStockListEntity.setQuantityOccupied(oldStockListEntity.getQuantityOccupied() + 1); +// distributionStockListService.updateById(newStockListEntity); +// } +// } } // 默认 计划数量和实际数量为0 - - return R.success("操作成功"); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 42e351f3b..5070469d2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -298,78 +298,78 @@