From 946d450d383f7c9882df8a37cbd05210d6c460ac Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 28 Dec 2023 18:42:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E5=8C=85=E4=BB=B6=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E8=AE=A2=E5=8D=95=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?= =?UTF-8?q?=202.=E5=B9=B2=E7=BA=BF=E5=AF=B9=E5=BA=94=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ModuleNameConstant.java | 2 +- .../logpm/trunkline/dto/BillladingDTO.java | 2 ++ .../entity/TrunklineBillladingEntity.java | 3 +++ .../feign/DistributionParcelListClient.java | 22 ++++++++-------- .../feign/DistributionStockListClient.java | 1 - .../controller/BillladingController.java | 10 ++++---- .../mapper/TrunklineBillladingMapper.java | 3 +-- .../mapper/TrunklineBillladingMapper.xml | 3 ++- .../service/ITrunklineBillladingService.java | 2 +- .../impl/TrunklineBillladingServiceImpl.java | 16 +++++------- .../impl/WarehouseUpdownTypeServiceImpl.java | 25 ++++++++++++++++++- 11 files changed, 55 insertions(+), 34 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 1baf7825b..153720380 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,7 +8,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH ="-tjj"; + public static final String DEVAUTH =""; /** * 工厂对接服务名称 diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java index f0f097378..b9c369dd9 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java @@ -14,6 +14,8 @@ public class BillladingDTO extends TrunklineBillladingEntity { private Integer pageNum; private Integer pageSize; + private List waybillNos = new ArrayList<>(); + private List billladingLineList = new ArrayList<>(); private List billladingWaybillList = new ArrayList<>(); diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java index 9e2e3e4e6..4023620ac 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java @@ -52,6 +52,9 @@ public class TrunklineBillladingEntity extends TenantEntity { /** 司机电话 */ @ApiModelProperty(name = "司机电话",notes = "") private String driverPhone ; + /** 承运商id */ + @ApiModelProperty(name = "承运商id",notes = "") + private Long carrierId ; /** 承运商 */ @ApiModelProperty(name = "承运商",notes = "") private String carrierName ; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index 3c83c5ccf..ecde9ee1d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -29,7 +29,6 @@ import com.logpm.distribution.service.IDistributionStockArticleService; import com.logpm.distribution.vo.DistributionParcelListVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.common.exception.CustomerException; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -41,7 +40,6 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; /** * 在库订单包件清单 Feign实现类 @@ -158,16 +156,16 @@ public class DistributionParcelListClient implements IDistributionParcelListClie @Override public void updatePackageGroundingStatus(String orderPackageCode, String groundingStatus,Long warehouseId) { distributionParcelListService.updateGroundingStatus(orderPackageCode,groundingStatus,warehouseId); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("order_package_code",orderPackageCode) - .eq("warehouse_id",warehouseId); - DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(queryWrapper); - if(Objects.isNull(parcelListEntity)){ - log.error("##################updatePackageGroundingStatus: 包件不存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId); - throw new CustomerException(405,"包件不存在"); - } - String orderCode = parcelListEntity.getOrderCode(); - distributionStockArticleService.updateOrderInfo(orderCode,warehouseId); +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.eq("order_package_code",orderPackageCode) +// .eq("warehouse_id",warehouseId); +// DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(queryWrapper); +// if(Objects.isNull(parcelListEntity)){ +// log.error("##################updatePackageGroundingStatus: 包件不存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId); +// throw new CustomerException(405,"包件不存在"); +// } +// String orderCode = parcelListEntity.getOrderCode(); +// distributionStockArticleService.updateOrderInfo(orderCode,warehouseId); } @Override diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java index 78eb03c67..06b7328c6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java @@ -199,5 +199,4 @@ public class DistributionStockListClient implements IDistributionStockListClient public void updeteSourceTypeById(String sourceType, Long stockListId) { distributionStockListService.updeteSourceTypeById(sourceType,stockListId); } - } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java index 8746511c3..cc805b975 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java @@ -410,12 +410,12 @@ public class BillladingController { billladingDTO.setWarehouseId(myCurrentWarehouse.getId()); billladingDTO.setWarehouseName(myCurrentWarehouse.getName()); - if(Objects.isNull(billladingId)){ - log.warn(method+"提货单id不能为空 billladingId={}",billladingId); - return R.fail(405,"提货单id不能为空"); - } +// if(Objects.isNull(billladingId)){ +// log.warn(method+"提货单id不能为空 billladingId={}",billladingId); +// return R.fail(405,"提货单id不能为空"); +// } - return trunklineBillladingService.findWaybillListNotBillladingId(billladingId); + return trunklineBillladingService.findWaybillListNotBillladingId(billladingDTO); }catch (CustomerException e){ log.error(e.message,e); return R.fail(e.code,e.message); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java index 2ebd27061..49d83dce5 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.BillladingDTO; import com.logpm.trunkline.entity.TrunklineBillladingEntity; import com.logpm.trunkline.vo.TrunklineBillladingVO; -import com.logpm.trunkline.vo.TrunklineBillladingWaybillVO; import com.logpm.warehouse.vo.WarehouseWaybillVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,5 +18,5 @@ public interface TrunklineBillladingMapper extends BaseMapper pageInfoList(IPage page, @Param("param") BillladingDTO billladingDTO); - List findWaybillListNotBillladingId(@Param("list") List waybillInfoListByBillladingId); + IPage findWaybillListNotBillladingId(IPage page,@Param("list") List waybillNos); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml index 1a7f7296e..f70188fb6 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml @@ -76,8 +76,9 @@ from logpm_warehouse_waybill lww where lww.stock_count != total_count + and lww.waybill_no not in - #{item.waybillNo} + #{item} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java index 0cdd982b0..ac49212d3 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java @@ -28,7 +28,7 @@ public interface ITrunklineBillladingService extends BaseService billladingWaybillEnterList); - R findWaybillListNotBillladingId(Long billladingId); + R findWaybillListNotBillladingId(BillladingDTO billladingDTO); R addWaybillToBillladingId(BillladingDTO billladingDTO); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java index d1bd12800..76e3abe93 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java @@ -444,18 +444,14 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl waybillInfoListByBillladingId = billladingWaybillService.findWaybillInfoListByBillladingId(billladingId); - - List ls = baseMapper.findWaybillListNotBillladingId(waybillInfoListByBillladingId); + IPage page = new Page<>(); + page.setCurrent(billladingDTO.getPageNum()); + page.setSize(billladingDTO.getPageSize()); + List waybillNos = billladingDTO.getWaybillNos(); + IPage ls = baseMapper.findWaybillListNotBillladingId(page,waybillNos); return R.data(ls); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 34386ffe1..e8a514992 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -1191,6 +1191,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl upShelfPackageList,Long warehouseId) { int num = 0; + Set orderSet = new TreeSet<>(); for (UpShelfPackageDTO upShelfPackageDTO:upShelfPackageList){ String orderPackageCode = upShelfPackageDTO.getOrderPackageCode(); //查询包件在哪个库位上 @@ -1206,6 +1207,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl upShelfPackageList,Long warehouseId) { int num = 0; + Set orderSet = new TreeSet<>(); for (UpShelfPackageDTO upShelfPackageDTO:upShelfPackageList){ String orderPackageCode = upShelfPackageDTO.getOrderPackageCode(); //查询包件在哪个库位上 @@ -1268,6 +1277,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl setOrder = new TreeSet<>(); for (WarehouseUpdownGoodsEntity updownGoodsEntity:updownGoodsList){ String associationType = updownGoodsEntity.getAssociationType(); String associationValue = updownGoodsEntity.getAssociationValue(); @@ -1540,11 +1557,17 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl