diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java index 14c7f3ab5..e2b2f0d32 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java @@ -67,7 +67,7 @@ public class DistributionStockupVO extends DistributionStockupEntity { private String stockArticleId; private String orderCode; //订单自编号 private String descriptionGoods; - private String reservationNum; + private Integer reservationNum; //预约数量 private Date stockupDate; private Integer number; private String goodsAllocation; //货位 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index 1dc7e0a38..5ae9794fc 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -46,6 +46,7 @@ import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.apache.commons.codec.Charsets; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; @@ -210,6 +211,12 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl stockUp(BasicdataGoodsAreaEntity warehouseWarehouse) { + BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseService.getMyCurrentWarehouse(); + Optional warehouseOptional = Optional.ofNullable(myCurrentWarehouse); + if(!warehouseOptional.isPresent()){ + throw new ServiceException("仓库信息未选择，请选择！"); + } + warehouseWarehouse.setDepartment(String.valueOf(myCurrentWarehouse.getDepartment())); return baseMapper.stockUp(warehouseWarehouse); } 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 7485e3709..84bfb06a8 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 @@ -532,9 +532,7 @@ public class DistributionStockupAppController extends BladeController { // try{ //设置lockey String lockKey = stockupDTO.getPacketBarCode()+stockupDTO.getStockupId(); - RLock lock = - - new RedissonConfig().redisson().getLock(lockKey); + RLock lock = new RedissonConfig().redisson().getLock(lockKey); if(lock.isLocked()){ String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "2"); return Resp.scanFail("重复扫描！", audioValue2); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.java index e3830dd8f..0b52125f9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.java @@ -62,6 +62,11 @@ public interface DistributionStockMapper extends BaseMapper selectReservationDelivery(@Param("stockupId")String stockupId); + /** + * 根据包件id查询有多少包件 + * @param pageId + * @return + */ DistributionStockVO selectParcelList(@Param("pageId")Long pageId); /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.xml index e4954f3c0..d61f4e52b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.xml @@ -85,7 +85,7 @@ where ldbs.bill_lading_id = ( select reservation_id from logpm_distribution_stockup_info - where stockup_id = '1693559371180425218' + where stockup_id = #{pageId} ) ) whole from logpm_distrilbution_bill_stock ldbs LEFT JOIN logpm_distribution_parcel_list ldpl on ldbs.stock_article_id = ldpl.stock_article_id 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 4f6325be5..22c6a4a11 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 @@ -230,6 +230,7 @@ public class DistributionStockServiceImpl extends BaseServiceImplquery().lambda().eq()); + + + + }); if(ObjectUtils.isNotNull(distributionStocks.getStockupType()) && distributionStocks.getStockupType().equals("ZT")){ - //修改备货状态 + //修改备货状态 自提 getUpdateOrderState(distributionStocks.getStockupId(),3 ); }else{ //修改备货状态 @@ -258,9 +264,11 @@ public class DistributionStockServiceImpl extends BaseServiceImpl stockVOptional = Optional.ofNullable(distributionStockVO); + if(stockVOptional.isPresent()){ + //已经备货完成 if(distributionStockVO.getScanned() == 0){ //修改 DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity(); @@ -274,18 +282,18 @@ public class DistributionStockServiceImpl extends BaseServiceImpl detailOrderOwnSelf(IPage page, Long parseLong) { IPage distributionStockupVOIPage = baseMapper.detailOrderOwnSelf(page, parseLong); distributionStockupVOIPage.getRecords().forEach(o -> { + //查询有没有零担的数据 + List list = reservationZeroPackageService.list(Wrappers.query().lambda() + .eq(DistributionReservationZeroPackageEntity::getStockArticleId, o.getStockArticleId()) + .eq(DistributionReservationZeroPackageEntity::getIsDeleted, 0) +// .apply("zero_package_status in (1,3)") + .in(DistributionReservationZeroPackageEntity::getZeroPackageStatus, "1", "3") + ); + if(!list.isEmpty()){ + int sum = list.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum(); + o.setReservationNum(sum); + } if (ObjectUtils.isNotNull(o.getStockArticleId())) { Integer integer = distributionStockService.selectCount(Long.parseLong(o.getStockArticleId()),parseLong); o.setNumber(integer);