1

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

@@ -1,10 +1,7 @@
 package com.huimv.getdata.controller;
 
 
-import com.huimv.getdata.entity.ErpBdDepartment;
-import com.huimv.getdata.entity.ErpBdMaterial;
-import com.huimv.getdata.entity.ErpBdOrg;
-import com.huimv.getdata.entity.ErpMaterial;
+import com.huimv.getdata.entity.*;
 import com.huimv.getdata.service.IErpBdOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -54,6 +51,16 @@ public class ErpBdOrgController {
     public List<ErpMaterial> getReagent(@RequestParam(value = "fnumber" ,required = false) String fnumber){
         return erpBdService.getReagent(fnumber);
     }
+
+    @RequestMapping(value = "/getQuail",method = RequestMethod.GET)
+    public List<ErpQuali> getQuail(){
+        return erpBdService.getQuail();
+    }
+
+    @RequestMapping(value = "/getQuailIbit",method = RequestMethod.GET)
+    public List<ErpQualiQm> getQuailIbit(){
+        return erpBdService.getQuailIbit();
+    }
 }
 
 

get-data/src/main/java/com/huimv/getdata/entity/ErpQuali.java

@@ -0,0 +1,70 @@
+package com.huimv.getdata.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ErpQuali {
+
+    private Integer id;
+
+    /**
+     * 质检id
+     */
+    private Integer incQcSchemeId;
+
+    /**
+     * 外键id
+     */
+    private Integer fmaterialId;
+
+    /**
+     * 名称
+     */
+    private String fname;
+
+    /**
+     * 检验项目
+     */
+    private String fBglRemark;
+
+    /**
+     * 单位
+     */
+    private String fBglText;
+
+    /**
+     * 标准值
+     */
+    private String fBglText1;
+
+    /**
+     * 物料编码
+     */
+    private String fnumber;
+
+    /**
+     * 部门id
+     */
+    private Integer fuseorgid;
+
+    /**
+     * 目标值
+     */
+    private String ftargetval;
+
+    /**
+     * 上限值
+     */
+    private String fuplimit;
+
+    /**
+     * 下限值
+     */
+    private String fdownlimit;
+
+    private String orgId;
+
+    private Date createTime;
+}

get-data/src/main/java/com/huimv/getdata/entity/ErpQualiQm.java

@@ -0,0 +1,94 @@
+package com.huimv.getdata.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ErpQualiQm {
+
+    //单据编号
+    private String FBILLNO;
+
+    /**
+     * 创建日期
+     */
+    private Date FCREATEDATE;
+
+    /**
+     * 质检组织
+     */
+    private Integer FINSPECTORGID;
+
+    /**
+     * 质检开始
+     */
+    private Date inspectStartDate;
+
+    /**
+     * 质检结束
+     */
+    private Date  inspectEndDate;
+
+    /**
+     * 批号
+     */
+    private String FLOT;
+
+    /**
+     * 标准值
+     */
+    private String fBglText1;
+
+    /**
+     * 生产车间
+     */
+    private String FWORKSHOPID;
+
+    /**
+     * 部门id
+     */
+    private Integer FINSPECTDEPID;
+
+    /**
+     *质检方案
+     */
+    private String FQCSCHEMEID;
+
+    /**
+     * 数量
+     */
+    private String FINSPECTQTY;
+
+    /**
+     * 外键
+     */
+    private String fentryid;
+    /**
+     * 结果
+     */
+    private String fbgltext20;
+    /**
+     * 检测项目
+     */
+    private String f_BGL_REMARKS;
+
+    /**
+     * 标准值
+     */
+    private String F_BGL_TEXT16;
+
+    /**
+     * 物料id
+     */
+    private int FMATERIALID;
+
+    /**
+     * 检测结果
+     */
+    private int FINSPECTRESULT;
+    /**
+     * 物料名称
+     */
+    private String fname;
+}

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

@@ -1,9 +1,7 @@
 package com.huimv.getdata.mapper;
 
-import com.huimv.getdata.entity.ErpBdDepartment;
+import com.huimv.getdata.entity.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.getdata.entity.ErpBdMaterial;
-import com.huimv.getdata.entity.ErpMaterial;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,4 +24,10 @@ public interface ErpBdDepartmentMapper extends BaseMapper<ErpBdDepartment> {
     List<ErpMaterial> getMaterialDetail(@Param("fnumber") String fnumber );
 
     List<ErpMaterial> getReagent();
+
+    List<ErpQuali> getQuail();
+
+
+    List<ErpQualiQm> getQuailIbit();
+
 }

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

@@ -1,10 +1,7 @@
 package com.huimv.getdata.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.getdata.entity.ErpBdDepartment;
