1.修复配送api中的引用问题

blade-service-api/logpm-distribution-api/pom.xml

@@ -3,15 +3,6 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>logpm-warehouse-api</artifactId>
-            <version>3.1.0.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-service-api</artifactId>

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

@@ -17,7 +17,6 @@
 package com.logpm.distribution.feign;
 
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
-import com.logpm.warehouse.vo.UpShelfDataVO;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -27,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 配送在库订单 Feign接口类
@@ -82,5 +82,5 @@ public interface IDistributionStockArticleClient {
 	@GetMapping(API_PREFIX + "/findEntityByStockArticleId")
     DistributionStockArticleEntity findEntityByStockArticleId(@RequestParam Long stockArticleId);
 	@GetMapping(API_PREFIX + "/fingListByServiceNumber")
-	List<UpShelfDataVO> fingListByServiceNumber(@RequestParam String serviceNumber);
+	List<Map> fingListByServiceNumber(@RequestParam String serviceNumber);
 }

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

@@ -22,7 +22,6 @@ import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.service.IDistributionParcelListService;
 import com.logpm.distribution.service.IDistributionStockArticleService;
-import com.logpm.warehouse.vo.UpShelfDataVO;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -33,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -143,7 +143,7 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 	}
 
 	@Override
-	public List<UpShelfDataVO> fingListByServiceNumber(String serviceNumber) {
+	public List<Map> fingListByServiceNumber(String serviceNumber) {
 		return distributionStockArticleService.fingListByServiceNumber(serviceNumber);
 	}
 

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

@@ -23,7 +23,6 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
-import com.logpm.warehouse.vo.UpShelfDataVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -80,5 +79,5 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 	 */
 	DistributionStockArticleQRCodeVO getOrderNoList(@Param("qrCode") String qrCode, @Param("o") String o);
 
-    List<UpShelfDataVO> fingListByServiceNumber(@Param("serviceNumber") String serviceNumber);
+    List<Map> fingListByServiceNumber(@Param("serviceNumber") String serviceNumber);
 }

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

@@ -203,7 +203,7 @@
         </where>
     </select>
 
-    <select id="fingListByServiceNumber" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
+    <select id="fingListByServiceNumber" resultType="java.util.Map">
         select ldsa.service_number serviceNum,
                ldsa.order_code orderCode,
                ldsa.total_number num,

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

@@ -17,12 +17,11 @@
 package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
-import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
-import com.logpm.warehouse.vo.UpShelfDataVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 
@@ -99,5 +98,5 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 
 	R<?> getPrintTemplates( Map<String,Object> params, HttpServletResponse response);
 
-    List<UpShelfDataVO> fingListByServiceNumber(String serviceNumber);
+    List<Map> fingListByServiceNumber(String serviceNumber);
 }

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

@@ -474,7 +474,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	@Override
-	public List<UpShelfDataVO> fingListByServiceNumber(String serviceNumber) {
+	public List<Map> fingListByServiceNumber(String serviceNumber) {
 		return baseMapper.fingListByServiceNumber(serviceNumber);
 	}
 }

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

@@ -41,9 +41,8 @@ public class WarehouseInventoryApiController {
 
 			//查询该库位的货物信息
 //			List<ReCheckOrderVO> upShelfDataVOs;
-//			List<ReCheckTrayVO> upShelfDataVOs = warehouseUpdownTypeService.findUpShelfScanGoods(code,upshelfScanType);
+//			List<ReCheckTrayVO> upShelfDataVOs1;
 //			List<ReCheckAllocationVO> upShelfDataVOs = warehouseUpdownTypeService.findUpShelfScanGoods(code,upshelfScanType);
-//			return R.data(upShelfDataVOs);
 			return R.success("success");
 		}catch (CustomerException e){
 			log.warn(e.message);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/ReCheckAllocationVO.java

@@ -0,0 +1,9 @@
+package com.logpm.warehouse.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ReCheckAllocationVO implements Serializable {
+}

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

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 @Log4j2
@@ -139,8 +140,18 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				throw new CustomerException(403,"订单信息不存在");
 			}
 			String serviceNumber = stockArticleEntity.getServiceNumber();//服务号
-			List<UpShelfDataVO> ls = distributionStockArticleClient.fingListByServiceNumber(serviceNumber);
+			List<Map> ls = distributionStockArticleClient.fingListByServiceNumber(serviceNumber);
-			return ls;
+			List<UpShelfDataVO> list = new ArrayList<>();
+			for (Map map:ls){
+				UpShelfDataVO upShelfDataVO = new UpShelfDataVO();
+				upShelfDataVO.setServiceNum((String) map.get("serviceNum"));
+				upShelfDataVO.setOrderCode((String) map.get("orderCode"));
+				upShelfDataVO.setNum((Integer) map.get("num"));
+				upShelfDataVO.setCompleteSet((Integer) map.get("completeSet"));
+				list.add(upShelfDataVO);
+			}
+
+			return list;
 		}else if(upshelfScanType == 2){
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCode(code);
 			if(Objects.isNull(stockArticleEntity)){