1

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

@@ -46,6 +46,16 @@ public class ErpXiaoShouController {
         return iErpXiaoShouService.getXiaoShouFeiYong(date);
     }
 
+    @RequestMapping(value = "/getXiaoShouFeiYong2",method = RequestMethod.GET)
+    public List<XiaoShouFeiYong> getXiaoShouFeiYong2(@RequestParam(value = "date" ,required = false) String date,
+                                                     @RequestParam(value = "number" ,required = false) String number){
+        return iErpXiaoShouService.getXiaoShouFeiYong2(date,number);
+    }
+    @RequestMapping(value = "/getDingDan",method = RequestMethod.GET)
+    public List<XiaoShouWanChenLvJinE> getDingDan(@RequestParam(value = "date" ,required = false) String date
+                                                   ){
+        return iErpXiaoShouService.getDingDan(date);
+    }
     @RequestMapping(value = "/getYvQiHeTongMingXi",method = RequestMethod.GET)
     public List<YvQiHeTongMingXi> getYvQiHeTongMingXi(@RequestParam(value = "date" ,required = false) String date){
         return iErpXiaoShouService.getYvQiHeTongMingXi(date);

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

@@ -11,7 +11,7 @@ public class CaiGouDingDanShuLiangJinE {
 
     private String fname;
 
-@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private int FPURCHASEORGID;
     private Double FQTY;
@@ -20,5 +20,8 @@ public class CaiGouDingDanShuLiangJinE {
     private String gys ;
     private String dingDanType ;
     private String fnumber ;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date createDate ;
+    private String FBILLNO;
 
 }

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

@@ -15,9 +15,20 @@ import java.util.Date;
  **/
 @Data
 public class CaiGouRuKu {
-    private Double FBILLAMOUNTLC;
+
 
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FDEMANDORGID;
+    private Integer FSTOCKORGID;
+
+    private Double FBILLAMOUNTLC;
+    private String FBILLNO;
+    private String FNAME;
+    private String FNUMBER;
+    private String materialId;
+    private Double FQTY;
+
+    private String poorderNo;
+
 }

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

@@ -12,4 +12,5 @@ public class FaPiaoJinE {
     private Date FDATE;
     private Integer FPURCHASEORGID;
     private Double FQTY;
+    private String FBILLNO;
 }

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

@@ -11,4 +11,16 @@ public class ShouLiaoJinE {
 @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FSTOCKORGID;
+
+    private Double FBILLAMOUNTLC;
+    private Double FBillAllAMONUTLC;
+    private String FBILLNO;
+    private String FNAME;
+
+    private String materialId;
+    private Double FQTY;
+    private String poorderNo;
+    private String FOrderBillNo;
+    private String FNUMBER;
+
 }

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

@@ -12,6 +12,8 @@ public class YvQiHeTongMingXi {
     private String FBILLNO;
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private String FDATE;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FCREATEDATE;
     private String FBILLTYPEID;
     //合同名字
     private String FNAME;

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

@@ -19,4 +19,8 @@ public interface ErpXiaoShouMapper {
     List<XiaoShouFeiYong> getXiaoShouFeiYong(String date);
 
     List<YvQiHeTongMingXi> getYvQiHeTongMingXi(String date);
+
+    List<XiaoShouFeiYong> getXiaoShouFeiYongFeiYong(@Param("date")String date ,@Param("number") String number);
+
+    List<XiaoShouWanChenLvJinE> getDingDan(@Param("date")String date );
 }

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

@@ -21,4 +21,8 @@ public interface IErpXiaoShouService {
     List<XiaoShouFeiYong> getXiaoShouFeiYong(String date);
 
     List<YvQiHeTongMingXi> getYvQiHeTongMingXi(String date);
+
+    List<XiaoShouFeiYong> getXiaoShouFeiYong2(String date,String number);
+
+    List<XiaoShouWanChenLvJinE> getDingDan(String date);
 }

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

@@ -59,4 +59,16 @@ public class ErpXiaoShouServiceImpl implements IErpXiaoShouService {
     public List<YvQiHeTongMingXi> getYvQiHeTongMingXi(String date) {
          return erpXiaoShouMapper.getYvQiHeTongMingXi(date);
     }
+
+    @Override
+    public List<XiaoShouFeiYong> getXiaoShouFeiYong2(String date,String number) {
+        List<XiaoShouFeiYong> xiaoShouFeiyong =  erpXiaoShouMapper.getXiaoShouFeiYongFeiYong(date,number);
+        return xiaoShouFeiyong;
+    }
+
+    @Override
+    public List<XiaoShouWanChenLvJinE> getDingDan(String date) {
+
+        return erpXiaoShouMapper.getDingDan(date);
+    }
 }

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

@@ -14,17 +14,28 @@ INNER JOIN  T_PUR_CONTRACTENTRY_F B ON A.FID = B.FID
     </select>
     <select id="getCaiGouRuku" resultType="com.huimv.getdata.entity.caigou.CaiGouRuKu"
             parameterType="java.util.Date">
-SElECT DISTINCT B.FBILLAMOUNT_LC  FBILLAMOUNTLC ,A.FDATE , A.FDEMANDORGID FROM  T_STK_INSTOCK A
+<!--SElECT DISTINCT B.FBILLAMOUNT_LC  FBILLAMOUNTLC ,A.FDATE , A.FDEMANDORGID ,A.FBILLNO FROM  T_STK_INSTOCK A
         INNER JOIN  T_STK_INSTOCKFIN B ON A.FID = B.FID
+        where  FBILLAMOUNT_LC != 0
         <if test="date !=null">
-            where  A.FDATE >= #{date}
-        </if>
+            and   A.FDATE >= #{date}
+        </if>-->
+
+        SELECT   A.FSTOCKORGID ,A.FCREATEDATE FDATE  , B.FRealQty   FQTY ,E.FMaterialId materialId ,E.FNAME ,A.FBillNo  FBILLNO, C.FBillAmount_LC FBILLAMOUNTLC,
+        B.FPOOrderNo  poorderNo ,
+        F.FNUMBER
+        from   T_STK_INSTOCK a
+        inner join T_STK_INSTOCKENTRY B on B.fid  = a.fid
+        inner join T_STK_INSTOCKFIN C on A.fid = C.fid
+        INNER JOIN T_BD_MATERIAL_L  E ON  E.FMATERIALID =B.FMATERIALID
+        INNER JOIN T_BD_MATERIAL F ON F.FMATERIALID =E.FMATERIALID
+
 
     </select>
 
     <select id="getCaiGouFaPiao" resultType="com.huimv.getdata.entity.caigou.FaPiaoJinE"
             parameterType="java.util.Date">
-        SELECT    B.FALLAMOUNT ,A.FDATE ,A.FPURCHASEORGID ,C.FQTY  FROM  T_PUR_POORDER A
+        SELECT    B.FALLAMOUNT_LC ,A.FDATE ,A.FPURCHASEORGID ,C.FQTY  ,A.FBILLNO FROM  T_PUR_POORDER A
         INNER JOIN T_PUR_POORDERENTRY C ON A.FID  = C.FID
         INNER JOIN  T_PUR_POORDERENTRY_F B ON B.FENTRYID  = C.FENTRYID
         <if test="date !=null">
@@ -44,12 +55,31 @@ SElECT DISTINCT B.FBILLAMOUNT_LC  FBILLAMOUNTLC ,A.FDATE , A.FDEMANDORGID FROM
     </select>
     <select id="getShouLiaoJinE" resultType="com.huimv.getdata.entity.caigou.ShouLiaoJinE"
             parameterType="java.util.Date">
-        SELECT B.FINSTOCKQTY ,A.FDATE  ,A.FSTOCKORGID
- FROM  T_PUR_RECEIVE A
+<!--        SELECT B.FINSTOCKQTY ,A.FDATE  ,A.FSTOCKORGID-->
+<!-- FROM  T_PUR_RECEIVE A-->
+<!--        INNER JOIN T_PUR_RECEIVEENTRY_S B ON A.FID = B.FID-->
+<!--        <if test="date !=null">-->
+<!--            where  A.FDATE >= #{date}-->
+<!--        </if>-->
+-- 测试
+--         SElECT distinct a.FOrderBillNo poorderNo ,a.FMaterialId  materialId  ,
+--         d.FAmount_LC  FBILLAMOUNTLC,a.FMustQty FQTY  ,c.FBillNo  FBILLNO  , c.FSTOCKORGID FSTOCKORGID from  T_PUR_RECEIVEENTRY a
+--         inner join T_PUR_RECEIVE c on c.fid  = a.fid
+--         inner join T_PUR_RECEIVEENTRY_F  d on  d.FENTRYID = a.FENTRYID
+        SELECT   B.FINSTOCKQTY   ,A.FSTOCKORGID ,A.FCREATEDATE   FDATE, C.FBillAllAmount_LC  FBillAllAMONUTLC  ,D.FMaterialId ,E.FNAME ,A.FBillNo ,
+        D.FOrderBillNo
+        ,F.FNUMBER
+        FROM  T_PUR_RECEIVE A
         INNER JOIN T_PUR_RECEIVEENTRY_S B ON A.FID = B.FID
+        INNER JOIN T_PUR_RECEIVEFIN C ON A.FID = C.FID
+        INNER JOIN T_PUR_RECEIVEENTRY D ON B.FENTRYID = D.FENTRYID
+        INNER JOIN T_BD_MATERIAL_L  E ON E.FMATERIALID =D.FMATERIALID
+        INNER JOIN T_BD_MATERIAL F ON F.FMATERIALID =E.FMATERIALID
+        WHERE B.FINSTOCKQTY != 0
         <if test="date !=null">
-            where  A.FDATE >= #{date}
-        </if>
+                    and  A.FDATE >= #{date}
+         </if>
+
 
 
     </select>
@@ -75,7 +105,7 @@ SElECT DISTINCT B.FBILLAMOUNT_LC  FBILLAMOUNTLC ,A.FDATE , A.FDEMANDORGID FROM
     <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 ,
-        F.FNAME dingDanType  , G.FNUMBER  fnumber
+        F.FNAME dingDanType  , G.FMATERIALID  fnumber ,A.FCreateDate createDate , A.FBILLNO
          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
@@ -136,11 +166,11 @@ 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 , 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
+        SELECT  D.FNAME ,A.FCREATEDATE FDATE,A.FPURCHASEORGID , B.FQTY ,C.FALLAMOUNT  ,( C.FALLAMOUNT /B.FQTY )  danJia , E.FNAME dingDanType  ,
+        G.FNUMBER  fnumber ,A.FBILLNO  FBILLNO  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">

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

@@ -84,7 +84,7 @@ SELECT    M.FNAME ,D.FCREDIT , B.FDATE ,B.FACCTORGID from  T_BD_ACCOUNT_L  M
 INNER JOIN T_GL_VOUCHERENTRY D ON  M.FACCTID= D.FACCOUNTID
 INNER JOIN   T_GL_VOUCHER B ON B.FVOUCHERID  = D.FVOUCHERID
 
- WHERE M.FNAME in ('国内销售收入','国内销售收入2','国外销售收入')
+ WHERE M.FNAME in ('国内销售收入','国内销售收入2','国外销售收入') and D.fcredit > 0
         <if test="date !=null">
             and  B.FDATE >= #{date}
         </if>

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

@@ -6,17 +6,30 @@
     <select id="getWanChengLv" resultType="com.huimv.getdata.entity.xiaoshou.XiaoShouWanChenLvJinE"
             parameterType="java.util.Date">
 
-        SELECT DISTINCT A.FBILLNO , C.FALLAMOUNT_LC ,C.FALLAMOUNT  , A.FCUSTID ,A.FSALEDEPTID , A.FSALERID , A.FSALEORGID ,A.FDATE  ,B.FQTY, B.FMATERIALID ,D.FNAME wuLiaoName ,E.FRETURNQTY,
-E.FBASERETURNQTY ,F.FNAME ,F.fdeptname, (C.FALLAMOUNT_LC / B.FQTY )  xiaoShouDanJia ,  G.FNAME  keHuName
- FROM  T_SAL_ORDER A
- INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID
- INNER JOIN T_SAL_ORDERENTRY_F C ON C.FENTRYID = B.FENTRYID
- INNER JOIN T_BD_MATERIAL_L D ON D.FMATERIALID  = B.FMATERIALID
- INNER JOIN T_SAL_ORDERENTRY_R E ON E.FENTRYID = B.FENTRYID
- LEFT JOIN V_BD_SALESMAN_L F ON F.fid = A.FSALERID
-        LEFT JOIN  T_BD_CUSTOMER_L G ON G.FCUSTID = A.FCUSTID
+--         SELECT DISTINCT A.FBILLNO , C.FALLAMOUNT_LC ,C.FALLAMOUNT  , A.FCUSTID ,A.FSALEDEPTID , A.FSALERID , A.FSALEORGID ,A.FDATE  ,B.FQTY, B.FMATERIALID ,D.FNAME wuLiaoName ,E.FRETURNQTY,
+-- E.FBASERETURNQTY ,F.FNAME ,F.fdeptname, (C.FALLAMOUNT_LC / B.FQTY )  xiaoShouDanJia ,  G.FNAME  keHuName
+--  FROM  T_SAL_ORDER A
+--  INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID
+--  INNER JOIN T_SAL_ORDERENTRY_F C ON C.FENTRYID = B.FENTRYID
+--  INNER JOIN T_BD_MATERIAL_L D ON D.FMATERIALID  = B.FMATERIALID
+--  INNER JOIN T_SAL_ORDERENTRY_R E ON E.FENTRYID = B.FENTRYID
+--  LEFT JOIN V_BD_SALESMAN_L F ON F.fid = A.FSALERID
+--         LEFT JOIN  T_BD_CUSTOMER_L G ON G.FCUSTID = A.FCUSTID
+        SELECT   A.FBILLNO    ,  A.FSALEORGID ,A.FCREATEDATE FDATE  , L.FNAME wuLiaoName , F.FAllAmount_LC , A.FSALEDEPTID ,D.FNAME keHuName,C.FNAME htName  ,E.fqty,H.FNAME ,H.fdeptname ,G.FDATE chuKuDate,
+        (F.FALLAMOUNT_LC / E.FQTY )  xiaoShouDanJia
+        FROM T_CRM_CONTRACT A
+        inner join T_CRM_CONTRACTENTRY E on a.fid = E.fid
+        inner  JOIN T_CRM_CONTRACTENTRY_F F  ON F.fentryid  = e.fentryid
+        INNER JOIN T_BAS_BILLTYPE  B ON B.FBILLTYPEID = A.FBILLTYPEID
+        INNER JOIN T_BAS_BILLTYPE_L C ON A.FBILLTYPEID = C.FBILLTYPEID
+        INNER JOIN T_BD_CUSTOMER_L D ON D.FCUSTID=A.FCUSTID
+        INNER JOIN T_BD_MATERIAL_L L ON L.FMATERIALID  = E.FMATERIALID
+        LEFT JOIN T_SAL_OUTSTOCK G  ON G.FBILLTYPEID  = A.FBILLTYPEID
+        LEFT JOIN V_BD_SALESMAN_L H ON H.fid = A.FSALERID
+
+         --合同
         <if test="date !=null">
-            where A.FDATE >= #{date}
+            where A.FCREATEDATE >= #{date}
         </if>
     </select>
     <select id="getBaiFangKeHu" resultType="com.huimv.getdata.entity.xiaoshou.BaiFangKeHu"
@@ -67,16 +80,49 @@ INNER JOIN T_BD_ACCOUNT C ON  C.FACCTID = B.FACCOUNTID
     </select>
     <select id="getYvQiHeTongMingXi" resultType="com.huimv.getdata.entity.xiaoshou.YvQiHeTongMingXi"
             parameterType="java.util.Date">
-        SELECT DISTINCT  A.FBILLNO , A.FDATE ,A.FBILLTYPEID   ,C.FNAME , D.FNAME keHuName ,E.FQTY  ,F.FALLAMOUNT_LC , G.FDATE chuKuDate
-        ,A.FSALEORGID FROM T_CRM_CONTRACT A
+--         SELECT DISTINCT  A.FBILLNO , A.FDATE ,A.FBILLTYPEID   ,C.FNAME , D.FNAME keHuName ,E.FQTY  ,F.FALLAMOUNT_LC , G.FDATE chuKuDate
+--         ,A.FSALEORGID FROM T_CRM_CONTRACT A
+--         INNER JOIN T_BAS_BILLTYPE  B ON B.FBILLTYPEID = A.FBILLTYPEID
+--         INNER JOIN T_BAS_BILLTYPE_L C ON A.FBILLTYPEID = C.FBILLTYPEID
+--         INNER JOIN T_BD_CUSTOMER_L D ON D.FCUSTID=A.FCUSTID
+--         INNER JOIN T_CRM_CONTRACTENTRY E  ON E.FID  = A.FID
+--         LEFT JOIN T_CRM_CONTRACTENTRY_F F  ON F.FID  = A.FID
+--         LEFT JOIN T_SAL_OUTSTOCK G  ON G.FBILLTYPEID  = A.FBILLTYPEID
+        SELECT    A.FCREATEDATE ,A.FBILLNO    , F.FAllAmount_LC  FALLAMOUNTLC , A.FSALEDEPTID ,D.FNAME keHuName,C.FNAME   ,E.FQTY,G.FDATE chuKuDate
+        FROM T_CRM_CONTRACT A
+        inner join T_CRM_CONTRACTENTRY E on a.fid = E.fid
+        inner  JOIN T_CRM_CONTRACTENTRY_F F  ON F.fentryid  = e.fentryid
+
         INNER JOIN T_BAS_BILLTYPE  B ON B.FBILLTYPEID = A.FBILLTYPEID
         INNER JOIN T_BAS_BILLTYPE_L C ON A.FBILLTYPEID = C.FBILLTYPEID
         INNER JOIN T_BD_CUSTOMER_L D ON D.FCUSTID=A.FCUSTID
-        INNER JOIN T_CRM_CONTRACTENTRY E  ON E.FID  = A.FID
-        LEFT JOIN T_CRM_CONTRACTENTRY_F F  ON F.FID  = A.FID
-        LEFT JOIN T_SAL_OUTSTOCK G  ON G.FBILLTYPEID  = A.FBILLTYPEID
+
         <if test="date !=null">
             where A.FDATE >= #{date}
         </if>
     </select>
+    <select id="getXiaoShouFeiYongFeiYong" resultType="com.huimv.getdata.entity.xiaoshou.XiaoShouFeiYong"
+            parameterType="java.util.Date">
+        SELECT A.FACCTORGID ,A.FDATE ,B.FCREDIT ,D.FNAME  FROM T_GL_VOUCHER A
+        INNER JOIN T_GL_VOUCHERENTRY B ON A.FVOUCHERID = B.FVOUCHERID
+        INNER JOIN T_BD_ACCOUNT C ON  C.FACCTID = B.FACCOUNTID
+        INNER JOIN T_BD_ACCOUNT_L  D ON  D.FACCTID = C.FACCTID
+        where
+        substring(C.FNumber,0,5)  = #{number}
+        and B.FCREDIT != 0
+        <if test="date !=null and date !=''" >
+            and A.FDATE >= #{date}
+        </if>
+    </select>
+    <select id="getDingDan" resultType="com.huimv.getdata.entity.xiaoshou.XiaoShouWanChenLvJinE"
+            parameterType="java.lang.String">
+
+ SELECT   A.FBILLNO    , A.FCREATEDATE  FDATE,A.FSALEORGID,B.fqty ,C.FALLAMOUNT_LC
+ FROM T_SAL_ORDER A
+ inner join T_SAL_ORDERENTRY B on a.fid = B.fid
+ inner join T_SAL_ORDERENTRY_F C on B.FENTRYID = c.FENTRYID
+        <if test="date !=null">
+            where A.FCREATEDATE >= #{date}
+        </if>
+    </select>
 </mapper>

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

@@ -19,5 +19,8 @@ public class CaiGouDingDanShuLiangJinE {
     private String gys;
     private String dingDanType ;
     private String fnumber ;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date createDate ;
+    private String FBILLNO;
 
 }

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

@@ -14,9 +14,17 @@ import java.util.Date;
  **/
 @Data
 public class CaiGouRuKu {
-    private Double FBILLAMOUNTLC;
-
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FDEMANDORGID;
+    private Integer FSTOCKORGID;
+
+    private Double FBILLAMOUNTLC;
+    private String FBILLNO;
+    private String FNAME;
+    private String FNUMBER;
+    private String materialId;
+    private Double FQTY;
+
+    private String poorderNo;
 }

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

@@ -11,4 +11,13 @@ public class ShouLiaoJinE {
 @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
     private Integer FSTOCKORGID;
+    private Double FBILLAMOUNTLC;
+    private Double FBillAllAMONUTLC;
+    private String FBILLNO;
+    private String materialId;
+    private Double FQTY;
+    private String poorderNo;
+    private String FOrderBillNo;
+    private String FNAME;
+    private String FNUMBER;
 }

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

@@ -11,6 +11,8 @@ public class YvQiHeTongMingXi {
     private String FBILLNO;
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date FDATE;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date FCREATEDATE;
     private String FBILLTYPEID;
     //合同名字
     private String FNAME;

huimv-farm/src/main/java/vip/xiaonuo/money/entity/MoneyCost.java

@@ -74,4 +74,5 @@ public class MoneyCost implements Serializable {
      */
     @ApiModelProperty(value = "研发费用", position = 7)
     private String research;
+    private String fname;
 }

huimv-farm/src/main/java/vip/xiaonuo/money/service/impl/MoneyCostServiceImpl.java

@@ -46,7 +46,8 @@ public class MoneyCostServiceImpl extends ServiceImpl<MoneyCostMapper, MoneyCost
         QueryWrapper<MoneyCost> queryWrapper = new QueryWrapper<>();
         queryWrapper.ge("create_time", currentDateString);
         queryWrapper.eq(StringUtils.isNotBlank(outParam.getOrgId()), "org_id", outParam.getOrgId());
-        queryWrapper.select(" IFNULL(sum(manage),'0') manage,convert(IFNULL(sum(sale),'0'),decimal(10,2)) sale,IFNULL(sum(finance),'0') finance,IFNULL(sum(research),'0') research," +
+        queryWrapper.select(" convert(IFNULL(sum(manage)/10000,'0') ,decimal(10,2))manage,convert(IFNULL(sum(sale)/10000,'0'),decimal(10,2)) sale," +
+                " convert(IFNULL(sum(finance)/10000,'0') ,decimal(10,2)) finance, convert(IFNULL(sum(research)/10000,'0'),decimal(10,2)) research," +
                 "create_time createTime");
         queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
         queryWrapper.orderByAsc("create_time");

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

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

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

@@ -3,7 +3,7 @@
 <mapper namespace="vip.xiaonuo.money.mapper.MoneyCostMapper">
 
     <select id="getMoneyDetailMonth" resultType="vip.xiaonuo.money.param.DsBusSaleMoneyParam">
-   SELECT ROUND(IFNULL(SUM(sale), 0) , 2)  saleMoney ,  ROUND(IFNULL(SUM(manage), 0), 2)   guanLiMoney , ROUND(IFNULL(SUM(finance), 0), 2)  caiWuMoney ,
+   SELECT ROUND(IFNULL(SUM(sale)/10000, 0) , 2)  saleMoney ,  ROUND(IFNULL(SUM(manage)/10000, 0), 2)   guanLiMoney , ROUND(IFNULL(SUM(finance)/10000, 0), 2)  caiWuMoney ,
    DATE_FORMAT(create_time, '%Y-%m') AS ymonth
         FROM `money_cost`
            ${ew.customSqlSegment}
@@ -12,7 +12,7 @@
 
 
     <select id="getMoneyDetailYear" resultType="vip.xiaonuo.money.param.DsBusSaleMoneyParam">
-   SELECT ROUND(IFNULL(SUM(sale), 0), 2)  saleMoney ,  ROUND(IFNULL(SUM(manage), 0), 2)   guanLiMoney , ROUND(IFNULL(SUM(finance), 0), 2)  caiWuMoney ,
+   SELECT ROUND(IFNULL(SUM(sale)/10000, 0), 2)  saleMoney ,  ROUND(IFNULL(SUM(manage)/10000, 0), 2)   guanLiMoney , ROUND(IFNULL(SUM(finance)/10000, 0), 2)  caiWuMoney ,
    DATE_FORMAT(create_time, '%Y') AS ymonth
         FROM `money_cost`
            ${ew.customSqlSegment}

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

@@ -96,39 +96,32 @@ public class MainTest {
             ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFPURCHASEORGID()));
             if (ObjectUtil.isEmpty(forgid))
                 continue;
-            PurchasePrice purchasePrice = new PurchasePrice();
-            purchasePrice.setCreateTime(forObject.getFDATE());
-            purchasePrice.setMaterial(forObject.getFname());
-            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.setCreateTime(forObject.getFDATE());
+//            PurchasePrice purchasePrice = new PurchasePrice();
+//            purchasePrice.setCreateTime(forObject.getFDATE());
+//            purchasePrice.setMaterial(forObject.getFname());
+//            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 purchaseOrder =new PurchaseOrder();
+                purchaseOrder.setCreateTime(forObject.getCreateDate());
                 purchaseOrder.setPurchaseMoney(String.format("%.2f",forObject.getFALLAMOUNT()));
                 purchaseOrder.setMaterial(forObject.getFname());
                 purchaseOrder.setOrgId(forgid.getOrgId());
-                purchaseOrder.setMaterialAcceptNumber(String.format("%.2f",forObject.getFQTY()));
-                purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFALLAMOUNT()));
+//                purchaseOrder.setMaterialAcceptNumber(String.format("%.2f",forObject.getFQTY()));
+//                purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFALLAMOUNT()));
                 purchaseOrder.setSupplier(forObject.getGys());
                 purchaseOrder.setFnumber(forObject.getFnumber());
+                purchaseOrder.setOrderNumber(forObject.getFBILLNO());
+                purchaseOrder.setCaiGou(forObject.getFQTY());
                 purchaseOrder.setOrderType(getOrderType(forObject.getDingDanType()));
                 orderMapper.insert(purchaseOrder);
-            }else {
-                purchaseOrder.setCreateTime(forObject.getFDATE());
-                purchaseOrder.setMaterial(forObject.getFname());
-                purchaseOrder.setOrgId(forgid.getOrgId());
-                purchaseOrder.setSupplier(forObject.getGys());
-                purchaseOrder.setPurchaseMoney(String.format("%.2f",forObject.getFALLAMOUNT()));
-                purchaseOrder.setMaterialAcceptNumber(String.format("%.2f",forObject.getFQTY()));
-                purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFALLAMOUNT()));
-                orderMapper.updateById(purchaseOrder);
-            }
+
         }
     }
 
