diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java index d20064544..5cb6c7c33 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java @@ -72,6 +72,11 @@ public class BasicdataStoreBrandEntity extends TenantEntity { */ @ApiModelProperty(value = "品牌ID") private String brandId; + /** + * 品牌名称 + */ + @ApiModelProperty(value = "品牌名称") + private String brandName; /** * 客户名称 */ diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java index f0254091d..5c865126e 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java @@ -36,6 +36,7 @@ public interface IBasicdataStoreBrandClient { String API_PREFIX = "/client"; String TOP = API_PREFIX + "/top7"; + String BRANDLIST = API_PREFIX + "/brandList"; /** * 获取门店品牌中间表列表 @@ -47,4 +48,14 @@ public interface IBasicdataStoreBrandClient { @GetMapping(TOP) BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + /** + * 根据客户查询对应的品牌 + * + * @param clientId 客户 + * @param brandName 品牌 + * @return BladePage + */ + @GetMapping(BRANDLIST) + BasicdataStoreBrandEntity getBrandList(@RequestParam("clientId") Long clientId, @RequestParam("brandName") String brandName); + } 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 a128cb61d..37b09afb1 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 @@ -118,12 +118,22 @@ public class DistributionParcelListEntity extends TenantEntity { * 物料Id */ @ApiModelProperty(value = "物料ID") - private String material; + private Long material; /** * 物料名称 */ @ApiModelProperty(value = "物料名称") private String materialName; + /** + * 物料编号 + */ + @ApiModelProperty(value = "物料编号") + private String materialCode; + /** + * 物料单位 + */ + @ApiModelProperty(value = "物料单位") + private String materialUnit; /** * 数量 */ @@ -145,5 +155,15 @@ public class DistributionParcelListEntity extends TenantEntity { */ @ApiModelProperty(value = "服务号") private String serviceNumber; + /** + * 品牌ID + */ + @ApiModelProperty(value = "品牌ID") + private String brandId; + /** + * 品牌名称 + */ + @ApiModelProperty(value = "品牌名称") + private String brandName; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionServiceLogEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionServiceLogEntity.java index 0136d66d0..f1328d395 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionServiceLogEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionServiceLogEntity.java @@ -66,7 +66,7 @@ public class DistributionServiceLogEntity extends TenantEntity { * 服务类型 */ @ApiModelProperty(value = "服务类型") - private Integer typeService; + private String typeService; /** * 费用 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index 1b5811876..90af3bef2 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -124,6 +124,11 @@ public class DistributionStockArticleEntity extends TenantEntity { */ @ApiModelProperty(value = "仓库") private String warehouse; + /** + * 车次号 + */ + @ApiModelProperty(value = "车次号") + private String trainNumber; /** * 仓库ID @@ -176,7 +181,7 @@ public class DistributionStockArticleEntity extends TenantEntity { * 服务类型 */ @ApiModelProperty(value = "服务类型") - private Integer typeService; + private String typeService; /** * 顾客名字 */ @@ -399,6 +404,11 @@ public class DistributionStockArticleEntity extends TenantEntity { */ @ApiModelProperty(value = "订单码") private String stockArticleCode; + /** + * 工厂车次 + */ + @ApiModelProperty(value = "工厂车次") + private String factoryTrain; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java index c580e5c40..8e4bf5067 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java @@ -113,6 +113,31 @@ public class DistributionStockEntity extends TenantEntity { */ @ApiModelProperty(value = "在库包件ID") private Long parcelListId; + /** + * 预约ID + */ + @ApiModelProperty(value = "预约ID") + private Long reservationId; + /** + * 预约编号 + */ + @ApiModelProperty(value = "预约编号") + private String reservationCode; + /** + * 出库类型 + */ + @ApiModelProperty(value = "出库类型") + private Long outboundType; + /** + * 配送Id + */ + @ApiModelProperty(value = "配送Id") + private Long deliveryListId; + /** + * 配送编号 + */ + @ApiModelProperty(value = "配送编号") + private Long deliveryListCode; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java index f220c2a0d..e3de1e05c 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java @@ -98,6 +98,32 @@ public class DistributionStockListEntity extends TenantEntity { */ @ApiModelProperty(value = "货物名称") private String descriptionGoods; + + /** + * 车牌 + */ + @ApiModelProperty(value = "车牌") + private String licensePlate; + /** + * 品牌名称 + */ + @ApiModelProperty(value = "品牌名称") + private String brandName; + /** + * 品牌Id + */ + @ApiModelProperty(value = "品牌ID") + private Long brandId; + /** + * 入库时间 + */ + @ApiModelProperty(value = "入库时间") + private Date warehousingTime; + /** + * 拆包数 + */ + @ApiModelProperty(value = "拆包数") + private Integer unpackingQuantity; /** * 货物编号 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBrandClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBrandClient.java index f91a6ab09..d9144f17e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBrandClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBrandClient.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.feign; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -50,4 +51,13 @@ public class BasicdataStoreBrandClient implements IBasicdataStoreBrandClient { return BladePage.of(page); } + @Override + @GetMapping(BRANDLIST) + public BasicdataStoreBrandEntity getBrandList(Long clientId, String brandName) { + return basicdataStoreBrandService.getOne(Wrappers.query().lambda() + .eq(BasicdataStoreBrandEntity::getClientId,clientId) + .eq(BasicdataStoreBrandEntity::getBrandName,brandName) + ); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 52fc2bb71..d812f134b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -90,7 +90,7 @@ public class DistributionStockArticleController extends BladeController { } IPage pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper); pages.getRecords().forEach( i ->{ - Integer typeService = i.getTypeService(); + String typeService = i.getTypeService(); //计算在库天数 // SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); long time1 = i.getWarehouseEntryTime().getTime(); //入库 @@ -114,7 +114,7 @@ public class DistributionStockArticleController extends BladeController { R> distribution_type = dictBizClient.getList("distribution_type"); if(!Objects.isNull(typeService)){ if(Func.isNotEmpty(distribution_type.getData())){ - DictBiz dictBiz = distribution_type.getData().get(typeService-1); + DictBiz dictBiz = distribution_type.getData().get(Integer.parseInt(typeService)-1); i.setTypeName(dictBiz.getDictValue()); switch (i.getState()){ case 1: 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 940f8bcd0..33ea657f8 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 @@ -17,15 +17,14 @@ package com.logpm.distribution.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.logpm.basic.feign.IBasicTenantCodeClient; import com.logpm.distribution.dto.DistributionStockArticleDTO; import com.logpm.distribution.entity.*; -import com.logpm.distribution.excel.DistributionAddvalueExcel; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.mapper.DistributionAddvalueMapper; import com.logpm.distribution.mapper.DistributionDeliveryListMapper; @@ -34,18 +33,16 @@ import com.logpm.distribution.service.*; import com.logpm.distribution.vo.DistributionStockArticleVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.RandomType; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.nio.charset.StandardCharsets; +import java.util.*; /** * 配送在库订单 服务实现类 @@ -247,38 +244,33 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl