拆分已发货

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoodWeDataAcquisitionServiceImpl.java

@@ -944,7 +944,7 @@ public class GoodWeDataAcquisitionServiceImpl implements GoodWeDataAcquisitionSe
 		requestInfo.put("starttime", today + " 00:00:00");
 		requestInfo.put("endtime", today + " 23:59:59");
 		requestInfo.put("stationid", stationid);
-//        requestInfo.put("status", 2);
+        requestInfo.put("status", 3);
 		List<GoodWeAlarmDto> alarmList = goodWeRequestUtil.getResPonseList(GoodWeConstant.alarmListUrl,
 				GoodWeConstant.requestPost, requestInfo, GoodWeConstant.resovleRule_data_list, GoodWeAlarmDto.class);
 		alarmList.forEach(goodWeAlarmDto -> {

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml

@@ -622,9 +622,11 @@
     <select id="statisticsPreparationMoney" resultType="map">
         SELECT
         IFNULL(SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货'  or preparation_money_state = '待补货'    THEN 1 ELSE 0 END ), 0 )  AS dfh,
-        IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成'  or preparation_money_state = '已收货'THEN 1 ELSE 0 END ), 0 )  AS ysh,
-        IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成'  or preparation_money_state = '已收货'THEN ei.real_scale ELSE 0 END ), 0 )  AS yshrl,
-        IFNULL(SUM( CASE WHEN preparation_money_state = '待收货'  THEN 1 ELSE 0 END ), 0 )  AS yfh
+        IFNULL(SUM( CASE WHEN  preparation_money_state = '已收货' THEN 1 ELSE 0 END ), 0 )  AS ysh,
+        IFNULL(SUM( CASE WHEN  preparation_money_state = '已收货' THEN ei.real_scale ELSE 0 END ), 0 )  AS yshrl,
+        IFNULL(SUM( CASE WHEN preparation_money_state = '待收货'  THEN 1 ELSE 0 END ), 0 )  AS yfh,
+        IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成'  THEN 1 ELSE 0 END ), 0 )  AS bhwc,
+        IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成'  THEN ei.real_scale ELSE 0 END ), 0 )  AS bhwcrl
 
         FROM
         hygf_peasant_household

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/StatisticsHomepageServiceImpl.java

@@ -581,6 +581,7 @@ public class StatisticsHomepageServiceImpl {
                      }
                  }
                  resultMap.put("ysh",Arrays.asList(preparationMoney.get("ysh"),new BigDecimal((double)preparationMoney.get("yshrl")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
+                 resultMap.put("bhwc",Arrays.asList(preparationMoney.get("bhwc"),new BigDecimal((double)preparationMoney.get("bhwcrl")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
                  break;
             case "workOrder":
                 List<Map<String, Object>> workOrderMaps = statisticsHomepageMapper.workOrderTotal(developerCode, regionalCompaniesCode, province, city, district);