@@ -179,27 +172,42 @@ public class MainTest {
         );
         List<CaiGouRuKu> forObjects = response.getBody();
         for (CaiGouRuKu forObject : forObjects) {
-            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFDEMANDORGID()));
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFSTOCKORGID()));
             if (ObjectUtil.isEmpty(forgid))
                 continue;
-            List<PurchaseOrder> purchaseOrders = orderMapper.selectList(new QueryWrapper<PurchaseOrder>().eq("org_id", forgid.getOrgId())
-                    .between("create_time",DateUtil.beginOfDay(forObject.getFDATE()),DateUtil.endOfDay(forObject.getFDATE())));
-            if (ObjectUtil.isEmpty(purchaseOrders)){
-                PurchaseOrder  purchaseOrder =new PurchaseOrder();
-                purchaseOrder.setCreateTime(forObject.getFDATE());
-                if (forObject.getFBILLAMOUNTLC()!=null){
-                    purchaseOrder.setEnterPrice(String.format("%.2f",forObject.getFBILLAMOUNTLC()));
-                }
-                purchaseOrder.setOrgId(forgid.getOrgId());
-                orderMapper.insert(purchaseOrder);
-            }else {
-                if (forObject.getFBILLAMOUNTLC()!=null){
-                    PurchaseOrder    purchaseOrder = purchaseOrders.get(0);
-                    purchaseOrder.setEnterPrice(String.format("%.2f",forObject.getFBILLAMOUNTLC()));
-                    orderMapper.updateById(purchaseOrder);
-                }
 
-            }
+            PurchaseOrder purchaseOrder = new PurchaseOrder();
+            purchaseOrder.setEnterNumber(String.format("%.2f",forObject.getFQTY()));
+            purchaseOrder.setEnterPrice(String.format("%.2f",forObject.getFBILLAMOUNTLC()));
+            purchaseOrder.setRemarkRk(forObject.getPoorderNo());
+            purchaseOrder.setMaterial(forObject.getFNAME());
+            purchaseOrder.setFnumber(forObject.getFNUMBER());
+            purchaseOrder.setRkNo(forObject.getFBILLNO());
+            purchaseOrder.setOrgId(forgid.getOrgId());
+            purchaseOrder.setCreateTime(forObject.getFDATE());
+            orderMapper.insert(purchaseOrder);
+//            List<PurchaseOrder> purchaseOrders = orderMapper.selectList(new QueryWrapper<PurchaseOrder>()
+//                    .eq("order_number",forObject.getPoorderNo()).eq("fnumber",forObject.getMaterialId()));
+//            if (ObjectUtil.isEmpty(purchaseOrders)){
+//                PurchaseOrder  purchaseOrder =new PurchaseOrder();
+//
+//                if (forObject.getFBILLAMOUNTLC()!=null){
+//                    purchaseOrder.setEnterPrice(String.format("%.2f",forObject.getFBILLAMOUNTLC()));
+//                    purchaseOrder.setEnterNumber(String.format("%.2f",forObject.getFQTY()));
+//                }
+//                purchaseOrder.setOrgId(forgid.getOrgId());
+//                purchaseOrder.setRkNo(forObject.getFBILLNO());
+//                orderMapper.insert(purchaseOrder);
+//            }else {
+//                if (forObject.getFBILLAMOUNTLC()!=null){
+//                    PurchaseOrder    purchaseOrder = purchaseOrders.get(0);
+//                    purchaseOrder.setEnterPrice(String.format("%.2f",forObject.getFBILLAMOUNTLC()));
+//                    purchaseOrder.setEnterNumber(String.format("%.2f",forObject.getFQTY()));
+//                    purchaseOrder.setRkNo(forObject.getFBILLNO());
+//                    orderMapper.updateById(purchaseOrder);
+//                }
+//
+//            }
         }
 
     }
