diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java index f3b610f2d..69a9d7d94 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java @@ -26,6 +26,7 @@ public class AdvanceDTO implements Serializable { private String freezeStatus; //列表查询参数 + private String htMallName; private String orderCode; private String dealerName; private String dealerCode; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java index 2e502c519..e256a40ca 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/InComingDTO.java @@ -3,6 +3,7 @@ package com.logpm.trunkline.dto; import lombok.Data; import java.io.Serializable; +import java.util.List; @Data public class InComingDTO implements Serializable { @@ -13,10 +14,14 @@ public class InComingDTO implements Serializable { private Long warehouseId;//仓库id private String warehouseName;//仓库 - private Integer incomingType;//入库类型 + private Integer incomingType;//入库类型 1提货扫描入库 2直接入库 3批量入库 4 按车次号入库 5按订单入库 private String trayCode;//托盘码 private String trayType;//打托方式 + private String incomingCode;//入库码 + + private List advanceIds;//暂存单ids + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java index 8f0774075..92d913e89 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineAdvanceVO.java @@ -14,4 +14,6 @@ public class TrunklineAdvanceVO extends TrunklineAdvanceEntity { private List detailList = new ArrayList<>(); + private Integer isIncoming; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 4fd9b880b..34a572b6d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -27,6 +27,7 @@ import com.logpm.basicdata.excel.BasicdataDriverArteryImporter; import com.logpm.basicdata.excel.BasicdataDriverArteryImproterExcel; import com.logpm.basicdata.service.IBasicdataDriverArteryService; import com.logpm.basicdata.service.IBasicdataDriverWarehouseService; +import com.logpm.basicdata.service.IBasicdataDrivermiddleService; import com.logpm.basicdata.service.IBasicdataVehicleService; import com.logpm.basicdata.vo.BasicdataDriverArteryVO; import com.logpm.basicdata.vo.BasicdataDriverWarehouseVO; @@ -79,6 +80,8 @@ public class BasicdataDriverArteryController extends BladeController { private final IBasicdataDriverWarehouseService basicdataDriverWarehouseService; + private final IBasicdataDrivermiddleService basicdataDrivermiddleService; + /** * 司机信息表 详情 */ @@ -88,10 +91,12 @@ public class BasicdataDriverArteryController extends BladeController { public R detail(BasicdataDriverArteryEntity basicdataDriverArtery) { BasicdataDriverArteryEntity detail = basicdataDriverArteryService.getOne(Condition.getQueryWrapper(basicdataDriverArtery)); Long driverId = detail.getId(); + List vehicleIds = basicdataDrivermiddleService.findVehicleIdsByDriverId(driverId); List warehouseIds = basicdataDriverWarehouseService.findByDriverId(driverId); BasicdataDriverArteryVO basicdataDriverArteryVO = new BasicdataDriverArteryVO(); BeanUtil.copy(detail,basicdataDriverArteryVO); basicdataDriverArteryVO.setWarehouses(warehouseIds); + basicdataDriverArteryVO.setBindVehicles(String.join(",",vehicleIds)); return R.data(basicdataDriverArteryVO); } /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDrivermiddleMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDrivermiddleMapper.java index 79e6616c6..28b93374e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDrivermiddleMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDrivermiddleMapper.java @@ -52,4 +52,5 @@ public interface BasicdataDrivermiddleMapper extends BaseMapper exportBasicdataDrivermiddle(@Param("ew") Wrapper queryWrapper); + List findVehicleIdsByDriverId(@Param("driverId") Long driverId); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDrivermiddleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDrivermiddleMapper.xml index 86171eab1..c1111513c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDrivermiddleMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDrivermiddleMapper.xml @@ -33,4 +33,11 @@ SELECT * FROM logpm_basicdata_drivermiddle ${ew.customSqlSegment} + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataDrivermiddleService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataDrivermiddleService.java index 6c69d4761..3c939ef3c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataDrivermiddleService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataDrivermiddleService.java @@ -50,4 +50,6 @@ public interface IBasicdataDrivermiddleService extends BaseService exportBasicdataDrivermiddle(Wrapper queryWrapper); + List findVehicleIdsByDriverId(Long driverId); + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDrivermiddleServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDrivermiddleServiceImpl.java index b4af4319f..d01d75574 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDrivermiddleServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDrivermiddleServiceImpl.java @@ -26,6 +26,7 @@ import com.logpm.basicdata.vo.BasicdataDrivermiddleVO; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -52,4 +53,14 @@ public class BasicdataDrivermiddleServiceImpl extends BaseServiceImpl findVehicleIdsByDriverId(Long driverId) { + List vehicleIdsByDriverId = baseMapper.findVehicleIdsByDriverId(driverId); + List vehicleIds = new ArrayList<>(); + for (Long aLong : vehicleIdsByDriverId) { + vehicleIds.add(aLong.toString()); + } + return vehicleIds; + } + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java new file mode 100644 index 000000000..828421cc2 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java @@ -0,0 +1,106 @@ +package com.logpm.trunkline.controller; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; +import com.logpm.trunkline.dto.InComingDTO; +import com.logpm.trunkline.service.IInComingService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.*; + +import java.util.Objects; + +@Slf4j +@RestController +@AllArgsConstructor +@RequestMapping("/incoming") +@Api(value = "包件入库控制类", tags = "PC入库接口") +public class IncomingController { + + private final IBasicdataWarehouseClient warehouseClient; + + private final IInComingService inComingService; + + + @ResponseBody + @PostMapping("/findIncomingOrderList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询入库订单明细", notes = "传入inComingDTO") + public R findIncomingOrderList(@RequestBody InComingDTO inComingDTO) { + String method = "############findIncomingOrderList: "; + log.info(method+"请求参数{}",inComingDTO); + Integer incomingType = inComingDTO.getIncomingType(); + + try{ + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"当前仓库信息为空"); + return R.fail(405,"请先选择仓库"); + } + inComingDTO.setWarehouseId(myCurrentWarehouse.getId()); + inComingDTO.setWarehouseName(myCurrentWarehouse.getName()); + + if(Objects.isNull(incomingType)){ + log.warn(method+"入库方式不能为空 incomingType={}",incomingType); + return R.fail(405,"入库方式不能为空"); + } + + if(incomingType < 4){ + log.warn(method+"入库方式不正确 incomingType={}",incomingType); + return R.fail(405,"入库方式不正确"); + } + return inComingService.findIncomingOrderList(inComingDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + @ResponseBody + @PostMapping("/incomingBatchOrder") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询入库订单明细", notes = "传入inComingDTO") + public R incomingBatchOrder(@RequestBody InComingDTO inComingDTO) { + String method = "############incomingBatchOrder: "; + log.info(method+"请求参数{}",inComingDTO); + Integer incomingType = inComingDTO.getIncomingType(); + + try{ + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"当前仓库信息为空"); + return R.fail(405,"请先选择仓库"); + } + inComingDTO.setWarehouseId(myCurrentWarehouse.getId()); + inComingDTO.setWarehouseName(myCurrentWarehouse.getName()); + + if(Objects.isNull(incomingType)){ + log.warn(method+"入库方式不能为空 incomingType={}",incomingType); + return R.fail(405,"入库方式不能为空"); + } + + if(incomingType < 4){ + log.warn(method+"入库方式不正确 incomingType={}",incomingType); + return R.fail(405,"入库方式不正确"); + } + return inComingService.incomingBatchOrder(inComingDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java index bc4733e13..c9a7c02f4 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java @@ -1539,4 +1539,31 @@ public class OpenOrderController { } + @ResponseBody + @PostMapping("/findUpdateWaybillList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询改单列表", notes = "传入openOrderDTO") + public R findUpdateWaybillList(@RequestBody OpenOrderDTO openOrderDTO) { + String method = "############findUpdateWaybillList: "; + log.info(method + "请求参数{}", openOrderDTO); + Long waybillId = openOrderDTO.getWaybillId(); + try{ + + if(Objects.isNull(waybillId)){ + log.warn(method+"运单id为空 waybillId={}",waybillId); + return R.fail(405,"运单id为空"); + } + + return openOrderService.findWaybillReturnList(waybillId); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + + } 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 24b462b6e..3af8f9b9b 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 @@ -43,4 +43,6 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper findIncomingWarehouseName(@Param("advanceId") Long advanceId); + + List findNoIncomingPackageCode(@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 e9f90ffe8..5586b5855 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 @@ -180,4 +180,11 @@ group by incoming_warehouse_name + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java index fb646060b..7ce18eb22 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java @@ -3,6 +3,7 @@ package com.logpm.trunkline.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.AdvanceDTO; +import com.logpm.trunkline.dto.InComingDTO; import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.vo.CustomerInfoVO; import com.logpm.trunkline.vo.OpenOrderVO; @@ -32,4 +33,7 @@ public interface TrunklineAdvanceMapper extends BaseMapper findIncomingOrderList(@Param("param") InComingDTO inComingDTO); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml index ad477cd17..71b1fc240 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml @@ -137,4 +137,19 @@ and id = #{advanceId} + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IInComingService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IInComingService.java index 5e2c882f0..f75e98021 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IInComingService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IInComingService.java @@ -7,4 +7,8 @@ public interface IInComingService { R incomingPackage(InComingDTO inComingDTO); + R findIncomingOrderList(InComingDTO inComingDTO); + + R incomingBatchOrder(InComingDTO inComingDTO); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java index b379aa80e..7e014833c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java @@ -54,4 +54,5 @@ public interface ITrunklineAdvanceDetailService extends BaseService findIncomingWarehouseName(Long advanceId); + List findNoIncomingPackageCode(Long advanceId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java index 1c542e00c..159dfd355 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java @@ -2,6 +2,7 @@ package com.logpm.trunkline.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.AdvanceDTO; +import com.logpm.trunkline.dto.InComingDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.vo.CustomerInfoVO; @@ -33,4 +34,5 @@ public interface ITrunklineAdvanceService extends BaseService findIncomingOrderList(InComingDTO inComingDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index 9e02f3795..c0652592b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -11,6 +11,7 @@ import com.logpm.trunkline.service.IInComingService; import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; import com.logpm.trunkline.service.ITrunklineAdvanceService; import com.logpm.trunkline.service.ITrunklineBillladingPackageServicie; +import com.logpm.trunkline.vo.TrunklineAdvanceVO; import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -103,4 +104,23 @@ public class InComingServiceImpl implements IInComingService { } return R.success("入库成功"); } + + @Override + public R findIncomingOrderList(InComingDTO inComingDTO) { + List ls = advanceService.findIncomingOrderList(inComingDTO); + return R.data(ls); + } + + @Override + public R incomingBatchOrder(InComingDTO inComingDTO) { + List advanceIds = inComingDTO.getAdvanceIds(); + + for (Long advanceId : advanceIds) { + List list = advanceDetailService.findNoIncomingPackageCode(advanceId); + inComingDTO.setOrderPackageCode(String.join(",",list)); + incomingPackage(inComingDTO); + } + + return R.success("入库成功"); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 9f50d3194..34addee2a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -240,4 +240,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl findIncomingWarehouseName(Long advanceId) { return baseMapper.findIncomingWarehouseName(advanceId); } + + @Override + public List findNoIncomingPackageCode(Long advanceId) { + return baseMapper.findNoIncomingPackageCode(advanceId); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 11c236d99..27d105d19 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -16,6 +16,7 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.feign.IDistributionParcelListClient; import com.logpm.distribution.feign.IDistributionStockArticleClient; import com.logpm.trunkline.dto.AdvanceDTO; +import com.logpm.trunkline.dto.InComingDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.mapper.TrunklineAdvanceMapper; @@ -315,20 +316,20 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl trunklineAdvanceVOIPage = baseMapper.advancePageList(page, advanceDTO); - List records = trunklineAdvanceVOIPage.getRecords(); - for (TrunklineAdvanceVO trunklineAdvanceVO:records){ - - - - String dealerName = trunklineAdvanceVO.getDealerName(); - String brand = trunklineAdvanceVO.getBrand(); - Long clientId = tripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand); - BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId); - if(!Objects.isNull(basicdataClientEntity)){ - trunklineAdvanceVO.setHtMallName(basicdataClientEntity.getClientName()); - } - } - trunklineAdvanceVOIPage.setRecords(records); +// List records = trunklineAdvanceVOIPage.getRecords(); +// for (TrunklineAdvanceVO trunklineAdvanceVO:records){ +// +// +// +// String dealerName = trunklineAdvanceVO.getDealerName(); +// String brand = trunklineAdvanceVO.getBrand(); +// Long clientId = tripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand); +// BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId); +// if(!Objects.isNull(basicdataClientEntity)){ +// trunklineAdvanceVO.setHtMallName(basicdataClientEntity.getClientName()); +// } +// } +// trunklineAdvanceVOIPage.setRecords(records); return trunklineAdvanceVOIPage; } @@ -379,4 +380,9 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl findIncomingOrderList(InComingDTO inComingDTO) { + return baseMapper.findIncomingOrderList(inComingDTO); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java index 9461f642d..390395eb6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java @@ -373,6 +373,4 @@ public class TaskQuestController extends BladeController { return R.fail(500,"############syncTaskData: 系统异常"); } } - - }