feat(all): 修改仓储成本报表

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseWarehouseMonthEntity.java

@@ -34,6 +34,11 @@ public class ExpenseWarehouseMonthEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "成本结算时间-月")
 	private String costSettlementMonth;
+	/**
+	 * 成本结算时间
+	 */
+	@ApiModelProperty(value = "成本结算时间")
+	private String costSettlement;
 	/**
 	 * 仓库总面积（㎡）
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/job/ExpenseJob.java

@@ -21,19 +21,6 @@ public class ExpenseJob {
 	@Resource
 	private IQualityDeliverService qualityDeliverService;
 
-	/**
-	 * 仓库月度仓储成本统计表
-	 * 每个月1号早上4点执行
-	 *
-	 * @param param
-	 * @return
-	 * @throws Exception
-	 */
-	@XxlJob("monthWarehouseExpenseJob")
-	public ReturnT<String> monthWarehouseExpenseJob(String param) throws Exception {
-
-		return ReturnT.SUCCESS;
-	}
 
 	/**
 	 * 配送财务审单

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java

@@ -402,6 +402,7 @@ public class QualityDeliverServiceImpl extends BaseServiceImpl<QualityDeliverMap
 	@Override
 	public void calculateTransshipmentCost(String param) {
 		// 计算代入代出成本
+		//
 
 	}
 

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/job/ExpenseJob.java

@@ -14,9 +14,9 @@ import com.logpm.basicdata.feign.IWarehouseLeasingClient;
 import com.logpm.distribution.entity.QualityDeliverEntity;
 import com.logpm.distribution.feign.IQualityDeliverClient;
 import com.logpm.statistics.entity.ExpenseWarehouseDayEntity;
-import com.logpm.statistics.service.IExpenseDispatchFinancialReviewService;
-import com.logpm.statistics.service.IExpenseDispatchTrainDetailService;
+import com.logpm.statistics.entity.ExpenseWarehouseMonthEntity;
 import com.logpm.statistics.service.IExpenseWarehouseDayService;
+import com.logpm.statistics.service.IExpenseWarehouseMonthService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;
@@ -43,10 +43,6 @@ import java.util.stream.Collectors;
 @Slf4j
 public class ExpenseJob {
 
-	@Resource
-	private IExpenseDispatchFinancialReviewService financialReviewService;
-	@Resource
-	private IExpenseDispatchTrainDetailService trainDetailService;
 	@Resource
 	private IBasicdataWarehouseClient warehouseClient;
 	@Resource
@@ -55,6 +51,8 @@ public class ExpenseJob {
 	private IQualityDeliverClient qualityDeliverClient;
 	@Resource
 	private IExpenseWarehouseDayService warehouseDayService;
+	@Resource
+	private IExpenseWarehouseMonthService warehouseMonthService;
 
 	/**
 	 * 仓库月度仓储成本统计表
@@ -66,7 +64,15 @@ public class ExpenseJob {
 	 */
 	@XxlJob("monthWarehouseExpenseJob")
 	public ReturnT<String> monthWarehouseExpenseJob(String param) throws Exception {
-
+		log.info("monthWarehouseExpenseJob 参数：{}", param);
+		DateTime statisticsTime = DateUtil.lastMonth();
+		if (StrUtil.isNotEmpty(param)) {
+			statisticsTime = DateUtil.parseDate(param);
+		}
+		List<ExpenseWarehouseMonthEntity> monthEntityList = warehouseDayService.statisticsMonthWarehouseExpense(DateUtil.year(statisticsTime), DateUtil.month(statisticsTime));
+		if (CollUtil.isNotEmpty(monthEntityList)) {
+			warehouseMonthService.saveBatch(monthEntityList);
+		}
 		return ReturnT.SUCCESS;
 	}
 
@@ -275,34 +281,4 @@ public class ExpenseJob {
 		entity.setTemporaryTurnoverArea(Convert.toStr(warehouse.getTemporaryTurnoverArea()));
 	}
 
