1.完成滞留记录

2.修复上架bug

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-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-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-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("上架成功","整托上架成功");