From 98c312a8d7820ebf3da3fe287b44f4d6471953a6 Mon Sep 17 00:00:00 2001 From: kilo Date: Tue, 17 Oct 2023 18:01:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=8F=B7=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/warehouse/vo/TaskContractVO.java | 1 + .../logpm/warehouse/vo/TaskPackagelistVO.java | 17 + .../DistributionStockupController.java | 3 +- .../DistributionReservationServiceImpl.java | 515 +++++++++--------- .../logpm/warehouse/dto/TaskSearchDTO.java | 3 + .../service/impl/TaskQuestServiceImpl.java | 12 +- 6 files changed, 284 insertions(+), 267 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskContractVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskContractVO.java index 1b5d6922f..f2c238926 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskContractVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskContractVO.java @@ -51,6 +51,7 @@ public class TaskContractVO { @ApiModelProperty(value = "是否是库存品 0- 否 1-是") private Integer isInventory; + /** * 包件列表 */ diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java index 9b4a2c0fe..2c604ea93 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskPackagelistVO.java @@ -42,12 +42,29 @@ public class TaskPackagelistVO { @ApiModelProperty(value = "订单号") private Long orderId; + + @ApiModelProperty(value = "盘点详情ID") + private Long questDetailId; + /** * 数量 */ @ApiModelProperty(value = "数量") private Integer quantity; + /** + * 盘点方式 + */ + @ApiModelProperty(value = "数量") + private Integer questTarget; + + + /** + * 盘点任务状态 + */ + @ApiModelProperty(value = "数量") + private Integer questStatus; + /** * 数量 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java index 01932c9a6..1c6ff1dcc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java @@ -175,7 +175,8 @@ public class DistributionStockupController extends BladeController { public R> listUser() { //获取当前登录用户 BladeUser user = AuthUtil.getUser(); - List cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "拣货员"); +// List cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "拣货员"); + List cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "叉车"); return R.data(cc); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 7db3208d5..eb0e14adc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -191,10 +191,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl selectDistrbutionReservationPage(IPage page, DistributionReservationVO distrbutionReservation) { return page.setRecords(baseMapper.selectDistrbutionReservationPage(page, distrbutionReservation)); @@ -263,8 +259,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl reservationZeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.query().lambda() @@ -281,16 +277,16 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl s.getReservationStatus().equals(OrderReservationStatusConstant.yiyueyue.getValue())); - if (flag){ + if (flag) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); log.error("预约选择订单被多次预约"); return R.fail("订单已预约!!!"); @@ -367,14 +363,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { // WarehouseWaybillEntity byWaybillNo = warehouseWaybillClient.findByWaybillNo(s.getWaybillNumber()); WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(s.getWaybillNumber()); - if (Func.isNotEmpty(wayBillEntity)){ + if (Func.isNotEmpty(wayBillEntity)) { waybillId.add(wayBillEntity.getId().toString()); - if (Func.isNotEmpty(wayBillEntity.getTakePhone())){ + if (Func.isNotEmpty(wayBillEntity.getTakePhone())) { marketPhone.add(wayBillEntity.getTakePhone()); } } - if (Func.isNotEmpty(s.getWaybillNumber())){ + if (Func.isNotEmpty(s.getWaybillNumber())) { waybillNo.add(s.getWaybillNumber()); } if (Func.isNotBlank(s.getServiceNumber())) { @@ -546,7 +542,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl reservationIds = Func.toLongList(ids); List reservationEntityList = distributionReservationMapper.selectList(Wrappers.query().lambda().in(DistributionReservationEntity::getId, reservationIds)); - if (Func.isNotEmpty(reservationEntityList)){ - reservationEntityList.forEach(r->{ + if (Func.isNotEmpty(reservationEntityList)) { + reservationEntityList.forEach(r -> { r.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue()); distributionReservationMapper.updateById(r); DistributionStockupInfoEntity reservationStockupEntity = new DistributionStockupInfoEntity(); @@ -808,13 +804,16 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl reservationVOList = null; - if (Func.isNotEmpty(myCurrentWarehouse)){ + if (Func.isNotEmpty(myCurrentWarehouse)) { List longs = Func.toLongList(ids); List reservationEntityList = this.listByIds(longs); reservationVOList = DistributionReservationWrapper.build().listVO(reservationEntityList); BasicdataWarehouseEntity entityWarehouseId = warehouseClient.getEntityWarehouseId(reservationVOList.get(0).getWarehouseId()); - if (Func.isNotEmpty(entityWarehouseId)){ - reservationVOList.stream().forEach(r->{r.setJingdu(entityWarehouseId.getLongitude());r.setWeidu(entityWarehouseId.getLatitude());}); + if (Func.isNotEmpty(entityWarehouseId)) { + reservationVOList.stream().forEach(r -> { + r.setJingdu(entityWarehouseId.getLongitude()); + r.setWeidu(entityWarehouseId.getLatitude()); + }); } } @@ -846,7 +845,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl stockArticleVOS = DistributionStockArticleWrapper.build().listVO(distrinbutionStockArticleVOS); stockArticleVOS.forEach(s -> { //区分正常订单和零担订单 - if (s.getIsZero().equals(IsOrNoConstant.no.getValue())){ + if (s.getIsZero().equals(IsOrNoConstant.no.getValue())) { //这里查询两个东西，一个是该订单在预约中所被选取的包件信息，以及该订单下所有的包件列表 List pageVOList = distributionParcelListMapper.getPageVOList(s.getId()); s.setParcelListVOS(DistributionParcelListWrapper.build().listVO(pageVOList)); //这里查询出该订单下已经被选取的包件信息 List packageVOList = distributionReservationPackageMapper.selectPackageVOList(reservationEntity.getId(), s.getId()); s.setPackageList(DistributionParcelListWrapper.build().listVO(packageVOList)); - }else { + } else { List parcelNumberVOS = baseMapper.selectReservationZeroOrderDetail(s.getId(), Long.parseLong(reservationId)); s.setParcelNumberVOS(parcelNumberVOS); } @@ -1170,8 +1169,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl packageListInfo = distributionStockArticleDTO.getPackageListInfo(); packageListInfo.forEach(p -> { DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity(); @@ -1208,14 +1207,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl parcelNumberVOS = distributionStockArticleDTO.getParcelNumberVOS(); AtomicInteger zeroPackageNum = new AtomicInteger(); - if (Func.isNotEmpty(parcelNumberVOS)){ + if (Func.isNotEmpty(parcelNumberVOS)) { //进行录入数量的操作 - parcelNumberVOS.forEach(p->{ - if (p.getReservationNum() >0){ + parcelNumberVOS.forEach(p -> { + if (p.getReservationNum() > 0) { DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = new DistributionReservationZeroPackageEntity(); distributionReservationZeroPackageEntity.setQuantity(p.getReservationNum()); distributionReservationZeroPackageEntity.setReservationId(id); @@ -1233,10 +1232,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl list = distributionStockArticleService.getZeroOrderDetail(distributionStockArticleDTO.getId()); - list.forEach(l->{ + list.forEach(l -> { DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = new DistributionReservationZeroPackageEntity(); distributionReservationZeroPackageEntity.setQuantity(l.getQuantity() - l.getDeliveryQuantity() - l.getOutboundQuantity()); distributionReservationZeroPackageEntity.setReservationId(id); @@ -1286,7 +1285,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl packageEntityList = distributionReservationPackageMapper.selectPackageByReservationAndStockArticleId(id, k); Map> oldPackage = packageEntityList.stream().collect(Collectors.groupingBy(DistributionReservationPackageEntity::getParceListId)); Map> newPackage = distributionStockArticleDTO.getPackageListInfo().stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getId)); @@ -1332,24 +1331,24 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl parcelNumberVOS = distributionStockArticleDTO.getParcelNumberVOS(); List reservationZeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationZeroPackageEntity::getReservationId, id) .eq(DistributionReservationZeroPackageEntity::getStockArticleId, distributionStockArticleDTO.getId()) - .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus,"2")); + .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "2")); Map> oldZeroPackage = reservationZeroPackageEntityList.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getParcelListId)); - if (Func.isEmpty(reservationZeroPackageEntityList)){ - log.error("#############零担订单预约信息数据错误:{}",distributionStockArticleDTO); + if (Func.isEmpty(reservationZeroPackageEntityList)) { + log.error("#############零担订单预约信息数据错误:{}", distributionStockArticleDTO); } AtomicInteger zeroPrderNum = new AtomicInteger(); - parcelNumberVOS.forEach(p->{ + parcelNumberVOS.forEach(p -> { List distributionReservationZeroPackageEntities = oldZeroPackage.get(p.getParcelListId()); - if (Func.isNotEmpty(distributionReservationZeroPackageEntities)){ + if (Func.isNotEmpty(distributionReservationZeroPackageEntities)) { DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = distributionReservationZeroPackageEntities.get(0); Integer quantity = distributionReservationZeroPackageEntity.getQuantity(); - if (p.getReservationNum() == 0){ + if (p.getReservationNum() == 0) { distributionReservationZeroPackageEntity.setQuantity(0); distributionReservationZeroPackageEntity.setZeroPackageStatus(ReservationOrderStatusConstant.quxiao.getValue()); distributionReservationZeroPackageService.updateById(distributionReservationZeroPackageEntity); @@ -1357,7 +1356,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { //这里就是需要进行取消的订单信息 DistributionReservationStockarticleEntity reservationStockarticleEntity = j.get(0); - if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())){ + if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) { reservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue()); List packageEntityList = distributionReservationPackageMapper.selectPackageByReservationAndStockArticleId(id, reservationStockarticleEntity.getStockArticleId()); packageEntityList.forEach(p -> { @@ -1429,17 +1428,17 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl reservationZeroPackageEntities = distributionReservationZeroPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationZeroPackageEntity::getReservationId, reservationStockarticleEntity.getReservationId()) .eq(DistributionReservationZeroPackageEntity::getStockArticleId, reservationStockarticleEntity.getStockArticleId()) .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationOrderStatusConstant.quxiao.getValue())); - reservationZeroPackageEntities.forEach(zp->{ + reservationZeroPackageEntities.forEach(zp -> { List parcelNumberEntityList = distributionParcelNumberService.list(Wrappers.query().lambda() .eq(DistributionParcelNumberEntity::getParcelListId, zp.getParcelListId())); - if (parcelNumberEntityList.size()>1){ - log.error("#############零担订单品类信息错误:{}",parcelNumberEntityList); + if (parcelNumberEntityList.size() > 1) { + log.error("#############零担订单品类信息错误:{}", parcelNumberEntityList); } DistributionParcelNumberEntity parcelNumberEntity = parcelNumberEntityList.get(0); parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - zp.getQuantity()); @@ -1522,37 +1521,37 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl newReservationNum){ + if (oldReservationNum > newReservationNum) { //对应库存品减少 //查询出对应的库存品信息，进行取消状态标识 int count = oldReservationNum - newReservationNum; List disStockListDetailEntities = disStockListDetailService.list(Wrappers.query().lambda() .eq(DisStockListDetailEntity::getReservationId, id) - .eq(DisStockListDetailEntity::getStockListId,distributionReservationStocklistEntity.getStocklistId()) + .eq(DisStockListDetailEntity::getStockListId, distributionReservationStocklistEntity.getStocklistId()) .ne(DisStockListDetailEntity::getStockLockingStatus, InventoryPackageStatusConstant.quxiao.getValue())); for (int i = 0; i < count; i++) { DisStockListDetailEntity disStockListDetailEntity = disStockListDetailEntities.get(i); disStockListDetailEntity.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue()); disStockListDetailService.updateById(disStockListDetailEntity); } - }else { - int count =newReservationNum - oldReservationNum ; + } else { + int count = newReservationNum - oldReservationNum; List detailEntities = new ArrayList<>(); for (int i = 0; i < count; i++) { - //构建库存品 - DisStockListDetailEntity disStockListDetailEntity = new DisStockListDetailEntity(); - disStockListDetailEntity.setNum(1); - disStockListDetailEntity.setSku(distributionStockListDTO.getSku()); - disStockListDetailEntity.setStockListId(distributionStockListDTO.getId()); - disStockListDetailEntity.setStockLockingStatus(InventoryLoadingStatusConstant.weizhuangche.getValue()); - disStockListDetailEntity.setStockSignfoStatus(InventorySigningStatusConstant.weiqianshou.getValue()); - disStockListDetailEntity.setStockStatus(InventoryBindingStatusConstant.weibangding.getValue()); - disStockListDetailEntity.setStockType(InventoryTypeConstant.saoma.getValue()); - disStockListDetailEntity.setWarehouseId(myCurrentWarehouse.getId()); - disStockListDetailEntity.setWarehouseName(myCurrentWarehouse.getName()); - disStockListDetailEntity.setReservationId(id); - detailEntities.add(disStockListDetailEntity); - disStockListDetailEntity.setStockPackageStatus(InventoryPackageStatusConstant.xinzneg.getValue()); + //构建库存品 + DisStockListDetailEntity disStockListDetailEntity = new DisStockListDetailEntity(); + disStockListDetailEntity.setNum(1); + disStockListDetailEntity.setSku(distributionStockListDTO.getSku()); + disStockListDetailEntity.setStockListId(distributionStockListDTO.getId()); + disStockListDetailEntity.setStockLockingStatus(InventoryLoadingStatusConstant.weizhuangche.getValue()); + disStockListDetailEntity.setStockSignfoStatus(InventorySigningStatusConstant.weiqianshou.getValue()); + disStockListDetailEntity.setStockStatus(InventoryBindingStatusConstant.weibangding.getValue()); + disStockListDetailEntity.setStockType(InventoryTypeConstant.saoma.getValue()); + disStockListDetailEntity.setWarehouseId(myCurrentWarehouse.getId()); + disStockListDetailEntity.setWarehouseName(myCurrentWarehouse.getName()); + disStockListDetailEntity.setReservationId(id); + detailEntities.add(disStockListDetailEntity); + disStockListDetailEntity.setStockPackageStatus(InventoryPackageStatusConstant.xinzneg.getValue()); //完成库存品详情的添加 } disStockListDetailService.saveBatch(detailEntities); @@ -1587,7 +1586,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl list = disStockListDetailService.list(Wrappers.query().lambda() .eq(DisStockListDetailEntity::getReservationId, distributionReservationStocklistEntity.getReservationId()).eq(DisStockListDetailEntity::getStockListId, distributionReservationStocklistEntity.getStocklistId())); - list.forEach(l->l.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue())); + list.forEach(l -> l.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue())); disStockListDetailService.updateBatchById(list); //TODO 删除库存品包件信息 }); @@ -1623,7 +1622,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl{ + mallClient.forEach((k, v) -> { clientTotal.getAndIncrement(); // AtomicInteger receivingUnit = new AtomicInteger(); //这里查询有问题 @@ -1723,7 +1722,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl consigneeAddress = new HashSet<>(); //运单客户收货单位 HashSet consignee = new HashSet<>(); - v.forEach(s->{ + v.forEach(s -> { DistributionStockArticleDTO stockArticleDTO = Func.copy(s, DistributionStockArticleDTO.class); // WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(s.getWaybillNumber()); // if (Func.isNotEmpty(warehouseWaybillEntity.getConsigneeMobile())){ @@ -1734,60 +1733,60 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl packageListInfo = s.getPackageListInfo(); - if (packageListInfo.size()>0){ - packageListInfo.forEach(p->{ + if (packageListInfo.size() > 0) { + packageListInfo.forEach(p -> { reservationOrderNum.getAndAdd(p.getQuantity()); DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity(); reservationPackageEntity.setPacketBarStatus(ReservationPackageStatusConstant.zhengchang.getValue()); @@ -1801,17 +1800,17 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl parcelNumberVOS = s.getParcelNumberVOS(); - if (Func.isNotEmpty(parcelNumberVOS)){ + if (Func.isNotEmpty(parcelNumberVOS)) { //这里需要先进行是否满足 - parcelNumberVOS.forEach(p->{ + parcelNumberVOS.forEach(p -> { DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = new DistributionReservationZeroPackageEntity(); distributionReservationZeroPackageEntity.setZeroPackageStatus(ReservationOrderStatusConstant.zhengchang.getValue()); distributionReservationZeroPackageEntity.setQuantity(p.getHandQuantity() - p.getDeliveryQuantity() - p.getOutboundQuantity()); @@ -1826,10 +1825,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl list = distributionStockArticleService.getZeroOrderDetail(s.getId()); - if (Func.isNotEmpty(list)){ - list.forEach(l->{ + if (Func.isNotEmpty(list)) { + list.forEach(l -> { DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = new DistributionReservationZeroPackageEntity(); distributionReservationZeroPackageEntity.setZeroPackageStatus(ReservationOrderStatusConstant.zhengchang.getValue()); distributionReservationZeroPackageEntity.setQuantity(l.getHandQuantity() - l.getDeliveryQuantity() - l.getOutboundQuantity()); @@ -1844,8 +1843,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.query().lambda() .eq(DistributionReservationStockarticleEntity::getReservationId, reservationEntity.getId()) .ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue())); - if (Func.isNotEmpty(reservationStockarticleEntityList) && reservationStockarticleEntityList.size()>0){ - reservationStockarticleEntityList.forEach(rs->{ + if (Func.isNotEmpty(reservationStockarticleEntityList) && reservationStockarticleEntityList.size() > 0) { + reservationStockarticleEntityList.forEach(rs -> { rs.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue()); distributionReservationStockarticleService.updateById(rs); - if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())){ + if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { //订制品 //需要进行包件的预约状态维护 List reservationPackageEntityList = distributionReservationPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationPackageEntity::getReservationId, rs.getReservationId()) .eq(DistributionReservationPackageEntity::getStockArticleId, rs.getStockArticleId()) .ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())); - if (Func.isNotEmpty(reservationPackageEntityList) && reservationPackageEntityList.size()>0){ - reservationPackageEntityList.forEach(rp->{ + if (Func.isNotEmpty(reservationPackageEntityList) && reservationPackageEntityList.size() > 0) { + reservationPackageEntityList.forEach(rp -> { rp.setPacketBarStatus(ReservationPackageStatusConstant.quxiao.getValue()); distributionReservationPackageService.updateById(rp); //维护包件状态 DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId()); - if (Func.isNotEmpty(parcelListEntity)){ + if (Func.isNotEmpty(parcelListEntity)) { parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue()); distributionParcelListService.updateById(parcelListEntity); distributionAsyncService.checkStockArticleReservationStatus(parcelListEntity); - }else { - log.error("#################错误包件ID:{}",rp.getParceListId()); + } else { + log.error("#################错误包件ID:{}", rp.getParceListId()); } }); } - }else if (rs.getIsZero().equals(IsOrNoConstant.yes.getValue())){ + } else if (rs.getIsZero().equals(IsOrNoConstant.yes.getValue())) { //零担 List reservationZeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationZeroPackageEntity::getReservationId, reservationEntity.getId()) .eq(DistributionReservationZeroPackageEntity::getStockArticleId, rs.getStockArticleId()) .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())); - reservationZeroPackageEntityList.forEach(rzp->{ + reservationZeroPackageEntityList.forEach(rzp -> { rzp.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue()); distributionReservationZeroPackageService.updateById(rzp); DistributionParcelNumberEntity parcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.query().lambda() .eq(DistributionParcelNumberEntity::getParcelListId, rzp.getParcelListId())); - if (Func.isNotEmpty(parcelNumberEntity)){ + if (Func.isNotEmpty(parcelNumberEntity)) { // parcelNumberEntity.setHandQuantity(parcelNumberEntity.getHandQuantity() + rzp.getQuantity()); parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - rzp.getQuantity()); distributionParcelNumberService.updateById(parcelNumberEntity); @@ -2197,16 +2196,16 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl distributionReservationStocklistEntities = distributionReservationMapper.selectStockListByReservationId(reservationEntity.getId()); - if (Func.isNotEmpty(distributionReservationStocklistEntities) && distributionReservationStocklistEntities.size() > 0){ + if (Func.isNotEmpty(distributionReservationStocklistEntities) && distributionReservationStocklistEntities.size() > 0) { //进行库存品库存数量的维护 - distributionReservationStocklistEntities.forEach(i->{ + distributionReservationStocklistEntities.forEach(i -> { DistributionStockListEntity stockListEntity = distributionStockListService.getById(i.getStocklistId()); stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() - i.getReservationNum()); distributionStockListService.updateById(stockListEntity); @@ -2216,7 +2215,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl distributionParcelListVOS = new ArrayList<>(); - if (Func.isNotEmpty(distributionReservationStockarticleEntityList)){ - distributionReservationStockarticleEntityList.forEach(rs->{ - if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())){ + if (Func.isNotEmpty(distributionReservationStockarticleEntityList)) { + distributionReservationStockarticleEntityList.forEach(rs -> { + if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { List reservationPackageEntityList = distributionReservationPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationPackageEntity::getReservationId, reservationId) .eq(DistributionReservationPackageEntity::getStockArticleId, rs.getStockArticleId()) .ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())); - if (Func.isNotEmpty(reservationPackageEntityList)){ - reservationPackageEntityList.forEach(rp->{ + if (Func.isNotEmpty(reservationPackageEntityList)) { + reservationPackageEntityList.forEach(rp -> { DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId()); DistributionParcelListVO distributionParcelListVO = DistributionParcelListWrapper.build().entityVO(parcelListEntity); distributionParcelListVO.setReservationNum(parcelListEntity.getQuantity()); distributionParcelListVOS.add(distributionParcelListVO); }); - }else { - log.error("####################此预约下订单查询包件信息错误,订单ID为:{}",rs.getStockArticleId()); + } else { + log.error("####################此预约下订单查询包件信息错误,订单ID为:{}", rs.getStockArticleId()); } - }else if (rs.getIsZero().equals(IsOrNoConstant.yes.getValue())){ + } else if (rs.getIsZero().equals(IsOrNoConstant.yes.getValue())) { List reservationZeroPackageEntities = distributionReservationZeroPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationZeroPackageEntity::getReservationId, reservationId) .eq(DistributionReservationZeroPackageEntity::getStockArticleId, rs.getStockArticleId()) .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())); - if (Func.isNotEmpty(reservationZeroPackageEntities)){ - reservationZeroPackageEntities.forEach(rp->{ + if (Func.isNotEmpty(reservationZeroPackageEntities)) { + reservationZeroPackageEntities.forEach(rp -> { DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParcelListId()); DistributionParcelListVO distributionParcelListVO = DistributionParcelListWrapper.build().entityVO(parcelListEntity); distributionParcelListVO.setReservationNum(rp.getQuantity()); distributionParcelListVOS.add(distributionParcelListVO); }); - }else { - log.error("####################此预约下零担订单查询品类信息错误,订单ID为:{}",rs.getStockArticleId()); + } else { + log.error("####################此预约下零担订单查询品类信息错误,订单ID为:{}", rs.getStockArticleId()); } - }else { - log.error("##################3预约订单isZero字段值错误,订单ID为:{}",rs.getStockArticleId()); + } else { + log.error("##################3预约订单isZero字段值错误,订单ID为:{}", rs.getStockArticleId()); } }); @@ -2437,7 +2425,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl selectStockupOrderList(Long reservationId, String isZero) { - return baseMapper.selectStockupOrderList(reservationId,isZero); + return baseMapper.selectStockupOrderList(reservationId, isZero); } @Override @@ -2467,7 +2455,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl selectUpdateAvailableStockArticle(Long reservationId,Map distributionStockArticle) { + public List selectUpdateAvailableStockArticle(Long reservationId, Map distributionStockArticle) { //这里还需要查询出该预约单下的订单信息 //这里将该预约下的订单进行过滤 String orderCode = (String) distributionStockArticle.get("orderCode"); @@ -2482,25 +2470,25 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { list.add(r.getStockArticleId().toString()); LambdaQueryWrapper lambda = Wrappers.query().lambda(); - if (Func.isNotEmpty(orderCode)){ - lambda.like(DistributionStockArticleEntity::getOrderCode,orderCode); + if (Func.isNotEmpty(orderCode)) { + lambda.like(DistributionStockArticleEntity::getOrderCode, orderCode); } - if (Func.isNotEmpty(mallName)){ - lambda.like(DistributionStockArticleEntity::getOrderCode,mallName); + if (Func.isNotEmpty(mallName)) { + lambda.like(DistributionStockArticleEntity::getOrderCode, mallName); } - if (Func.isNotEmpty(descriptionGoods)){ - lambda.like(DistributionStockArticleEntity::getOrderCode,descriptionGoods); + if (Func.isNotEmpty(descriptionGoods)) { + lambda.like(DistributionStockArticleEntity::getOrderCode, descriptionGoods); } - if (Func.isNotEmpty(brand)){ - lambda.like(DistributionStockArticleEntity::getOrderCode,brand); + if (Func.isNotEmpty(brand)) { + lambda.like(DistributionStockArticleEntity::getOrderCode, brand); } - if (Func.isNotEmpty(customerName)){ - lambda.like(DistributionStockArticleEntity::getOrderCode,customerName); + if (Func.isNotEmpty(customerName)) { + lambda.like(DistributionStockArticleEntity::getOrderCode, customerName); } - if (Func.isNotEmpty(customerTelephone)){ - lambda.like(DistributionStockArticleEntity::getOrderCode,customerTelephone); + if (Func.isNotEmpty(customerTelephone)) { + lambda.like(DistributionStockArticleEntity::getOrderCode, customerTelephone); } - lambda.eq(DistributionStockArticleEntity::getId,r.getStockArticleId()); + lambda.eq(DistributionStockArticleEntity::getId, r.getStockArticleId()); List stockArticleEntities = distributionStockArticleService.getBaseMapper().selectList(lambda); List stockArticleVOList = DistributionStockArticleWrapper.build().listVO(stockArticleEntities); stockArticleVOList.forEach(s -> { @@ -2525,23 +2513,23 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl stockArticleEntityList = distributionStockArticleService.getBaseMapper().selectList(qw); List stockArticleVOS = DistributionStockArticleWrapper.build().listVO(stockArticleEntityList); @@ -2562,7 +2550,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl s.getReservationStatus().equals(OrderReservationStatusConstant.yiyueyue.getValue())); - if (flag){ + if (flag) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); log.error("预约选择订单被多次预约"); return R.fail("订单已预约!!!"); } stockArticleList.forEach(s -> { DistributionStockArticleDTO stockArticleDTO = Func.copy(s, DistributionStockArticleDTO.class); - if (s.getIsZero().equals("0")){ + if (s.getIsZero().equals("0")) { WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(s.getWaybillNumber()); if (Func.isNotEmpty(wayBillEntity)) { waybillId.add(wayBillEntity.getId().toString()); - if (Func.isNotEmpty(wayBillEntity.getTakePhone())){ + if (Func.isNotEmpty(wayBillEntity.getTakePhone())) { marketPhone.add(wayBillEntity.getTakePhone()); } } @@ -2661,12 +2649,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl packageList = s.getPackageListInfo(); if (Func.isEmpty(packageList)) { //添加订单下的所有在库订单的包件 - List distributionParcelListEntities = distributionParcelListService.list(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId,s.getId()) + List distributionParcelListEntities = distributionParcelListService.list(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId()) .ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue()) - .ne(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.yiyueyue.getValue()) - .notIn(DistributionParcelListEntity::getOrderPackageStatus,new String[]{OrderPackageStatusConstant.yichuku.getValue(),OrderPackageStatusConstant.yiqianshou.getValue()})); + .ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue()) + .notIn(DistributionParcelListEntity::getOrderPackageStatus, new String[]{OrderPackageStatusConstant.yichuku.getValue(), OrderPackageStatusConstant.yiqianshou.getValue()})); distributionParcelListEntities.forEach(p -> { - if (p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){ + if (p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) { if (!Func.equals(p.getOrderPackageFreezeStatus(), OrderPackageFreezeStatusConstant.yidongjie.getValue()) && !Func.equals(p.getOrderPackageReservationStatus(), OrderPackageReservationStatusConstant.yiyueyue.getValue())) { DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity(); distributionReservationPackageEntity.setReservationId(reservationId); @@ -2691,8 +2679,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { - if (!p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){ - if (!Func.equals(p.getOrderPackageFreezeStatus(), OrderPackageFreezeStatusConstant.yidongjie.getValue()) && !Func.equals(p.getOrderPackageReservationStatus(), OrderPackageReservationStatusConstant.yiyueyue.getValue())){ + if (!p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) { + if (!Func.equals(p.getOrderPackageFreezeStatus(), OrderPackageFreezeStatusConstant.yidongjie.getValue()) && !Func.equals(p.getOrderPackageReservationStatus(), OrderPackageReservationStatusConstant.yiyueyue.getValue())) { DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity(); distributionReservationPackageEntity.setReservationId(reservationId); distributionReservationPackageEntity.setParceListId(p.getId()); @@ -2729,7 +2717,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl parcelNumberVOS = s.getParcelNumberVOS(); AtomicInteger zeroPackageNum = new AtomicInteger(0); - if (Func.isNotEmpty(parcelNumberVOS)){ - //存在零担订单的包件信息 - parcelNumberVOS.forEach(p->{ - if (p.getReservationNum() > 0){ - DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = new DistributionReservationZeroPackageEntity(); - distributionReservationZeroPackageEntity.setQuantity(p.getReservationNum()); - distributionReservationZeroPackageEntity.setReservationId(reservationId); - distributionReservationZeroPackageEntity.setStockArticleId(s.getId()); - distributionReservationZeroPackageEntity.setCategoryName(p.getFirsts()); - distributionReservationZeroPackageEntity.setParcelListId(p.getParcelListId()); - distributionReservationZeroPackageEntity.setType(DistributionTypeConstant.shipie.getValue()); - distributionReservationZeroPackageEntity.setZeroPackageStatus(ReservationOrderStatusConstant.zhengchang.getValue()); - distributionReservationZeroPackageService.save(distributionReservationZeroPackageEntity); - //统计数量 - zeroPackageNum.getAndAdd(distributionReservationZeroPackageEntity.getQuantity()); - //维护零担订单品类对应数量的冻结数量 - DistributionParcelNumberEntity parcelNumberEntity = distributionParcelNumberService.getById(p.getId()); - parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() + distributionReservationZeroPackageEntity.getQuantity()); - distributionParcelNumberService.updateById(parcelNumberEntity); - distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity); - } - }); - } else { - //不存在录入数量的操作，此时进行全部可配送的品类进行添加 - //查询出该零担订单的品类信息 + if (Func.isNotEmpty(parcelNumberVOS)) { + //存在零担订单的包件信息 + parcelNumberVOS.forEach(p -> { + if (p.getReservationNum() > 0) { + DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = new DistributionReservationZeroPackageEntity(); + distributionReservationZeroPackageEntity.setQuantity(p.getReservationNum()); + distributionReservationZeroPackageEntity.setReservationId(reservationId); + distributionReservationZeroPackageEntity.setStockArticleId(s.getId()); + distributionReservationZeroPackageEntity.setCategoryName(p.getFirsts()); + distributionReservationZeroPackageEntity.setParcelListId(p.getParcelListId()); + distributionReservationZeroPackageEntity.setType(DistributionTypeConstant.shipie.getValue()); + distributionReservationZeroPackageEntity.setZeroPackageStatus(ReservationOrderStatusConstant.zhengchang.getValue()); + distributionReservationZeroPackageService.save(distributionReservationZeroPackageEntity); + //统计数量 + zeroPackageNum.getAndAdd(distributionReservationZeroPackageEntity.getQuantity()); + //维护零担订单品类对应数量的冻结数量 + DistributionParcelNumberEntity parcelNumberEntity = distributionParcelNumberService.getById(p.getId()); + parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() + distributionReservationZeroPackageEntity.getQuantity()); + distributionParcelNumberService.updateById(parcelNumberEntity); + distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity); + } + }); + } else { + //不存在录入数量的操作，此时进行全部可配送的品类进行添加 + //查询出该零担订单的品类信息 // List list = distributionParcelNumberService.list(Wrappers.query().lambda().eq(DistributionParcelNumberEntity::getStockArticleId, s.getId())); // List list = distributionParcelNumberMapper.selectZeroOrderPackageList(s.getId()); - List list = distributionStockArticleService.getZeroOrderDetail(s.getId()); - list.forEach(l->{ - if (l.getHandQuantity()>0){ - DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = new DistributionReservationZeroPackageEntity(); - distributionReservationZeroPackageEntity.setQuantity(l.getHandQuantity() - l.getDeliveryQuantity() - l.getOutboundQuantity()); - distributionReservationZeroPackageEntity.setReservationId(reservationId); - distributionReservationZeroPackageEntity.setStockArticleId(s.getId()); - distributionReservationZeroPackageEntity.setParcelListId(l.getParcelListId()); - distributionReservationZeroPackageEntity.setCategoryName(l.getFirsts()); - distributionReservationZeroPackageEntity.setType(DistributionTypeConstant.shipie.getValue()); - distributionReservationZeroPackageEntity.setZeroPackageStatus(ReservationOrderStatusConstant.zhengchang.getValue()); - distributionReservationZeroPackageService.save(distributionReservationZeroPackageEntity); - //统计数量 - zeroPackageNum.getAndAdd(distributionReservationZeroPackageEntity.getQuantity()); - //维护零担订单品类对应数量的冻结数量 - DistributionParcelNumberEntity parcelNumberEntity = distributionParcelNumberService.getById(l.getId()); - parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() + distributionReservationZeroPackageEntity.getQuantity()); - distributionParcelNumberService.updateById(parcelNumberEntity); - distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity); - } - }); - } - distributionReservationStockarticleEntity.setIsZero(IsOrNoConstant.yes.getValue()); - distributionReservationStockarticleEntity.setReservationId(reservationId); - distributionReservationStockarticleEntity.setStockArticleId(s.getId()); - distributionReservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.zhengchang.getValue()); - distributionReservationStockarticleEntity.setStockArticleCode(s.getOrderCode()); - distributionReservationStockarticleEntity.setIsHaveData(s.getIsHaveData()); - distributionReservationStockarticleEntity.setReservationNum(zeroPackageNum.get()); - distributionReservationStockarticleService.save(distributionReservationStockarticleEntity); - packageTotal.getAndAdd(distributionReservationStockarticleEntity.getReservationNum()); + List list = distributionStockArticleService.getZeroOrderDetail(s.getId()); + list.forEach(l -> { + if (l.getHandQuantity() > 0) { + DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = new DistributionReservationZeroPackageEntity(); + distributionReservationZeroPackageEntity.setQuantity(l.getHandQuantity() - l.getDeliveryQuantity() - l.getOutboundQuantity()); + distributionReservationZeroPackageEntity.setReservationId(reservationId); + distributionReservationZeroPackageEntity.setStockArticleId(s.getId()); + distributionReservationZeroPackageEntity.setParcelListId(l.getParcelListId()); + distributionReservationZeroPackageEntity.setCategoryName(l.getFirsts()); + distributionReservationZeroPackageEntity.setType(DistributionTypeConstant.shipie.getValue()); + distributionReservationZeroPackageEntity.setZeroPackageStatus(ReservationOrderStatusConstant.zhengchang.getValue()); + distributionReservationZeroPackageService.save(distributionReservationZeroPackageEntity); + //统计数量 + zeroPackageNum.getAndAdd(distributionReservationZeroPackageEntity.getQuantity()); + //维护零担订单品类对应数量的冻结数量 + DistributionParcelNumberEntity parcelNumberEntity = distributionParcelNumberService.getById(l.getId()); + parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() + distributionReservationZeroPackageEntity.getQuantity()); + distributionParcelNumberService.updateById(parcelNumberEntity); + distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity); + } + }); + } + distributionReservationStockarticleEntity.setIsZero(IsOrNoConstant.yes.getValue()); + distributionReservationStockarticleEntity.setReservationId(reservationId); + distributionReservationStockarticleEntity.setStockArticleId(s.getId()); + distributionReservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.zhengchang.getValue()); + distributionReservationStockarticleEntity.setStockArticleCode(s.getOrderCode()); + distributionReservationStockarticleEntity.setIsHaveData(s.getIsHaveData()); + distributionReservationStockarticleEntity.setReservationNum(zeroPackageNum.get()); + distributionReservationStockarticleService.save(distributionReservationStockarticleEntity); + packageTotal.getAndAdd(distributionReservationStockarticleEntity.getReservationNum()); } distributionAsyncService.changeOrderReservationStatus(stockArticleDTO); // WarehouseWaybillEntity byWaybillNo = warehouseWaybillClient.findByWaybillNo(); @@ -2892,19 +2880,19 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl getReservationZeroOrderDetail(Long id,Long reservationId) { + public List getReservationZeroOrderDetail(Long id, Long reservationId) { List zeroOrderDetail = distributionStockArticleService.getZeroOrderDetail(id); - List parcelNumberVOS= baseMapper.selectReservationZeroOrderDetail(id,reservationId); + List parcelNumberVOS = baseMapper.selectReservationZeroOrderDetail(id, reservationId); Map reservationNum = parcelNumberVOS.stream().collect(Collectors.toMap(DistributionParcelNumberVO::getParcelListId, Function.identity(), (k1, k2) -> k2)); - zeroOrderDetail.forEach(z->{ - if (Func.isNotEmpty(reservationNum.get(z.getParcelListId()))){ + zeroOrderDetail.forEach(z -> { + if (Func.isNotEmpty(reservationNum.get(z.getParcelListId()))) { z.setReservationNum(reservationNum.get(z.getParcelListId()).getReservationNum()); } }); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java index f86ac932b..b7f77cbe4 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java @@ -51,6 +51,9 @@ public class TaskSearchDTO { @ApiModelProperty(value = "托盘ID") private Long trayId; + + + /** * type */ 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 48b1451ac..19113c431 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 @@ -1043,8 +1043,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl0){ TaskContractVO taskContractVO = new TaskContractVO(); @@ -1344,6 +1345,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl zeroQuestDetailEntityList = questDetailService.list(Wrappers.query().lambda() @@ -1395,6 +1398,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl