预约详情获取

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

@@ -18,6 +18,9 @@ package com.logpm.distribution.vo;
 
 import com.logpm.distribution.entity.DistributionAddvalueEntity;
 import com.logpm.distribution.entity.DistributionReservationEntity;
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.entity.DistributionStockListEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -34,10 +37,19 @@ import java.util.List;
 public class DistributionReservationVO extends DistributionReservationEntity {
 	private static final long serialVersionUID = 1L;
 
-	//增值服务信息
-	List<DistributionAddvalueEntity> addvalueEntityList;
 
-	//订单信息
-	List<?>  orderInfos;
+	/**
+	 * 库存品信息列表
+	 */
+	@ApiModelProperty(value = "库存品信息列表")
+	private List<DistributionStockListEntity> inventoryList;
+
+	/**
+	 * 订单信息列表
+	 */
+	@ApiModelProperty(value = "订单信息列表")
+	private List<DistributionStockArticleEntity> stockArticleList;
+
+
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -102,7 +102,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 					basicdataStoreBusinessEntity.setTypeService(s);
 					basicdataStoreBusinessEntity.setClientId(basicdataClient.getId().toString());
 					if(s.equals("3")){
-						basicdataStoreBusinessEntity.setMold(basicdataClient.getBusinessType());
+						basicdataStoreBusinessEntity.setMold(Integer.parseInt(basicdataClient.getBusinessType()));
 					}
 					basicdataStoreBusinessService.save(basicdataStoreBusinessEntity);
 				}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -194,4 +194,16 @@ public class DistributionReservationController extends BladeController {
 		R<?> result = reservationService.deliveryTask(deliveryInfo);
 		return result;
 	}
+
+
+	/**
+	 * 获取指定预约信息
+	 */
+	@GetMapping("/getReservationInfo")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "批量预约转备货任务")
+	public R<DistributionReservationVO> getReservationInfo(@RequestParam String reservationId) {
+		R<DistributionReservationVO> result = reservationService.getReservationInfo(reservationId);
+		return result;
+	}
 }

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

@@ -36,8 +36,8 @@
         <result column="genre" property="genre"/>
         <result column="state" property="state"/>
         <result column="fee" property="fee"/>
-        <result column="reservation_id" property="reservationId"/>
-        <result column="reservation_num" property="reservationNum"/>
+<!--        <result column="reservation_id" property="reservationId"/>-->
+<!--        <result column="reservation_num" property="reservationNum"/>-->
     </resultMap>
 
 

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

@@ -31,7 +31,7 @@
         <result column="quantity_stock" property="quantityStock"/>
         <result column="outbound_quantity" property="outboundQuantity"/>
         <result column="despatch" property="despatch"/>
-        <result column="reservation_num" property="reservationNum"/>
+<!--        <result column="reservation_num" property="reservationNum"/>-->
     </resultMap>
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -55,7 +55,7 @@ public interface IDistributionReservationService extends BaseService<Distributio
 
 	/**
 	 * 批量确认预约信息
-	 * @param ids
+	 * @param param
 	 * @return
 	 */
 	R addReservations(Map<String,Object> param);
@@ -97,4 +97,10 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	R<?> deliveryTask(Map<String, Object> deliveryInfo);
 
 
+	/**
+	 * 查询指定预约信息
+	 * @param id
+	 * @return
+	 */
+	R<DistributionReservationVO> getReservationInfo(String reservationId);
 }

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.logpm.distribution.dto.DistributionReservationDTO;
@@ -25,6 +26,7 @@ import com.logpm.distribution.mapper.DistributionReservationMapper;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.DistributionReservationVO;
 import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -391,4 +393,40 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		}
 		return R.status(result);
 	}
+
+	@Override
+	public R<DistributionReservationVO> getReservationInfo(String reservationId) {
+		//查询出预约信息
+		DistributionReservationEntity reservationEntity = this.getBaseMapper().selectById(reservationId);
+		DistributionReservationVO reservationVO = new DistributionReservationVO();
+		Func.copy(reservationEntity,reservationVO);
+		//查询出订单信息
+		QueryWrapper<DistributionReservationStockarticleEntity> q = Condition.getQueryWrapper(new HashMap<String, Object>(),DistributionReservationStockarticleEntity.class);
+		q.lambda().eq(DistributionReservationStockarticleEntity::getReservationId,reservationEntity.getId());
+		List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.getBaseMapper().selectList(q);
+		QueryWrapper<DistributionReservationStocklistEntity> w = Condition.getQueryWrapper(new HashMap<String, Object>(),DistributionReservationStocklistEntity.class);
+		w.lambda().eq(DistributionReservationStocklistEntity::getReservationId,reservationEntity.getId());
+		List<DistributionReservationStocklistEntity> reservationStocklistEntityList = distributionReservationStocklistService.getBaseMapper().selectList(w);
+		if (!Func.isEmpty(reservationStockarticleEntityList)){
+			List<DistributionStockArticleEntity> stockArticleEntityList = new ArrayList<>();
+			reservationStockarticleEntityList.forEach(a->{
+				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(a.getStockarticleId());
+				stockArticleEntity.setReservationNum(a.getReservationNum());
+				stockArticleEntityList.add(stockArticleEntity);
+			});
+			//查询出库存信息
+			reservationVO.setStockArticleList(stockArticleEntityList);
+		}
+		if (!Func.isEmpty(reservationStocklistEntityList)){
+			List<DistributionStockListEntity> stockArticleEntityList = new ArrayList<>();
+			reservationStocklistEntityList.forEach(a->{
+				DistributionStockListEntity stockListEntity = distributionStockListService.getById(a.getStocklistId());
+				stockListEntity.setReservationNum(a.getReservationNum());
+				stockArticleEntityList.add(stockListEntity);
+			});
+			//查询出库存信息
+			reservationVO.setInventoryList(stockArticleEntityList);
+		}
+		return R.data(reservationVO);
+	}
 }