-	/**
-	 * 配送财务审单
-	 * 每个月1号早上4点执行
-	 *
-	 * @param param
-	 * @return
-	 * @throws Exception
-	 */
-	@XxlJob("expenseDispatchFinancialReviewJob")
-	public ReturnT<String> expenseDispatchFinancialReviewJob(String param) throws Exception {
-
-		financialReviewService.expenseDispatchFinancialReviewJob();
-		return ReturnT.SUCCESS;
-	}
-
-	/**
-	 * 车辆成本明细表 job
-	 * 每天晚上凌晨0点执行
-	 *
-	 * @param param
-	 * @return
-	 * @throws Exception
-	 */
-	@XxlJob("carExpenseDispatchDetailJob")
-	public ReturnT<String> carExpenseDispatchDetailJob(String param) throws Exception {
-		trainDetailService.carExpenseDispatchDetailJob(param);
-		return ReturnT.SUCCESS;
-	}
-
-
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseWarehouseDayMapper.java

@@ -17,6 +17,7 @@
 package com.logpm.statistics.mapper;
 
 import com.logpm.statistics.entity.ExpenseWarehouseDayEntity;
+import com.logpm.statistics.entity.ExpenseWarehouseMonthEntity;
 import com.logpm.statistics.vo.ExpenseWarehouseDayVO;
 import com.logpm.statistics.excel.ExpenseWarehouseDayExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -51,4 +52,13 @@ public interface ExpenseWarehouseDayMapper extends BaseMapper<ExpenseWarehouseDa
 	 */
 	List<ExpenseWarehouseDayExcel> exportExpenseWarehouseDay(@Param("ew") Wrapper<ExpenseWarehouseDayEntity> queryWrapper);
 
+	/**
+	 * 根据年月统计仓储成本月度统计报表
+	 *
+	 * @param year  统计年份
+	 * @param month 统计月份
+	 * @Return java.util.List<com.logpm.statistics.entity.ExpenseWarehouseMonthEntity>
+	 * @Author zqb 2024/10/10
+	 **/
+	List<ExpenseWarehouseMonthEntity> statisticsMonthWarehouseExpense(@Param("year") int year, @Param("month") int month);
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseWarehouseDayMapper.xml

@@ -29,4 +29,32 @@
         SELECT * FROM logpm_expense_warehouse_day ${ew.customSqlSegment}
     </select>
 
+    <select id="statisticsMonthWarehouseExpense" resultType="com.logpm.statistics.entity.ExpenseWarehouseMonthEntity">
+        select t.warehouse_name,
+               t.cost_settlement_year,
+               t.cost_settlement_month,
+               concat(t.cost_settlement_year,'-',t.cost_settlement_month) costSettlement,
+               sum(ifnull(t.monthly_rent,0)) monthly_rent,
+               sum(ifnull(t.total_quantity_issued,0)) total_quantity_issued,
+               sum(ifnull(t.customer_leased_area,0)) customer_leased_area,
+               sum(ifnull(t.customer_monthly_rent,0)) customer_monthly_rent,
+               sum(ifnull(t.rented_items_dispatched_quantity,0)) rented_items_dispatched_quantity,
+               sum(ifnull(t.customer_rented_item_cost_per_unit,0)) customer_rented_item_cost_per_unit,
+               sum(ifnull(t.customer_total_leasing_cost,0)) customer_total_leasing_cost,
+               sum(ifnull(t.temporary_turnover_quantity,0)) temporary_turnover_quantity,
+               sum(ifnull(t.temporary_turnover_cost_per_item,0))temporary_turnover_cost_per_item,
+               sum(ifnull(t.total_temporary_turnover_cost,0)) total_temporary_turnover_cost,
+               sum(ifnull(t.dr_ware_dis_number,0)) dr_ware_dis_number,
+               sum(ifnull(t.dr_ware_dis_cost_per_unit,0)) dr_ware_dis_cost_per_unit,
+               sum(ifnull(t.dr_ware_dis_total_cost,0)) dr_ware_dis_total_cost,
+               sum(ifnull(t.consignment_storage,0)) consignment_storage,
+               sum(ifnull(t.total_cost_of_consignment_storage,0)) total_cost_of_consignment_storage,
+               sum(ifnull(t.consignment_withdrawal,0)) consignment_withdrawal,
+               sum(ifnull(t.total_cost_of_consignment_withdrawal,0)) total_cost_of_consignment_withdrawal,
+               sum(ifnull(t.total_cost_of_agency_operations,0)) total_cost_of_agency_operations,
+               sum(ifnull(t.total_warehouse_cost,0)) total_warehouse_cost
+        from logpm_expense_warehouse_day t
+        where t.cost_settlement_year = #{year} and t.cost_settlement_month = #{month}
+        group by t.cost_settlement_year,t.cost_settlement_month,t.warehouse_name
+    </select>
 </mapper>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseDispatchFinancialReviewService.java

