From d4aa6ca776a56a4bff71a9166a17217bb02ed5a3 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 2 Aug 2023 19:14:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=90=8D=E7=A7=B0=202.=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95vo=20=E7=9A=84=E7=8A=B6=E6=80=81=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/DictBizConstant.java | 5 +++ .../DistributionStockArticleEntity.java | 34 ++++++++++++------- .../vo/DistributionStockArticleVO.java | 21 ++++++++++-- .../DistributionParcelListController.java | 2 +- .../DistributionStockArticleController.java | 7 +--- .../mapper/DistributionStockArticleMapper.xml | 6 +++- .../DistributionStockArticleServiceImpl.java | 2 +- .../DistributionParcelListWrapper.java | 3 +- .../DistributionStockArticleWrapper.java | 11 +++--- .../wrapper/DistributionStockupWrapper.java | 2 +- .../impl/PanFactoryDataServiceImpl.java | 9 +++-- 11 files changed, 67 insertions(+), 35 deletions(-) rename blade-service/logpm-distribution/src/main/java/{ => com/logpm/distribution}/wrapper/DistributionParcelListWrapper.java (94%) rename blade-service/logpm-distribution/src/main/java/{ => com/logpm/distribution}/wrapper/DistributionStockArticleWrapper.java (76%) rename blade-service/logpm-distribution/src/main/java/{ => com/logpm/distribution}/wrapper/DistributionStockupWrapper.java (97%) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java index a1f1a2b01..d8e7ed9f3 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java @@ -14,6 +14,11 @@ public class DictBizConstant { public static final String DELIVERY_ORDER_STATUS = "order_status";//配送订单状态 public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态 public static final String BASIC_GROUNDING = "basic_grounding";//上架状态 + public static final String STOCKUP_STATUS = "stockup_status";//备货状态 + public static final String RESERVATION_STATUS = "reservation_status";//预约状态 + + + public static final String PDA_AUDIO = "pda_audio";//PDA扫码语音 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 a2e42b7e8..64f0c8b31 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 @@ -203,11 +203,7 @@ public class DistributionStockArticleEntity extends TenantEntity { */ @ApiModelProperty(value = "类型;1 预约单 2库存单") private Integer genre; - /** - * 状态;1 配送 2 待配送 3部分入库 4已入库 - */ - @ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库") - private String orderStatus; + // /** // * 状态;1 配送 2 待配送 3部分入库 4已入库 // */ @@ -343,11 +339,7 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "签收件数") private Integer signinQuantity; - /** - * 上架状态（0未上架 1部分上架 2已上架 3已下架） - */ - @ApiModelProperty(value = "上架状态") - private Integer groundingStatus; + /** * 货位信息 @@ -392,11 +384,27 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "盘点人id") private Long inventoryPersonId; + @ApiModelProperty(value = "冻结状态") + private String freezeStatus; /** - * 冻结状态0未冻结 1已冻结 + * 上架状态 */ - @ApiModelProperty(value = "冻结状态0未冻结 1已冻结") - private Integer freezeStatus; + @ApiModelProperty(value = "上架状态") + private String groundingStatus; + + + @ApiModelProperty(value = "订单状态") + private String orderStatus; + + @ApiModelProperty(value = "预约状态") + private String reservationStatus; + + @ApiModelProperty(value = "备货状态") + private String stockupStatus; + + + + /** * 有无数据源 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 5d2084d40..216e278fb 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 @@ -70,11 +70,28 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { @ApiModelProperty(value = "服务类型 商 市 自") private String typeServerName; - @ApiModelProperty(value = "订单状态") - private String orderStateName; + @ApiModelProperty(value = "上架状态名称") private String groundingStatusName; + + @ApiModelProperty(value = "冻结状态名称") + private String freezeStatusName; + /** + * 上架状态 + */ + @ApiModelProperty(value = "上架状态名称") + private String groundingStatus; + + @ApiModelProperty(value = "订单状态名称") + private String orderStatusName; + + @ApiModelProperty(value = "预约状态名称") + private String reservationStatusName; + + @ApiModelProperty(value = "备货状态名称") + private String stockupStatusName; + /** * 是否齐套名称 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index f9508c365..b357b8eda 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -40,7 +40,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; -import wrapper.DistributionParcelListWrapper; +import com.logpm.distribution.wrapper.DistributionParcelListWrapper; import java.util.Map; import java.util.List; 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 39952419b..27ce2fc51 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 @@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionStockArticleDTO; import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.service.IDistributionStockArticleService; import com.logpm.distribution.vo.DistributionStockArticleVO; @@ -39,19 +38,15 @@ import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.system.cache.DictBizCache; -import org.springblade.system.entity.DictBiz; -import org.springblade.system.entity.User; import org.springblade.system.feign.IDictBizClient; import org.springblade.system.feign.IUserClient; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import wrapper.DistributionStockArticleWrapper; +import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; -import java.util.stream.Collectors; /** * 配送在库订单 控制器 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 0773a05a7..560bbf5a4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -38,7 +38,11 @@ - + + + + + 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 0b6485712..4c5507f3a 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 @@ -90,7 +90,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl selectDistributionStockArticlePage(IPage page, DistributionStockArticleVO distributionStockArticle) { List distributionStockArticleVOS = baseMapper.selectDistributionStockArticlePage(page, distributionStockArticle); distributionStockArticleVOS.forEach(t->{ - t.setOrderStateName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, t.getOrderStatus())); + t.setOrderStatusName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, t.getOrderStatus())); }); return page.setRecords(distributionStockArticleVOS); diff --git a/blade-service/logpm-distribution/src/main/java/wrapper/DistributionParcelListWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java similarity index 94% rename from blade-service/logpm-distribution/src/main/java/wrapper/DistributionParcelListWrapper.java rename to blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java index 0b4c78c1b..1e6686797 100644 --- a/blade-service/logpm-distribution/src/main/java/wrapper/DistributionParcelListWrapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java @@ -1,4 +1,4 @@ -package wrapper; +package com.logpm.distribution.wrapper; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.vo.DistributionParcelListVO; @@ -6,7 +6,6 @@ import org.springblade.common.constant.DictBizConstant; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.system.cache.DictBizCache; -import org.springframework.beans.BeanUtils; import java.util.Objects; diff --git a/blade-service/logpm-distribution/src/main/java/wrapper/DistributionStockArticleWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java similarity index 76% rename from blade-service/logpm-distribution/src/main/java/wrapper/DistributionStockArticleWrapper.java rename to blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java index a1ab36e25..95fa436e1 100644 --- a/blade-service/logpm-distribution/src/main/java/wrapper/DistributionStockArticleWrapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java @@ -1,4 +1,4 @@ -package wrapper; +package com.logpm.distribution.wrapper; import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.vo.DistributionStockArticleVO; @@ -45,13 +45,12 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper