修改托盘ID盘点

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

@@ -37,14 +37,15 @@ import java.util.List;
 public class QuestDetailVO extends QuestDetailEntity {
 	private static final long serialVersionUID = 1L;
 	//包件状态
+	/**
+	 * 盘点明细子表List
+	 */
 	private List<QuestDetailChildEntity> list;
 
 
 
-
+//
-
+//
-	/**
+//
-	 * 盘点明细子表List
+//	List<QuestDetailChildEntity> list = new ArrayList<>();
-	 */
-	List<QuestDetailChildEntity> list = new ArrayList<>();
 }

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

@@ -24,6 +24,7 @@ import com.logpm.distribution.dto.DistributionStockArticleOweDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.vo.DistributionParcelNumberVO;
+import com.logpm.distribution.vo.DistributionStockArticleGroundingVO;
 import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.vo.app.DistributionAppStockArticleVO;
@@ -114,5 +115,5 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 	 * @param ids
 	 * @return
 	 */
-    List<DistributionAppStockArticleVO> selectListGrounding(@Param("ids")List<String> ids);
+    List<DistributionStockArticleGroundingVO> selectListGrounding(@Param("ids")List<String> ids);
 }

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

@@ -570,7 +570,7 @@
 
         </where>
     </select>
-    <select id="selectListGrounding" resultType="">
+    <select id="selectListGrounding" resultType="com.logpm.distribution.vo.DistributionStockArticleGroundingVO">
         select ldsa.grounding_status,lwtg.association_type
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id

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

@@ -150,7 +150,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 			);
 			//查询包件有没有上架，打托信息
-			List<DistributionStockArticleEntity> list2 = baseMapper.selectListGrounding(Arrays.asList(ids.split(",")));
+			List<DistributionStockArticleGroundingVO> list2 = baseMapper.selectListGrounding(Arrays.asList(ids.split(",")));