模块开发12

huimv-farm/src/main/java/vip/xiaonuo/quality/entity/QualityReagentInStock.java

@@ -65,4 +65,10 @@ public class QualityReagentInStock implements Serializable {
     private String orgName;
 
 
+    /**
+     * 入库数量
+     */
+    @ApiModelProperty(value = "试剂名称id",position =7 )
+    private Integer reagentId;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/entity/QualityReagentOutStock.java

@@ -65,4 +65,11 @@ public class QualityReagentOutStock implements Serializable {
     private String orgName;
 
 
+    /**
+     * 入库数量
+     */
+    @ApiModelProperty(value = "试剂名称id",position =7 )
+    private Integer reagentId;
+
+
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/param/QualityStockPageParam.java

@@ -21,4 +21,6 @@ public class QualityStockPageParam {
     private String reagent;
 
 
+    @ApiModelProperty(value = "试剂名称Id", position = 5)
+    private Integer id;
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/service/impl/QualityReagentInStockServiceImpl.java

@@ -51,6 +51,7 @@ public class QualityReagentInStockServiceImpl extends ServiceImpl<QualityReagent
             qualityReagentInStock.setOrgId(inStock.getOrgId());
             qualityReagentInStock.setOrgName(inStock.getOrgName());
             qualityReagentInStock.setReagent(inStock.getReagent());
+            qualityReagentInStock.setReagentId(inStock.getReagentId());
             inStockMapper.insert(qualityReagentInStock);
             if (ObjectUtil.isEmpty(stock)) {
                 QualityReagentStock stock1 = new QualityReagentStock();
@@ -87,9 +88,13 @@ public class QualityReagentInStockServiceImpl extends ServiceImpl<QualityReagent
         Integer pageNum = pageParam.getPageNum();
         String orgId = pageParam.getOrgId();
         String reagent = pageParam.getReagent();
+        Integer reagentId = pageParam.getId();
         QueryWrapper<QualityReagentInStock> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
         queryWrapper.eq(StringUtils.isNotBlank(reagent), "reagent", reagent);
+        if (null != reagentId) {
+            queryWrapper.eq("reagent_id", reagentId);
+        }
         queryWrapper.orderByDesc("create_time");
         Page<QualityReagentInStock> page = new Page<>(pageNum, pageSize);
         return inStockMapper.selectPage(page,queryWrapper);