Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java

@@ -53,6 +53,6 @@ public interface IBasicdataGoodsAreaClient {
     Long addCargo(@RequestBody BasicdataGoodsAreaEntity goodsAreaEntity);
 
 	@GetMapping(API_PREFIX+"/getEntityByGoodsAreaId")
-    BasicdataGoodsAreaEntity getEntityByGoodsAreaId(Long goodsAreaId);
+    BasicdataGoodsAreaEntity getEntityByGoodsAreaId(@RequestParam Long goodsAreaId);
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java

@@ -99,7 +99,7 @@ public interface IBasicdataWarehouseClient {
 	 * @return
 	 */
 	@GetMapping(API_PREFIX+"/getMyCurrentWarehouse")
-	Object getMyCurrentWarehouse();
+	BasicdataWarehouseEntity getMyCurrentWarehouse();
 
 
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionLoadscanClient.java

@@ -47,4 +47,7 @@ public interface IDistributionLoadscanClient {
     @GetMapping(TOP)
     BladePage<DistributionLoadscanEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+	@GetMapping(API_PREFIX+"/getByOrderPackageCode")
+	DistributionLoadscanEntity getByOrderPackageCode(@RequestParam("orderPackageCode") String orderPackageCode);
+
 }

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

@@ -63,6 +63,13 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	@ApiModelProperty(value = "订单")
 	private String orderIds;
+
+	/**
+	 * 商场名称
+	 */
+	@ApiModelProperty(value = "商场名称")
+	private String storeName;
+
 	/**
 	 * 状态
 	 */

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

@@ -41,6 +41,7 @@ public class DistributionStockVO extends DistributionStockEntity {
 	private Long stockArticleId;
 
 	private Integer scanned;//已扫
+
 	private Integer whole;//全部
 
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseTaryAllocationEntity.java

@@ -30,7 +30,7 @@ public class WarehouseTaryAllocationEntity extends TenantEntity {
 	private String reserve5 ;
 	/** 托盘id */
 	@ApiModelProperty(name = "托盘id",notes = "")
-	private Long taryId ;
+	private Long trayId ;
 	/** 货位Id */
 	@ApiModelProperty(name = "货位Id",notes = "")
 	private Long allocationId ;

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java

@@ -17,5 +17,6 @@ public class UpShelfDataVO implements Serializable {
 	private String marketName;//商场名称
 	private String materialCode;//物料编码
 	private String materialName;//物料名称
+	private Integer goodsType;//货物类型
 
 }

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

@@ -136,7 +136,6 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl<Basicda
 					List<Long> collect = list1.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
 					sendWarehouseIds = collect.stream().map(String::valueOf).collect(Collectors.toList());
 				}
-
 			}else{
 				sendWarehouseIds = basicdataStorageServices.getSendWarehouseIds();
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionLoadscanClient.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
@@ -50,4 +51,12 @@ public class DistributionLoadscanClient implements IDistributionLoadscanClient {
         return BladePage.of(page);
     }
 
+	@Override
+	public DistributionLoadscanEntity getByOrderPackageCode(String orderPackageCode) {
+		QueryWrapper<DistributionLoadscanEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("order_package_code",orderPackageCode)
+			.ne("scan_status",1);
+		return distributionLoadscanService.getOne(queryWrapper);
+	}
+
 }

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

@@ -66,6 +66,7 @@
         ldr.id id,
         ldr.is_urgent isUrgent,
         lds.id deliveryId,
+        ldr.store_name,
         ldr.consignee consignee,
          lds.signing_type signingType,
         lds.train_number trainNumber,

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

@@ -269,7 +269,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	 * @param id
 	 * @return
 	 */
-	List<DistributionReservationStockarticleEntity> selectStockArticleById(@Param("deliveryListId")Long id);
+	List<DistributionReservationStockarticleEntity> selectStockArticleById(@Param("deliveryListId")Long id,@Param("consignee")String consignee);
 
 	/**
 	 * 查询配送下的预约信息

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

@@ -84,9 +84,9 @@
         SELECT
         COALESCE (COUNT(*), 0)
         FROM
-        logpm_distribution_signfor lds
+        logpm_distribution_signfor lds INNER JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
         WHERE
-        lds.delivery_id = lddl.id
+        lds.delivery_id = lddl.id and ldr.reservation_status != '40'
         ) customersNumber,
         lddl.price price,
         lddl.added_services_id addedServicesId,
@@ -98,7 +98,7 @@
         JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id
         JOIN logpm_distribution_reservation_stockarticle ldrs ON ldrs.reservation_id = ldr.id
         WHERE
-        lds.delivery_id = lddl.id
+        lds.delivery_id = lddl.id and ldrs.stock_article_status != 2
         ) orderNumber,
         (
         SELECT
@@ -107,7 +107,7 @@
         logpm_distribution_signfor lds
         JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id
         WHERE
-        lds.delivery_id = lddl.id
+        lds.delivery_id = lddl.id and ldr.reservation_status != '40'
         ) deliveryNumber,
         (
         SELECT
@@ -1028,11 +1028,16 @@
         b.*
         FROM
         logpm_distribution_signfor a
+        INNER JOIN logpm_distribution_reservation AS lds ON a.reservation_id = lds.id
         INNER JOIN logpm_distribution_reservation_stockarticle b ON a.reservation_id = b.reservation_id
         <where>
+            b.stock_article_status != 2
             <if test="deliveryListId != null and deliveryListId != ''">
               and  a.delivery_id = #{deliveryListId}
             </if>
+            <if test="consignee != null and consignee != ''">
+              and  lds.consignee = #{consignee}
+            </if>
         </where>
 
     </select>

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

@@ -3,6 +3,7 @@ package com.logpm.distribution.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.mapper.DistributionLoadscanMapper;
@@ -53,11 +54,17 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		if (distributionLoadscanEntities.size()<0){log.info("[makeSureByPackage]包条无数据"); return;}
 		// 使用流式操作和映射，提取包条Id并创建新的列表
 		List<Long> PackageIdList = distributionLoadscanEntities.stream().map(DistributionLoadscanEntity::getPackageId).collect(Collectors.toList());
+		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListMapper.selectList(Wrappers.<DistributionParcelListEntity>query().lambda().in(DistributionParcelListEntity::getId, PackageIdList));
+		//
+		//TODO 包件状态变更
 		//修改状态包条状态
 		distributionParcelListService.update(new UpdateWrapper<DistributionParcelListEntity>().lambda()
 			.in(DistributionParcelListEntity::getId,PackageIdList)
 			.set(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yizhuangche.getValue())
 		);
+
+
+
 		//提取订单Id(去重)
 		List<Long> OrderList = distributionLoadscanEntities.stream().map(DistributionLoadscanEntity::getOrderId).distinct().collect(Collectors.toList());
 		//查询修改订单状态

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

@@ -1202,38 +1202,43 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		DistributionDeliveryListVO deliveryListVO = Func.copy(deliveryListEntity, DistributionDeliveryListVO.class);
 		//这里对于同一个配送任务下的预约信息是一致的，这里进行去重的操作，
 		DistributionReservationVO reservationVOS = distributionReservationMapper.getReservationInfo(id);
-		deliveryListVO.setReservationInfo(reservationVOS);
-		//1、查询出订单信息
-		List<DistributionStockArticleEntity> stockArticleVOS = distributionDeliveryListMapper.getDeliveryDisuccStockArticleInfo(id);
-		List<DistributionStockArticleVO> stockArticleVOList = DistributionStockArticleWrapper.build().listVO(stockArticleVOS);
-		stockArticleVOList.forEach(s -> {
-			//这里查询出订单选取的包件信息
-			DistributionReservationPackageDTO reservationPackageDTO = new DistributionReservationPackageDTO();
-			reservationPackageDTO.setReservationId(reservationVOS.getId());
-			reservationPackageDTO.setStockArticleId(s.getId());
-			List<DistributionParcelListEntity> parcelListEntities = distributionReservationPackageMapper.getDeliveryReservationPackage(deliveryListEntity.getId(), s.getId());
-			List<DistributionParcelListVO> distributionParcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntities);
-			if (Func.isNotEmpty(distributionParcelListVOS)){
-				//查询出订单的所有包件信息
-				List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId()));
-				List<DistributionParcelListVO> parcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
-				s.setPackageList(distributionParcelListVOS);
-				s.setParcelListVOS(parcelListVOS);
-			}
-		});
-		deliveryListVO.setStockArticleList(stockArticleVOList);
+		if (Func.isNotEmpty(reservationVOS)){
+			deliveryListVO.setReservationInfo(reservationVOS);
+			//1、查询出订单信息
+			List<DistributionStockArticleEntity> stockArticleVOS = distributionDeliveryListMapper.getDeliveryDisuccStockArticleInfo(id);
+			List<DistributionStockArticleVO> stockArticleVOList = DistributionStockArticleWrapper.build().listVO(stockArticleVOS);
+			stockArticleVOList.forEach(s -> {
+				//这里查询出订单选取的包件信息
+				DistributionReservationPackageDTO reservationPackageDTO = new DistributionReservationPackageDTO();
+				reservationPackageDTO.setReservationId(reservationVOS.getId());
+				reservationPackageDTO.setStockArticleId(s.getId());
+				List<DistributionParcelListEntity> parcelListEntities = distributionReservationPackageMapper.getDeliveryReservationPackage(deliveryListEntity.getId(), s.getId());
+				List<DistributionParcelListVO> distributionParcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntities);
+				if (Func.isNotEmpty(distributionParcelListVOS)){
+					//查询出订单的所有包件信息
+					List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId()));
+					List<DistributionParcelListVO> parcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
+					s.setPackageList(distributionParcelListVOS);
+					s.setParcelListVOS(parcelListVOS);
+				}
+			});
+			deliveryListVO.setStockArticleList(stockArticleVOList);
+		}
+
 		//2、查询出备货信息
 		DistributionStockupVO stockupEntity = distributionStockupMapper.getDeliveryStockupInfo(id);
-		deliveryListVO.setStockupInfo(stockupEntity);
-		//3、查询司机信息
-		if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
-			//自主配送
-			List<DistributionDeliverySelfVO> deliverySelfVO = distributionDeliverySelfMapper.getDeliverySelfInfo(id);
-			deliveryListVO.setDeliverySelfVO(deliverySelfVO);
-		} else {
-			//外协配送
-			DistributionDeliveryTripartiteVO deliveryTripartiteVO = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(id);
-			deliveryListVO.setDeliveryTripartiteVO(deliveryTripartiteVO);
+		if (Func.isNotEmpty(stockupEntity)){
+			deliveryListVO.setStockupInfo(stockupEntity);
+			//3、查询司机信息
+			if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
+				//自主配送
+				List<DistributionDeliverySelfVO> deliverySelfVO = distributionDeliverySelfMapper.getDeliverySelfInfo(id);
+				deliveryListVO.setDeliverySelfVO(deliverySelfVO);
+			} else {
+				//外协配送
+				DistributionDeliveryTripartiteVO deliveryTripartiteVO = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(id);
+				deliveryListVO.setDeliveryTripartiteVO(deliveryTripartiteVO);
+			}
 		}
 		//4、结果封装
 		return deliveryListVO;
@@ -1382,6 +1387,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						DistributionReservationPackageEntity packageEntity = new DistributionReservationPackageEntity();
 						packageEntity.setStockArticleId(s.getId());
 						packageEntity.setReservationId(distributionReservationEntity.getId());
+						packageEntity.setPacketBarCode(p.getOrderPackageCode());
 						packageEntity.setPacketBarStatus(ReservationPackageStatusConstant.xinzeng.getValue());
 						packageEntity.setParceListId(p.getId());
 						p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
@@ -1430,7 +1436,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				AtomicInteger packageTotal = new AtomicInteger();
 				AtomicInteger reduceOrder = new AtomicInteger();
 //				List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationMapper.selectStockArticleByReservationId(reservationEntity.getId());
-				List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionDeliveryListMapper.selectStockArticleById(deliveryListEntityId);
+				List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionDeliveryListMapper.selectStockArticleById(deliveryListEntityId,k);
 				Map<Long, List<DistributionReservationStockarticleEntity>> oldStockArticle = reservationStockarticleEntityList.stream().collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getStockArticleId));
 				v.forEach(s -> {
 					//根据配送和客户名称查询预约
@@ -1447,20 +1453,22 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
 							reservationPackageEntity.setPacketBarStatus(ReservationPackageStatusConstant.xinzeng.getValue());
 							reservationPackageEntity.setParceListId(p.getId());
+							distributionReservationPackageService.save(reservationPackageEntity);
 							//统计包件数量
 							packageNum.getAndAdd(p.getQuantity());
 							p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
 							distributionParcelListService.updateById(p);
 						});
 						//查询该订单有效的预约包件数量是否和订单总件数一样，一样订单状态为已预约，否则为部分预约
-						int number = distributionReservationPackageMapper.selectPackageNum(s.getId());
-						if (Func.equals(number, s.getTotalNumber())) {
-							s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
-						} else {
-							s.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
-						}
+//						int number = distributionReservationPackageMapper.selectPackageNum(s.getId());
+//						if (Func.equals(number, s.getTotalNumber())) {
+//							s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+//						} else {
+//							s.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+//						}
 						DistributionReservationStockarticleEntity reservationStockarticleEntity = new DistributionReservationStockarticleEntity();
 						reservationStockarticleEntity.setReservationId(reservationEntity.getId());
+//						reservationStockarticleEntity.setStockArticleStatus(distributionReservationPackageService.judgmentStatus());
 						reservationStockarticleEntity.setStockArticleId(s.getId());
 						reservationStockarticleEntity.setStockArticleStatus(ReservationOrderStatusConstant.zengjia.getValue());
 						reservationStockarticleEntity.setReservationNum(packageNum.get());
@@ -1559,6 +1567,27 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			DistributionReservationEntity reservationEntity = baseMapper.selectReservationByDeliveryListIdAndCustomer(deliveryListEntity.getId(), f);
 			reservationEntity.setReservationStatus(ReservationStatusConstant.yiquexiao.getValue());
 			distributionReservationMapper.updateById(reservationEntity);
+			//这里还需要将减少的预约单下的所有订单、包件进行取消状态
+			List<DistributionReservationStockarticleEntity> entities = distributionReservationStockarticleMapper.selectList(Wrappers.<DistributionReservationStockarticleEntity>query().lambda()
+				.ne(DistributionReservationStockarticleEntity::getStockArticleStatus, "2")
+				.eq(DistributionReservationStockarticleEntity::getReservationId, reservationEntity.getId()));
+			entities.forEach(e->{
+				e.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue());
+				distributionReservationStockarticleService.updateById(e);
+				//这个订单的包件预约进行取消
+				List<DistributionReservationPackageEntity> packageEntityList = distributionReservationPackageMapper.selectList(Wrappers.<DistributionReservationPackageEntity>query().lambda().eq(DistributionReservationPackageEntity::getStockArticleId, e.getStockArticleId()).ne(DistributionReservationPackageEntity::getPacketBarStatus, "2"));
+				packageEntityList.forEach(p->{
+					p.setPacketBarStatus(ReservationPackageStatusConstant.quxiao.getValue());
+					distributionReservationPackageService.updateById(p);
+					DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(p.getParceListId());
+					parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
+					distributionParcelListService.updateById(parcelListEntity);
+				});
+				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(e.getStockArticleId());
+				stockArticleEntity.setReservationStatus(distributionReservationPackageService.judgmentStatus(Func.copy(stockArticleEntity,DistributionStockArticleDTO.class)));
+				distributionStockArticleService.updateById(stockArticleEntity);
+				//修改预约状态和包件状态
+			});
 		});
 		String kind = deliveryListEntity.getKind();
 		switch (kind) {
@@ -1827,6 +1856,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			if (Func.isNotEmpty(stockupInfo.getForkliftName())) {
 				deliveryStockupInfo.setAssignStatusName(StockAssignStatusConstant.weizhipai.getValue());
 				deliveryStockupInfo.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
+				deliveryStockupInfo.setForkliftName(stockupInfo.getForkliftName());
+				deliveryStockupInfo.setForkliftId(stockupInfo.getForkliftId());
 				//不存在备货人员，此时该任务的状态处于未指派、待分配的状态
 			} else {
 				deliveryStockupInfo.setAssignStatusName(StockAssignStatusConstant.yizhipai.getValue());
@@ -1856,6 +1887,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			deliveryStockupInfo.setOutboundDate(stockupInfo.getOutboundDate());
 			distributionStockupMapper.updateById(deliveryStockupInfo);
 		}
+		deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
 		//对配送进行更改
 		this.updateById(deliveryListEntity);
 		return R.status(true);

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

@@ -270,6 +270,7 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 				}
 
 			break;
+
 		}
 
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java

@@ -160,7 +160,7 @@ public class WarehouseUpdownTypeApiController {
 	public R upShelfTray(@RequestBody UpdownTypeDTO updownTypeDTO ) {
 		String method = "###########upShelfTray: ";
 		log.info(method + "上架托盘维度 updownTypeDTO={}", updownTypeDTO);
-		String trayCode = updownTypeDTO.getCode();//托盘码
+		String trayCode = updownTypeDTO.getTrayCode();//托盘码
 		Long allocationId = updownTypeDTO.getAllocationId();
 		try{
 			if(Objects.isNull(allocationId)){

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayAllocationMapper.xml

@@ -17,7 +17,7 @@
     <select id="getTrayByAllocationId" resultType="com.logpm.basicdata.entity.BasicdataTrayEntity">
         select lwt.*
         from logpm_warehouse_tary_allocation lwta
-         left join logpm_warehouse_tray lwt on lwta.tary_id = lwt.id and lwt.is_deleted = 0
+         left join logpm_warehouse_tray lwt on lwta.tray_id = lwt.id and lwt.is_deleted = 0
         where lwta.is_deleted = 0
         and lwta.allocation_id = #{allocationId}
     </select>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml

@@ -100,7 +100,7 @@
     </select>
 
     <select id="getStockUpListByTrayTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
-        select ldsa.order_code orderCode,
+        select ldsl.order_code orderCode,
                lwtg.tray_code trayCode,
                ldsl.quantity_stock totalNum,
                lwtg.num shelfNum,

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml

@@ -80,6 +80,7 @@
         select ldsa.service_number serviceNum,
                ldsa.order_code orderCode,
                ldsa.complete_set completeSet,
+               1 goodsType,
                max(ldsa.total_number) totalNum,
                sum(ldpl.quantity) shelfNum
         from logpm_warehouse_updown_goods lwug
@@ -96,6 +97,7 @@
     <select id="findZeroByUpdownTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
         select ldsa.order_code orderCode,
                ldsa.total_number totalNum,
+               2 goodsType,
                lwug.num shelfNum,
                ldsa.complete_set completeSet
         from logpm_warehouse_updown_goods lwug
@@ -112,6 +114,7 @@
                ldsl.market_id marketId,
                ldsl.market_name marketName,
                ldsl.quantity_stock totalNum,
+               3 goodsType,
                lwug.num 	shelfNum
         from logpm_warehouse_updown_goods lwug
                  left join logpm_basicdata_material lbm on lbm.id = lwug.association_id and lbm.is_deleted = 0

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java

@@ -16,18 +16,13 @@
  */
 package com.logpm.warehouse.service.impl;
 
-import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
-import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
-import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
-import com.logpm.warehouse.mapper.WarehouseRetentionRecordMapper;
-import com.logpm.warehouse.service.IWarehouseRetentionRecordService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.distribution.entity.DistributionLoadscanEntity;
+import com.logpm.distribution.entity.DistributionParcelListEntity;
+import com.logpm.distribution.feign.IDistributionLoadscanClient;
+import com.logpm.distribution.feign.IDistributionParcelListClient;
 import com.logpm.warehouse.dto.RetentionDTO;
 import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
 import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
@@ -36,11 +31,13 @@ import com.logpm.warehouse.service.IWarehouseRetentionRecordService;
 import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
 import com.logpm.warehouse.vo.WarehouseWaybillDetentionVO;
 import com.logpm.warehouse.wrapper.WarehouseRetentionRecordWrapper;
+import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 滞留记录 服务实现类
@@ -48,9 +45,13 @@ import java.util.List;
  * @author BladeX
  * @since 2023-08-09
  */
+@AllArgsConstructor
 @Service
 public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<WarehouseRetentionRecordMapper, WarehouseRetentionRecordEntity> implements IWarehouseRetentionRecordService {
 
+	private final IDistributionLoadscanClient distributionLoadscanClient;
+	private final IDistributionParcelListClient distributionParcelListClient;
+
 	@Override
 	public IPage<WarehouseRetentionRecordVO> selectWarehouseRetentionRecordPage(IPage<WarehouseRetentionRecordVO> page, WarehouseRetentionRecordVO warehouseRetentionRecord) {
 		return page.setRecords(baseMapper.selectWarehouseRetentionRecordPage(page, warehouseRetentionRecord));
@@ -88,6 +89,30 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 	public R retentionScanPackage(String orderPackageCode) {
 
 		//查询装车记录表，存入滞留包件记录
+		//查询配送装车记录表是否有包件记录
+		DistributionLoadscanEntity loadscanEntity = distributionLoadscanClient.getByOrderPackageCode(orderPackageCode);
+		if(Objects.isNull(loadscanEntity)){
+			log.warn("#################retentionScanPackage: 未找到配送装车记录 orderPackageCode="+orderPackageCode);
+			return R.fail(403,"未找到配送装车记录");
+		}
+		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+		if(Objects.isNull(parcelListEntity)){
+			log.warn("#################retentionScanPackage: 未找到包件数据 orderPackageCode="+orderPackageCode);
+			return R.fail(403,"未找到包件数据");
+		}
+
+		WarehouseRetentionRecordEntity retentionRecordEntity = new WarehouseRetentionRecordEntity();
+		retentionRecordEntity.setOrderCode(parcelListEntity.getOrderCode());
+		retentionRecordEntity.setPackageCode(orderPackageCode);
+		retentionRecordEntity.setWaybillNo(parcelListEntity.getWaybillNumber());
+		retentionRecordEntity.setRetentionCarNo(loadscanEntity.getTrainNumber());
+		retentionRecordEntity.setRetentionWarehouseId(loadscanEntity.getWarehouseId());
+		retentionRecordEntity.setRetentionWarehouseName(loadscanEntity.getWarehouseName());
+		retentionRecordEntity.setRetentionType(2);
+		retentionRecordEntity.setAssembleCarDate(loadscanEntity.getScanTime());
+		retentionRecordEntity.setAssembleCarPersonId(loadscanEntity.getCreateUser());
+		retentionRecordEntity.setRemark(loadscanEntity.getMsg());
+		save(retentionRecordEntity);
 
 		return R.success("success");
 	}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -169,14 +169,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 
 		BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
 		if(Objects.isNull(basicdataTrayEntity)){
-			log.warn("#########saveTrayType: 未找到托盘信息 trayCode={}",trayCode);
-			throw new CustomerException(403,"未找到托盘信息");
+			log.warn("#########orderScanOrderPackageCode: 未找到托盘信息 trayCode={}",trayCode);
+			return R.fail(403,"未找到托盘信息");
 		}
 		Integer disableType = basicdataTrayEntity.getDisableType();
 		Long trayId = basicdataTrayEntity.getId();
 		if(disableType == 2){
 			log.warn("###############orderScanOrderPackageCode: 该托盘已被禁用 trayCode={}",trayCode);
-			throw new CustomerException(403,"该托盘已被禁用");
+			return R.fail(403,"该托盘已被禁用");
 		}
 		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
 		if(Objects.isNull(parcelListEntity)){

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -1249,11 +1249,19 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		}
 //		String type = trayTypeEntity.getType();//1扫码分拣（订制品）  2人工分拣（零担） 3库存品
 		Long trayTypeId = trayTypeEntity.getId();
+		Long trayId = trayTypeEntity.getTrayId();
 		QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsQueryWrapper = new QueryWrapper<>();
 		trayGoodsQueryWrapper.eq("tray_type_id",trayTypeId);
 		List<WarehouseTrayGoodsEntity> trayGoodsList = warehouseTrayGoodsService.list(trayGoodsQueryWrapper);
 		//把托盘绑定关系转成货位绑定关系
 		changeTrayGoodsToUpdownGoodsAndLog(trayGoodsList,updownTypeEntity);
+		//绑定托盘与库位关系
+		WarehouseTaryAllocationEntity taryAllocationEntity = new WarehouseTaryAllocationEntity();
+		taryAllocationEntity.setTrayId(trayId);
+		taryAllocationEntity.setAllocationId(allocationId);
+		taryAllocationEntity.setBindStatus("0");
+		warehouseTaryAllocationService.save(taryAllocationEntity);
+
 		//更新打托方式上的数量
 		updateUpdownTypeNum(updownTypeEntity);
 		return Resp.scanSuccess("上架成功","整托上架成功");