1

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

@@ -11,7 +11,18 @@ public class ChanPinShouRu {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date fdate ;
     private Double fallamount ;
+
+
     private String  fname ;
 
+    //新字段
+    private  Double fcredit ;
+    private  Double fcreditqty ;
+    private int fuseorgid;
+    private String yearperiod;
+
+
+
+
 
 }

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

@@ -31,4 +31,6 @@ public interface ErpVoucherMapper  {
     List<LinJinHuanKuanQi> getLinJinHuanKuan(@Param("date")String date);
 
     List<ErpVoucher> getDangQianYueJingLiRunFuShu(@Param("date")String date);
+
+    List<ChanPinShouRu> getChanPinShouRuQty(@Param("date") String date);
 }

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

@@ -63,7 +63,10 @@ public class ErpVoucherServiceImpl implements IErpVoucherService {
 
     @Override
     public List<ChanPinShouRu> getChanPinShouRu(String date) {
-        return  erpVoucherMapper.getChanPinShouRu(date);
+        List<ChanPinShouRu> chanPinShouRu = erpVoucherMapper.getChanPinShouRu(date);
+        List<ChanPinShouRu> chanPinShouRuQty = erpVoucherMapper.getChanPinShouRuQty(date);
+        chanPinShouRu.addAll(chanPinShouRuQty);
+        return  chanPinShouRu;
     }
 
     @Override

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

@@ -60,6 +60,9 @@ inner join T_BD_ACCOUNT KM ON KM.FACCTID=D.FACCOUNTID
         inner join T_GL_VOUCHER d on d.FACCOUNTBOOKID = m.FACCOUNTBOOKID
         inner join T_BD_ACCOUNT_L KM ON KM.FACCTID=m.FACCOUNTID  where km.fname  IN ('人民币','人民币存款','外币存款')
         and fdetailID = 0
+        <if test="date !=null">
+                  where  d.FDATE >= #{date}
+              </if>
 
 
 
@@ -89,14 +92,21 @@ INNER JOIN   T_GL_VOUCHER B ON B.FVOUCHERID  = D.FVOUCHERID
     </select>
     <select id="getChanPinShouRu" resultType="com.huimv.getdata.entity.voucher.ChanPinShouRu"
             parameterType="java.util.Date">
-SELECT     A.FSTOCKORGID ,  A.FDATE , C.FALLAMOUNT ,D.FNAME  FROM  T_SAL_OUTSTOCK  A
-INNER JOIN  T_SAL_OUTSTOCKENTRY B  ON A.FID= B.FID
-INNER JOIN T_SAL_OUTSTOCKENTRY_F C ON C.FENTRYID  = B.FENTRYID
-INNER JOIN T_BD_MATERIAL_L D  ON D.FMATERIALID = B.FMATERIALID
-	WHERE FNAME in ('50万IU/G饲料添加剂VD3微粒','NF级胆固醇','饲料级胆固醇91%','25-羟基VD3原','4000万IU/G胆钙化醇','维生素D3原','蜡丸','100万IU/G复配营养强化剂MO','饲料级胆固醇80%','化妆品级羊毛醇')
-        <if test="date !=null">
-            and  A.FDATE >= #{date}
-        </if>
+<!--SELECT     A.FSTOCKORGID ,  A.FDATE , C.FALLAMOUNT ,D.FNAME  FROM  T_SAL_OUTSTOCK  A-->
+<!--INNER JOIN  T_SAL_OUTSTOCKENTRY B  ON A.FID= B.FID-->
+<!--INNER JOIN T_SAL_OUTSTOCKENTRY_F C ON C.FENTRYID  = B.FENTRYID-->
+<!--INNER JOIN T_BD_MATERIAL_L D  ON D.FMATERIALID = B.FMATERIALID-->
+<!--	WHERE FNAME in ('50万IU/G饲料添加剂VD3微粒','NF级胆固醇','饲料级胆固醇91%','25-羟基VD3原','4000万IU/G胆钙化醇','维生素D3原','蜡丸','100万IU/G复配营养强化剂MO','饲料级胆固醇80%','化妆品级羊毛醇')-->
+<!--        <if test="date !=null">-->
+<!--            and  A.FDATE >= #{date}-->
+<!--        </if>-->
+        SELECT DISTINCT  A.FCREDIT fcredit ,WLL.FNAME fname ,km.FUSEORGID  fuseorgid,a.FYEARPERIOD  yearperiod
+        FROM T_GL_BALANCE A
+        inner join t_bd_account KM on KM.FAcctId=A.FACCOUNTID and KM.FISDETAIL='1' and (KM.FNumber like '6001%')
+        INNER JOIN T_BD_FLEXITEMDETAILV B ON A.FDETAILID=B.FID
+        INNER JOIN T_BD_MATERIAL_L WLL ON B.FFLEX8=WLL.FMATERIALID
+        where fcredit != 0
+
     </select>
     <select id="getJingLiRunQuShi" resultType="com.huimv.getdata.entity.voucher.JingLiRunQuShi"
             parameterType="java.util.Date">
@@ -138,4 +148,14 @@ INNER JOIN t_org_organizations_l D ON D.FORGID = C.FACCTORGID
         </if>
         ORDER BY M.FDATE DESC
 </select>
+    <select id="getChanPinShouRuQty" resultType="com.huimv.getdata.entity.voucher.ChanPinShouRu"
+            parameterType="java.lang.String">
+
+  SELECT DISTINCT  A.FCREDITQTY fcreditqty ,WLL.FNAME fname ,km.FUSEORGID  fuseorgid,a.FYEARPERIOD  yearperiod
+        FROM T_GL_BALANCEQTY  A
+        inner join t_bd_account KM on KM.FAcctId=A.FACCOUNTID and KM.FISDETAIL='1' and (KM.FNumber like '6001%')
+        INNER JOIN T_BD_FLEXITEMDETAILV B ON A.FDETAILID=B.FID
+        INNER JOIN T_BD_MATERIAL_L WLL ON B.FFLEX8=WLL.FMATERIALID
+        where fcreditqty != 0
+    </select>
 </mapper>

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

@@ -12,6 +12,12 @@ public class ChanPinShouRu {
     private Date fdate ;
     private Double fallamount ;
     private String  fname ;
+    //新字段
+    private  Double fcredit ;
+    private  Double fcreditqty ;
+    private int fuseorgid;
+    private String yearperiod;
+
 
 
 }

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

@@ -12,10 +12,12 @@
  */
 package vip.xiaonuo;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.junit.Test;
+import org.junit.platform.commons.util.StringUtils;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -30,17 +32,12 @@ import vip.xiaonuo.erp.entity.voucher.ErpVoucher;
 import vip.xiaonuo.erp.entity.voucher.LinJinHuanKuanQi;
 import vip.xiaonuo.erp.entity.xiaoshou.*;
 import vip.xiaonuo.erp.mapper.ErpBdOrgMapper;
-import vip.xiaonuo.money.entity.MoneyBorrowWarning;
-import vip.xiaonuo.money.entity.MoneyBusiness;
-import vip.xiaonuo.money.entity.MoneyProduce;
-import vip.xiaonuo.money.entity.MoneyProduceIncome;
-import vip.xiaonuo.money.mapper.MoneyBorrowWarningMapper;
-import vip.xiaonuo.money.mapper.MoneyBusinessMapper;
-import vip.xiaonuo.money.mapper.MoneyProduceIncomeMapper;
-import vip.xiaonuo.money.mapper.MoneyProduceMapper;
+import vip.xiaonuo.money.entity.*;
+import vip.xiaonuo.money.mapper.*;
 import vip.xiaonuo.sale.entity.*;
 import vip.xiaonuo.sale.mapper.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -180,6 +177,8 @@ public class CaiWuTest {
         }
     }
 
