配送状态字段变更

blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java

@@ -31,5 +31,10 @@ public class DictBizConstant {
 	//--------------2023-08-02 ---------------------
 	public static final String PERIOD_OF_TIME = "period_of_time";//时段
 
+	//--------------2023-08-03 ---------------------
+	public static final String ADD_VALUE_SERVE_TYPE = "addvalue_serve_type";//增值服务类型
+
+
+
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@@ -139,7 +139,7 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 * 配送状态;1-配送中,2-已完成
 	 */
 	@ApiModelProperty(value = "配送状态;1-配送中,2-已完成")
-	private String state;
+	private String deliveryState;
 	/**
 	 * 配送客户数
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java

@@ -143,7 +143,7 @@ public class DistributionReservationEntity extends TenantEntity {
 	private Integer reservationNum;
 
 	/**
-	 * 预约数量
+	 * 库存品 预约数量
 	 */
 	@ApiModelProperty(value = "预约数量")
 	private Integer reservationStockListNum;

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java

@@ -37,6 +37,12 @@ public class DistributionReservationVO extends DistributionReservationEntity {
 	@ApiModelProperty(value = "时段名称")
 	private String periodOfTimeName;
 
+	private String serveTypeName;
+
+	private String deliveryWayName;
+
+	private String deliveryTypeName;
+
 
 	/**
 	 * 库存品信息列表

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

@@ -1297,6 +1297,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								Integer i = distributionReservationPackageMapper.deletePackageByRidAndSid(reservationEntity.getId(),o.getId());
 								//构建新的
 								if (!Func.isEmpty(o.getPackageList())){
+
 									//订单全选
 									LambdaQueryWrapper<DistributionParcelListEntity> qw = new QueryWrapper<DistributionParcelListEntity>().lambda().eq(DistributionParcelListEntity::getStockArticleId, o.getId());
 									List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw);

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

@@ -218,6 +218,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			//存在订单的情况下才会对预约和包件的关系进行维护
 			//选择了订单但是未进行包件的选择，默认选择了订单下的所有在库包件
 			stockArticleList.forEach(s -> {
+				DistributionStockArticleEntity stockArticleEntity = Func.copy(s, DistributionStockArticleEntity.class);
 				DistributionReservationStockarticleEntity distributionReservationStockarticleEntity = new DistributionReservationStockarticleEntity();
 				//预约订单数量
 				AtomicInteger packageNum = new AtomicInteger();
@@ -239,8 +240,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							//此时订单下的所有包件都处于预约状态，可用数为0
 							packageNum.getAndAdd(p.getQuantity());
 							//修改订单下的包件状态
+//							p.setOrderPackageReservationStatus();
 							p.setOrderPackageStatus(ServiceConstant.PACKAGE_STATUS_RESERVATION);
 							distributionParcelListService.updateById(p);
+							stockArticleEntity.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_RESERVED);
 						});
 						s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_RESERVED);
 					s.setAvailableQuantity(0);
@@ -271,11 +274,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				distributionReservationStockarticleEntity.setReservationNum(packageNum.get());
 				//订单无数据源，不需要进行包件信息维护
 				//修改订单状态为已预约
+// 				TODO 需要根据订单预约的包件数量是否等于订单总包件数量，存入 部分预约和已预约的状态值
+//				s.setReservationStatus(30+"");
 //				s.setOrderStatus(ServiceConstant.ORDER_STATE_ALREADY_RESERVATION);
-				s.setReservationStatus(30+"");// TODO 需要根据订单预约的包件数量是否等于订单总包件数量，存入 部分预约和已预约的状态值
 
 				stockArticleCount.getAndAdd(s.getReservationNum());
-				DistributionStockArticleEntity stockArticleEntity = Func.copy(s, DistributionStockArticleEntity.class);
+//				DistributionStockArticleEntity stockArticleEntity = Func.copy(s, DistributionStockArticleEntity.class);
 				distributionStockArticleService.updateById(s);
 				//拼接订单自编号
 				arrayList.add(s.getOrderCode());
@@ -367,6 +371,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			String goddsAreaId = (String) stockUpInfo.get("stockupArea");
 			String stockupAreaName = (String) stockUpInfo.get("goodsAreaName");
 			DistributionStockupEntity stockupEntity = new DistributionStockupEntity();
+			BladeUser user = AuthUtil.getUser();
+			stockupEntity.setStockupUser(user.getUserName());
+			stockupEntity.setStockupArea(stockupAreaName);
 			stockupEntity.setGoodsAreaId(Long.parseLong(goddsAreaId));
 			//设置备货任务指派状态---未指派
 			stockupEntity.setAssignStatus(ServiceConstant.STOCkUP_ASSIGNSTATUS_ABSENCE);
@@ -388,8 +395,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				}
 				//修改预约备货状态
 				reservationEntity.setStockupStatus(ServiceConstant.STOCKUP_STATE_WAIT_EXECUTION);
-				reservationEntity.setGoodsAreaName(stockupAreaName);
+//				reservationEntity.setGoodsAreaName(stockupAreaName);
-				reservationEntity.setGoodsAreaId(Long.parseLong(goddsAreaId));
+//				reservationEntity.setGoodsAreaId(Long.parseLong(goddsAreaId));
 				result = SqlHelper.retBool(distributionReservationMapper.updateById(reservationEntity));
 				//构建中间表信息
 				DistributionStockupInfoEntity reservationStockupEntity = new DistributionStockupInfoEntity();
@@ -449,6 +456,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		Integer stockListTotal = distributionReservationStocklistMapper.getStockListTotal(ids);
 		if (!flag){
 			BladeUser user = AuthUtil.getUser();
+			distributionStockupEntity.setStockupUser(user.getUserName());
 			distributionStockupEntity.setAssignStatus(ServiceConstant.STOCkUP_ASSIGNSTATUS_ALREADY);
 			distributionStockupEntity.setAssignTime(new Date());
 			distributionStockupEntity.setStockupUser(user.getUserName());
@@ -581,7 +589,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					DistributionLoadscaninvnEntity loadscaninvnEntity = new DistributionLoadscaninvnEntity();
 					loadscaninvnEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 //					packageNum.getAndAdd(l.getReservationNum());
-					//TODO 需要设置库存品的SKU码
+					//TODO 需要设置库存品的SKU码*-
 					loadscaninvnEntity.setReservationId(reservationEntity.getId());
 					loadscaninvnEntity.setInventoryId(l.getStocklistId());
 					loadscaninvnEntity.setPackageNub(l.getReservationNum());

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

@@ -27,6 +27,20 @@ public class DistributionReservationWrapper extends BaseEntityWrapper<Distributi
 		DistributionReservationVO reservationVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionReservationVO.class));
 
 		reservationVO.setPeriodOfTimeName(DictBizCache.getValue(DictBizConstant.PERIOD_OF_TIME,entity.getPeriodOfTime()));
+		String serveType = entity.getServeType();
+		StringBuilder builder = new StringBuilder();
+		if (serveType.indexOf(",")>0){
+			String[] split = serveType.split(",");
+			for (String s : split) {
+				String value = DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE, s);
+				builder.append(value).append(",");
+			}
+		}else {
+			builder.append(DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE,serveType)).append(",");
+		}
+
+		reservationVO.setServeTypeName(builder.deleteCharAt(builder.length()-1).toString());
+//		reservationVO.setDeliveryTypeName(builder.append(DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE,serveType)).append(","););
 		return reservationVO;
 	}