1.修改订单状态名称

2.增加对订单vo 的状态转换

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扫码语音
 
 

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已冻结")
+	@ApiModelProperty(value = "上架状态")
-	private Integer freezeStatus;
+	private String groundingStatus;
+
+
+	@ApiModelProperty(value = "订单状态")
+	private String orderStatus;
+
+	@ApiModelProperty(value = "预约状态")
+	private String reservationStatus;
+
+	@ApiModelProperty(value = "备货状态")
+	private String stockupStatus;
+
+
+
+
 
 	/**
 	 * 有无数据源

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;
+
 	/**
 	 * 是否齐套名称
 	 */

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;

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;
 
 /**
  * 配送在库订单 控制器

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -38,7 +38,11 @@
         <result column="customer_telephone" property="customerTelephone"/>
         <result column="customer_address" property="customerAddress"/>
         <result column="genre" property="genre"/>
-        <result column="state" property="state"/>
+        <result column="order_status" property="orderStatus"/>
+        <result column="freeze_status" property="freezeStatus"/>
+        <result column="grounding_status" property="groundingStatus"/>
+        <result column="reservation_status" property="reservationStatus"/>
+        <result column="stockup_status" property="stockupStatus"/>
         <result column="fee" property="fee"/>
         <result column="stock_article_code" property="stockArticleCode"/>
         <!--        <result column="reservation_id" property="reservationId"/>-->

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -90,7 +90,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	public IPage<DistributionStockArticleVO> selectDistributionStockArticlePage(IPage<DistributionStockArticleVO> page, DistributionStockArticleVO distributionStockArticle) {
 		List<DistributionStockArticleVO> 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);

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;
 

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<Distribut
 				distributionStockupVO.setCompleteSetName("是");
 				break;
 		}
-
 		distributionStockupVO.setTypeServerName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, entity.getTypeService()));
-
+		distributionStockupVO.setOrderStatusName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, entity.getOrderStatus()));
-
-		distributionStockupVO.setOrderStateName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, entity.getOrderStatus()));
 		distributionStockupVO.setGroundingStatusName(DictBizCache.getValue(DictBizConstant.BASIC_GROUNDING, entity.getGroundingStatus()));
-
+		distributionStockupVO.setFreezeStatusName(DictBizCache.getValue(DictBizConstant.FREEZE_STATUS,entity.getFreezeStatus()));
+		distributionStockupVO.setReservationStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STATUS,entity.getReservationStatus()));
+		distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STATUS,entity.getStockupStatus()));
 
 
 		return distributionStockupVO;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockupWrapper.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package wrapper;
+package com.logpm.distribution.wrapper;
 
 import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.vo.DistributionStockupVO;

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -408,7 +408,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setCustomerName(customerName);
 
 				distributionStockArticleEntity.setGenre(1);
-				distributionStockArticleEntity.setOrderStatus(ServiceConstant.ORDER_STATE_ONE);
+
 				distributionStockArticleEntity.setAdvanceId(advanceId);
 				//--------------2023-07-06 新增字段处理
 				//查询包条码对应的运单信息
@@ -435,7 +435,12 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setDeliveryQuantity(0); //配送件数
 				distributionStockArticleEntity.setTransferQuantity(0); //中转件数
 				distributionStockArticleEntity.setSigninQuantity(0); //签收件数
-				distributionStockArticleEntity.setFreezeStatus(0); //冻结状态0未冻结 1已冻结
+				distributionStockArticleEntity.setFreezeStatus("10"); //冻结状态
+				distributionStockArticleEntity.setReservationStatus("10"); //预约状态
+				distributionStockArticleEntity.setStockupStatus("10"); //备货状态
+				distributionStockArticleEntity.setGroundingStatus("10"); //上架状态
+				distributionStockArticleEntity.setOrderStatus(ServiceConstant.ORDER_STATE_ONE);
+
 
 				id = distributionStockArticleClient.addData(distributionStockArticleEntity);
 				if(id == 0){