523096025 2 months ago
parent
commit
e3dcdefa74

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

@@ -13,7 +13,7 @@ public class ErpQualiQm {
     /**
      * 创建日期
      */
-    private Date FCREATEDATE;
+    private String FCREATEDATE;
 
     /**
      * 质检组织
@@ -23,12 +23,13 @@ public class ErpQualiQm {
     /**
      * 质检开始
      */
-    private Date inspectStartDate;
+
+    private String inspectStartDate;
 
     /**
      * 质检结束
      */
-    private Date  inspectEndDate;
+    private String  inspectEndDate;
 
     /**
      * 批号

+ 94 - 0
huimv-farm/src/main/java/vip/xiaonuo/quality/entity/vo/ErpQualiQm.java

@@ -0,0 +1,94 @@
+package vip.xiaonuo.quality.entity.vo;
+
+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;
+}

+ 59 - 0
huimv-farm/src/test/java/vip/xiaonuo/Bdest.java

@@ -33,8 +33,11 @@ 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.QualityFenxibaogao;
 import vip.xiaonuo.quality.entity.QualityReagentStock;
+import vip.xiaonuo.quality.entity.vo.ErpQualiQm;
 import vip.xiaonuo.quality.mapper.ErpBdQuailMapper;
+import vip.xiaonuo.quality.mapper.QualityFenxibaogaoMapper;
 import vip.xiaonuo.quality.mapper.QualityReagentStockMapper;
 import vip.xiaonuo.quality.service.IQualityReagentService;
 import vip.xiaonuo.quality.service.IQualityReagentStockService;
@@ -68,8 +71,64 @@ public class Bdest {
 
     @Autowired
     private ErpBdQuailMapper erpBdQuailMapper;
+
+    @Autowired
+    private QualityFenxibaogaoMapper qualityFenxibaogaoMapper;
+
 //    private IQualityReagentService produceLocationMapper;
 
+
+    //获取质量 所有记录
+    @Test
+    public void  test6(){
+        ResponseEntity<List<ErpQualiQm>> response = restTemplate.exchange(
+                "http://127.0.0.1:9200/erp-bd-org/getQuailIbit",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<ErpQualiQm>>() {}
+        );
+        List<ErpQualiQm> forObjects = response.getBody();
+        for (ErpQualiQm erpMaterial : forObjects) {
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", erpMaterial.getFINSPECTORGID()));
+            if (ObjectUtil.isEmpty(forgid))
+                continue;
+
+            QualityFenxibaogao qualityFenxibaogao = new QualityFenxibaogao();
+            String fworkshopid = erpMaterial.getFWORKSHOPID();
+            //车间
+            ErpBdDepartment fdeptid = erpBdDepartmentMapper.selectOne(new QueryWrapper<ErpBdDepartment>().eq("fdeptid", fworkshopid));
+
+            if(ObjectUtil.isNotEmpty(fdeptid)){
+                qualityFenxibaogao.setCheJianName(fdeptid.getFname());
+            }
+            qualityFenxibaogao.setInspecDate( erpMaterial.getInspectStartDate());
+            qualityFenxibaogao.setInspecItems(erpMaterial.getF_BGL_REMARKS());
+            qualityFenxibaogao.setInspecNum(erpMaterial.getFBILLNO());
+            qualityFenxibaogao.setInspecResults("合格");
+            qualityFenxibaogao.setInspecStandards(erpMaterial.getF_BGL_TEXT16());
+            qualityFenxibaogao.setManufBatchNum(erpMaterial.getFLOT());
+            qualityFenxibaogao.setMaterialName(erpMaterial.getFname());
+            qualityFenxibaogao.setOrgId(forgid.getOrgId());
+            //生产单位
+            ErpBdDepartment fdeptid1 = erpBdDepartmentMapper.selectOne(new QueryWrapper<ErpBdDepartment>().eq("fdeptid", erpMaterial.getFINSPECTDEPID()));
+            if(ObjectUtil.isNotEmpty(fdeptid1)){
+                qualityFenxibaogao.setProductionUnit(fdeptid1.getFname());
+            }
+
+            qualityFenxibaogao.setQualityType(0);
+            qualityFenxibaogao.setQuantity(erpMaterial.getFINSPECTQTY());
+            qualityFenxibaogao.setReportDate(erpMaterial.getInspectEndDate());
+            qualityFenxibaogao.setSelfBatchNum(erpMaterial.getFBILLNO());
+            qualityFenxibaogao.setSampDate(erpMaterial.getInspectStartDate());
+//            qualityFenxibaogao.setSpec();
+            qualityFenxibaogao.setSpecificOtation(erpMaterial.getFbgltext20());
+
+            qualityFenxibaogaoMapper.insert(qualityFenxibaogao);
+
+        }
+
+    }
+
     //获取车间
     @Test
     public void  test2(){