diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java index 68a54d0c1..286f690ac 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java +++ b/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 list; - - - /** - * 盘点明细子表List - */ - List list = new ArrayList<>(); +// +// +// +// List list = new ArrayList<>(); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index 29b7b8cc7..50ff86326 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/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 selectListGrounding(@Param("ids")List ids); + List selectListGrounding(@Param("ids")List ids); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 522baa4c3..29fe22070 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -570,7 +570,7 @@ - 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 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 141b01c77..19e03a452 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -150,7 +150,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl list2 = baseMapper.selectListGrounding(Arrays.asList(ids.split(","))); + List list2 = baseMapper.selectListGrounding(Arrays.asList(ids.split(",")));