@@ -49,6 +49,4 @@ public interface IExpenseDispatchFinancialReviewService extends BaseService<Expe
 	 */
 	List<ExpenseDispatchFinancialReviewExcel> exportExpenseDispatchFinancialReview(Wrapper<ExpenseDispatchFinancialReviewEntity> queryWrapper);
 
-    void expenseDispatchFinancialReviewJob();
-
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseDispatchTrainDetailService.java

@@ -49,5 +49,4 @@ public interface IExpenseDispatchTrainDetailService extends BaseService<ExpenseD
 	 */
 	List<ExpenseDispatchTrainDetailExcel> exportExpenseDispatchTrainDetail(Wrapper<ExpenseDispatchTrainDetailEntity> queryWrapper);
 
-	void carExpenseDispatchDetailJob(String param);
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseWarehouseDayService.java

@@ -17,11 +17,13 @@
 package com.logpm.statistics.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.statistics.entity.ExpenseWarehouseDayEntity;
-import com.logpm.statistics.vo.ExpenseWarehouseDayVO;
+import com.logpm.statistics.entity.ExpenseWarehouseMonthEntity;
 import com.logpm.statistics.excel.ExpenseWarehouseDayExcel;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.statistics.vo.ExpenseWarehouseDayVO;
 import org.springblade.core.mp.base.BaseService;
+
 import java.util.List;
 
 /**
@@ -49,4 +51,13 @@ public interface IExpenseWarehouseDayService extends BaseService<ExpenseWarehous
 	 */
 	List<ExpenseWarehouseDayExcel> exportExpenseWarehouseDay(Wrapper<ExpenseWarehouseDayEntity> queryWrapper);
 
+	/**
+	 * 按年月统计仓储成本数据
+	 * @param year 年份
+     * @param month 月份
+	 * @Return java.util.List<com.logpm.statistics.entity.ExpenseWarehouseMonthEntity>
+	 * @Author zqb 2024/10/10
+	 **/
+	List<ExpenseWarehouseMonthEntity> statisticsMonthWarehouseExpense(int year, int month);
+
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchFinancialReviewServiceImpl.java

@@ -51,14 +51,4 @@ public class ExpenseDispatchFinancialReviewServiceImpl extends BaseServiceImpl<E
 		return expenseDispatchFinancialReviewList;
 	}
 
-	/**
-	 * 财务审单
-	 * @Return void
-	 * @Author zqb 2024/8/13
-	 **/
-    @Override
-    public void expenseDispatchFinancialReviewJob() {
-
-    }
-
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailServiceImpl.java

@@ -51,11 +51,5 @@ public class ExpenseDispatchTrainDetailServiceImpl extends BaseServiceImpl<Expen
 		return expenseDispatchTrainDetailList;
 	}
 
-    @Override
-    public void carExpenseDispatchDetailJob(String param) {
-
-
-
-    }
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseWarehouseDayServiceImpl.java

@@ -16,15 +16,19 @@
  */
 package com.logpm.statistics.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.statistics.entity.ExpenseWarehouseDayEntity;
-import com.logpm.statistics.vo.ExpenseWarehouseDayVO;
+import com.logpm.statistics.entity.ExpenseWarehouseMonthEntity;
 import com.logpm.statistics.excel.ExpenseWarehouseDayExcel;
 import com.logpm.statistics.mapper.ExpenseWarehouseDayMapper;
 import com.logpm.statistics.service.IExpenseWarehouseDayService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.statistics.vo.ExpenseWarehouseDayVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -51,4 +55,12 @@ public class ExpenseWarehouseDayServiceImpl extends BaseServiceImpl<ExpenseWareh
 		return expenseWarehouseDayList;
 	}
 
+	@Override
+	public List<ExpenseWarehouseMonthEntity> statisticsMonthWarehouseExpense(int year, int month) {
+		if(ObjectUtil.isEmpty(year) || ObjectUtil.isEmpty(month)){
+			return Collections.emptyList();
+		}
+		return baseMapper.statisticsMonthWarehouseExpense(year, month);
+	}
+
 }