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 8413259da..9db7ca66c 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 @@ -61,6 +61,11 @@ public class DistributionParcelListEntity extends TenantEntity { */ @ApiModelProperty(value = "预留5") private String reserve5; + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private String orderSelfNumbering; /** * 仓库 */ 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 5715fe967..0136d66d0 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 @@ -81,6 +81,6 @@ public class DistributionServiceLogEntity extends TenantEntity { * 在库Id */ @ApiModelProperty(value = "在库ID") - private Long stockArticleId; + private String stockArticleId; } 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 edcd5cd75..0f6fdd623 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 @@ -16,6 +16,7 @@ */ package com.logpm.distribution.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -89,6 +90,11 @@ public class DistributionStockArticleEntity extends TenantEntity { */ @ApiModelProperty(value = "仓库") private String warehouse; + + @TableField(exist = false) + private String stateName; + @TableField(exist = false) + private String typeName; /** * 入库时间 */ @@ -166,7 +172,13 @@ public class DistributionStockArticleEntity extends TenantEntity { /** * 增值服务总费用 */ - @ApiModelProperty(value = "预约编号") + @ApiModelProperty(value = "增值服务总费用") private BigDecimal fee; + /** + * 协商费用 + */ + @ApiModelProperty(value = "协商费用") + private BigDecimal rate; + } 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 c23cac30a..2273acdb7 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 @@ -91,6 +91,16 @@ public class DistributionStockListEntity extends TenantEntity { */ @ApiModelProperty(value = "仓库") private String warehouse; + /** + * 工厂车次 + */ + @ApiModelProperty(value = "工厂车次") + private String factory; + /** + * 品分类 + */ + @ApiModelProperty(value = "品分类") + private String category; /** * 商场 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java index 68c230896..6ac5d0de9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java @@ -32,4 +32,5 @@ import lombok.EqualsAndHashCode; public class DistributionStockArticleVO extends DistributionStockArticleEntity { private static final long serialVersionUID = 1L; + } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicDelineNodeService.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicDelineNodeService.java index 15859c997..44f0fc6fa 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicDelineNodeService.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicDelineNodeService.java @@ -50,7 +50,7 @@ public interface IBasicDelineNodeService extends BaseService exportBasicDelineNode(Wrapper queryWrapper); /** - * 获取字典 + * 获取 * * @return */ diff --git a/blade-service/logpm-distribution/pom.xml b/blade-service/logpm-distribution/pom.xml index 48c87c66a..1ba108142 100644 --- a/blade-service/logpm-distribution/pom.xml +++ b/blade-service/logpm-distribution/pom.xml @@ -27,6 +27,11 @@ org.springblade blade-starter-excel + + org.springblade + blade-dict-api + ${bladex.project.version} + org.springblade logpm-distribution-api diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionServiceLogController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionServiceLogController.java index 4c45638a4..105f4bf8c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionServiceLogController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionServiceLogController.java @@ -117,7 +117,7 @@ public class DistributionServiceLogController extends BladeController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入distributionServiceLog") public R submit(@Valid @RequestBody DistributionServiceLogEntity distributionServiceLog) { - return R.status(distributionServiceLogService.saveOrUpdate(distributionServiceLog)); + return R.status(distributionServiceLogService.OwnSaveOrUpdate(distributionServiceLog)); } /** 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 af148cd3a..9e380b4d5 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 @@ -29,6 +29,10 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.system.entity.Dict; +import org.springblade.system.entity.DictBiz; +import org.springblade.system.feign.IDictBizClient; +import org.springblade.system.feign.IDictClient; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -59,6 +63,8 @@ public class DistributionStockArticleController extends BladeController { private final IDistributionStockArticleService distributionStockArticleService; + private final IDictBizClient dictBizClient; + /** * 配送在库订单 详情 */ @@ -77,6 +83,31 @@ public class DistributionStockArticleController extends BladeController { @ApiOperation(value = "分页", notes = "传入distributionStockArticle") public R> list(@ApiIgnore @RequestParam Map distributionStockArticle, Query query) { IPage pages = distributionStockArticleService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class)); + pages.getRecords().forEach( i ->{ + R> distribution_type = dictBizClient.getList("distribution_type"); + DictBiz dictBiz = distribution_type.getData().get(i.getTypeService()-1); + i.setTypeName(dictBiz.getDictValue()); + switch (i.getState()){ + case 1: + i.setStateName("待预约"); + break; + case 2: + i.setStateName("已预约"); + break; + case 3: + i.setStateName("待配送"); + break; + case 4: + i.setStateName("配送中"); + break; + case 5: + i.setStateName("已配送"); + break; + case 6: + i.setStateName("已完成"); + break; + } + }); return R.data(pages); } @@ -88,6 +119,16 @@ public class DistributionStockArticleController extends BladeController { @ApiOperation(value = "分页", notes = "传入distributionStockArticle") public R> page(DistributionStockArticleVO distributionStockArticle, Query query) { IPage pages = distributionStockArticleService.selectDistributionStockArticlePage(Condition.getPage(query), distributionStockArticle); + pages.getRecords().forEach( i ->{ + switch (i.getState()){ + case 1: + i.setStateName("待预约"); + break; + case 2: + i.setStateName("已预约"); + break; + } + }); return R.data(pages); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionServiceLogService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionServiceLogService.java index 3d0ecfe3c..fbb15734c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionServiceLogService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionServiceLogService.java @@ -49,4 +49,5 @@ public interface IDistributionServiceLogService extends BaseService exportDistributionServiceLog(Wrapper queryWrapper); + Boolean OwnSaveOrUpdate(DistributionServiceLogEntity distributionServiceLog); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionServiceLogServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionServiceLogServiceImpl.java index 03f65b474..0c2e0d6f1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionServiceLogServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionServiceLogServiceImpl.java @@ -17,14 +17,22 @@ package com.logpm.distribution.service.impl; import com.logpm.distribution.entity.DistributionServiceLogEntity; +import com.logpm.distribution.entity.DistributionStockArticleEntity; +import com.logpm.distribution.service.IDistributionStockArticleService; import com.logpm.distribution.vo.DistributionServiceLogVO; import com.logpm.distribution.excel.DistributionServiceLogExcel; import com.logpm.distribution.mapper.DistributionServiceLogMapper; import com.logpm.distribution.service.IDistributionServiceLogService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; import java.util.List; /** @@ -34,8 +42,12 @@ import java.util.List; * @since 2023-06-14 */ @Service +@Slf4j +@AllArgsConstructor public class DistributionServiceLogServiceImpl extends BaseServiceImpl implements IDistributionServiceLogService { + private final IDistributionStockArticleService distributionStockArticleService; + @Override public IPage selectDistributionServiceLogPage(IPage page, DistributionServiceLogVO distributionServiceLog) { return page.setRecords(baseMapper.selectDistributionServiceLogPage(page, distributionServiceLog)); @@ -51,4 +63,27 @@ public class DistributionServiceLogServiceImpl extends BaseServiceImpl list = new ArrayList<>(); + List entityList = new ArrayList<>(); + for (String s : split) { + DistributionServiceLogEntity distributionServiceLogEntity = new DistributionServiceLogEntity(); + BeanUtils.copyProperties(distributionServiceLog,distributionServiceLogEntity); + distributionServiceLogEntity.setStockArticleId(s); + list.add(distributionServiceLogEntity); + DistributionStockArticleEntity distributionStockArticle = new DistributionStockArticleEntity(); + distributionStockArticle.setId(Long.parseLong(s)); + distributionStockArticle.setTypeService(distributionServiceLog.getTypeService()); + distributionStockArticle.setRate(distributionServiceLog.getCost()); + entityList.add(distributionStockArticle); + } + //添加记录 + this.saveBatch(list); + //修改订单服务状态 + return distributionStockArticleService.saveOrUpdateBatch(entityList); + } + }