-import com.huimv.getdata.entity.ErpBdMaterial;
-import com.huimv.getdata.entity.ErpBdOrg;
-import com.huimv.getdata.entity.ErpMaterial;
+import com.huimv.getdata.entity.*;
 
 import java.util.List;
 
@@ -18,4 +15,8 @@ public interface IErpBdOrgService extends IService<ErpBdOrg> {
     List<ErpMaterial> getMaterialDetail(String fnumber);
 
     List<ErpMaterial> getReagent(String fnumber);
+
+    List<ErpQuali> getQuail();
+
+    List<ErpQualiQm> getQuailIbit();
 }

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

@@ -2,10 +2,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;
-import com.huimv.getdata.entity.ErpMaterial;
+import com.huimv.getdata.entity.*;
 import com.huimv.getdata.mapper.ErpBdDepartmentMapper;
 import com.huimv.getdata.mapper.ErpBdOrgMapper;
 import com.huimv.getdata.service.IErpBdOrgService;
@@ -55,8 +52,17 @@ public class ErpBdOrgServiceImpl extends ServiceImpl<ErpBdOrgMapper, ErpBdOrg> i
 
     @Override
     public List<ErpMaterial> getReagent(String fnumber) {
-
         return erpBdDepartmentMapper.getReagent();
 
     }
+
+    @Override
+    public List<ErpQuali> getQuail() {
+        return erpBdDepartmentMapper.getQuail();
+    }
+
+    @Override
+    public List<ErpQualiQm> getQuailIbit() {
+        return erpBdDepartmentMapper.getQuailIbit();
+    }
 }

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

@@ -46,5 +46,38 @@ inner join   T_BD_MATERIAL_L b on a.fmaterialid = b.fmaterialid
  where a.FFORBIDSTATUS = 'A'
  and  a.fnumber like '1003%'
     </select>
+    <select id="getQuail" resultType="com.huimv.getdata.entity.ErpQuali">
+        select a.FIncQcSchemeId  incQcSchemeId ,a.fmaterialid ,b.fname ,c.f_bgl_remark , c.f_bgl_text,c.f_bgl_text1  , e.fnumber,b.fuseorgid ,
+        d.ftargetval ,d.fuplimit ,d.fdownlimit
+        from T_BD_MATERIALQUALITY a
+        inner join  T_BD_MATERIAL_L b on   a.fmaterialid = b.fmaterialid
+        inner join T_BD_MATERIAL e on e.fmaterialid = b.fmaterialid
+        right join  T_QM_QCSCHEMEENTRY c on  a.FIncQcSchemeId = c.fid
+        inner join  T_QM_QCSCHEMEENTRY_A d  on  c.fentryid = d.fentryid
+
+        where   a.FIncQcSchemeId is not null
+        order by  a.FIncQcSchemeId  desc
+
+    </select>
+    <select id="getQuailIbit" resultType="com.huimv.getdata.entity.ErpQualiQm">
+
+        select a.FBILLNO  FBILLNO,  a.FCREATEDATE  FCREATEDATE, a.FINSPECTORGID  FINSPECTORGID, b.fInspectStartDate  inspectStartDate, b.FLOT  FLOT,b.FWORKSHOPID FWORKSHOPID ,
+         b.fInspectEndDate inspectEndDate, a.FINSPECTDEPID  FINSPECTDEPID, b.FQCSCHEMEID  FQCSCHEMEID,b.FINSPECTQTY FINSPECTQTY,
+         b.fentryid fentryid,
+         e.f_BGL_TEXT20 f_BGL_TEXT20
+         , e.f_BGL_REMARKS f_BGL_REMARKS
+         , e.F_BGL_TEXT16 F_BGL_TEXT16,
+        c.FMATERIALID  FMATERIALID
+        ,c.FINSPECTRESULT  FINSPECTRESULT
+        ,d.fname fname
+
+
+         from T_QM_INSPECTBILL a
+        inner join  T_QM_INSPECTBILLENTRY b on a.fid = b.fid
+        inner  join T_QM_INSPECTBILLENTRY_A  c on a.fid = c.fid
+        inner join T_BD_MATERIAL_L d on c.FMATERIALID = d.FMATERIALID
+        right  join T_QM_IBITEMDETAIL e on e.fentryid = b.fentryid
+
+    </select>
 
 </mapper>

huimv-farm/src/main/java/vip/xiaonuo/quality/controller/ErpBdQuailController.java

@@ -0,0 +1,20 @@
+package vip.xiaonuo.quality.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2025-03-11
+ */
+@RestController
+@RequestMapping("/erp-bd-quail")
+public class ErpBdQuailController {
+
+}

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

