diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java index 77eb9328d..dde1899af 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java @@ -34,6 +34,8 @@ public class DistributionStockupOrderListVO implements Serializable { private Long areaId; //货区id private Long trayId; //托盘id private Long shelfId; //货架id + private Long parcelListId; //包件id + private Long stockId; //备货id private Long allocationId; //货位id } 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 adfc722dc..eb6c5d157 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 @@ -247,9 +247,6 @@ public class DistributionStockupAppController extends BladeController { @ApiOperation(value = "客户订单列表", notes = "传入stockupDTO") public R orderInfo(@RequestBody StockupDTO stockupDTO) { log.info("##############orderInfo: {}", stockupDTO); -// Long reservationId = 1694647731085103105L;//预约单id -// Long stockArticleId = 1686560469463760898L;//订单id -// Long stockupId = 1694647730430791682L;//备货任务Id Long reservationId = stockupDTO.getReservationId();//预约单id Long stockArticleId = stockupDTO.getStockArticleId();//订单id Long stockupId = stockupDTO.getStockupId();//备货任务Id @@ -465,6 +462,7 @@ public class DistributionStockupAppController extends BladeController { String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "1"); //查询是否货位数据是否该下架 + distributionAsyncService.stockupSelfOffShelf(stockupDTO); return Resp.scanSuccess("扫描成功！", audioValue); case 2: diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index a3f9cdbfc..3afb48544 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -20,6 +20,7 @@ import com.logpm.distribution.dto.DistributionParcelListDTO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.excel.DistributionParcelListExcel; import com.logpm.distribution.vo.DistributionParcelListBaseVO; @@ -88,7 +89,7 @@ public interface DistributionParcelListMapper extends BaseMapper selectOrderInfoSelfList(@Param("reservationId") Long reservationId,@Param("stockupId") Long stockupId, @Param("stockArticleId")Long stockArticleId); + List selectOrderInfoSelfList(@Param("param") StockupDTO stockupDTO); List findALLNoUpShelfPackageByOrderCode(@Param("orderCode") String orderCode,@Param("orderCode") Long warehouseId); 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 a7d0b1ea4..95090fa27 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 @@ -145,8 +145,10 @@ ) positionCode from logpm_distribution_parcel_list ldpl LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id - ldpl.stock_article_id = #{stockArticleId} + ldpl.stock_article_id = #{param.stockArticleId} + and lwug.allocation_id = #{param.allocationId} 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 298775e06..c7e943d81 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 @@ -216,12 +216,21 @@ where ldrs.reservation_id = ldrp.reservation_id and ldrs.stock_article_id = ldpl.stock_article_id and wug.allocation_id = lwug.allocation_id ) END planNum, + CASE WHEN lwug.allocation_id is null THEN ( + select COUNT(ldplw.id) - COUNT(lwu.id) + from logpm_distribution_parcel_list ldplw + LEFT JOIN logpm_warehouse_updown_goods lwu on ldplw.id = lwu.association_id and lwu.association_type = '3' + LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = lwu.association_id + + where ldplw.stock_article_id = ldpl.stock_article_id + ) ELSE ( select COUNT(lds.id) - from logpm_distribution_reservation_package drp - LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = drp.parce_list_id - where drp.reservation_id = ldrp.reservation_id and drp.packet_bar_status in (1,3) and drp.stock_article_id = ldpl.stock_article_id - ) scanNum + from logpm_distribution_parcel_list ldplw + LEFT JOIN logpm_warehouse_updown_goods lwu on ldplw.id = lwu.association_id and lwu.association_type = '3' + LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = lwu.association_id + where ldplw.stock_article_id = ldpl.stock_article_id and lwu.allocation_id = lwug.allocation_id + ) END scanNum from logpm_distribution_reservation_package ldrp LEFT JOIN logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id LEFT JOIN logpm_warehouse_updown_goods lwug on ldpl.id = lwug.association_id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 3ae58665e..3751c6496 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -659,11 +659,17 @@ lddl.id = ldl.delivery_id and ldl.signfor_state =2) ) signNubSr, ( select GROUP_CONCAT(ldr.consignee) from logpm_distribution_reservation ldr where ldr.id in (select lds.reservation_id from logpm_distribution_signfor lds where lds.delivery_id = lddl.id ) - ) consignee + ) consignee, + ( + select sum(reservation_num ) + from logpm_distribution_reservation_stocklist + where reservation_id = ldsf.reservation_id + ) inventoryNub FROM logpm_distribution_delivery_list lddl left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id - left join logpm_distribution_reservation ldr on ldr.id = lddl.reservation_id + left join logpm_distribution_signfor ldsf on ldsf.delivery_id = lddl.id + lddl.is_deleted =0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java index a13ca7c26..556856e99 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java @@ -19,6 +19,7 @@ package com.logpm.distribution.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; import com.logpm.distribution.excel.DistrilbutionBillStockExcel; import com.logpm.distribution.vo.*; @@ -58,7 +59,9 @@ public interface DistrilbutionBillStockMapper extends BaseMapper selectDistrilbutionBillSelf(@Param("reservationId")Long reservationId); - DistributionStockupSelfVO selectDistrilbutionBillPackSelf(@Param("reservationId")Long reservationId,@Param("stockupId") Long stockupId,@Param("allocationId") Long allocationId); + DistributionStockupSelfVO selectDistrilbutionBillPackSelf(@Param("param") StockupDTO stockupDTO); DistributionStockupSelfVO selectDistrilbutionBillPackWuSelf(@Param("reservationId")Long reservationId,@Param("stockupId") Long stockupId); + + DistributionStockupSelfVO selectDistrilbutionBillOverPackWuSelf(@Param("param")StockupDTO stockupDTO); } 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 2154ba222..1cea2bb45 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 @@ -17,7 +17,7 @@ FROM logpm_distribution_parcel_list lpl LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = lpl.id where - lpl.stock_article_id = ldbs.stock_article_id and lwug.allocation_id = #{allocationId} + lpl.stock_article_id = ldbs.stock_article_id and lwug.allocation_id = #{param.allocationId} ) planNum ,( SELECT COUNT(lt.id) FROM logpm_distribution_stock lt @@ -38,17 +38,38 @@ SELECT GROUP_CONCAT( DISTINCT lwug.allocation_title SEPARATOR ',') FROM logpm_distribution_parcel_list lp LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = lp.id and lwug.association_type = 3 - where lp.stock_article_id = ldbs.stock_article_id + where lp.stock_article_id = ldbs.stock_article_id and lwug.allocation_id = #{param.allocationId} ) warehouseArea from logpm_distribution_stockup_info ldsi LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id - - ldsi.stockup_id = #{stockupId} and ldsi.reservation_id = #{reservationId} + ldsi.stockup_id = #{param.stockupId} and ldsi.reservation_id = #{param.reservationId} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java index e33128cfa..b84d74d3d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java @@ -18,6 +18,7 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.excel.DistributionParcelListExcel; import com.logpm.distribution.vo.DistributionParcelListBaseVO; @@ -91,13 +92,10 @@ public interface IDistributionParcelListService extends BaseService selectOrderInfoSelfList(Long reservationId, Long stockArticleId, Long stockupId, Long trayId); + List selectOrderInfoSelfList(StockupDTO stockupDTO); List findALLNoUpShelfPackageByOrderCode(String orderCode,Long warehouseId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java index 4d11c6702..4754c6672 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java @@ -18,6 +18,7 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; import com.logpm.distribution.excel.DistrilbutionBillStockExcel; import com.logpm.distribution.vo.*; @@ -67,12 +68,11 @@ public interface IDistrilbutionBillStockService extends BaseService selectOrderInfoSelfList(Long reservationId, Long stockArticleId, Long stockupId, Long trayId) { - return baseMapper.selectOrderInfoSelfList(reservationId,stockupId,stockArticleId); + public List selectOrderInfoSelfList(StockupDTO stockupDTO) { + return baseMapper.selectOrderInfoSelfList(stockupDTO); } @Override diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 107c2f4bd..d5964ea47 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -39,12 +39,10 @@ import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; import com.logpm.warehouse.entity.WarehouseUpdownGoodsLogEntity; import com.logpm.warehouse.feign.IWarehouseTaryAllocationClient; import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; -import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; import com.logpm.warehouse.feign.IWarehouseUpdownGoodsLogClient; import lombok.AllArgsConstructor; import org.springblade.common.constant.CodeDesEnum; import org.springblade.common.constant.DictBizConstant; -import org.springblade.common.constant.DistributionTypeConstant; import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant; import org.springblade.common.constant.stocklist.StockLockingStatusConstant; import org.springblade.common.constant.stocklist.StockSignfoStatusConstant; @@ -64,9 +62,13 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.xml.ws.BindingType; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; /** * 备货信息表 服务实现类 @@ -479,6 +481,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl Predicate distinctByKey(Function keyExtractor){ + Map map=new ConcurrentHashMap<>(); + return t -> map.putIfAbsent(keyExtractor.apply(t),Boolean.TRUE)==null; + } @Override public List selectStockupOrderList(StockupDTO stockupDTO) { @@ -486,40 +492,91 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distrilbutionBillStockService.selectDistrilbutionBillSelf(reservationId); - //查询包件的库位的 - if(!list.isEmpty()){ - list.forEach( i ->{ - if(ObjectUtils.isNull(i.getAllocationId())){ - //查询包件信息 - List list1 = distributionParcelListService.list(Wrappers.query().lambda() - .eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId()) - ); - if(!list1.isEmpty()){ - list1.forEach( a ->{ - WarehouseUpdownGoodsLogEntity updownGoodsLog = new WarehouseUpdownGoodsLogEntity(); - updownGoodsLog.setAssociationType("3"); - updownGoodsLog.setAssociationId(a.getId()); - updownGoodsLog.setBindingType("2"); //下架 - BasicdataWarehouseEntity my = basicdataWarehouseClient.getMyCurrentWarehouse(); - updownGoodsLog.setWarehouseId(my.getId()); - WarehouseUpdownGoodsLogEntity updownGoods = warehouseUpdownGoodsLogClient.getUpdownGoods(updownGoodsLog); - if(ObjectUtils.isNotNull(updownGoods)){ - i.setAllocation(updownGoods.getPositionCode()); - i.setAllocationId(updownGoods.getAllocationId()); - i.setCompleteStact(true); + //获取有货位的数据 + List collect11 = list.stream().filter(o -> ObjectUtils.isNotNull(o.getAllocationId())).collect(Collectors.toList()); + Set listYou = new HashSet<>(); + collect11.forEach( i -> { + if(listYou.size() > 0){ + boolean b = listYou.stream().anyMatch(o -> o.getAllocationId().equals(i.getAllocationId())); + if(b){ + listYou.forEach( y -> { + if(y.getAllocationId().equals(i.getAllocationId())){ + //相同 + y.setPlanNum(y.getPlanNum()+1); + if(ObjectUtils.isNotNull(i.getStockId())){ + y.setScanNum(y.getScanNum()+1); } - }); - + //t托盘信息 + if(ObjectUtils.isNotNull(y.getTrayId()) && y.getTrayId().equals(i.getTrayId())){ + y.setPallet(y.getPallet()+","+i.getPallet()); + } + } + } ); + }else{ + i.setPlanNum(1); + if(ObjectUtils.isNotNull(i.getStockId())){ + i.setScanNum(1); + }else{ + i.setScanNum(0); } + listYou.add(i); + } + }else{ + i.setPlanNum(1); + if(ObjectUtils.isNotNull(i.getStockId())){ + i.setScanNum(1); + }else{ + i.setScanNum(0); + } + listYou.add(i); + } + } ); + //获取没有货位的数据 + List collect22 = list.stream().filter(o -> ObjectUtils.isNull(o.getAllocationId())).collect(Collectors.toList()); + if(!collect22.isEmpty()){ + collect22.forEach( i -> { + boolean b = listYou.stream().anyMatch(ii -> ObjectUtils.isNull(ii.getAllocationId())); + if(b){ + listYou.forEach( wu -> { + if(ObjectUtils.isNull(wu.getAllocationId())){ + //相同 + wu.setPlanNum(wu.getPlanNum()+1); + if(ObjectUtils.isNotNull(i.getStockId())){ + wu.setScanNum(wu.getScanNum()+1); + } + //托盘信息 + if(ObjectUtils.isNotNull(wu.getTrayId()) && wu.getTrayId().equals(i.getTrayId())){ + wu.setPallet(wu.getPallet()+","+i.getPallet()); + } + if(wu.getPlanNum().equals(wu.getScanNum())){ + wu.setCompleteStact(true); + } + } + }); + }else{ + i.setPlanNum(1); + if(ObjectUtils.isNotNull(i.getStockId())){ + i.setScanNum(1); + }else{ + i.setScanNum(0); + } + listYou.add(i); } }); } - return list; +// List collect = list.stream().filter(o -> ObjectUtils.isNotNull(o.getAllocationId())).collect(Collectors.toList());//不为空 +// List collect2 = collect.stream().filter(distinctByKey(person -> person.getAllocationId())).collect(Collectors.toList()); //去重 +// List collect1 = list.stream().filter(o -> ObjectUtils.isNull(o.getAllocationId())).collect(Collectors.toList());//为空 + //查询包件的库位的 + return new ArrayList<>(listYou); } else { //商 市 //1.根据预约单id 查询到对应的数据 List list = distributionReservationService.selectStockupOrderList(reservationId); +// list.forEach( p ->{ +// +// }); return list; } @@ -649,7 +706,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distributionParcelListService.list(Wrappers.query().lambda() .eq(DistributionParcelListEntity::getStockArticleId, stockupDTO.getStockArticleId()) ); @@ -658,20 +718,23 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl{ WarehouseUpdownGoodsLogEntity updownGoodsLogEntity = new WarehouseUpdownGoodsLogEntity(); updownGoodsLogEntity.setAssociationType("3"); - updownGoodsLogEntity.setAssociationId(stockupDTO.getAllocationId()); + updownGoodsLogEntity.setAssociationId(i.getId()); + updownGoodsLogEntity.setAllocationId(stockupDTO.getAllocationId()); updownGoodsLogEntity.setBindingType("2"); updownGoodsLogEntity.setWarehouseId(myCurrentWarehouse.getId()); - updownGoodsLogEntity.setAllocationId(i.getId()); +// updownGoodsLogEntity.setAllocationId(i.getId()); WarehouseUpdownGoodsLogEntity updownGoods = warehouseUpdownGoodsLogClient.getUpdownGoods(updownGoodsLogEntity); - PackageStockupVO packageStockupVO = new PackageStockupVO(); - packageStockupVO.setOrderCode(i.getOrderCode()); - packageStockupVO.setPackageBarCode(i.getOrderPackageCode()); - packageStockupVO.setGoodsType(1); - packageStockupVO.setGoodsTypeStr("定制品"); - packageStockupVO.setMaterialName(i.getMaterialName()); - packageStockupVO.setIsScanStr("已备货"); - packageStockupVO.setIsScan(2); - listPack.add(packageStockupVO); + if(ObjectUtils.isNotNull(updownGoods)){ + PackageStockupVO packageStockupVO = new PackageStockupVO(); + packageStockupVO.setOrderCode(i.getOrderCode()); + packageStockupVO.setPackageBarCode(i.getOrderPackageCode()); + packageStockupVO.setGoodsType(1); + packageStockupVO.setGoodsTypeStr("定制品"); + packageStockupVO.setMaterialName(i.getMaterialName()); + packageStockupVO.setIsScanStr("已备货"); + packageStockupVO.setIsScan(2); + listPack.add(packageStockupVO); + } }); DistributionStockupOrderInfoVO vo = new DistributionStockupOrderInfoVO(); vo.setReservationId(stockupDTO.getReservationId()); //预约id @@ -690,13 +753,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distributionParcelListService.selectOrderInfoSelfList(stockupDTO.getReservationId(), stockupDTO.getStockArticleId(), stockupDTO.getStockupId(), stockupDTO.getTrayId()); + List list = distributionParcelListService.selectOrderInfoSelfList(stockupDTO); Iterator iterator = list.iterator(); if(Objects.isNull(stockupDTO.getAllocationId())){ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java index 5fe91f481..9fc353d58 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java @@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; import com.logpm.distribution.excel.DistrilbutionBillStockExcel; import com.logpm.distribution.mapper.DistrilbutionBillStockMapper; @@ -88,14 +89,11 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl