修改成本SQL语句。

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/controller/ErpDataController.java

@@ -318,7 +318,7 @@ public class ErpDataController {
 
     /**
      * @Method      : getWorkPlan
-     * @Description : 工组计划
+     * @Description : 工作计划
      * @Params      : [startDate, endDate, accessToken]
      * @Return      : com.huimv.common.result.Result
      * 

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/dao/repo/TDeliveryRepo.java

@@ -920,7 +920,7 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             "and TMonthCostDetail.FID=TMonthCostDetailChild.FMonthCostDetailMainStruID \n" +
             "and TMonthCostDetail.CREATEORGID=TOrganizeCell.FID \n" +
             "and TMonthCostDetail.FBILLSTATE=3 \n" +
-            "and FPROJECTNAME in('存栏','饲料费','防疫消毒','兽药','公摊费用项目') \n" +
+            "and FPROJECTNAME in('饲料','防疫消毒','兽药','公摊费用项目') \n" +
             "and TMonthCostDetail.ACCOUNTPERIODID in (select FID from TAccountingPeriodData where FNAME=?1) \n" +
             "order by TOrganizeCell.FSHORTNAME,FITEM,TOrganizeCell.fid")
     List<Object[]> getCostWithManyFarm(String month);

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

@@ -375,6 +375,10 @@ public class ErpDataServiceImpl implements IErpDataService {
         JSONArray costJa = new JSONArray();
         for(int a=0;a<costList.size();a++){
             Object[] costObj = (Object[]) costList.get(a);
+//            for(int b=0;b<costObj.length;b++){
+//                System.out.println(b+"="+costObj[b]);
+//            }
+//            System.out.println();
             JSONObject dataJo = new JSONObject();
             costJa.add(dataJo);
             //牧场名称
@@ -518,7 +522,6 @@ public class ErpDataServiceImpl implements IErpDataService {
             Object[] planObj = (Object[]) workPlanList.get(a);
             JSONObject dataJo = new JSONObject();
             produceJa.add(dataJo);
-            System.out.println("length="+planObj.length);
             //牧场名称
             dataJo.put("mcmc", planObj[0]);
             //计划名称
@@ -583,15 +586,15 @@ public class ErpDataServiceImpl implements IErpDataService {
             Object[] salesObj = (Object[]) salesList.get(a);
             JSONObject dataJo = new JSONObject();
             produceJa.add(dataJo);
-            System.out.println("planObj[0].toString()="+salesObj[0]);
-            System.out.println("planObj[1].toString()="+salesObj[1]);
-            System.out.println("planObj[2].toString()="+salesObj[2]);
-            System.out.println("planObj[3].toString()="+salesObj[3]);
-            System.out.println("planObj[4].toString()="+salesObj[4]);
-            System.out.println("planObj[5].toString()="+salesObj[5]);
-            System.out.println("planObj[6].toString()="+salesObj[6]);
-            System.out.println("planObj[7].toString()="+salesObj[7]);
-            System.out.println("planObj[8].toString()="+salesObj[8]);
+//            System.out.println("planObj[0].toString()="+salesObj[0]);
+//            System.out.println("planObj[1].toString()="+salesObj[1]);
+//            System.out.println("planObj[2].toString()="+salesObj[2]);
+//            System.out.println("planObj[3].toString()="+salesObj[3]);
+//            System.out.println("planObj[4].toString()="+salesObj[4]);
+//            System.out.println("planObj[5].toString()="+salesObj[5]);
+//            System.out.println("planObj[6].toString()="+salesObj[6]);
+//            System.out.println("planObj[7].toString()="+salesObj[7]);
+//            System.out.println("planObj[8].toString()="+salesObj[8]);
             //牧场名称
             dataJo.put("farm_name", salesObj[0]);
             //今日数量