@@ -0,0 +1,93 @@
+package vip.xiaonuo.quality.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2025-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("erp_bd_quail")
+public class ErpBdQuail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 质检id
+     */
+    private Integer incQcSchemeId;
+
+    /**
+     * 外键id
+     */
+    private Integer fmaterialId;
+
+    /**
+     * 名称
+     */
+    private String fname;
+
+    /**
+     * 检验项目
+     */
+    private String fBglRemark;
+
+    /**
+     * 单位
+     */
+    private String fBglText;
+
+    /**
+     * 标准值
+     */
+    private String fBglText1;
+
+    /**
+     * 物料编码
+     */
+    private String fnumber;
+
+    /**
+     * 部门id
+     */
+    private Integer fuseorgid;
+
+    /**
+     * 目标值
+     */
+    private String ftargetval;
+
+    /**
+     * 上限值
+     */
+    private String fuplimit;
+
+    /**
+     * 下限值
+     */
+    private String fdownlimit;
+
+    private String orgId;
+
+    private Date createTime;
+
+
+}

huimv-farm/src/main/java/vip/xiaonuo/quality/mapper/ErpBdQuailMapper.java

@@ -0,0 +1,16 @@
+package vip.xiaonuo.quality.mapper;
+
+import vip.xiaonuo.quality.entity.ErpBdQuail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2025-03-11
+ */
+public interface ErpBdQuailMapper extends BaseMapper<ErpBdQuail> {
+
+}

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

@@ -0,0 +1,16 @@
+package vip.xiaonuo.quality.service;
+
+import vip.xiaonuo.quality.entity.ErpBdQuail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2025-03-11
+ */
+public interface IErpBdQuailService extends IService<ErpBdQuail> {
+
+}

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

@@ -0,0 +1,20 @@
+package vip.xiaonuo.quality.service.impl;
+
+import vip.xiaonuo.quality.entity.ErpBdQuail;
+import vip.xiaonuo.quality.mapper.ErpBdQuailMapper;
+import vip.xiaonuo.quality.service.IErpBdQuailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2025-03-11
+ */
+@Service
+public class ErpBdQuailServiceImpl extends ServiceImpl<ErpBdQuailMapper, ErpBdQuail> implements IErpBdQuailService {
+
+}

huimv-farm/src/main/resources/mapper/ErpBdQuailMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="vip.xiaonuo.quality.mapper.ErpBdQuailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="vip.xiaonuo.quality.entity.ErpBdQuail">
+        <id column="id" property="id" />
+        <result column="inc_qc_scheme_id" property="incQcSchemeId" />
+        <result column="fmaterial_id" property="fmaterialId" />
+        <result column="fname" property="fname" />
+        <result column="f_bgl_remark" property="fBglRemark" />
+        <result column="f_bgl_text" property="fBglText" />
+        <result column="f_bgl_text1" property="fBglText1" />
+        <result column="fnumber" property="fnumber" />
+        <result column="fuseorgid" property="fuseorgid" />
+        <result column="ftargetval" property="ftargetval" />
+        <result column="fuplimit" property="fuplimit" />
+        <result column="fdownlimit" property="fdownlimit" />
+        <result column="org_id" property="orgId" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+</mapper>

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

@@ -32,11 +32,14 @@ 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.ErpBdQuail;
 import vip.xiaonuo.quality.entity.QualityReagentStock;
+import vip.xiaonuo.quality.mapper.ErpBdQuailMapper;
 import vip.xiaonuo.quality.mapper.QualityReagentStockMapper;
 import vip.xiaonuo.quality.service.IQualityReagentService;
 import vip.xiaonuo.quality.service.IQualityReagentStockService;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -62,6 +65,9 @@ public class Bdest {
     private ProduceLocationMapper produceLocationMapper;
     @Autowired
     private QualityReagentStockMapper qualityReagentStockMapper;
+
+    @Autowired
+    private ErpBdQuailMapper erpBdQuailMapper;
 //    private IQualityReagentService produceLocationMapper;
 
     //获取车间
@@ -77,6 +83,28 @@ public class Bdest {
             produceLocationMapper.insert(produceLocation);
         }
     }
+    //获取质量检验项目
+    @Test
+    public void  test5(){
+        ResponseEntity<List<ErpBdQuail>> response = restTemplate.exchange(
+                "http://127.0.0.1:9200/erp-bd-org/getQuail",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<ErpBdQuail>>() {}
+        );
+        List<ErpBdQuail> forObjects = response.getBody();
+        for (ErpBdQuail erpMaterial : forObjects) {
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", erpMaterial.getFuseorgid()));
+            if (ObjectUtil.isEmpty(forgid))
+                continue;
+            erpMaterial.setOrgId(forgid.getOrgId());
+            erpMaterial.setCreateTime(new Date());
+//            qualityReagentStock.setStock();
+            erpBdQuailMapper.insert(erpMaterial);
+
+        }
+
+    }
 
         //获取试剂
     @Test