From 4e2e8b753acf55903bba00d92ac1254a9e5bede7 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 9 Jan 2024 20:12:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 4 +- .../common/launch/LauncherServiceImpl.java | 8 +- .../IBasicdataStorageServicesClient.java | 3 + .../entity/DistributionParcelListEntity.java | 3 + .../feign/IDistributionParcelListClient.java | 3 + .../logpm/trunkline/dto/BillladingDTO.java | 4 + .../com/logpm/trunkline/dto/LoadCarsDTO.java | 1 + .../vo/TrunklineBillladingDetailListVO.java | 13 ++ .../vo/TrunklineBillladingDetailVO.java | 15 ++ .../feign/BasicdataStorageServicesClient.java | 14 ++ .../BasicdataStorageServicesMapper.java | 2 + .../mapper/BasicdataStorageServicesMapper.xml | 7 + .../IBasicdataStorageServicesService.java | 2 + .../impl/BasicdataCodeServiceImpl.java | 2 +- .../BasicdataStorageServicesServiceImpl.java | 5 + .../feign/DistributionParcelListClient.java | 12 + .../IDistributionParcelListService.java | 4 + .../DistributionParcelListServiceImpl.java | 68 ++++++ .../DistributionStockArticleServiceImpl.java | 6 +- .../src/main/resources/application-dev.yml | 2 +- .../api/BillladingApiController.java | 69 ++++++ .../controller/CarsLoadController.java | 6 +- .../mapper/TrunklineAdvanceDetailMapper.java | 2 + .../mapper/TrunklineAdvanceDetailMapper.xml | 8 + .../mapper/TrunklineBillladingMapper.java | 7 + .../mapper/TrunklineBillladingMapper.xml | 55 ++++- .../TrunklineBillladingPackageMapper.xml | 4 +- .../mapper/TrunklineCarsLoadMapper.xml | 93 ++++---- .../mapper/TrunklineCarsOrderMapper.xml | 17 +- .../ITrunklineAdvanceDetailService.java | 2 + .../service/ITrunklineBillladingService.java | 6 + .../service/impl/OpenOrderServiceImpl.java | 69 ++++-- .../TrunklineAdvanceDetailServiceImpl.java | 5 + .../impl/TrunklineAdvanceServiceImpl.java | 25 ++- .../impl/TrunklineBillladingServiceImpl.java | 36 ++- ...TrunklineBillladingWaybillServiceImpl.java | 10 +- .../impl/TrunklineCarsLoadServiceImpl.java | 54 +++-- .../impl/WarehouseTrayTypeServiceImpl.java | 205 ++++++++++++++++-- .../src/main/resources/application-dev.yml | 2 +- 39 files changed, 693 insertions(+), 160 deletions(-) create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailVO.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 5c1b3fa51..b3591064f 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -45,7 +45,7 @@ public interface LauncherConstant { /** * nacos dev 地址 */ - String NACOS_DEV_ADDR = "192.168.10.100:8848"; + String NACOS_DEV_ADDR = "192.168.10.46:8848"; /** @@ -77,7 +77,7 @@ public interface LauncherConstant { /** * seata dev 地址 */ - String SEATA_DEV_ADDR = "192.168.10.100:8091"; + String SEATA_DEV_ADDR = "192.168.10.46:8091"; /** diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index 7d5c44bb6..2749bc113 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -41,10 +41,10 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); - PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); - PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); - PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); - PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); +// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); +// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); +// PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); +// PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java index 8eb7cb4e7..143514715 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java @@ -51,4 +51,7 @@ public interface IBasicdataStorageServicesClient { @GetMapping(API_PREFIX+"/findBySendWarehouseIdAndClientId") List findBySendWarehouseIdAndClientId(@RequestParam Long warehouseId, @RequestParam Long clientId); + + @GetMapping(API_PREFIX+"/findEntityBySendWarehouseIdAndClientId") + BasicdataStorageServicesEntity findEntityBySendWarehouseIdAndClientId(@RequestParam Long warehouseId, @RequestParam Long clientId); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index f35c72f5e..c8a08bab3 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -375,6 +375,9 @@ public class DistributionParcelListEntity extends TenantEntity { @ApiModelProperty(value = "是否中转") private Integer isTransfer;//是否中转 + @ApiModelProperty(value = "暂存单id") + private Long advanceId;//暂存单id + // /** // * 配送状态 // */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index 6ed13419e..c30f89c04 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -131,4 +131,7 @@ public interface IDistributionParcelListClient { @GetMapping(API_PREFIX+"/updateTransferStatus") void updateTransferStatus(@RequestParam String orderCode, @RequestParam Long warehouseId, @RequestParam Integer isTransfer); + + @GetMapping(API_PREFIX+"/updateEntityByOpenOrder") + void updateEntityByOpenOrder(@RequestParam Long advanceId, @RequestParam Long warehouseId, @RequestParam Long waybillId); } 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 b9c369dd9..656e2b06b 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 @@ -37,4 +37,8 @@ public class BillladingDTO extends TrunklineBillladingEntity { private String clientName; + + private String startDateStr; + private String endDateStr; + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index b8f06fa47..1f0e63bee 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -36,6 +36,7 @@ public class LoadCarsDTO implements Serializable { private Long carsOrderId; + private String carsOrderIds; private Integer planNum; private String isCustomer; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java new file mode 100644 index 000000000..3981d6b96 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java @@ -0,0 +1,13 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class TrunklineBillladingDetailListVO implements Serializable { + + private String orderPackageCode; + private String packageStatus; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailVO.java new file mode 100644 index 000000000..0d3143bc6 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailVO.java @@ -0,0 +1,15 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class TrunklineBillladingDetailVO implements Serializable { + + private String serviceNum; + private String orderCode; + private Integer totalNum; + private Integer scanNum; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java index d7a29cc66..778bea708 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java @@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import java.util.List; +import java.util.Objects; /** * 门店服务仓库表 Feign实现类 @@ -63,4 +64,17 @@ public class BasicdataStorageServicesClient implements IBasicdataStorageServices return basicdataStorageServicesService.list(queryWrapper); } + @Override + public BasicdataStorageServicesEntity findEntityBySendWarehouseIdAndClientId(Long warehouseId, Long clientId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("send_warehouse_id",warehouseId) + .eq("client_id",clientId) + .eq("is_deleted",0); + BasicdataStorageServicesEntity servicesEntity = basicdataStorageServicesService.getOne(queryWrapper); + if(Objects.isNull(servicesEntity)){ + servicesEntity = basicdataStorageServicesService.findEntityBySendWarehouseIdIsNullAndClientId(clientId); + } + return servicesEntity; + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java index c1f9ce265..a257f2f2d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java @@ -51,4 +51,6 @@ public interface BasicdataStorageServicesMapper extends BaseMapper exportBasicdataStorageServices(@Param("ew") Wrapper queryWrapper); + + BasicdataStorageServicesEntity findEntityBySendWarehouseIdIsNullAndClientId(@Param("clientId") Long clientId); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml index dbc087151..684861a99 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml @@ -51,4 +51,11 @@ SELECT * FROM logpm_basicdata_storage_services ${ew.customSqlSegment} + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java index 4416f9441..21c1af991 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java @@ -55,4 +55,6 @@ public interface IBasicdataStorageServicesService extends BaseService pageList(IPage page, Map basicdataStorageServices); + + BasicdataStorageServicesEntity findEntityBySendWarehouseIdIsNullAndClientId(Long clientId); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java index cdb1dac88..4b881368c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java @@ -146,7 +146,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { bladeRedis.expireAt(key,CommonUtil.getDayEnd()); } - return warehouseCode+f+dateShort+CommonUtil.geFourNumber(incr,5); + return warehouseCode+f+CommonUtil.geFourNumber(incr,5); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java index d3188e31e..c23ddafcb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java @@ -153,4 +153,9 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl set = distributionParcelListService.updateEntityByOpenOrder(advanceId, warehouseId, waybillId); + + for (String orderCode : set) { + distributionStockArticleService.updateOrderInfo(orderCode,warehouseId); + } + + } } 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 28f749d30..0d0474983 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 @@ -29,6 +29,7 @@ import org.springblade.core.tool.api.R; import java.util.List; import java.util.Map; +import java.util.Set; /** * 在库订单包件清单 服务类 @@ -171,4 +172,7 @@ public interface IDistributionParcelListService extends BaseService updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 01eea1e19..d8c200cee 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -25,7 +25,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basic.entity.BasicMaterialEntity; import com.logpm.basic.feign.IBasicMaterialClient; +import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataClientClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.dto.DistributionParcelListDTO; import com.logpm.distribution.dto.app.StockupDTO; @@ -39,12 +41,15 @@ import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.DistributionParcelListZeroVO; import com.logpm.distribution.vo.PackageStockupVO; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; +import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; +import com.logpm.warehouse.feign.IWarehouseWaybillClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.order.OrderStockupStatusConstant; +import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; @@ -95,6 +100,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList) { @@ -640,6 +648,66 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId) { + WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); + if(Objects.isNull(waybillEntity)){ + log.warn("############updateEntityByOpenOrder: 运单信息不存在 waybillId={}",waybillId); + throw new CustomerException(405,"运单信息不存在"); + } + Long departureWarehouseId = waybillEntity.getDepartureWarehouseId(); + String departureWarehouseName = waybillEntity.getDepartureWarehouseName(); + Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId(); + String destinationWarehouseName = waybillEntity.getDestinationWarehouseName(); + String waybillNo = waybillEntity.getWaybillNo(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("advance_id",advanceId) + .eq("warehouse_id",warehouseId) + .eq("is_deleted",0); + List listEntityList = baseMapper.selectList(queryWrapper); + Set orderCodes = new TreeSet<>(); + for (DistributionParcelListEntity parcelListEntity : listEntityList) { + parcelListEntity.setWaybillId(waybillId+""); + parcelListEntity.setWaybillNumber(waybillNo); + parcelListEntity.setSendWarehouseId(departureWarehouseId); + parcelListEntity.setSendWarehouseName(departureWarehouseName); + parcelListEntity.setAcceptWarehouseId(destinationWarehouseId); + parcelListEntity.setAcceptWarehouseName(destinationWarehouseName); + if(departureWarehouseId.equals(destinationWarehouseId)){ + parcelListEntity.setIsTransfer(0); + }else{ + parcelListEntity.setIsTransfer(1); + } + orderCodes.add(parcelListEntity.getOrderCode()); + } + updateBatchById(listEntityList); + + + for (String orderCode : orderCodes) { + QueryWrapper stockArticleEntityQueryWrapper = new QueryWrapper<>(); + stockArticleEntityQueryWrapper.eq("order_code",orderCode) + .eq("warehouse_id",warehouseId) + .eq("is_deleted",0); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectOne(stockArticleEntityQueryWrapper); + if(Objects.isNull(stockArticleEntity)){ + log.error("############updateEntityByOpenOrder: 未找到订单信息 orderCode={}",orderCode); + continue; + } + Long consigneeId = waybillEntity.getConsigneeId(); + BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId); + stockArticleEntity.setMallId(consigneeId); + stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); + stockArticleEntity.setMallName(basicdataClientEntity.getClientName()); + stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName()); + stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile()); + stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress()); + stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName()); + distributionStockArticleMapper.updateById(stockArticleEntity); + } + return orderCodes; + } + /** * @param distributionParcelList 包件信息 * @return diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index a73d3c38e..ce50109ae 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -54,7 +54,6 @@ import org.springblade.common.constant.order.OrderStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; -import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; @@ -1317,7 +1316,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl pages = billladingService.billladingList(billladingDTO); + + return R.data(pages); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error("############sendOrders: 系统异常",e); + return R.fail(500,"############sendOrders: 系统异常"); + } + } + + + @ResponseBody + @PostMapping("/findAdvanceDetailList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询暂存单明细列表", notes = "传入billladingDTO") + public R findAdvanceDetailList(@RequestBody BillladingDTO billladingDTO) { + String method = "############findAdvanceDetailList: "; + log.info(method+"请求参数{}",billladingDTO); + String orderCode = billladingDTO.getOrderCode(); + try{ + + //当前登录人选择的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + return R.fail(403,"仓库信息为空"); + } + billladingDTO.setWarehouseId(myCurrentWarehouse.getId()); + + if(StringUtil.isBlank(orderCode)){ + log.warn(method+"订单号为空 orderCode={}",orderCode); + return R.fail(403,"订单号为空"); + } + + IPage pages = billladingService.findAdvanceDetailList(billladingDTO); + + return R.data(pages); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error("############sendOrders: 系统异常",e); + return R.fail(500,"############sendOrders: 系统异常"); + } + } + + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index 0be4cb655..8b87e659e 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -417,7 +417,7 @@ public class CarsLoadController { public R removeCarsOrderByCarsOrderId(@RequestBody LoadCarsDTO loadCarsDTO) { String method = "############removeCarsOrderByCarsOrderId: "; log.info(method+"请求参数{}",loadCarsDTO); - Long carsOrderId = loadCarsDTO.getCarsOrderId(); + String carsOrderIds = loadCarsDTO.getCarsOrderIds(); try{ //当前登录人选择的仓库 @@ -427,8 +427,8 @@ public class CarsLoadController { return R.fail(400,"仓库信息为空"); } loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); - if(Objects.isNull(carsOrderId)){ - log.warn(method+"节点订单id为空 carsOrderId={}",carsOrderId); + if(StringUtil.isBlank(carsOrderIds)){ + log.warn(method+"节点订单id为空 carsOrderIds={}",carsOrderIds); return R.fail(400,"节点订单id为空"); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java index 7885d6d7d..599377cc9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java @@ -27,4 +27,6 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper findBillladingPackageByAdvanceIdsAnd(@Param("list") List advanceIds); IPage advanceDetailPageList(IPage page, @Param("param") AdvanceDetailDTO advanceDetailDTO); + + Integer getIncomingNum(@Param("advanceId") Long advanceId); } 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 9093cbbbc..f7f50f5af 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 @@ -117,4 +117,12 @@ order by ltad.create_time desc + + 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 49d83dce5..4299100db 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 @@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.BillladingDTO; import com.logpm.trunkline.entity.TrunklineBillladingEntity; +import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO; +import com.logpm.trunkline.vo.TrunklineBillladingDetailVO; import com.logpm.trunkline.vo.TrunklineBillladingVO; import com.logpm.warehouse.vo.WarehouseWaybillVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -19,4 +22,8 @@ public interface TrunklineBillladingMapper extends BaseMapper pageInfoList(IPage page, @Param("param") BillladingDTO billladingDTO); IPage findWaybillListNotBillladingId(IPage page,@Param("list") List waybillNos); + + IPage billladingList(IPage page, @Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr); + + IPage findAdvanceDetailList(IPage page, @Param("orderCode") String orderCode); } 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 1a517af53..50a7852c0 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 @@ -4,16 +4,34 @@ @@ -86,4 +105,22 @@ + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml index 20a4b352d..8251fdcf0 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml @@ -24,12 +24,10 @@ ltbp.create_time createTime from logpm_trunkline_billlading_package ltbp left join logpm_trunkline_billlading ltb on ltb.id = ltbp.billlading_id - left join logpm_trunkline_billlading_waybill ltbw on ltbw.billlading_id = ltb.id left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltbp.order_package_code left join logpm_warehouse_tray_goods lwtg on lwtg.association_value = ldpl.order_package_code left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id - left join logpm_trunkline_waybill_order ltwo on ltwo.order_code = ldpl.order_code and ltwo.waybill_id = ltbw.waybill_id - left join logpm_warehouse_waybill lww on lww.id = ltwo.waybill_id + left join logpm_warehouse_waybill lww on lww.waybill_no = ldpl.waybill_number where ltbp.billlading_id = #{param.id} and ldpl.warehouse_id = #{param.warehouseId} 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 fa98ed02e..27e520ab0 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 @@ -117,37 +117,44 @@