包件状态调整

blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java

@@ -243,6 +243,16 @@ public interface ServiceConstant {
 	//已签收
 	String ORDER_STATE_SEVEN = "70";
 
+	/**
+	 * 订单预约状态
+	 */
+	//未预约
+	String ORDER_RESERVATION_STATE_NOT="10";
+	//部分预约
+	String ORDER_RESERVATION_STATE_PART="20";
+	//已预约
+	String ORDER_RESERVATION_STATE_RESERVED="30";
+
 
 
 

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

@@ -108,4 +108,6 @@ public class DistributionParcelDetailsEntity extends TenantEntity {
 	@ApiModelProperty(value = "货位")
 	private String goodsAllocation;
 
+
+
 }

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

@@ -188,9 +188,14 @@ public class DistributionParcelListEntity extends TenantEntity {
 	@ApiModelProperty(value = "包件冻结状态")
 	private String orderPackageFreezeStatus;
 
+	@ApiModelProperty(value = "包件冻结状态")
+	private String orderPackageReservationStatus;
+
+
 
 	@ApiModelProperty(value = "备货状态")
 	private String orderPackageStockupStatus;
+
 	@ApiModelProperty(value = "上架状态")
 	private String orderPackageGroundingStatus;
 

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

@@ -57,5 +57,10 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	 */
 	private String orderPackageStockupStatusName;
 
+	/**
+	 * 包件预约状态
+	 */
+	private String orderPackageReservationStatusName;
+
 
 }

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

@@ -439,7 +439,7 @@
              ldsl.reserve3,
              ldsl.reserve4,
              ldsl.reserve5,
-             ldsl.order_self_numbering,
+             ldsl.order_code,
              ldsl.incoming_batch,
              ldsl.service_number,
              ldsl.material_id,

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

@@ -93,7 +93,6 @@
             ldpl.warehouse_id,
             ldpl.warehouse,
             ldpl.conditions,
-            ldpl.packet_bar_code,
             ldpl.cargo_title,
             ldpl.shelf_title,
             ldpl.goods_allocation,
@@ -105,7 +104,7 @@
             ldpl.quantity,
             ldpl.train_number,
             ldpl.stock_article_id,
-            ldpl.order_self_numbering,
+            ldpl.order_code,
             ldpl.service_number,
             ldpl.material_name,
             ldpl.material_code,

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

@@ -17,6 +17,7 @@
 package com.logpm.distribution.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
@@ -241,6 +242,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							p.setOrderPackageStatus(ServiceConstant.PACKAGE_STATUS_RESERVATION);
 							distributionParcelListService.updateById(p);
 						});
+						s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_RESERVED);
 					s.setAvailableQuantity(0);
 				} else {
 					//维护选中的包件信息
@@ -255,31 +257,25 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //						p.setBrandId(p.getBrandId());
 						distributionParcelListService.updateById(p);
 					});
+					s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_PART);
 					//设置订单可用数量为
 					s.setAvailableQuantity(s.getHandQuantity() - s.getReservationNum());
+					//这里查询到当前订单下的包件信息和选中包件进行比对，如果数量一致那么说明该订单是已预约状态、否则为部分预约状态
+					LambdaQueryWrapper<DistributionParcelListEntity> qw = new QueryWrapper<DistributionParcelListEntity>().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId());
+					List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw);
+					if (packageList.size() == parcelListEntities.size()){
+						//这里就是表示进行了包件选取的操作，但是选取的包件数量为全部
+						s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_RESERVED);
+					}
 				}
 				distributionReservationStockarticleEntity.setReservationNum(packageNum.get());
 				//订单无数据源，不需要进行包件信息维护
 				//修改订单状态为已预约
 //				s.setOrderStatus(ServiceConstant.ORDER_STATE_ALREADY_RESERVATION);
 				s.setReservationStatus(30+"");// TODO 需要根据订单预约的包件数量是否等于订单总包件数量，存入 部分预约和已预约的状态值
+
 				stockArticleCount.getAndAdd(s.getReservationNum());
 				DistributionStockArticleEntity stockArticleEntity = Func.copy(s, DistributionStockArticleEntity.class);
-//				if (stockArticleEntity.getStoreId()==-1){
-//
-//				}
-//				if (stockArticleEntity.getMallId()==-1){
-//
-//				}
-//				if (stockArticleEntity.getFee().equals(-1)){
-//
-//				}
-//				if (stockArticleEntity.getStoreId()==-1){
-//
-//				}
-//				if (stockArticleEntity.getStoreId()==-1){
-//
-//				}
 				distributionStockArticleService.updateById(s);
 				//拼接订单自编号
 				arrayList.add(s.getOrderCode());

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

@@ -31,6 +31,7 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
 		parcelListVO.setOrderPackageGroundingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, entity.getOrderPackageGroundingStatus()));
 		parcelListVO.setOrderPackageStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, entity.getOrderPackageStockupStatus()));
 
+		parcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageReservationStatus()));
 		return parcelListVO;
 	}
 }