1

get-data/src/main/java/com/huimv/getdata/controller/ErpBdOrgController.java

@@ -49,6 +49,11 @@ public class ErpBdOrgController {
     public List<ErpMaterial> getMaterialDetail(@RequestParam(value = "fnumber" ,required = false) String fnumber){
         return erpBdService.getMaterialDetail(fnumber);
     }
+
+    @RequestMapping(value = "/getReagent",method = RequestMethod.GET)
+    public List<ErpMaterial> getReagent(@RequestParam(value = "fnumber" ,required = false) String fnumber){
+        return erpBdService.getReagent(fnumber);
+    }
 }
 
 

get-data/src/main/java/com/huimv/getdata/mapper/ErpBdDepartmentMapper.java

@@ -24,4 +24,6 @@ public interface ErpBdDepartmentMapper extends BaseMapper<ErpBdDepartment> {
 
 
     List<ErpMaterial> getMaterialDetail(@Param("fnumber") String fnumber );
+
+    List<ErpMaterial> getReagent();
 }

get-data/src/main/java/com/huimv/getdata/service/IErpBdOrgService.java

@@ -16,4 +16,6 @@ public interface IErpBdOrgService extends IService<ErpBdOrg> {
     List<ErpBdMaterial> getMaterial();
 
     List<ErpMaterial> getMaterialDetail(String fnumber);
+
+    List<ErpMaterial> getReagent(String fnumber);
 }

get-data/src/main/java/com/huimv/getdata/service/impl/ErpBdOrgServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.getdata.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.getdata.entity.ErpBdDepartment;
 import com.huimv.getdata.entity.ErpBdMaterial;
 import com.huimv.getdata.entity.ErpBdOrg;
@@ -51,4 +52,11 @@ public class ErpBdOrgServiceImpl extends ServiceImpl<ErpBdOrgMapper, ErpBdOrg> i
 
             return erpBdDepartmentMapper.getMaterialDetail(fnumber+"%");
     }
+
+    @Override
+    public List<ErpMaterial> getReagent(String fnumber) {
+
+        return erpBdDepartmentMapper.getReagent();
+
+    }
 }

get-data/src/main/resources/com/huimv/getdata/mapper/ErpBdDepartmentMapper.xml

@@ -40,5 +40,11 @@ inner join   T_BD_MATERIAL_L b on a.fmaterialid = b.fmaterialid
  where a.FFORBIDSTATUS = 'A'
  and  a.fnumber like #{fnumber}
     </select>
+    <select id="getReagent" resultType="com.huimv.getdata.entity.ErpMaterial">
+        SELECT a.fnumber  fnumber   , b.fuseorgid  facctorgid, b.FNAME fname ,b.FSPECIFICATION fspecification   FROM [dbo].[T_BD_MATERIAL]  a
+inner join   T_BD_MATERIAL_L b on a.fmaterialid = b.fmaterialid
+ where a.FFORBIDSTATUS = 'A'
+ and  a.fnumber like '1003%'
+    </select>
 
 </mapper>

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

@@ -60,5 +60,7 @@ public class QualityReagentStock implements Serializable {
     @ApiModelProperty(value = "最新出库时间",position = 6)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date outTime;
+    private String fnumber;
+    private String fspecification;
 
 }

huimv-farm/src/test/java/vip/xiaonuo/Bdest.java

@@ -32,6 +32,10 @@ import vip.xiaonuo.erp.mapper.ErpBdMaterialMapper;
 import vip.xiaonuo.erp.mapper.ErpBdOrgMapper;
 import vip.xiaonuo.production.entity.ProduceLocation;
 import vip.xiaonuo.production.mapper.ProduceLocationMapper;
+import vip.xiaonuo.quality.entity.QualityReagentStock;
+import vip.xiaonuo.quality.mapper.QualityReagentStockMapper;
+import vip.xiaonuo.quality.service.IQualityReagentService;
+import vip.xiaonuo.quality.service.IQualityReagentStockService;
 
 import java.util.List;
 
@@ -56,6 +60,10 @@ public class Bdest {
     private ErpBdDepartmentMapper erpBdDepartmentMapper;
     @Autowired
     private ProduceLocationMapper produceLocationMapper;
+    @Autowired
+    private QualityReagentStockMapper qualityReagentStockMapper;
+//    private IQualityReagentService produceLocationMapper;
+
     //获取车间
     @Test
     public void  test2(){
@@ -70,6 +78,34 @@ public class Bdest {
         }
     }
 
+        //获取试剂
+    @Test
+    public void  test4(){
+        ResponseEntity<List<ErpMaterial>> response = restTemplate.exchange(
+                "http://127.0.0.1:9200/erp-bd-org/getReagent",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<ErpMaterial>>() {}
+        );
+        List<ErpMaterial> forObjects = response.getBody();
+        for (ErpMaterial erpMaterial : forObjects) {
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", erpMaterial.getFacctorgid()));
+            if (ObjectUtil.isEmpty(forgid))
+                continue;
+            QualityReagentStock qualityReagentStock = new QualityReagentStock();
+
+
+            qualityReagentStock.setFnumber(erpMaterial.getFnumber());
+            qualityReagentStock.setFspecification(erpMaterial.getFspecification());
+            qualityReagentStock.setOrgId(forgid.getOrgId());
+            qualityReagentStock.setOrgName(forgid.getFname());
+            qualityReagentStock.setReagent(erpMaterial.getFname());
+//            qualityReagentStock.setStock();
+            qualityReagentStockMapper.insert(qualityReagentStock);
+
+        }
+
+    }
 
     @Test
     public void  test1(){