diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java index 692add5a1..f79eced5b 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java @@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 托盘 Feign接口类 * @@ -38,6 +40,7 @@ public interface IBasicdataTrayClient { String API_PREFIX = "tray/client"; String TOP = API_PREFIX + "/top"; + String GETTRAYENTITY = API_PREFIX + "/getTrayEntity"; /** * 获取托盘列表 @@ -57,4 +60,8 @@ public interface IBasicdataTrayClient { @PostMapping(API_PREFIX+"/updateTrayStatus") void updateTrayStatus(@RequestParam("trayId") Long trayId, @RequestParam("trayStatus") int trayStatus); + + @GetMapping(GETTRAYENTITY) + List getTrayEntityList(@RequestParam("trayId") String trayId); + } 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 0f7f40d7b..f3362d9e9 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 @@ -20,8 +20,10 @@ public class DistributionStockupOrderListVO implements Serializable { private String stockArticleId;//订单ID @ApiModelProperty(value = "托盘") private String pallet;//托盘 - @ApiModelProperty(value = "整托状态") + @ApiModelProperty(value = "托盘状态") private boolean trayLean;//整托状态 + @ApiModelProperty(value = "托盘名称") + private String trayLeanName;//整托状态 @ApiModelProperty(value = "货位配货状态") private boolean completeStact;//货位配货状态 @ApiModelProperty(value = "容器件数") diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java index f4060953d..3c08cc57e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java @@ -27,6 +27,7 @@ public class DistributionStockupStockListVO implements Serializable { private Integer realNum;//实际数量 private String trayName;//托盘信息 + private String trayNames;//托盘信息 private Boolean trayLean;//整托状态 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java index 324fe0700..34283d1c8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java @@ -19,6 +19,8 @@ package com.logpm.basicdata.feign; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basicdata.entity.BasicdataTrayEntity; import com.logpm.basicdata.service.IBasicdataTrayService; import lombok.AllArgsConstructor; @@ -29,6 +31,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + /** * 托盘 Feign实现类 * @@ -79,4 +83,13 @@ public class BasicdataTrayClient implements IBasicdataTrayClient { basicdataTrayService.update(updateWrapper); } + + @Override + @GetMapping(GETTRAYENTITY) + public List getTrayEntityList(String trayId) { + return basicdataTrayService.list(Wrappers.query().lambda() + .in(ObjectUtils.isNotNull(trayId),BasicdataTrayEntity::getId,trayId.split(",")) + ); + } + } 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 f6d154676..403deaba6 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 @@ -22,7 +22,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.basicdata.entity.BasicdataTrayEntity; import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient; +import com.logpm.basicdata.feign.IBasicdataTrayClient; import com.logpm.distribution.bean.Resp; import com.logpm.distribution.config.RedissonConfig; @@ -32,10 +34,7 @@ import com.logpm.distribution.entity.*; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.*; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; -import com.logpm.warehouse.feign.IWarehouseGoodsAllocationClient; -import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; -import com.logpm.warehouse.feign.IWarehouseUpdownGoodsLogClient; -import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; +import com.logpm.warehouse.feign.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -82,7 +81,7 @@ public class DistributionStockupAppController extends BladeController { private final IDistributionReservationService distributionReservationService; private final IBasicdataGoodsAreaClient basicdataGoodsAreaClient; private final IDistrilbutionBillStockService distrilbutionBillStockService; - + private final IBasicdataTrayClient basicdataTrayClient; private final IDistributionStockService distributionStockService; private final IDistributionStockArticleService distributionStockArticleService; private final IDistributionParcelListService distributionParcelListService; @@ -215,8 +214,11 @@ public class DistributionStockupAppController extends BladeController { if(!list.isEmpty()){ List collect = list.stream().filter(i -> { // if (ObjectUtils.isNotNull(i.getTrayId()) && !i.getPallet().contains(",") && !i.isCompleteStact() && ObjectUtils.isNotNull( i.getAllocationId()) ) { - if (ObjectUtils.isNotNull(i.getTrayId()) && !i.isCompleteStact()) { + List trayEntityList = basicdataTrayClient.getTrayEntityList(i.getTrayId()); + if(ObjectUtils.isNotNull(trayEntityList) && ObjectUtils.isNotNull( trayEntityList.get(0))){ + i.setTrayLeanName(trayEntityList.stream().map(BasicdataTrayEntity::getPalletName).collect(Collectors.joining(","))); + } i.setTrayLean(distributionStockupService.getTrayBoot(i,stockupDTO.getTypeService())); } return true; @@ -258,6 +260,10 @@ public class DistributionStockupAppController extends BladeController { // vo.setTrayLean(aBoolean); // if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.getPallet().contains(",") && !vo.isCompleteStact() && ObjectUtils.isNotNull( vo.getAllocationId()) ) { if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.isCompleteStact() ) { + List trayEntityList = basicdataTrayClient.getTrayEntityList(vo.getTrayId()); + if(ObjectUtils.isNotNull(trayEntityList) && ObjectUtils.isNotNull( trayEntityList.get(0))){ + vo.setTrayLeanName(trayEntityList.stream().map(BasicdataTrayEntity::getPalletName).collect(Collectors.joining(","))); + } //有没有可用整托配货的数据 vo.setTrayLean(distributionStockupService.getTrayBoot(vo,stockupDTO.getTypeService())); }