From 586ef3e71e826a0493ab3b77316bf8d3fc3fd5ba Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 29 Feb 2024 19:12:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-bug=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E5=8D=95=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataForwardingUnitEntity.java | 65 +++++++++++++++++++ .../feign/IBasicdataForwardingUnitClient.java | 20 ++++++ .../com/logpm/trunkline/vo/OpenOrderVO.java | 7 ++ .../feign/BasicdataForwardingUnitClient.java | 31 +++++++++ .../mapper/BasicdataForwardingUnitMapper.java | 11 ++++ .../IBasicdataForwardingUnitService.java | 7 ++ .../BasicdataForwardingUnitServiceImpl.java | 16 +++++ .../mapper/TrunklineAdvanceDetailMapper.xml | 2 +- .../mapper/TrunklineCarsLoadMapper.xml | 1 + .../mapper/TrunklineCarsLoadScanMapper.xml | 1 + .../service/impl/OpenOrderServiceImpl.java | 23 +++++-- 11 files changed, 178 insertions(+), 6 deletions(-) create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataForwardingUnitEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataForwardingUnitClient.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataForwardingUnitClient.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataForwardingUnitMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataForwardingUnitService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataForwardingUnitServiceImpl.java diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataForwardingUnitEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataForwardingUnitEntity.java new file mode 100644 index 000000000..52f4d7f1c --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataForwardingUnitEntity.java @@ -0,0 +1,65 @@ +package com.logpm.basicdata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("logpm_basicdata_forwarding_unit") +@ApiModel(value = "BasicdataForwardingUnit对象", description = "默认仓库发货单位表") +@EqualsAndHashCode(callSuper = true) +public class BasicdataForwardingUnitEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + + + + /** + * 仓库id + */ + @ApiModelProperty(value = "仓库id") + private Long warehouseId; + + @ApiModelProperty(value = "仓库名称") + private String warehouseName; + + @ApiModelProperty(value = "用户id") + private Long userId; + + /** + * 客户id + */ + @ApiModelProperty(value = "客户id") + private Long clientId; + + @ApiModelProperty(value = "客户名称") + private String clientName; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataForwardingUnitClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataForwardingUnitClient.java new file mode 100644 index 000000000..423ccbf14 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataForwardingUnitClient.java @@ -0,0 +1,20 @@ +package com.logpm.basicdata.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@FeignClient( + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME +) +public interface IBasicdataForwardingUnitClient { + + String API_PREFIX = "forwardingUnit/client"; + String TOP = API_PREFIX + "/top"; + + + @GetMapping(API_PREFIX+"/findForwardingUnitByWarehouseId") + Long findForwardingUnitByWarehouseIdAndUserId(@RequestParam("warehouseId") Long warehouseId,@RequestParam("userId") Long userId); + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java index 391611967..ed0f0e146 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java @@ -23,8 +23,15 @@ public class OpenOrderVO implements Serializable { private Long destinationWarehouseId;//目的仓Id private String destination;//到站 + private String destinationCode;//到站编码 private List destinationArray;//到站 + private Long shipperClientId;//发货单位clientId + private String shipper;//发货单位 + private String shipperName;//发货人 + private String shipperMobile;//发货人电话 + private String shipperAddress;//发货单位地址 + private Long consigneeClientId;//收货单位clientId private String consignee;//收货单位 private String consigneeName;//收货人 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataForwardingUnitClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataForwardingUnitClient.java new file mode 100644 index 000000000..57e8d44a5 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataForwardingUnitClient.java @@ -0,0 +1,31 @@ +package com.logpm.basicdata.feign; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.logpm.basicdata.entity.BasicdataForwardingUnitEntity; +import com.logpm.basicdata.service.IBasicdataForwardingUnitService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Objects; + +@ApiIgnore() +@RestController +@AllArgsConstructor +public class BasicdataForwardingUnitClient implements IBasicdataForwardingUnitClient{ + + private final IBasicdataForwardingUnitService basicdataForwardingUnitService; + + @Override + public Long findForwardingUnitByWarehouseIdAndUserId(Long warehouseId, Long userId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("warehouse_id",warehouseId) + .eq("user_id",userId); + + BasicdataForwardingUnitEntity forwardingUnitEntity = basicdataForwardingUnitService.getOne(queryWrapper); + if(!Objects.isNull(forwardingUnitEntity)){ + return forwardingUnitEntity.getClientId(); + } + return null; + } +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataForwardingUnitMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataForwardingUnitMapper.java new file mode 100644 index 000000000..9192e3050 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataForwardingUnitMapper.java @@ -0,0 +1,11 @@ +package com.logpm.basicdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.basicdata.entity.BasicdataForwardingUnitEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BasicdataForwardingUnitMapper extends BaseMapper { + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataForwardingUnitService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataForwardingUnitService.java new file mode 100644 index 000000000..b33601025 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataForwardingUnitService.java @@ -0,0 +1,7 @@ +package com.logpm.basicdata.service; + +import com.logpm.basicdata.entity.BasicdataForwardingUnitEntity; +import org.springblade.core.mp.base.BaseService; + +public interface IBasicdataForwardingUnitService extends BaseService { +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataForwardingUnitServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataForwardingUnitServiceImpl.java new file mode 100644 index 000000000..5b4e2331a --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataForwardingUnitServiceImpl.java @@ -0,0 +1,16 @@ +package com.logpm.basicdata.service.impl; + +import com.logpm.basicdata.entity.BasicdataForwardingUnitEntity; +import com.logpm.basicdata.mapper.BasicdataForwardingUnitMapper; +import com.logpm.basicdata.service.IBasicdataForwardingUnitService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@AllArgsConstructor +public class BasicdataForwardingUnitServiceImpl extends BaseServiceImpl implements IBasicdataForwardingUnitService { + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index 7deb63051..3791a5532 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -13,7 +13,7 @@ select ltad.id id, ltad.warehouse_id warehouseId, ltad.warehouse_name warehouseName, - ltad.waybill_no waybillNo, + lta.waybill_no waybillNo, ltad.order_code orderCode, lta.train_number trainNumber, ltad.package_status packageStatus, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index d54e84d3d..e06799bf1 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -354,6 +354,7 @@ and ltcl.load_status != '0' + order by ltcl.create_time desc diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 4f800b0b6..2d55a0a59 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -74,6 +74,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { private final ITrunklineWaybillPackageService trunklineWaybillPackageService; private final IBasicMaterialClient basicMaterialClient; private final IBasicdataBrandClient basicdataBrandClient; + private final IBasicdataForwardingUnitClient basicdataForwardingUnitClient; @Override public IPage advancePageList(AdvanceDTO advanceDTO) { @@ -130,8 +131,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService { openOrderVO.setDepartureWarehouseName(basicdataWarehouseEntity.getName()); openOrderVO.setDepartureWarehouseId(warehouseId); openOrderVO.setTotalNum(totalNum); - - //发货单位 TODO + //发货单位 + Long shipperId = basicdataForwardingUnitClient.findForwardingUnitByWarehouseIdAndUserId(warehouseId,AuthUtil.getUserId()); + if(!Objects.isNull(shipperId)){ + BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(shipperId); + if(!Objects.isNull(basicdataClientEntity)){ + openOrderVO.setShipperClientId(shipperId); + openOrderVO.setShipper(basicdataClientEntity.getClientName()); + openOrderVO.setShipperName(basicdataClientEntity.getLinkman()); + openOrderVO.setShipperMobile(basicdataClientEntity.getPhone()); + openOrderVO.setShipperAddress(basicdataClientEntity.getDetailedly()); + } + } //收货单位-----根据三方商场找到对应的clientId @@ -151,20 +162,22 @@ public class OpenOrderServiceImpl implements IOpenOrderService { destinationArray.add(bladeRegionProvinceId); destinationArray.add(bladeRegionCityId); String name = regionFeign.getName(bladeRegionCityId); + String areaId = bladeRegionCityId; if(!StringUtil.isBlank(badeRegionAreaId)){ destinationArray.add(badeRegionAreaId); name = regionFeign.getName(badeRegionAreaId); + areaId = badeRegionAreaId; } openOrderVO.setDestination(name); + openOrderVO.setDestinationCode(areaId); openOrderVO.setDestinationArray(destinationArray); openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods()); //查询目的仓数据 - List storageServicesEntities = basicdataStorageServicesClient.findBySendWarehouseIdAndClientId(warehouseId,clientId); - if(!storageServicesEntities.isEmpty()){ - BasicdataStorageServicesEntity basicdataStorageServicesEntity = storageServicesEntities.get(0); + BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId); + if(!Objects.isNull(basicdataStorageServicesEntity)){ openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId()); openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName()); }