@@ -236,36 +244,36 @@ public class MainTest {
 
     }
 
-    @Test
-    public void  test4(){
-        ResponseEntity<List<LeiJiRuKu>> response = restTemplate.exchange(
-                "http://127.0.0.1:9200/erp-caiGou/getLeiJiRuKu?date=",
-                HttpMethod.GET,
-                null,
-                new ParameterizedTypeReference<List<LeiJiRuKu>>() {}
-        );
-        List<LeiJiRuKu> forObjects = response.getBody();
-
-        for (LeiJiRuKu forObject : forObjects) {
-            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFDEMANDORGID()));
-            if (ObjectUtil.isEmpty(forgid))
-                continue;
-            List<PurchaseOrder> purchaseOrders = orderMapper.selectList(new QueryWrapper<PurchaseOrder>().eq("org_id", forgid.getOrgId())
-                    .between("create_time",DateUtil.beginOfDay(forObject.getFDATE()),DateUtil.endOfDay(forObject.getFDATE())));
-            if (ObjectUtil.isEmpty(purchaseOrders)){
-                PurchaseOrder purchaseOrder =new PurchaseOrder();
-                purchaseOrder.setCreateTime(forObject.getFDATE());
-                purchaseOrder.setEnterNumber(String.format("%.2f",forObject.getFREALQTY()));
-                purchaseOrder.setOrgId(forgid.getOrgId());
-                orderMapper.insert(purchaseOrder);
-            }else {
-                PurchaseOrder purchaseOrder = purchaseOrders.get(0);
-                purchaseOrder.setEnterNumber(String.format("%.2f",forObject.getFREALQTY()));
-                orderMapper.updateById(purchaseOrder);
-            }
-        }
-    }
-
+//    @Test
+//    public void  test4(){
+//        ResponseEntity<List<LeiJiRuKu>> response = restTemplate.exchange(
+//                "http://127.0.0.1:9200/erp-caiGou/getLeiJiRuKu?date=",
+//                HttpMethod.GET,
+//                null,
+//                new ParameterizedTypeReference<List<LeiJiRuKu>>() {}
+//        );
+//        List<LeiJiRuKu> forObjects = response.getBody();
+//
+//        for (LeiJiRuKu forObject : forObjects) {
+//            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFDEMANDORGID()));
+//            if (ObjectUtil.isEmpty(forgid))
+//                continue;
+//            List<PurchaseOrder> purchaseOrders = orderMapper.selectList(new QueryWrapper<PurchaseOrder>().eq("org_id", forgid.getOrgId())
+//                    .between("create_time",DateUtil.beginOfDay(forObject.getFDATE()),DateUtil.endOfDay(forObject.getFDATE())));
+//            if (ObjectUtil.isEmpty(purchaseOrders)){
+//                PurchaseOrder purchaseOrder =new PurchaseOrder();
+//                purchaseOrder.setCreateTime(forObject.getFDATE());
+//                purchaseOrder.setEnterNumber(String.format("%.2f",forObject.getFREALQTY()));
+//                purchaseOrder.setOrgId(forgid.getOrgId());
+//                orderMapper.insert(purchaseOrder);
+//            }else {
+//                PurchaseOrder purchaseOrder = purchaseOrders.get(0);
+//                purchaseOrder.setEnterNumber(String.format("%.2f",forObject.getFREALQTY()));
+//                orderMapper.updateById(purchaseOrder);
+//            }
+//        }
+//    }
+ //-- 1
     @Test
     public void  test5(){
         ResponseEntity<List<ShouLiaoJinE>> response = restTemplate.exchange(
@@ -280,19 +288,40 @@ public class MainTest {
             ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFSTOCKORGID()));
             if (ObjectUtil.isEmpty(forgid))
                 continue;
-            List<PurchaseOrder> purchaseOrders = orderMapper.selectList(new QueryWrapper<PurchaseOrder>().eq("org_id", forgid.getOrgId())
-                    .between("create_time",DateUtil.beginOfDay(forObject.getFDATE()),DateUtil.endOfDay(forObject.getFDATE())));
-            if (ObjectUtil.isEmpty(purchaseOrders)){
-                PurchaseOrder purchaseOrder =new PurchaseOrder();
-                purchaseOrder.setCreateTime(forObject.getFDATE());
-                purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFINSTOCKQTY()));
-                purchaseOrder.setOrgId(forgid.getOrgId());
-                orderMapper.insert(purchaseOrder);
-            }else {
-                PurchaseOrder purchaseOrder = purchaseOrders.get(0);
-                purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFINSTOCKQTY()));
-                orderMapper.updateById(purchaseOrder);
-            }
+            PurchaseOrder purchaseOrder = new PurchaseOrder();
+            purchaseOrder.setMaterialAcceptNumber(String.format("%.2f",forObject.getFINSTOCKQTY()));
+            purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFBillAllAMONUTLC()));
+            purchaseOrder.setRemarkRk(forObject.getFOrderBillNo());
+            purchaseOrder.setMaterial(forObject.getFNAME());
+            purchaseOrder.setFnumber(forObject.getFNUMBER());
+            purchaseOrder.setHtNo(forObject.getFBILLNO());
+            purchaseOrder.setCreateTime(forObject.getFDATE());
+            purchaseOrder.setOrgId(forgid.getOrgId());
+//            purchaseOrder.setHtNo(forObject.getFBILLNO());
+            orderMapper.insert(purchaseOrder);
+
+//            List<PurchaseOrder> purchaseOrders = orderMapper.selectList(new QueryWrapper<PurchaseOrder>()  .eq("order_number",forObject.getPoorderNo()).eq("fnumber",forObject.getMaterialId()));
+//            if (ObjectUtil.isEmpty(purchaseOrders)){
+//                PurchaseOrder  purchaseOrder =new PurchaseOrder();
+//
+//                if (forObject.getFBILLAMOUNTLC()!=null){
+//                    purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFBILLAMOUNTLC()));
+//                    purchaseOrder.setMaterialAcceptNumber(String.format("%.2f",forObject.getFQTY()));
+//                }
+//                purchaseOrder.setOrgId(forgid.getOrgId());
+//                purchaseOrder.setHtNo(forObject.getFBILLNO());
+//                orderMapper.insert(purchaseOrder);
+//            }else {
+//                if (forObject.getFBILLAMOUNTLC()!=null){
+//                    PurchaseOrder    purchaseOrder = purchaseOrders.get(0);
+//                    purchaseOrder.setMaterialAcceptPrice(String.format("%.2f",forObject.getFBILLAMOUNTLC()));
+//                    purchaseOrder.setMaterialAcceptNumber(String.format("%.2f",forObject.getFQTY()));
+//                    purchaseOrder.setHtNo(forObject.getFBILLNO());
+//                    purchaseOrder.setOrgId(forgid.getOrgId());
+//                    orderMapper.updateById(purchaseOrder);
+//                }
+//
+//            }
         }
     }
 
