From 3223d60be6bd424074cf3e43b68cf52c48b87c21 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Fri, 5 Jan 2024 11:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E5=A4=87?= =?UTF-8?q?=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistrilbutionBillLadingVO.java | 7 +- .../DistributionStockupAppController.java | 13 +- .../DistributionStockController.java | 4 +- .../mapper/DistributionParcelListMapper.xml | 3 + .../mapper/DistributionStockupMapper.xml | 21 +- .../mapper/DistrilbutionBillLadingMapper.xml | 23 ++- .../mapper/DistrilbutionBillStockMapper.xml | 2 +- .../service/IDistributionStockupService.java | 4 +- .../impl/DistributionAsyncServiceImpl.java | 8 +- .../impl/DistributionStockServiceImpl.java | 8 +- .../impl/DistributionStockupServiceImpl.java | 194 ++++++++++-------- .../DistrilbutionBillLadingServiceImpl.java | 5 +- 12 files changed, 177 insertions(+), 115 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java index 8d8a7951b..a181e0d9f 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java @@ -48,7 +48,12 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity { private String warehouse; private String warehouseEntryTime; private String storageFee; + //计划件数 private String totalNumber; + //实际件数 + private String handQuantity; + //货物名称 + private String productInformation; //订单自编号 private String orderCode; private String brand; @@ -64,7 +69,7 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity { private Integer treatNum; //待 private Integer signedFor ; //已签收 - private Integer stopNum; //已 + private Integer stopNum; //实提件数 private Integer sumTotal; //总数 @ApiModelProperty(value = "提货状态") 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 fdfcb4fb1..b3342b18f 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 @@ -266,6 +266,7 @@ public class DistributionStockupAppController extends BladeController { DistributionStockupSelfVO distributionStockupSelfVO = distributionStockupService.selectStockupStockListDetails(reservationId); map = convertObjectToMap(distributionStockupSelfVO); //库存品 + List list = distributionStockupService.selectStockupStockList(stockupDTO); map.put("stockList", list); } @@ -342,7 +343,9 @@ public class DistributionStockupAppController extends BladeController { @ApiOperationSupport(order = 1) @ApiOperation(value = "配置包条码", notes = "传入stockupDTO") public R stockConfigList(@RequestBody StockupDTO stockupDTO) { - + if(ObjectUtils.isNull( stockupDTO.getTypeService()) ){ + throw new ServiceException("服务类型不能为空！！！"); + } StockConfigInfoVO stockConfigOrderPackageListVOS = distributionStockupService.stockConfigList(stockupDTO); @@ -436,10 +439,12 @@ public class DistributionStockupAppController extends BladeController { @ApiOperation(value = "备货库存品生成包件码", notes = "传入stockupDTO") public R stockupStockListPackageCode(@RequestBody StockupDTO stockupDTO) { Long reservationId = stockupDTO.getReservationId();//预约单id - + if(ObjectUtils.isNull(stockupDTO.getTypeService())){ + throw new ServiceException("服务类型不能为空！！"); + } // 根据当前库位获取最早入库的入库批次 - Long stockListId = distributionStockupService.selectStockListInfoByCargoNumber(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getAllocationId()); + Long stockListId = distributionStockupService.selectStockListInfoByCargoNumber(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getAllocationId(),stockupDTO.getTypeService()); log.warn("##############stockupStockListPackageCode: 库存品id为空 stockListId={}", stockListId); if (Objects.isNull(stockListId)) { return R.fail("当前库位没有无数据的库存品"); @@ -1538,7 +1543,7 @@ public class DistributionStockupAppController extends BladeController { entity.setStockupId(stockupId); entity.setParcelListId(one.getId()); entity.setStockQuantity(1); - if (distributionStockupEntity.getTypeService().equals("3")) { + if ("3".equals(distributionStockupEntity.getTypeService())) { entity.setBillLadingId(reservationId); DistributionStockupEntity byId = distributionStockupService.getById(stockupId); entity.setStockupArea(byId.getStockupArea()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java index b802748ca..5e4ec0df6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java @@ -110,9 +110,9 @@ public class DistributionStockController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "系统备货新增", notes = "传入distributionStock") public R addStockDetail(@Valid @RequestBody DistributionStockDTO distributionStock) { - if(ObjectUtils.isNull(distributionStock.getGoodsAreaId())){ + /* if(ObjectUtils.isNull(distributionStock.getGoodsAreaId())){ return R.fail("注意，注意：备货区未选择！"); - } + }*/ return R.status(distributionStockService.addStockDetail(distributionStock)); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index baed1bd62..7565cb63f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -336,6 +336,9 @@ and ldpl.stock_article_id = #{param.stockArticleId} + and ldbp.bill_lading_id = + #{param.reservationId} + and ldpl.stock_article_id in diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 3ee1bdfd8..2999bcf1a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -395,6 +395,7 @@ GROUP BY lds.id + ORDER By lds.create_time Desc select lddd.stock_list_id stockListId, GROUP_CONCAT(DISTINCT lwug.position_code) allocation, + GROUP_CONCAT(DISTINCT lwug.allocation_id) allocations, ldsl.description_goods materialName, ldsl.sku sku, ldsl.cargo_norms cargoNorms, + ldsl.cargo_number cargoNumber, lddd.quantity planNum, ldsl.cargo_unit cargoUnit, ldsl.tray_name trayName, ldsl.unpack unpack, ldsl.source_type sourceType, - ( select COUNT(id) - from logpm_distribution_stock - where bill_lading_id = lddd.bill_lading_id + from logpm_dis_stock_list_detail + where reservation_id = lddd.bill_lading_id and stock_package_code is NOT null ) realNum, lddd.id deliveryDetailsId from logpm_distribution_delivery_details lddd @@ -698,7 +699,13 @@ select COUNT(id) from logpm_distribution_stock where bill_lading_id = ldbs.bill_lading_id - ) stockupNum,lds.stockup_status stockupStatus ,lds.type_service typeService + ) stockupNum,lds.stockup_status stockupStatus ,lds.type_service typeService, + ( + SELECT sum(lddd.quantity) + from logpm_distribution_delivery_details lddd + where lddd.bill_lading_id = ldsi.reservation_id + ) inventoryNub, + GROUP_CONCAT(DISTINCT ldsa.mall_name) mallName from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on lds.id = ldsi.stockup_id LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index f8755f21b..5a518a0de 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -34,7 +34,7 @@ GROUP_CONCAT(DISTINCT dsa.brand) brand,dsa.type_service typeService,dbl.pick_up_time pickUpTime,dbl.consignee,dbl.delivery_document deliveryDocument,dbl.conditions,dbl.total_cost totalCost, dbl.pick_up_plate pickUpPlate,dbl.pickup_batch pickupBatch, - ( + + ( + select COUNT(id) + from logpm_distribution_bill_lading_scan + where bill_lading_id = dbl.id ) stopNum, GROUP_CONCAT(DISTINCT dsa.order_code) orderCode from logpm_distrilbution_bill_lading dbl @@ -111,7 +116,8 @@ - GROUP BY dbl.id,dsa.warehouse,dsa.warehouse_entry_time,dsa.storage_fee,dsa.type_service + GROUP BY dbl.id,dsa.warehouse,dsa.type_service + Order BY dbl.create_time desc diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index 61a5e739d..e6d5998ca 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -118,7 +118,7 @@ select DISTINCT ldsa.order_code orderCode,ldsa.description_goods descriptionGoods,ldsa.stockup_status stockupStatus, (select COUNT(id) from logpm_distrilbution_bill_package where stock_article_id = ldsa.id and packet_bar_status in (1,3)) handQuantity, - (select GROUP_CONCAT(IFNULL(ldpl.material_name , '') SEPARATOR ', ') + (select GROUP_CONCAT(DISTINCT ldpl.material_name ) from logpm_distribution_parcel_list ldpl where ldpl.material_name is not null and ldpl.stock_article_id = ldbs.stock_article_id) materialName, (select count(lds.id) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java index 2eebcf92e..6b886548b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java @@ -260,12 +260,14 @@ public interface IDistributionStockupService extends BaseService distrilbutionBillStockEntities = distrilbutionBillStockMapper.selectList(Wrappers.query().lambda() - .eq(DistrilbutionBillStockEntity::getBillLadingId, stockupDTO.getReservationId()) - .apply("order_status in (1,2)") - ); +// List distrilbutionBillStockEntities = distrilbutionBillStockMapper.selectList(Wrappers.query().lambda() +// .eq(DistrilbutionBillStockEntity::getBillLadingId, stockupDTO.getReservationId()) +// .apply("order_status in (1,2)") +// ); //查询是否有零担信息 List listZero = reservationZeroPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationZeroPackageEntity::getReservationId, stockupDTO.getReservationId()) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java index da403f85d..b69502332 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockServiceImpl.java @@ -330,9 +330,15 @@ public class DistributionStockServiceImpl extends BaseServiceImpl distributionStockupEntityIPage = baseMapper.selectHomeStockupPage(page, stockupDTO); -// IPage distributionStockupEntityIPage = baseMapper.selectStockupPage(page, stockupDTO); + List records = distributionStockupEntityIPage.getRecords(); for (DistributionStockupListVO vo : records) { AtomicReference b = new AtomicReference<>(false); @@ -333,9 +335,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list2self = distrilbutionBillStockService.listPackageSelf(z.getReservationId()); -// nu.set(nu.get()+list2self.size()); } if (z.getStockUpType().equals("3")) { @@ -367,63 +366,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl packageAllocation = distributionParcelListService.selectWarehouseAreaByReservationId(reservationId); -// //2.通过预约单查询所有库存品的库位信息 -// List stockListAllocation = distributionStockListService.selectWarehouseAreaByReservationId(reservationId); -// String allocation = dealwithAllocation(packageAllocation, stockListAllocation); -// //查询托盘信息 -// //1.查询包件托盘信息` -// List packagePallet = distributionParcelListService.selectPalletByReservationId(reservationId); -// //2.查询库存品托盘信息 -// List stockListPallet = distributionStockListService.selectPalletByReservationId(reservationId); -// String pallet = deakwithPallet(packagePallet, stockListPallet); - -// //查询对应预约单的订单总数 -// Integer orderNum = distributionReservationService.selectOrderNumByReservationId(reservationId); -// -// //查询计划件数 -// Integer planNum = distributionReservationService.selectPlanNum(reservationId); - - //查询已备货件数 -// Integer realNum = distributionStockupScanService.selectRealNum(reservationId); -// Integer realNum = distributionStockService.selectRealNum(reservationId); - - //备货任务是否完成通过扫描表中的记录数量和计划数量对比 -// if (realNum.equals(planNum)) { -// vo.setStockupStatusStr("是"); -// } else { -// vo.setStockupStatusStr("否"); -// } -// vo.setWarehouseArea(allocation); -// vo.setTrays(pallet); -// vo.setOrderNum(orderNum); -// vo.setPlanNum(planNum); -// vo.setRealNum(realNum); } distributionStockupEntityIPage.setRecords(records); return distributionStockupEntityIPage; -// //查询该备货单上对应的客户 -// //1.通过备货任务id查询得到所有的预约单 -// List reservationIds = distributionStockupInfoService.selectReservationIdListByStockupId(stockupId); -// //2.通过预约id查到所有的预约单 -// List reservationEntities = distributionReservationService.selectListByIds(reservationIds); -// //3.拼接客户名称 -// vo.setCustomer(getCustomer(reservationEntities)); -// //4.拿到所有包件的托盘信息 -// vo.setTrays(getTrays(reservationEntities)); -// //5.查询订单总数 计划数量 备货件数 -// Map nums = getNums(reservationEntities); -// vo.setOrderNum(nums.get("orderNum")); -// vo.setPlanNum(nums.get("stockNum")); -// //6.查询已扫描备货的数据 TODO 还需要查询逻辑 -// vo.setRealNum(0); -// } - - } @Override @@ -471,7 +417,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids); + + for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) { + if (i.getAllocationList() == null) { + i.setAllocationList(new ArrayList<>()); + } + Map map = new HashMap<>(); + map.put("id", allocationInforById.getId()); + map.put("name", allocationInforById.getQrCode()); + i.getAllocationList().add(map); + } + } }); return list; } else { @@ -2881,10 +2841,31 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distrilbutionBillStockService.list(Wrappers.query().lambda(). + eq(DistrilbutionBillStockEntity::getBillLadingId, reservationId) + .apply("order_status in (1,2)") + );//预约信息 + if(!list.isEmpty()){ + DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId()); + mallId = byId.getMallId(); + mallName = byId.getMallName(); + + } + + }else{ + // 查询预约单上的商城 + DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId); + mallId = distributionReservationEntity.getMallId(); + mallName = distributionReservationEntity.getMallName(); + + } - // 查询预约单上的商城 - DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId); //查询货位上物料信息 // todo BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); @@ -2905,7 +2886,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper(); lambdaQueryWrapper.in(DistributionStockListEntity::getIncomingBatch, incomingBatches); lambdaQueryWrapper.eq(DistributionStockListEntity::getCargoNumber, cargoNumber); - lambdaQueryWrapper.eq(DistributionStockListEntity::getMarketName, distributionReservationEntity.getMallName()); + lambdaQueryWrapper.eq(DistributionStockListEntity::getMarketName, mallName); // 入库 时间先进的先出 lambdaQueryWrapper.orderByAsc(DistributionStockListEntity::getCreateTime); List distributionStockListEntities = distributionStockListMapper.selectList(lambdaQueryWrapper); @@ -2933,6 +2914,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); //过滤出同物料库存品的ID信息 List stockListIds = distributionStockListEntities.stream().map(DistributionStockListEntity::getId).collect(Collectors.toList()); - //查询该物料的库存品信息 - List reservationStocklistEntityList = distributionReservationStocklistService.list(Wrappers.query().lambda() - .eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId()) - .in(DistributionReservationStocklistEntity::getStocklistId, stockListIds) - .notIn(DistributionReservationStocklistEntity::getStockListStatus, 2) - ); - stockConfigInfoVO.setRealityNum(0); - if (Func.isNotEmpty(reservationStocklistEntityList)){ - int realityNum = reservationStocklistEntityList.stream().mapToInt(DistributionReservationStocklistEntity::getRealityNum).sum(); - stockConfigInfoVO.setRealityNum(realityNum); //地址 + List ls = new ArrayList<>(); + if(typeService.equals(StockupTypeConstant.ziti.getValue())){ + //自提 + // 查询预约单的上的信息 + List list = distrilbutionBillStockService.list(Wrappers.query().lambda(). + eq(DistrilbutionBillStockEntity::getBillLadingId, stockupDTO.getReservationId()) + .apply("order_status in (1,2)") + );//预约信息 + if(!list.isEmpty()){ + DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId()); + if(ObjectUtils.isNotNull(byId)){ + stockConfigInfoVO.setCustomer(byId.getCustomerName()); //客户0 + stockConfigInfoVO.setAddress(byId.getCustomerAddress()); //地址 + } + } + //查询该物料的库存品信息 + List detailsEntityList = distributionDeliveryDetailsService.list(Wrappers.query().lambda() + .eq(DistributionDeliveryDetailsEntity::getBillLadingId, stockupDTO.getReservationId()) + .in(DistributionDeliveryDetailsEntity::getStockListId, stockListIds) + .apply("inventory_status in (1,2)") + ); + + stockConfigInfoVO.setRealityNum(0); + if (Func.isNotEmpty(detailsEntityList)){ + int realityNum = detailsEntityList.stream().mapToInt(DistributionDeliveryDetailsEntity::getRealityQuantity).sum(); + stockConfigInfoVO.setRealityNum(realityNum); //已备数量 + } + }else{ + // 查询预约单的上的信息 + DistributionReservationEntity reservationEntity = distributionReservationService.getById(stockupDTO.getReservationId()); //预约信息 + stockConfigInfoVO.setCustomer(reservationEntity.getConsignee()); //客户0 + stockConfigInfoVO.setAddress(reservationEntity.getDeliveryAddress()); //地址 +// List ls = new ArrayList<>(); + + //查询该物料的库存品信息 + List reservationStocklistEntityList = distributionReservationStocklistService.list(Wrappers.query().lambda() + .eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId()) + .in(DistributionReservationStocklistEntity::getStocklistId, stockListIds) + .notIn(DistributionReservationStocklistEntity::getStockListStatus, 2) + ); + stockConfigInfoVO.setRealityNum(0); + if (Func.isNotEmpty(reservationStocklistEntityList)){ + int realityNum = reservationStocklistEntityList.stream().mapToInt(DistributionReservationStocklistEntity::getRealityNum).sum(); + stockConfigInfoVO.setRealityNum(realityNum); //地址 + + } + /* LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(DistributionStockEntity::getReservationId, stockupDTO.getReservationId()); + lambdaQueryWrapper.eq(DistributionStockEntity::getAllocationId, stockupDTO.getAllocationId()); + lambdaQueryWrapper.eq(DistributionStockEntity::getType, 2); + lambdaQueryWrapper.eq(DistributionStockEntity::getStockupId, stockupDTO.getStockupId()); + lambdaQueryWrapper.in(DistributionStockEntity::getStockListId, stockListIds); + List distributionStockEntities = distributionStockMapper.selectList(lambdaQueryWrapper); + for (DistributionStockEntity distributionStockEntity : distributionStockEntities) { + StockConfigOrderPackageListVO stockConfigOrderPackageListVO = new StockConfigOrderPackageListVO(); + stockConfigOrderPackageListVO.setCode(distributionStockEntity.getCoding()); + stockConfigOrderPackageListVO.setNum(1); + stockConfigOrderPackageListVO.setCreateTime(distributionStockEntity.getCreateTime()); + // 查询批次 + DistributionStockListEntity distributionStockListEntity = distributionStockListMapper.selectById(distributionStockEntity.getStockListId()); + stockConfigOrderPackageListVO.setIncomingBatch(distributionStockListEntity.getIncomingBatch()); + ls.add(stockConfigOrderPackageListVO); + } + stockConfigInfoVO.setStockConfigOrderPackageListVOS(ls);*/ } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(DistributionStockEntity::getReservationId, stockupDTO.getReservationId()); @@ -3033,7 +3058,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl > 签收成功!!"); + return Resp.scanSuccess( "签收成功",""); } }