diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java index dd28ab4..db81c95 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java @@ -96,4 +96,8 @@ public class Goods extends BaseEntity { @TableField(exist = false) private String sort; + + @TableField(exist = false) + // 批次数 + private Integer pNum; } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java index 383e449..395e7c1 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java @@ -104,6 +104,13 @@ public class GoodsController extends BladeController { return page; } + @GetMapping("/listByPnum") + public IPage listByPnum(Goods goods, Query query) { + return goodsService.listByPnum(goods,Condition.getPage(query)); + + } + + //查看详情 @GetMapping("/detail") public Goods detail(Goods goods) { diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.java index 23f1869..08fe0da 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.java @@ -14,5 +14,5 @@ import java.util.List; * 物品表 Mapper 接口 */ public interface GoodsMapper extends BaseMapper { - + IPage listByPnum(Goods goods,IPage page); } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml new file mode 100644 index 0000000..1f7ed10 --- /dev/null +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml @@ -0,0 +1,43 @@ + + + + + + \ No newline at end of file diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IGoodsService.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IGoodsService.java index 221a790..c47b4c1 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IGoodsService.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IGoodsService.java @@ -1,7 +1,9 @@ package org.springblade.lims.goods.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.lims.goods.entity.Goods; public interface IGoodsService extends BaseService { + IPage listByPnum(Goods goods,IPage page); } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java index ded5cd2..11b7271 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java @@ -1,6 +1,7 @@ package org.springblade.lims.goods.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.lims.goods.entity.Goods; @@ -14,5 +15,9 @@ import org.springframework.stereotype.Service; @Service @AllArgsConstructor public class GoodsServiceImpl extends BaseServiceImpl implements IGoodsService { - + private final GoodsMapper goodsMapper; + @Override + public IPage listByPnum(Goods goods, IPage page){ + return goodsMapper.listByPnum(goods,page); + } }