1

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

@@ -42,6 +42,7 @@ public class ErpBdOrgController {
         return erpBdService.getMaterial();
     }
 
+
     @RequestMapping(value = "/getMaterialDetail",method = RequestMethod.GET)
     public List<ErpMaterial> getMaterialDetail(@RequestParam(value = "fnumber" ,required = false) String fnumber){
         return erpBdService.getMaterialDetail(fnumber);
@@ -61,6 +62,12 @@ public class ErpBdOrgController {
     public List<ErpQualiQm> getQuailIbit(){
         return erpBdService.getQuailIbit();
     }
+
+    //原材料
+    @RequestMapping(value = "/getMaterialRaw",method = RequestMethod.GET)
+    public List<ErpBdMaterial> getMaterialRaw (){
+        return erpBdService.getMaterialRaw();
+    }
 }
 
 

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

@@ -34,6 +34,8 @@ public class ErpBdMaterial implements Serializable {
 
     private String orgId;
     private String fnumber;
+    private String fspecification;
+    private Integer facctorgid;
 
 
 }

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

@@ -37,11 +37,6 @@ public class ErpQualiQm {
     private String FLOT;
 
     /**
-     * 标准值
-     */
-    private String fBglText1;
-
-    /**
      * 生产车间
      */
     private String FWORKSHOPID;
@@ -72,12 +67,12 @@ public class ErpQualiQm {
     /**
      * 检测项目
      */
-    private String f_BGL_REMARKS;
+    private String fbglremarks;
 
     /**
      * 标准值
      */
-    private String F_BGL_TEXT16;
+    private String fbgltext16;
 
     /**
      * 物料id

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

@@ -18,5 +18,7 @@ public class CaiGouDingDanShuLiangJinE {
     private Double FALLAMOUNT;
     private Double danJia ;
     private String gys ;
+    private String dingDanType ;
+    private String fnumber ;
 
 }

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

@@ -30,4 +30,5 @@ public interface ErpBdDepartmentMapper extends BaseMapper<ErpBdDepartment> {
 
     List<ErpQualiQm> getQuailIbit();
 
+    List<ErpBdMaterial> getMaterialRaw();
 }

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

@@ -19,4 +19,7 @@ public interface IErpBdOrgService extends IService<ErpBdOrg> {
     List<ErpQuali> getQuail();
 
     List<ErpQualiQm> getQuailIbit();
+
+    List<ErpBdMaterial> getMaterialRaw();
+
 }

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

@@ -65,4 +65,9 @@ public class ErpBdOrgServiceImpl extends ServiceImpl<ErpBdOrgMapper, ErpBdOrg> i
     public List<ErpQualiQm> getQuailIbit() {
         return erpBdDepartmentMapper.getQuailIbit();
     }
+
+    @Override
+    public List<ErpBdMaterial> getMaterialRaw() {
+        return erpBdDepartmentMapper.getMaterialRaw();
+    }
 }

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

@@ -64,9 +64,9 @@ inner join   T_BD_MATERIAL_L b on a.fmaterialid = b.fmaterialid
         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,
+         e.f_BGL_TEXT20 fbgltext20
+         , e.f_BGL_REMARKS fbglremarks
+         , e.F_BGL_TEXT16 fbgltext16,
         c.FMATERIALID  FMATERIALID
         ,c.FINSPECTRESULT  FINSPECTRESULT
         ,d.fname fname
@@ -79,5 +79,11 @@ inner join   T_BD_MATERIAL_L b on a.fmaterialid = b.fmaterialid
         right  join T_QM_IBITEMDETAIL e on e.fentryid = b.fentryid
 
     </select>
+    <select id="getMaterialRaw" resultType="com.huimv.getdata.entity.ErpBdMaterial">
+     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 '10%'
+    </select>
 
 </mapper>

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

@@ -74,11 +74,15 @@ SElECT DISTINCT B.FBILLAMOUNT_LC  FBILLAMOUNTLC ,A.FDATE , A.FDEMANDORGID FROM
     </select>
     <select id="getCaiGouDingDanShuLiangJinE" resultType="com.huimv.getdata.entity.caigou.CaiGouDingDanShuLiangJinE"
             parameterType="java.lang.String">
-        SELECT DISTINCT D.FNAME ,A.FDATE ,A.FPURCHASEORGID , B.FQTY ,C.FALLAMOUNT ,( C.FALLAMOUNT /B.FQTY ) danJia  ,E.FNAME gys  FROM T_PUR_POORDER A
+        SELECT DISTINCT D.FNAME ,A.FDATE ,A.FPURCHASEORGID , B.FQTY ,C.FALLAMOUNT ,( C.FALLAMOUNT /B.FQTY ) danJia  ,E.FNAME gys ,
+        F.FNAME dingDanType  , G.FNUMBER  fnumber
+         FROM T_PUR_POORDER A
 INNER JOIN T_PUR_POORDERENTRY B ON A.FID = B.FID
 INNER JOIN T_PUR_POORDERENTRY_F C  ON B.FENTRYID = C.FENTRYID
 INNER JOIN T_BD_MATERIAL_L  D ON D.FMATERIALID = B.FMATERIALID
         INNER JOIN T_BD_SUPPLIER_L  E ON A.FSUPPLIERID = E.FSUPPLIERID
+        INNER JOIN T_BAS_BILLTYPE_L F ON A.FBILLTYPEID = F.FBILLTYPEID
+        INNER JOIN T_BD_MATERIAL G ON G.FMATERIALID = D.FMATERIALID
         <if test="date !=null">
             where  A.FDATE >= #{date}
         </if>
@@ -132,10 +136,13 @@ INNER JOIN  T_CN_RECPAYPURPOSE_L C ON C.FID = B.FPURPOSEID
     </select>
     <select id="getCaiGouHeTongShuLiangJinE" resultType="com.huimv.getdata.entity.caigou.CaiGouDingDanShuLiangJinE"
             parameterType="java.util.Date">
-        SELECT DISTINCT D.FNAME ,A.FDATE ,A.FPURCHASEORGID , B.FQTY ,C.FALLAMOUNT  ,( C.FALLAMOUNT /B.FQTY )  danJia FROM T_PUR_CONTRACT A
+        SELECT DISTINCT D.FNAME ,A.FDATE ,A.FPURCHASEORGID , B.FQTY ,C.FALLAMOUNT  ,( C.FALLAMOUNT /B.FQTY )  danJia , E.FNAME dingDanType  ,
+        G.FNUMBER  fnumber   FROM T_PUR_CONTRACT A
 INNER JOIN T_PUR_CONTRACTENTRY B ON A.FID = B.FID
 INNER JOIN T_PUR_CONTRACTENTRY_F C  ON B.FENTRYID = C.FENTRYID
 INNER JOIN T_BD_MATERIAL_L  D ON D.FMATERIALID = B.FMATERIALID
+        INNER JOIN T_BAS_BILLTYPE_L E ON A.FBILLTYPEID = E.FBILLTYPEID
+        INNER JOIN T_BD_MATERIAL G ON G.FMATERIALID = D.FMATERIALID
         <if test="date !=null">
             WHERE  A.FDATE >= #{date}
         </if>

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/ErpBdRawMaterial.java

@@ -62,6 +62,7 @@ public class ErpBdRawMaterial implements Serializable {
     private String fname;
 
     private String fspecification;
+    private Integer materialType;
 
 
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/caigou/CaiGouDingDanShuLiangJinE.java

@@ -17,5 +17,7 @@ public class CaiGouDingDanShuLiangJinE {
     private Double FALLAMOUNT;
     private Double danJia ;
     private String gys;
+    private String dingDanType ;
+    private String fnumber ;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/kucun/ChengPinRuKu.java

@@ -15,4 +15,5 @@ public class ChengPinRuKu {
     private String FNAME;
     private String fnumber;
     private String wuLiaoName;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/purchase/entity/PurchaseContract.java

@@ -68,6 +68,8 @@ public class PurchaseContract implements Serializable {
      */
     @ApiModelProperty(value = "组织id", position = 6)
     private String orgId;
+    private Integer orderType;
+    private String fnumber;
 
 
 }

huimv-farm/src/main/java/vip/xiaonuo/purchase/entity/PurchaseOrder.java

@@ -121,5 +121,6 @@ public class PurchaseOrder implements Serializable {
 
 
     @ApiModelProperty(value = "合同类型 0原辅料包材采购合同 1五金材料采购合同 2设备采购合同 3工程服务采购合同 4其他服务类采购合同 5办公用品采购合同", position = 15)
-    private Double orderType;
+    private Integer orderType;
+    private String fnumber;
 }

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

@@ -71,12 +71,12 @@ public class ErpQualiQm {
     /**
      * 检测项目
      */
-    private String f_BGL_REMARKS;
+    private String fbglremarks;
 
     /**
      * 标准值
      */
-    private String F_BGL_TEXT16;
+    private String fbgltext16;
 
     /**
      * 物料id

huimv-farm/src/main/java/vip/xiaonuo/warehouse/entity/WarehouseMaterialInStock.java

@@ -35,7 +35,7 @@ public class WarehouseMaterialInStock implements Serializable {
      * 原材料id
      */
     @ApiModelProperty(value = "物料分类0原材料 1成品半成品 2低值易耗  3包材",position = 1)
-    private String materialType;
+    private Integer materialType;
 
     /**
      * 原材料名称

huimv-farm/src/main/java/vip/xiaonuo/warehouse/entity/WarehouseMaterialOutStock.java

@@ -35,7 +35,7 @@ public class WarehouseMaterialOutStock implements Serializable {
      * 原材料id
      */
     @ApiModelProperty(value = "物料分类0原材料 1成品半成品 2低值易耗  3包材",position = 1)
-    private String materialType;
+    private Integer materialType;
 
     /**
      * 原材料名称

huimv-farm/src/main/java/vip/xiaonuo/warehouse/entity/WarehouseMaterialStock.java

@@ -35,7 +35,7 @@ public class WarehouseMaterialStock implements Serializable {
      * 原材料id
      */
     @ApiModelProperty(value = "物料分类0原材料 1成品半成品 2低值易耗  3包材",position = 1)
-    private String materialType;
+    private Integer materialType;
 
     /**
      * 原材料名称

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

@@ -26,10 +26,12 @@ import org.springframework.web.client.RestTemplate;
 import vip.xiaonuo.erp.entity.ErpBdDepartment;
 import vip.xiaonuo.erp.entity.ErpBdMaterial;
 import vip.xiaonuo.erp.entity.ErpBdOrg;
+import vip.xiaonuo.erp.entity.ErpBdRawMaterial;
 import vip.xiaonuo.erp.entity.voucher.ErpMaterial;
 import vip.xiaonuo.erp.mapper.ErpBdDepartmentMapper;
 import vip.xiaonuo.erp.mapper.ErpBdMaterialMapper;
 import vip.xiaonuo.erp.mapper.ErpBdOrgMapper;
+import vip.xiaonuo.erp.mapper.ErpBdRawMaterialMapper;
 import vip.xiaonuo.production.entity.ProduceLocation;
 import vip.xiaonuo.production.mapper.ProduceLocationMapper;
 import vip.xiaonuo.quality.entity.ErpBdQuail;
@@ -75,6 +77,9 @@ public class Bdest {
     @Autowired
     private QualityFenxibaogaoMapper qualityFenxibaogaoMapper;
 
+    @Autowired
+    private ErpBdRawMaterialMapper erpBdRawMaterialMapper;
+
 //    private IQualityReagentService produceLocationMapper;
 
 
@@ -102,10 +107,10 @@ public class Bdest {
                 qualityFenxibaogao.setCheJianName(fdeptid.getFname());
             }
             qualityFenxibaogao.setInspecDate( erpMaterial.getInspectStartDate());
-            qualityFenxibaogao.setInspecItems(erpMaterial.getF_BGL_REMARKS());
+            qualityFenxibaogao.setInspecItems(erpMaterial.getFbglremarks());
             qualityFenxibaogao.setInspecNum(erpMaterial.getFBILLNO());
             qualityFenxibaogao.setInspecResults("合格");
-            qualityFenxibaogao.setInspecStandards(erpMaterial.getF_BGL_TEXT16());
+            qualityFenxibaogao.setInspecStandards(erpMaterial.getFbgltext16());
             qualityFenxibaogao.setManufBatchNum(erpMaterial.getFLOT());
             qualityFenxibaogao.setMaterialName(erpMaterial.getFname());
             qualityFenxibaogao.setOrgId(forgid.getOrgId());
@@ -165,7 +170,7 @@ public class Bdest {
 
     }
 
-        //获取试剂
+    //获取试剂
     @Test
     public void  test4(){
         ResponseEntity<List<ErpMaterial>> response = restTemplate.exchange(
@@ -300,5 +305,42 @@ public class Bdest {
         }
     }
 
+    //获取原材料 等
+    @Test
+    public void  test7(){
+        ResponseEntity<List<ErpMaterial>> response = restTemplate.exchange(
+                "http://127.0.0.1:9200/erp-bd-org/getMaterialRaw",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<ErpMaterial>>() {}
+        );
+        List<ErpMaterial> forObjects = response.getBody();
+        System.out.println(forObjects);
+        for (ErpMaterial erpMaterial : forObjects) {
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", erpMaterial.getFacctorgid()));
+            if (ObjectUtil.isEmpty(forgid))
+                continue;
+            ErpBdRawMaterial erpBdRawMaterial = new ErpBdRawMaterial();
+            erpBdRawMaterial.setFspecification(erpMaterial.getFspecification());
+            erpBdRawMaterial.setOrgId(forgid.getOrgId());
+            erpBdRawMaterial.setErpFnumber(erpMaterial.getFnumber());
+            erpBdRawMaterial.setFname(erpMaterial.getFname());
+            erpBdRawMaterial.setMaterialType(getType(erpBdRawMaterial.getErpFnumber()));
+            erpBdRawMaterialMapper.insert(erpBdRawMaterial);
+        }
+    }
+
+    private Integer getType(String erpFunmber) {
+        if (erpFunmber.startsWith("01"))
+            return 1;
+        else if (erpFunmber.startsWith("10"))
+            return 0;
+        else if (erpFunmber.startsWith("11"))
+            return 3;
+        else if (erpFunmber.startsWith("15"))
+            return 2;
+        else
+            return 4;
+    }
 
 }

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

@@ -64,8 +64,14 @@ public class KuCunTest {
     @Autowired
     private WarehouseStockMapper stockMapper;
     @Autowired
+    private WarehouseMaterialStockMapper materialStockMapper;
+    @Autowired
     private WarehouseStockDetailMapper stockDetailMapper;
     @Autowired
+    private WarehouseMaterialOutStockMapper materialOutStockMapper;
+    @Autowired
+    private WarehouseMaterialInStockMapper materialInStockMapper;
+    @Autowired
     private WarehouseStockSecondMapper stockSecondMapper;
 
     @Test
@@ -85,25 +91,36 @@ public class KuCunTest {
             ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFSTOCKORGID()));
             if (ObjectUtil.isEmpty(forgid))
                 continue;
-            WarehouseStock warehouseStock = new WarehouseStock();
-            if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
-                warehouseStock.setMaterial(String.format("%.2f",forObject.getFBASEQTY()));
-            }
-            if ("成品库".equals(forObject.getFNAME()) || "成品库CW".equals(forObject.getFNAME())){
-                warehouseStock.setFinishProduce(String.format("%.2f",forObject.getFBASEQTY()));
-            }
-            if ("五金库".equals(forObject.getFNAME())){
-                warehouseStock.setLowValue(String.format("%.2f",forObject.getFBASEQTY()));
-            }
-            if ("包材库".equals(forObject.getFNAME())){
-                warehouseStock.setPackageMaterial(String.format("%.2f",forObject.getFBASEQTY()));
-            }
-            if (forObject.getFnumber().equals("10020002")){
-                warehouseStock.setLanolin(String.format("%.2f",forObject.getFBASEQTY()));
-            }
-            warehouseStock.setCreateTime(forObject.getFUPDATETIME());
-            warehouseStock.setOrgId(forgid.getOrgId());
-            stockMapper.insert(warehouseStock);
+//            WarehouseStock warehouseStock = new WarehouseStock();
+//            if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
+//                warehouseStock.setMaterial(String.format("%.2f",forObject.getFBASEQTY()));
+//            }
+//            if ("成品库".equals(forObject.getFNAME()) || "成品库CW".equals(forObject.getFNAME())){
+//                warehouseStock.setFinishProduce(String.format("%.2f",forObject.getFBASEQTY()));
+//            }
+//            if ("五金库".equals(forObject.getFNAME())){
+//                warehouseStock.setLowValue(String.format("%.2f",forObject.getFBASEQTY()));
+//            }
+//            if ("包材库".equals(forObject.getFNAME())){
+//                warehouseStock.setPackageMaterial(String.format("%.2f",forObject.getFBASEQTY()));
+//            }
+//            if (forObject.getFnumber().equals("10020002")){
+//                warehouseStock.setLanolin(String.format("%.2f",forObject.getFBASEQTY()));
+//            }
+//            warehouseStock.setCreateTime(forObject.getFUPDATETIME());
+//            warehouseStock.setOrgId(forgid.getOrgId());
+//            stockMapper.insert(warehouseStock);
+
+            //库存
+            WarehouseMaterialStock warehouseMaterialStock = new WarehouseMaterialStock();
+            warehouseMaterialStock.setCreateTime(forObject.getFUPDATETIME());
+            warehouseMaterialStock.setMaterial(forObject.getWuLiaoName());
+            warehouseMaterialStock.setMaterialType(getMaterialType(forObject.getFNAME()));
+            warehouseMaterialStock.setMaterialStock(String.format("%.2f",forObject.getFBASEQTY()));
+            warehouseMaterialStock.setOrgId(forgid.getOrgId());
+            warehouseMaterialStock.setOrgName(forgid.getFname());
+            warehouseMaterialStock.setFnumber(forObject.getFnumber());
+            materialStockMapper.insert(warehouseMaterialStock);
 
             WarehouseStockDetail warehouseStockDetail = new WarehouseStockDetail();
             if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
@@ -123,9 +140,27 @@ public class KuCunTest {
             warehouseStockDetail.setMaterialNumber(String.format("%.2f",forObject.getFBASEQTY()));
             warehouseStockDetail.setStockName(forObject.getFNAME());
             warehouseStockDetail.setCreateTime(forObject.getFUPDATETIME());
+            warehouseStockDetail.setFnumber(forObject.getFnumber());
             stockDetailMapper.insert(warehouseStockDetail);
         }
     }
+
+    private Integer getMaterialType(String fname) {
+        if (("原料库".equals(fname) || "高科原料仓库".equals(fname))){
+            return 0;
+        }
+        if ("成品库".equals(fname) || "成品库CW".equals(fname)){
+         return 1;
+        }
+        if ("五金库".equals(fname)){
+           return 2;
+        }
+        if ("包材库".equals(fname)){
+           return 3;
+        }
+       return 0;
+    }
+
     @Test
     public void test2() {
         //成品半成品
@@ -142,62 +177,73 @@ public class KuCunTest {
             ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFSTOCKORGID()));
             if (ObjectUtil.isEmpty(forgid))
                 continue;
-            WarehouseIncomStock warehouseIncomStock  = new WarehouseIncomStock();
-            if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
-                warehouseIncomStock.setMaterial(String.format("%.2f",forObject.getFREALQTY()));
-            }
-            if ("成品库".equals(forObject.getFNAME()) || "成品库CW".equals(forObject.getFNAME())){
-                warehouseIncomStock.setFinishProduce(String.format("%.2f",forObject.getFREALQTY()));
-            }
-            if ("五金库".equals(forObject.getFNAME())){
-                warehouseIncomStock.setLowValue(String.format("%.2f",forObject.getFREALQTY()));
-            }
-            if ("包材库".equals(forObject.getFNAME())){
-                warehouseIncomStock.setPackageMaterial(String.format("%.2f",forObject.getFREALQTY()));
-            }
-            if (forObject.getFnumber().equals("10020002")){
-                warehouseIncomStock.setLanolin(String.format("%.2f",forObject.getFREALQTY()));
-            }
+//            WarehouseIncomStock warehouseIncomStock  = new WarehouseIncomStock();
+//            if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
+//                warehouseIncomStock.setMaterial(String.format("%.2f",forObject.getFREALQTY()));
+//            }
+//            if ("成品库".equals(forObject.getFNAME()) || "成品库CW".equals(forObject.getFNAME())){
+//                warehouseIncomStock.setFinishProduce(String.format("%.2f",forObject.getFREALQTY()));
+//            }
+//            if ("五金库".equals(forObject.getFNAME())){
+//                warehouseIncomStock.setLowValue(String.format("%.2f",forObject.getFREALQTY()));
+//            }
+//            if ("包材库".equals(forObject.getFNAME())){
+//                warehouseIncomStock.setPackageMaterial(String.format("%.2f",forObject.getFREALQTY()));
+//            }
+//            if (forObject.getFnumber().equals("10020002")){
+//                warehouseIncomStock.setLanolin(String.format("%.2f",forObject.getFREALQTY()));
+//            }
+//
+//            warehouseIncomStock.setCreateTime(forObject.getFDATE());
+//            warehouseIncomStock.setOrgId(forgid.getOrgId());
+//            incomStockMapper.insert(warehouseIncomStock);
 
-            warehouseIncomStock.setCreateTime(forObject.getFDATE());
-            warehouseIncomStock.setOrgId(forgid.getOrgId());
-            incomStockMapper.insert(warehouseIncomStock);
+            WarehouseMaterialInStock warehouseMaterialOutStock = new WarehouseMaterialInStock();
+            warehouseMaterialOutStock.setCreateTime(forObject.getFDATE());
+            warehouseMaterialOutStock.setFnumber(forObject.getFnumber());
+            warehouseMaterialOutStock.setMaterial(forObject.getWuLiaoName());
+            warehouseMaterialOutStock.setMaterialType(getMaterialType(forObject.getFNAME()));
+            warehouseMaterialOutStock.setOrgId(forgid.getOrgId());
+            warehouseMaterialOutStock.setOutStock(String.format("%.2f",forObject.getFREALQTY()));
+            warehouseMaterialOutStock.setOrgName(forgid.getFname());
+            materialInStockMapper.insert(warehouseMaterialOutStock);
 
-            List<WarehouseStockDetail> warehouseStockDetails = stockDetailMapper.selectList(new QueryWrapper<WarehouseStockDetail>()
-                    .eq("org_id", forgid.getOrgId()).eq("material_name", forObject.getWuLiaoName())
-                    .between("create_time",DateUtil.beginOfDay(forObject.getFDATE()),DateUtil.endOfDay(forObject.getFDATE())));
-            if (ObjectUtil.isEmpty(warehouseStockDetails)){
-                WarehouseStockDetail warehouseStockDetail = new WarehouseStockDetail();
-                if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
-                    warehouseStockDetail.setMaterialCode(0);
-                }
-                if ("成品库".equals(forObject.getFNAME()) || "成品库CW".equals(forObject.getFNAME())){
-                    warehouseStockDetail.setMaterialCode(1);
-                }
-                if ("五金库".equals(forObject.getFNAME())){
-                    warehouseStockDetail.setMaterialCode(3);
-                }
-                if ("包材库".equals(forObject.getFNAME())){
-                    warehouseStockDetail.setMaterialCode(4);
-                }
-                if (forObject.getFnumber().equals("10020002")){
-                    warehouseStockDetail.setMaterialCode(5);
-                }
-                warehouseStockDetail.setOrgId(forgid.getOrgId());
-                warehouseStockDetail.setMaterialName(forObject.getWuLiaoName());
-                warehouseStockDetail.setIncomeNumber(String.format("%.2f",forObject.getFREALQTY()));
-                warehouseStockDetail.setStockName(forObject.getFNAME());
-                warehouseStockDetail.setCreateTime(forObject.getFDATE());
-                stockDetailMapper.insert(warehouseStockDetail);
-            }else {
-                WarehouseStockDetail warehouseStockDetail = warehouseStockDetails.get(0);
-                if (warehouseStockDetail.getIncomeNumber() ==null){
-                    warehouseStockDetail.setIncomeNumber(String.format("%.2f",forObject.getFREALQTY()));
-                }else {
-                    warehouseStockDetail.setIncomeNumber(String.format("%.2f",forObject.getFREALQTY() + Double.parseDouble(warehouseStockDetail.getIncomeNumber())));
-                }
-                stockDetailMapper.updateById(warehouseStockDetail);
-            }
+//            List<WarehouseStockDetail> warehouseStockDetails = stockDetailMapper.selectList(new QueryWrapper<WarehouseStockDetail>()
+//                    .eq("org_id", forgid.getOrgId()).eq("material_name", forObject.getWuLiaoName())
+//                    .between("create_time",DateUtil.beginOfDay(forObject.getFDATE()),DateUtil.endOfDay(forObject.getFDATE())));
+//            if (ObjectUtil.isEmpty(warehouseStockDetails)){
+//                WarehouseStockDetail warehouseStockDetail = new WarehouseStockDetail();
+//                if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
+//                    warehouseStockDetail.setMaterialCode(0);
+//                }
+//                if ("成品库".equals(forObject.getFNAME()) || "成品库CW".equals(forObject.getFNAME())){
+//                    warehouseStockDetail.setMaterialCode(1);
+//                }
+//                if ("五金库".equals(forObject.getFNAME())){
+//                    warehouseStockDetail.setMaterialCode(3);
+//                }
+//                if ("包材库".equals(forObject.getFNAME())){
+//                    warehouseStockDetail.setMaterialCode(4);
+//                }
+//                if (forObject.getFnumber().equals("10020002")){
+//                    warehouseStockDetail.setMaterialCode(5);
+//                }
+//                warehouseStockDetail.setOrgId(forgid.getOrgId());
+//                warehouseStockDetail.setMaterialName(forObject.getWuLiaoName());
+//                warehouseStockDetail.setIncomeNumber(String.format("%.2f",forObject.getFREALQTY()));
+//                warehouseStockDetail.setStockName(forObject.getFNAME());
+//                warehouseStockDetail.setCreateTime(forObject.getFDATE());
+//                warehouseStockDetail.setFnumber(forObject.getFnumber());
+//                stockDetailMapper.insert(warehouseStockDetail);
+//            }else {
+//                WarehouseStockDetail warehouseStockDetail = warehouseStockDetails.get(0);
+//                if (warehouseStockDetail.getIncomeNumber() ==null){
+//                    warehouseStockDetail.setIncomeNumber(String.format("%.2f",forObject.getFREALQTY()));
+//                }else {
+//                    warehouseStockDetail.setIncomeNumber(String.format("%.2f",forObject.getFREALQTY() + Double.parseDouble(warehouseStockDetail.getIncomeNumber())));
+//                }
+//                stockDetailMapper.updateById(warehouseStockDetail);
+//            }
         }
     }
 
@@ -217,26 +263,35 @@ public class KuCunTest {
             ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFSTOCKORGID()));
             if (ObjectUtil.isEmpty(forgid))
                 continue;
-            WarehouseOutStock warehouseIncomStock  = new WarehouseOutStock();
-            if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
-                warehouseIncomStock.setMaterial(String.format("%.2f",forObject.getFSALUNITQTY()));
-            }
-            if ("成品库".equals(forObject.getFNAME()) || "成品库CW".equals(forObject.getFNAME())){
-                warehouseIncomStock.setFinishProduce(String.format("%.2f",forObject.getFSALUNITQTY()));
-            }
-            if ("五金库".equals(forObject.getFNAME())){
-                warehouseIncomStock.setLowValue(String.format("%.2f",forObject.getFSALUNITQTY()));
-            }
-            if ("包材库".equals(forObject.getFNAME())){
-                warehouseIncomStock.setPackageMaterial(String.format("%.2f",forObject.getFSALUNITQTY()));
-            }
-            if (forObject.getFnumber().equals("10020002")){
-                warehouseIncomStock.setLanolin(String.format("%.2f",forObject.getFSALUNITQTY()));
-            }
-
-            warehouseIncomStock.setCreateTime(forObject.getFDATE());
-            warehouseIncomStock.setOrgId(forgid.getOrgId());
-            outStockMapper.insert(warehouseIncomStock);
+//            WarehouseOutStock warehouseIncomStock  = new WarehouseOutStock();
+//            if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
+//                warehouseIncomStock.setMaterial(String.format("%.2f",forObject.getFSALUNITQTY()));
+//            }
+//            if ("成品库".equals(forObject.getFNAME()) || "成品库CW".equals(forObject.getFNAME())){
+//                warehouseIncomStock.setFinishProduce(String.format("%.2f",forObject.getFSALUNITQTY()));
+//            }
+//            if ("五金库".equals(forObject.getFNAME())){
+//                warehouseIncomStock.setLowValue(String.format("%.2f",forObject.getFSALUNITQTY()));
+//            }
+//            if ("包材库".equals(forObject.getFNAME())){
+//                warehouseIncomStock.setPackageMaterial(String.format("%.2f",forObject.getFSALUNITQTY()));
+//            }
+//            if (forObject.getFnumber().equals("10020002")){
+//                warehouseIncomStock.setLanolin(String.format("%.2f",forObject.getFSALUNITQTY()));
+//            }
+//
+//            warehouseIncomStock.setCreateTime(forObject.getFDATE());
+//            warehouseIncomStock.setOrgId(forgid.getOrgId());
+//            outStockMapper.insert(warehouseIncomStock);
+            WarehouseMaterialOutStock warehouseMaterialOutStock = new WarehouseMaterialOutStock();
+            warehouseMaterialOutStock.setCreateTime(forObject.getFDATE());
+            warehouseMaterialOutStock.setFnumber(forObject.getFnumber());
+            warehouseMaterialOutStock.setMaterial(forObject.getWuLiaoName());
+            warehouseMaterialOutStock.setMaterialType(getMaterialType(forObject.getFNAME()));
+            warehouseMaterialOutStock.setOrgId(forgid.getOrgId());
+            warehouseMaterialOutStock.setOutStock(String.format("%.2f",forObject.getFSALUNITQTY()));
+            warehouseMaterialOutStock.setOrgName(forgid.getFname());
+            materialOutStockMapper.insert(warehouseMaterialOutStock);
 
             List<WarehouseStockDetail> warehouseStockDetails = stockDetailMapper.selectList(new QueryWrapper<WarehouseStockDetail>()
                     .eq("org_id", forgid.getOrgId()).eq("material_name", forObject.getWuLiaoName())
@@ -289,26 +344,26 @@ public class KuCunTest {
             ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFSTOCKORGID()));
             if (ObjectUtil.isEmpty(forgid))
                 continue;
-            WarehouseIncomStock warehouseIncomStock  = new WarehouseIncomStock();
-            if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
-                warehouseIncomStock.setMaterial(String.format("%.2f",forObject.getFINSTOCKQTY()));
-            }
-            if ("成品库".equals(forObject.getFNAME()) || "成品库CW".equals(forObject.getFNAME())){
-                warehouseIncomStock.setFinishProduce(String.format("%.2f",forObject.getFINSTOCKQTY()));
-            }
-            if ("五金库".equals(forObject.getFNAME())){
-                warehouseIncomStock.setLowValue(String.format("%.2f",forObject.getFINSTOCKQTY()));
-            }
-            if ("包材库".equals(forObject.getFNAME())){
-                warehouseIncomStock.setPackageMaterial(String.format("%.2f",forObject.getFINSTOCKQTY()));
-            }
-            if (forObject.getFnumber().equals("10020002")){
-                warehouseIncomStock.setLanolin(String.format("%.2f",forObject.getFINSTOCKQTY()));
-            }
-//
-            warehouseIncomStock.setCreateTime(forObject.getFDATE());
-            warehouseIncomStock.setOrgId(forgid.getOrgId());
-            incomStockMapper.insert(warehouseIncomStock);
+//            WarehouseIncomStock warehouseIncomStock  = new WarehouseIncomStock();
+//            if (("原料库".equals(forObject.getFNAME()) || "高科原料仓库".equals(forObject.getFNAME())) && !forObject.getFnumber().equals("10020002")){
+//                warehouseIncomStock.setMaterial(String.format("%.2f",forObject.getFINSTOCKQTY()));
+//            }
+//            if ("成品库".equals(forObject.getFNAME()) || "成品库CW".equals(forObject.getFNAME())){
+//                warehouseIncomStock.setFinishProduce(String.format("%.2f",forObject.getFINSTOCKQTY()));
+//            }
+//            if ("五金库".equals(forObject.getFNAME())){
+//                warehouseIncomStock.setLowValue(String.format("%.2f",forObject.getFINSTOCKQTY()));
+//            }
+//            if ("包材库".equals(forObject.getFNAME())){
+//                warehouseIncomStock.setPackageMaterial(String.format("%.2f",forObject.getFINSTOCKQTY()));
+//            }
+//            if (forObject.getFnumber().equals("10020002")){
+//                warehouseIncomStock.setLanolin(String.format("%.2f",forObject.getFINSTOCKQTY()));
+//            }
+////
+//            warehouseIncomStock.setCreateTime(forObject.getFDATE());
+//            warehouseIncomStock.setOrgId(forgid.getOrgId());
+//            incomStockMapper.insert(warehouseIncomStock);
 //
             List<WarehouseStockDetail> warehouseStockDetails = stockDetailMapper.selectList(new QueryWrapper<WarehouseStockDetail>()
                     .eq("org_id", forgid.getOrgId()).eq("material_name", forObject.getWuLiaoName())
@@ -375,6 +430,7 @@ public class KuCunTest {
             warehouseStockSecond.setIncomeMoney(String.format("%.2f",forObject.getFBILLAMOUNTLC()));
             warehouseStockSecond.setCreateTime(forObject.getFDATE());
             warehouseStockSecond.setOrgId(forgid.getOrgId());
+            warehouseStockSecond.setFnumber(forObject.getFnumber());
             warehouseStockSecond.setStock(String.format("%.2f",forObject.getFSTOCKBASEQTY()));
             stockSecondMapper.insert(warehouseStockSecond);
         }

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

@@ -102,13 +102,13 @@ public class MainTest {
             purchasePrice.setOrgId(forgid.getOrgId());
             purchasePrice.setPrice(String.format("%.2f",forObject.getDanJia()));
             priceMapper.insert(purchasePrice);
-//
+
             Date fdate = forObject.getFDATE();
             PurchaseOrder purchaseOrder = orderMapper.selectOne(new QueryWrapper<PurchaseOrder>().eq("org_id", forgid.getOrgId())
                     .eq("create_time",fdate)
                     .eq("material",forObject.getFname()));
             if (ObjectUtil.isEmpty(purchaseOrder)){
-                purchaseOrder =new PurchaseOrder();
+               purchaseOrder =new PurchaseOrder();
                 purchaseOrder.setCreateTime(forObject.getFDATE());
                 purchaseOrder.setPurchaseMoney(String.format("%.2f",forObject.getFALLAMOUNT()));
                 purchaseOrder.setMaterial(forObject.getFname());
@@ -116,6 +116,8 @@ public class MainTest {
                 purchaseOrder.setMaterialAcceptNumber(String.format("%.2f",forObject.getFQTY()));
                 purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFALLAMOUNT()));
                 purchaseOrder.setSupplier(forObject.getGys());
+                purchaseOrder.setFnumber(forObject.getFnumber());
+                purchaseOrder.setOrderType(getOrderType(forObject.getDingDanType()));
                 orderMapper.insert(purchaseOrder);
             }else {
                 purchaseOrder.setCreateTime(forObject.getFDATE());
@@ -130,6 +132,43 @@ public class MainTest {
         }
     }
 
+    private Integer getOrderType(String dingDanType) {
+        switch (dingDanType){
+            //0原辅料包材采购合同 1五金材料采购合同 2设备采购合同 3工程服务采购合同 4其他服务类采购合同 5办公用品采购合同
+            case "原辅料包材采购订单":
+                return 0;
+            case "五金材料采购订单":
+                return 1;
+            case "设备采购订单":
+                return 2;
+            case "工程服务采购订单":
+                return 3;
+            case "其他服务类采购订单":
+                return 4;
+            case "办公用品采购订单":
+                return 5;
+        }
+        return 6;
+    }
+    private Integer getHeTongType(String dingDanType) {
+        switch (dingDanType){
+            //0原辅料包材采购合同 1五金材料采购合同 2设备采购合同 3工程服务采购合同 4其他服务类采购合同 5办公用品采购合同
+            case "原辅料包材采购合同":
+                return 0;
+            case "五金材料采购合同":
+                return 1;
+            case "设备采购合同":
+                return 2;
+            case "工程服务采购合同":
+                return 3;
+            case "其他服务类采购合同":
+                return 4;
+            case "办公用品采购合同":
+                return 5;
+        }
+        return 6;
+    }
+
     @Test
     public void  test2(){
         ResponseEntity<List<CaiGouRuKu>> response = restTemplate.exchange(
@@ -379,6 +418,8 @@ public class MainTest {
             purchaseContract.setMaterialNumber(String.format("%.2f",forObject.getFQTY()));
             purchaseContract.setMaterialType(forObject.getFname());
             purchaseContract.setOrgId(forgid.getOrgId());
+            purchaseContract.setOrderType(getHeTongType(forObject.getDingDanType()));
+            purchaseContract.setFnumber(forObject.getFnumber());
             contractMapper.insert(purchaseContract);
         }