+    @Autowired
+    private MoneyProduce0422Mapper moneyProduce0422Mapper;
 
 
     @Test
@@ -195,32 +194,59 @@ public class CaiWuTest {
         // '维生素D3原','蜡丸','100万IU/G复配营养强化剂MO','饲料级胆固醇80%','化妆品级羊毛醇'
         List<ChanPinShouRu> forObjects = response.getBody();
         for (ChanPinShouRu forObject : forObjects) {
-            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFstockorgid()));
+            ErpBdOrg forgid = erpBdOrgMapper.selectOne(new QueryWrapper<ErpBdOrg>().eq("forgid", forObject.getFuseorgid()));
             if (ObjectUtil.isEmpty(forgid))
                 continue;
-
-            MoneyProduce moneyProduce = new MoneyProduce();
+            Date yearperiod = DateUtil.parse(forObject.getYearperiod(), "yyyyMM");
+            MoneyProduce0422 moneyProduce = new MoneyProduce0422();
             moneyProduce.setOrgId(forgid.getOrgId());
-            moneyProduce.setCreateTime(forObject.getFdate());
-            MoneyProduceIncome moneyProduceIncome = new MoneyProduceIncome();
-            moneyProduceIncome.setOrgId(forgid.getOrgId());
-            moneyProduceIncome.setCreateTime(forObject.getFdate());
-            if ("NF级胆固醇".equals(forObject.getFname())){
-                moneyProduce.setNfCholesterol(String.format("%.2f",forObject.getFallamount()));
-                moneyProduceIncome.setNfCholesterol(String.format("%.2f",forObject.getFallamount()));
-            }else if ("饲料级胆固醇80".equals(forObject.getFname())||"饲料级胆固醇91".equals(forObject.getFname())){
-                moneyProduce.setBreedCholesterol(String.format("%.2f",forObject.getFallamount()));
-                moneyProduceIncome.setBreedCholesterol(String.format("%.2f",forObject.getFallamount()));
-            }else if ("化妆品级羊毛醇".equals(forObject.getFname())){
-                moneyProduce.setSheepAlcohol(String.format("%.2f",forObject.getFallamount()));
-                moneyProduceIncome.setSheepAlcohol(String.format("%.2f",forObject.getFallamount()));
-            }else {
-                moneyProduce.setOther(String.format("%.2f",forObject.getFallamount()));
-                moneyProduceIncome.setOther(String.format("%.2f",forObject.getFallamount()));
+            moneyProduce.setCreateTime(yearperiod);
+            moneyProduce.setMaterialName(forObject.getFname());
+            if (ObjectUtil.isNotEmpty(forObject.getFcredit())){
+                moneyProduce.setMaterialAmount(String.format("%.2f",forObject.getFcredit()));
             }
-            produceIncomeMapper.insert(moneyProduceIncome);
-            produceMapper.insert(moneyProduce);
+            if (ObjectUtil.isNotEmpty(forObject.getFcreditqty())){
+                moneyProduce.setMaterialQty(String.format("%.2f",forObject.getFcreditqty()));
+            }
+
+
+            moneyProduce.setMaterialType(getMaterType(forObject.getFname()));
+
+//            MoneyProduceIncome moneyProduceIncome = new MoneyProduceIncome();
+//            moneyProduceIncome.setOrgId(forgid.getOrgId());
+//            moneyProduceIncome.setCreateTime(yearperiod);
+
+//            if ("NF级胆固醇".equals(forObject.getFname())){
+//                moneyProduceIncome.setNfCholesterol(String.format("%.2f",forObject.getFallamount()));
+//            }else if (forObject.getFname().contains("饲料级胆固醇")){
+//                moneyProduceIncome.setBreedCholesterol(String.format("%.2f",forObject.getFallamount()));
+//            }else if (forObject.getFname().contains("化妆品级羊毛醇")){
+//                moneyProduceIncome.setSheepAlcohol(String.format("%.2f",forObject.getFallamount()));
+//            }else {
+//                moneyProduceIncome.setOther(String.format("%.2f",forObject.getFallamount()));
+//            }
+//            produceIncomeMapper.insert(moneyProduceIncome);
+            moneyProduce0422Mapper.insert(moneyProduce);
+        }
+    }
+
+    private Integer getMaterType(String fname) {
+      if ("NF级胆固醇".equals(fname)){
+          return 0;
+      }
+        if ("羊毛酸异丙酯".equals(fname)){
+            return 4;
+        }
+        if (fname.contains( "饲料级胆固醇")){
+            return 1;
+        }
+        if (fname.contains( "羊毛醇")){
+            return 2;
+        }
+        if (fname.contains( "羊毛酸")){
+            return 3;
         }
+        return 5;
     }
 
     @Test