修改查询每月数据接口

huimv-hy-production/huimv.hy.autoGetData/src/main/java/com/huimv/production/autoGetData/service/impl/AutoGetErpDataImpl.java

@@ -1109,7 +1109,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         stockEntity1.setFarmId(farmId);
                         stockEntity1.setStockType("sow_stock");
                         stockEntity1.setStockName("母猪存栏");
-                        stockEntity1.setStockQuantity(dataJo.getString("mz"));
+                        stockEntity1.setStockQuantity((dataJo.getInteger("mz")-dataJo.getInteger("mzhb"))+"");
                         if (total == 0) {
                             stockEntity1.setRate(Float.parseFloat("0"));
                         } else {
@@ -1215,9 +1215,9 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
                         ProdStockEntity stockEntity10 = new ProdStockEntity();
                         stockEntity10.setFarmId(farmId);
                         stockEntity10.setStockType("sow_stock_5");
-                        stockEntity10.setStockName("后备母猪存栏");
+                        stockEntity10.setStockName("后备猪存栏");
 //                        stockEntity10.setStockQuantity(String.valueOf(dataJo.getInteger("hb")));
-                        stockEntity10.setStockQuantity(String.valueOf(dataJo.getInteger("mzhb")));
+                        stockEntity10.setStockQuantity(String.valueOf(dataJo.getInteger("mzhb")+dataJo.getInteger("hb")));
                         stockEntity10.setMonth(Integer.valueOf(month));
                         stockEntity10.setYear(Integer.parseInt(year));
                         prodStockRepo.saveAndFlush(stockEntity10);

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/service/impl/ErpDataServiceImpl.java

@@ -441,7 +441,7 @@ public class ErpDataServiceImpl implements IErpDataService {
             dataJo.put("br", stockObj[8]);
             //空怀
             dataJo.put("kh", stockObj[9]);
-            //空怀
+            //母猪后备
             dataJo.put("mzhb", stockObj[10]);
 //            System.out.println("dataJo>>"+dataJo.toJSONString());
         }