@@ -420,6 +449,8 @@ public class MainTest {
             purchaseContract.setOrgId(forgid.getOrgId());
             purchaseContract.setOrderType(getHeTongType(forObject.getDingDanType()));
             purchaseContract.setFnumber(forObject.getFnumber());
+            purchaseContract.setContractOrder(forObject.getFBILLNO());
+
             contractMapper.insert(purchaseContract);
         }
 

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

@@ -1,27 +0,0 @@
-/*
- * Copyright [2022] [https://www.baiduc.com]
- *
- * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
- *
- * 1.请不要删除和修改根目录下的LICENSE文件。
- * 2.请不要删除和修改Snowy源码头部的版权声明。
- * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
- * 4.分发源码时候，请注明软件出处 https://www.baiduc.com
- * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
- * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.baiduc.com
- */
-package vip.xiaonuo;
-
-/**
- * TestMain方法
- *
- * @author xuyuxiang
- * @date 2022/9/17 17:10
- */
-public class Test {
-    public static void main(String[] args) {
-
-    }
-
-
-}

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

@@ -143,20 +143,50 @@ public class XiaoShouTest {
             saleProduce.setSaleMoney(String.format("%.2f",forObject.getFALLAMOUNTLC()));
             produceMapper.insert(saleProduce);
 
-             SaleOrder saleOrder = new SaleOrder();
+//             SaleOrder saleOrder = new SaleOrder();
+//            saleOrder.setCreateTime(forObject.getFDATE());
+//            saleOrder.setOrgId(forgid.getOrgId());
+//            saleOrder.setSaleMoney(String.format("%.2f",forObject.getFALLAMOUNTLC()));
+//            saleOrder.setSaleNumber(String.format("%.2f",forObject.getFQTY()));
+//            saleOrder.setSaleOrder(forObject.getFBILLNO());
+//            orderMapper.insert(saleOrder);
+
+        }
+    }
+    //订单金额
+    @Test
+    public void  test8() {
+
+        // 销售费用，管理费用，财务费用，研发费用
+        ResponseEntity<List<XiaoShouWanChenLvJinE>> response = restTemplate.exchange(
+                "http://127.0.0.1:9200/erp-XiaoShou/getDingDan?date=",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<XiaoShouWanChenLvJinE>>() {
+                }
+        );
+        List<XiaoShouWanChenLvJinE> forObjects = response.getBody();
+        System.out.println(forObjects);
+        for (XiaoShouWanChenLvJinE forObject : forObjects) {
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFSALEORGID()));
+            if (ObjectUtil.isEmpty(forgid))
+                continue;
+            SaleOrder saleOrder = new SaleOrder();
             saleOrder.setCreateTime(forObject.getFDATE());
             saleOrder.setOrgId(forgid.getOrgId());
             saleOrder.setSaleMoney(String.format("%.2f",forObject.getFALLAMOUNTLC()));
             saleOrder.setSaleNumber(String.format("%.2f",forObject.getFQTY()));
             saleOrder.setSaleOrder(forObject.getFBILLNO());
             orderMapper.insert(saleOrder);
-
         }
     }
+
     @Test
     public void  test2(){
+
+        // 销售费用，管理费用，财务费用，研发费用
         ResponseEntity<List<XiaoShouFeiYong>> response = restTemplate.exchange(
-                "http://127.0.0.1:9200/erp-XiaoShou/getXiaoShouFeiYong?date=",
+                "http://127.0.0.1:9200/erp-XiaoShou/getXiaoShouFeiYong2?date=&number=",
                 HttpMethod.GET,
                 null,
                 new ParameterizedTypeReference<List<XiaoShouFeiYong>>() {}
@@ -184,6 +214,106 @@ public class XiaoShouTest {
 
 
     }
+    @Test
+    public void  test2_1(){
+
+        // 销售费用，管理费用，财务费用，研发费用
+        ResponseEntity<List<XiaoShouFeiYong>> response = restTemplate.exchange(
+                "http://127.0.0.1:9200/erp-XiaoShou/getXiaoShouFeiYong2?date=&number=6601",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<XiaoShouFeiYong>>() {}
+        );
+        List<XiaoShouFeiYong> forObjects = response.getBody();
+        System.out.println(forObjects);
+        for (XiaoShouFeiYong forObject : forObjects) {
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFacctorgid()));
+            if (ObjectUtil.isEmpty(forgid))
+                continue;
+            MoneyCost moneyCost = new MoneyCost();
+            moneyCost.setCreateTime(forObject.getFDATE());
+            moneyCost.setOrgId(forgid.getOrgId());
+            moneyCost.setSale(String.format("%.2f",forObject.getFCREDIT()));
+            moneyCost.setCompany(forgid.getFname());
+            moneyCost.setFname(forObject.getFname());
+            moneyCostMapper.insert(moneyCost);
+        }
+    }
+    @Test
+    public void  test2_2(){
+
+        // 销售费用，管理费用，财务费用，研发费用
+        ResponseEntity<List<XiaoShouFeiYong>> response = restTemplate.exchange(
+                "http://127.0.0.1:9200/erp-XiaoShou/getXiaoShouFeiYong2?date=&number=6602",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<XiaoShouFeiYong>>() {}
+        );
+        List<XiaoShouFeiYong> forObjects = response.getBody();
+        System.out.println(forObjects);
+        for (XiaoShouFeiYong forObject : forObjects) {
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFacctorgid()));
+            if (ObjectUtil.isEmpty(forgid))
+                continue;
+            MoneyCost moneyCost = new MoneyCost();
+            moneyCost.setCreateTime(forObject.getFDATE());
+            moneyCost.setOrgId(forgid.getOrgId());
+            moneyCost.setManage(String.format("%.2f",forObject.getFCREDIT()));
+            moneyCost.setCompany(forgid.getFname());
+            moneyCost.setFname(forObject.getFname());
+            moneyCostMapper.insert(moneyCost);
+        }
+    }
+    @Test
+    public void  test2_3(){
+
+        // 销售费用，管理费用，财务费用，研发费用
+        ResponseEntity<List<XiaoShouFeiYong>> response = restTemplate.exchange(
+                "http://127.0.0.1:9200/erp-XiaoShou/getXiaoShouFeiYong2?date=&number=6603",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<XiaoShouFeiYong>>() {}
+        );
+        List<XiaoShouFeiYong> forObjects = response.getBody();
+        System.out.println(forObjects);
+        for (XiaoShouFeiYong forObject : forObjects) {
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFacctorgid()));
+            if (ObjectUtil.isEmpty(forgid))
+                continue;
+            MoneyCost moneyCost = new MoneyCost();
+            moneyCost.setCreateTime(forObject.getFDATE());
+            moneyCost.setOrgId(forgid.getOrgId());
+            moneyCost.setFinance(String.format("%.2f",forObject.getFCREDIT()));
+            moneyCost.setCompany(forgid.getFname());
+            moneyCost.setFname(forObject.getFname());
+            moneyCostMapper.insert(moneyCost);
+        }
+    }
+    @Test
+    public void  test2_4(){
+
+        // 销售费用，管理费用，财务费用，研发费用
+        ResponseEntity<List<XiaoShouFeiYong>> response = restTemplate.exchange(
+                "http://127.0.0.1:9200/erp-XiaoShou/getXiaoShouFeiYong2?date=&number=6605",
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<XiaoShouFeiYong>>() {}
+        );
+        List<XiaoShouFeiYong> forObjects = response.getBody();
+        System.out.println(forObjects);
+        for (XiaoShouFeiYong forObject : forObjects) {
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFacctorgid()));
+            if (ObjectUtil.isEmpty(forgid))
+                continue;
+            MoneyCost moneyCost = new MoneyCost();
+            moneyCost.setCreateTime(forObject.getFDATE());
+            moneyCost.setOrgId(forgid.getOrgId());
+            moneyCost.setResearch(String.format("%.2f",forObject.getFCREDIT()));
+            moneyCost.setCompany(forgid.getFname());
+            moneyCost.setFname(forObject.getFname());
+            moneyCostMapper.insert(moneyCost);
+        }
+    }
 
     @Test
     public void  test3(){
@@ -252,7 +382,7 @@ public class XiaoShouTest {
             if (ObjectUtil.isEmpty(forgid))
                 continue;
             SaleOverdue saleOverdue = new SaleOverdue();
-            saleOverdue.setCreateTime(forObject.getFDATE());
+            saleOverdue.setCreateTime(forObject.getFCREATEDATE());
             saleOverdue.setDeliveryDate(forObject.getChuKuDate());
             saleOverdue.setDeliveryNumber(forObject.getFQTY());
             saleOverdue.setOrgId(forgid.getOrgId());
@@ -264,7 +394,7 @@ public class XiaoShouTest {
             MoneyOverdue moneyProduce = new MoneyOverdue();
 //            moneyProduce.setBalance();
             moneyProduce.setCollectPrice(String.format("%.2f",forObject.getFALLAMOUNTLC()));
-            moneyProduce.setDateTime(forObject.getFDATE());
+            moneyProduce.setDateTime(forObject.getFCREATEDATE());
             moneyProduce.setDocumentNumber(forObject.getFBILLNO());
 //            moneyProduce.setDocumentStatus();
             moneyProduce.setDocumentType(forObject.getFNAME());