zhenghaoyu
4 months ago
73 changed files with 2880 additions and 1326 deletions
@ -1,103 +0,0 @@
|
||||
package com.logpm.statistics.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
/** |
||||
* 订单总仓储成本明细 |
||||
* |
||||
* @author zqb |
||||
* @create 2024-07-17 11:32:30 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_expense_order_warehouse_total") |
||||
@ApiModel(value = "ExpenseOrderWarehouseTotal对象", description = "订单总仓储成本明细") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseOrderWarehouseTotalEntity extends TenantEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
/** |
||||
* 目的仓 |
||||
*/ |
||||
@ApiModelProperty(value = "目的仓") |
||||
private String warehouseName; |
||||
/** |
||||
* 订单编号 |
||||
*/ |
||||
@ApiModelProperty(value = "订单编号") |
||||
private String orderCode; |
||||
/** |
||||
* 运单编号 |
||||
*/ |
||||
@ApiModelProperty(value = "运单编号") |
||||
private String shipmentNumber; |
||||
/** |
||||
* 收货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "收货单位") |
||||
private String receivingUnit; |
||||
/** |
||||
* 发货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "发货单位") |
||||
private String shippingUnit; |
||||
/** |
||||
* 运单类型 |
||||
*/ |
||||
@ApiModelProperty(value = "运单类型") |
||||
private String shipmenttype; |
||||
/** |
||||
* 服务类型 |
||||
*/ |
||||
@ApiModelProperty(value = "服务类型") |
||||
private String servicetype; |
||||
/** |
||||
* 总件数 |
||||
*/ |
||||
@ApiModelProperty(value = "总件数") |
||||
private String totalQuantity; |
||||
/** |
||||
* 发站仓 |
||||
*/ |
||||
@ApiModelProperty(value = "发站仓") |
||||
private String originWarehouse; |
||||
/** |
||||
* 代入库仓件数 |
||||
*/ |
||||
@ApiModelProperty(value = "代入库仓件数") |
||||
private String consignmentInQuantity; |
||||
/** |
||||
* 代入库总成本 |
||||
*/ |
||||
@ApiModelProperty(value = "代入库总成本") |
||||
private String consignmentInTotalCost; |
||||
/** |
||||
* 代出库仓件数 |
||||
*/ |
||||
@ApiModelProperty(value = "代出库仓件数") |
||||
private String consignmentOutQuantity; |
||||
/** |
||||
* 代出库成本 |
||||
*/ |
||||
@ApiModelProperty(value = "代出库成本") |
||||
private String consignmentOutTotalCost; |
||||
/** |
||||
* 代作业成本 |
||||
*/ |
||||
@ApiModelProperty(value = "代作业成本") |
||||
private String contractedOperaCost; |
||||
/** |
||||
* 仓租成本 |
||||
*/ |
||||
@ApiModelProperty(value = "仓租成本") |
||||
private String warehouseRentalCost; |
||||
/** |
||||
* 仓储成本 |
||||
*/ |
||||
@ApiModelProperty(value = "仓储成本") |
||||
private String warehousingCost; |
||||
|
||||
} |
||||
@ -0,0 +1,89 @@
|
||||
package com.logpm.statistics.entity; |
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnore; |
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
import java.math.BigDecimal; |
||||
|
||||
/** |
||||
* 订单仓储成本报表 |
||||
* |
||||
* @author zqb |
||||
* @create 2024-07-17 11:32:30 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_expense_warehouse_order") |
||||
@ApiModel(value = "ExpenseWarehouseOrderEntity对象", description = "订单仓储成本报表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseWarehouseOrderEntity extends TenantEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
/** |
||||
* 事业线 |
||||
*/ |
||||
@ApiModelProperty(value = "事业线") |
||||
@ExcelIgnore |
||||
private String businessUnit; |
||||
/** |
||||
* 目的仓 |
||||
*/ |
||||
@ApiModelProperty(value = "目的仓") |
||||
@ExcelProperty("目的仓") |
||||
private String warehouseName; |
||||
/** |
||||
* 订单编号 |
||||
*/ |
||||
@ApiModelProperty(value = "订单编号") |
||||
@ExcelProperty("订单编号") |
||||
private String orderCode; |
||||
/** |
||||
* 运单编号 |
||||
*/ |
||||
@ApiModelProperty(value = "运单编号") |
||||
@ExcelProperty("运单编号") |
||||
private String shipmentNumber; |
||||
/** |
||||
* 收货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "收货单位") |
||||
@ExcelProperty("收货单位") |
||||
private String receivingUnit; |
||||
/** |
||||
* 发货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "发货单位") |
||||
@ExcelProperty("发货单位") |
||||
private String shippingUnit; |
||||
/** |
||||
* 发站仓 |
||||
*/ |
||||
@ApiModelProperty(value = "发站仓") |
||||
@ExcelProperty("发站仓") |
||||
private String originWarehouse; |
||||
|
||||
/** |
||||
* 订单总件数 |
||||
*/ |
||||
@ApiModelProperty(value = "订单总件数") |
||||
@ExcelProperty("订单总件数") |
||||
private Integer totalNumber; |
||||
|
||||
/** |
||||
* 出库件数 |
||||
*/ |
||||
@ApiModelProperty(value = "出库件数") |
||||
@ExcelProperty("出库件数") |
||||
private Integer outNumber; |
||||
/** |
||||
* 租赁成本 |
||||
*/ |
||||
@ApiModelProperty(value = "租赁成本") |
||||
@ExcelProperty("租赁成本") |
||||
private BigDecimal warehouseRentalCost; |
||||
|
||||
} |
||||
@ -0,0 +1,121 @@
|
||||
package com.logpm.statistics.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
import java.math.BigDecimal; |
||||
|
||||
/** |
||||
* 日包件仓储成本报表 |
||||
* |
||||
* @author zqb |
||||
* @create 2024-07-17 11:32:30 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_expense_warehouse_package_day") |
||||
@ApiModel(value = "ExpenseWarehousePackageEntity对象", description = "日包件仓储成本报表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseWarehousePackageDayEntity extends TenantEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 统计年 |
||||
*/ |
||||
@ApiModelProperty(value = "统计年") |
||||
private Integer statisticalYear; |
||||
/** |
||||
* 统计月 |
||||
*/ |
||||
@ApiModelProperty(value = "统计月") |
||||
private Integer statisticalMonth; |
||||
/** |
||||
* 统计日 |
||||
*/ |
||||
@ApiModelProperty(value = "统计日") |
||||
private Integer statisticalDay; |
||||
/** |
||||
* 日期 |
||||
*/ |
||||
@ApiModelProperty(value = "日期") |
||||
private String statisticalTime; |
||||
/** |
||||
* 事业线 |
||||
*/ |
||||
@ApiModelProperty(value = "事业线") |
||||
private String businessUnit; |
||||
/** |
||||
* 目的仓 |
||||
*/ |
||||
@ApiModelProperty(value = "目的仓") |
||||
private String warehouseName; |
||||
/** |
||||
* 品牌 |
||||
*/ |
||||
@ApiModelProperty(value = "品牌") |
||||
private String brandName; |
||||
/** |
||||
* 包条码 |
||||
*/ |
||||
@ApiModelProperty(value = "包条码") |
||||
private String packageCode; |
||||
/** |
||||
* 包件类型 |
||||
*/ |
||||
@ApiModelProperty(value = "包件类型") |
||||
private String packageType; |
||||
/** |
||||
* 订单编号 |
||||
*/ |
||||
@ApiModelProperty(value = "订单编号") |
||||
private String orderCode; |
||||
/** |
||||
* 运单编号 |
||||
*/ |
||||
@ApiModelProperty(value = "运单编号") |
||||
private String shipmentNumber; |
||||
/** |
||||
* 收货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "收货单位") |
||||
private String receivingUnit; |
||||
/** |
||||
* 发货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "发货单位") |
||||
private String shippingUnit; |
||||
/** |
||||
* 成本类型 |
||||
*/ |
||||
@ApiModelProperty(value = "成本类型") |
||||
private String expenseType; |
||||
/** |
||||
* 中转仓 |
||||
*/ |
||||
@ApiModelProperty(value = "中转仓") |
||||
private String transitWarehouseName; |
||||
/** |
||||
* 配送类型 |
||||
*/ |
||||
@ApiModelProperty(value = "配送类型") |
||||
private String dispatchType; |
||||
/** |
||||
* 发站仓 |
||||
*/ |
||||
@ApiModelProperty(value = "发站仓") |
||||
private String originWarehouse; |
||||
/** |
||||
* 件数 |
||||
*/ |
||||
@ApiModelProperty(value = "件数") |
||||
private Integer number; |
||||
/** |
||||
* 成本 |
||||
*/ |
||||
@ApiModelProperty(value = "成本") |
||||
private BigDecimal cost; |
||||
|
||||
} |
||||
@ -0,0 +1,80 @@
|
||||
package com.logpm.statistics.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
import java.math.BigDecimal; |
||||
|
||||
/** |
||||
* 中转仓月度成本报表 |
||||
* |
||||
* @author zqb |
||||
* @create 2024-07-17 11:32:30 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_expense_warehouse_transit_month") |
||||
@ApiModel(value = "ExpenseWarehouseTransitMonthEntity对象", description = "中转仓月度成本报表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseWarehouseTransitMonthEntity extends TenantEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
/** |
||||
* 统计年 |
||||
*/ |
||||
@ApiModelProperty(value = "统计年") |
||||
private Integer statisticalYear; |
||||
/** |
||||
* 统计月 |
||||
*/ |
||||
@ApiModelProperty(value = "统计月") |
||||
private Integer statisticalMonth; |
||||
/** |
||||
* 日期 |
||||
*/ |
||||
@ApiModelProperty(value = "日期") |
||||
private String statisticalTime; |
||||
/** |
||||
* 事业线 |
||||
*/ |
||||
@ApiModelProperty(value = "事业线") |
||||
private String businessUnit; |
||||
/** |
||||
* 中转仓 |
||||
*/ |
||||
@ApiModelProperty(value = "中转仓") |
||||
private String transitWarehouseName; |
||||
/** |
||||
* 目的仓 |
||||
*/ |
||||
@ApiModelProperty(value = "目的仓") |
||||
private String warehouseName; |
||||
/** |
||||
* 中转入库件数 |
||||
*/ |
||||
@ApiModelProperty(value = "中转入库件数") |
||||
private Integer inNumber; |
||||
/** |
||||
* 中转入库收入 |
||||
*/ |
||||
@ApiModelProperty(value = "中转入库收入") |
||||
private BigDecimal inCost; |
||||
/** |
||||
* 中转出库件数 |
||||
*/ |
||||
@ApiModelProperty(value = "中转出库件数") |
||||
private Integer outNumber; |
||||
/** |
||||
* 中转出库收入 |
||||
*/ |
||||
@ApiModelProperty(value = "中转出库收入") |
||||
private BigDecimal outCost; |
||||
/** |
||||
* 中转总收入 |
||||
*/ |
||||
@ApiModelProperty(value = "中转总收入") |
||||
private BigDecimal totalCost; |
||||
|
||||
} |
||||
@ -0,0 +1,79 @@
|
||||
package com.logpm.statistics.vo; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
import java.math.BigDecimal; |
||||
|
||||
/** |
||||
* 中转仓月度成本报表 |
||||
* |
||||
* @author zqb |
||||
* @create 2024-07-17 11:32:30 |
||||
*/ |
||||
@Data |
||||
@ApiModel(value = "ExpenseWarehouseTransitMonthEntity对象", description = "中转仓月度成本报表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseWarehouseTransitMonthVO extends TenantEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
/** |
||||
* 统计年 |
||||
*/ |
||||
@ApiModelProperty(value = "统计年") |
||||
private Integer statisticalYear; |
||||
/** |
||||
* 统计月 |
||||
*/ |
||||
@ApiModelProperty(value = "统计月") |
||||
private Integer statisticalMonth; |
||||
/** |
||||
* 日期 |
||||
*/ |
||||
@ApiModelProperty(value = "日期") |
||||
private String statisticalTime; |
||||
/** |
||||
* 事业线 |
||||
*/ |
||||
@ApiModelProperty(value = "事业线") |
||||
private String businessUnit; |
||||
/** |
||||
* 中转仓 |
||||
*/ |
||||
@ApiModelProperty(value = "中转仓") |
||||
private String transitWarehouseName; |
||||
/** |
||||
* 目的仓 |
||||
*/ |
||||
@ApiModelProperty(value = "目的仓") |
||||
private String warehouseName; |
||||
/** |
||||
* 中转入库件数 |
||||
*/ |
||||
@ApiModelProperty(value = "中转入库件数") |
||||
private Integer inNumber; |
||||
/** |
||||
* 中转入库收入 |
||||
*/ |
||||
@ApiModelProperty(value = "中转入库收入") |
||||
private BigDecimal inCost; |
||||
/** |
||||
* 中转出库件数 |
||||
*/ |
||||
@ApiModelProperty(value = "中转出库件数") |
||||
private Integer outNumber; |
||||
/** |
||||
* 中转出库收入 |
||||
*/ |
||||
@ApiModelProperty(value = "中转出库收入") |
||||
private BigDecimal outCost; |
||||
/** |
||||
* 中转总收入 |
||||
*/ |
||||
@ApiModelProperty(value = "中转总收入") |
||||
private BigDecimal totalCost; |
||||
|
||||
} |
||||
@ -1,157 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.statistics.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.statistics.entity.ExpenseOrderWarehouseMonthEntity; |
||||
import com.logpm.statistics.excel.ExpenseOrderWarehouseMonthExcel; |
||||
import com.logpm.statistics.service.IExpenseOrderWarehouseMonthService; |
||||
import com.logpm.statistics.vo.ExpenseOrderWarehouseMonthVO; |
||||
import com.logpm.statistics.wrapper.ExpenseOrderWarehouseMonthWrapper; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import io.swagger.annotations.ApiParam; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.excel.util.ExcelUtil; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.secure.BladeUser; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.constant.BladeConstant; |
||||
import org.springblade.core.tool.utils.DateUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.PostMapping; |
||||
import org.springframework.web.bind.annotation.RequestBody; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
import javax.servlet.http.HttpServletResponse; |
||||
import javax.validation.Valid; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 月度订单仓储成本明细 控制器 |
||||
* |
||||
* @author BladeX |
||||
* @since 2024-07-16 |
||||
*/ |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/expenseOrderWarehouseMonth") |
||||
@Api(value = "月度订单仓储成本明细", tags = "月度订单仓储成本明细接口") |
||||
public class ExpenseOrderWarehouseMonthController extends BladeController { |
||||
|
||||
private final IExpenseOrderWarehouseMonthService expenseOrderWarehouseMonthService; |
||||
|
||||
/** |
||||
* 月度订单仓储成本明细 详情 |
||||
*/ |
||||
@GetMapping("/detail") |
||||
@ApiOperationSupport(order = 1) |
||||
@ApiOperation(value = "详情", notes = "传入expenseOrderWarehouseMonth") |
||||
public R<ExpenseOrderWarehouseMonthVO> detail(ExpenseOrderWarehouseMonthEntity expenseOrderWarehouseMonth) { |
||||
ExpenseOrderWarehouseMonthEntity detail = expenseOrderWarehouseMonthService.getOne(Condition.getQueryWrapper(expenseOrderWarehouseMonth)); |
||||
return R.data(ExpenseOrderWarehouseMonthWrapper.build().entityVO(detail)); |
||||
} |
||||
/** |
||||
* 月度订单仓储成本明细 分页 |
||||
*/ |
||||
@GetMapping("/list") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "分页", notes = "传入expenseOrderWarehouseMonth") |
||||
public R<IPage<ExpenseOrderWarehouseMonthVO>> list(@ApiIgnore @RequestParam Map<String, Object> expenseOrderWarehouseMonth, Query query) { |
||||
IPage<ExpenseOrderWarehouseMonthEntity> pages = expenseOrderWarehouseMonthService.page(Condition.getPage(query), Condition.getQueryWrapper(expenseOrderWarehouseMonth, ExpenseOrderWarehouseMonthEntity.class)); |
||||
return R.data(ExpenseOrderWarehouseMonthWrapper.build().pageVO(pages)); |
||||
} |
||||
|
||||
/** |
||||
* 月度订单仓储成本明细 自定义分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@ApiOperationSupport(order = 3) |
||||
@ApiOperation(value = "分页", notes = "传入expenseOrderWarehouseMonth") |
||||
public R<IPage<ExpenseOrderWarehouseMonthVO>> page(ExpenseOrderWarehouseMonthVO expenseOrderWarehouseMonth, Query query) { |
||||
|
||||
IPage<ExpenseOrderWarehouseMonthVO> pages = expenseOrderWarehouseMonthService.selectExpenseOrderWarehouseMonthPage(Condition.getPage(query), expenseOrderWarehouseMonth); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
/** |
||||
* 月度订单仓储成本明细 新增 |
||||
*/ |
||||
@PostMapping("/save") |
||||
@ApiOperationSupport(order = 4) |
||||
@ApiOperation(value = "新增", notes = "传入expenseOrderWarehouseMonth") |
||||
public R save(@Valid @RequestBody ExpenseOrderWarehouseMonthEntity expenseOrderWarehouseMonth) { |
||||
return R.status(expenseOrderWarehouseMonthService.save(expenseOrderWarehouseMonth)); |
||||
} |
||||
|
||||
/** |
||||
* 月度订单仓储成本明细 修改 |
||||
*/ |
||||
@PostMapping("/update") |
||||
@ApiOperationSupport(order = 5) |
||||
@ApiOperation(value = "修改", notes = "传入expenseOrderWarehouseMonth") |
||||
public R update(@Valid @RequestBody ExpenseOrderWarehouseMonthEntity expenseOrderWarehouseMonth) { |
||||
return R.status(expenseOrderWarehouseMonthService.updateById(expenseOrderWarehouseMonth)); |
||||
} |
||||
|
||||
/** |
||||
* 月度订单仓储成本明细 新增或修改 |
||||
*/ |
||||
@PostMapping("/submit") |
||||
@ApiOperationSupport(order = 6) |
||||
@ApiOperation(value = "新增或修改", notes = "传入expenseOrderWarehouseMonth") |
||||
public R submit(@Valid @RequestBody ExpenseOrderWarehouseMonthEntity expenseOrderWarehouseMonth) { |
||||
return R.status(expenseOrderWarehouseMonthService.saveOrUpdate(expenseOrderWarehouseMonth)); |
||||
} |
||||
|
||||
/** |
||||
* 月度订单仓储成本明细 删除 |
||||
*/ |
||||
@PostMapping("/remove") |
||||
@ApiOperationSupport(order = 7) |
||||
@ApiOperation(value = "逻辑删除", notes = "传入ids") |
||||
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { |
||||
return R.status(expenseOrderWarehouseMonthService.deleteLogic(Func.toLongList(ids))); |
||||
} |
||||
|
||||
|
||||
/** |
||||
* 导出数据 |
||||
*/ |
||||
@GetMapping("/export-expenseOrderWarehouseMonth") |
||||
@ApiOperationSupport(order = 9) |
||||
@ApiOperation(value = "导出数据", notes = "传入expenseOrderWarehouseMonth") |
||||
public void exportExpenseOrderWarehouseMonth(@ApiIgnore @RequestParam Map<String, Object> expenseOrderWarehouseMonth, BladeUser bladeUser, HttpServletResponse response) { |
||||
QueryWrapper<ExpenseOrderWarehouseMonthEntity> queryWrapper = Condition.getQueryWrapper(expenseOrderWarehouseMonth, ExpenseOrderWarehouseMonthEntity.class); |
||||
//if (!AuthUtil.isAdministrator()) {
|
||||
// queryWrapper.lambda().eq(ExpenseOrderWarehouseMonth::getTenantId, bladeUser.getTenantId());
|
||||
//}
|
||||
queryWrapper.lambda().eq(ExpenseOrderWarehouseMonthEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); |
||||
List<ExpenseOrderWarehouseMonthExcel> list = expenseOrderWarehouseMonthService.exportExpenseOrderWarehouseMonth(queryWrapper); |
||||
ExcelUtil.export(response, "月度订单仓储成本明细数据" + DateUtil.time(), "月度订单仓储成本明细数据表", list, ExpenseOrderWarehouseMonthExcel.class); |
||||
} |
||||
|
||||
} |
||||
@ -1,156 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.statistics.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.statistics.entity.ExpenseOrderWarehouseTotalEntity; |
||||
import com.logpm.statistics.excel.ExpenseOrderWarehouseTotalExcel; |
||||
import com.logpm.statistics.service.IExpenseOrderWarehouseTotalService; |
||||
import com.logpm.statistics.vo.ExpenseOrderWarehouseTotalVO; |
||||
import com.logpm.statistics.wrapper.ExpenseOrderWarehouseTotalWrapper; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import io.swagger.annotations.ApiParam; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.excel.util.ExcelUtil; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.secure.BladeUser; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.constant.BladeConstant; |
||||
import org.springblade.core.tool.utils.DateUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.PostMapping; |
||||
import org.springframework.web.bind.annotation.RequestBody; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
import javax.servlet.http.HttpServletResponse; |
||||
import javax.validation.Valid; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 订单总仓储成本明细 控制器 |
||||
* |
||||
* @author BladeX |
||||
* @since 2024-07-16 |
||||
*/ |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/expenseOrderWarehouseTotal") |
||||
@Api(value = "订单总仓储成本明细", tags = "订单总仓储成本明细接口") |
||||
public class ExpenseOrderWarehouseTotalController extends BladeController { |
||||
|
||||
private final IExpenseOrderWarehouseTotalService expenseOrderWarehouseTotalService; |
||||
|
||||
/** |
||||
* 订单总仓储成本明细 详情 |
||||
*/ |
||||
@GetMapping("/detail") |
||||
@ApiOperationSupport(order = 1) |
||||
@ApiOperation(value = "详情", notes = "传入expenseOrderWarehouseTotal") |
||||
public R<ExpenseOrderWarehouseTotalVO> detail(ExpenseOrderWarehouseTotalEntity expenseOrderWarehouseTotal) { |
||||
ExpenseOrderWarehouseTotalEntity detail = expenseOrderWarehouseTotalService.getOne(Condition.getQueryWrapper(expenseOrderWarehouseTotal)); |
||||
return R.data(ExpenseOrderWarehouseTotalWrapper.build().entityVO(detail)); |
||||
} |
||||
/** |
||||
* 订单总仓储成本明细 分页 |
||||
*/ |
||||
@GetMapping("/list") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "分页", notes = "传入expenseOrderWarehouseTotal") |
||||
public R<IPage<ExpenseOrderWarehouseTotalVO>> list(@ApiIgnore @RequestParam Map<String, Object> expenseOrderWarehouseTotal, Query query) { |
||||
IPage<ExpenseOrderWarehouseTotalEntity> pages = expenseOrderWarehouseTotalService.page(Condition.getPage(query), Condition.getQueryWrapper(expenseOrderWarehouseTotal, ExpenseOrderWarehouseTotalEntity.class)); |
||||
return R.data(ExpenseOrderWarehouseTotalWrapper.build().pageVO(pages)); |
||||
} |
||||
|
||||
/** |
||||
* 订单总仓储成本明细 自定义分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@ApiOperationSupport(order = 3) |
||||
@ApiOperation(value = "分页", notes = "传入expenseOrderWarehouseTotal") |
||||
public R<IPage<ExpenseOrderWarehouseTotalVO>> page(ExpenseOrderWarehouseTotalVO expenseOrderWarehouseTotal, Query query) { |
||||
IPage<ExpenseOrderWarehouseTotalVO> pages = expenseOrderWarehouseTotalService.selectExpenseOrderWarehouseTotalPage(Condition.getPage(query), expenseOrderWarehouseTotal); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
/** |
||||
* 订单总仓储成本明细 新增 |
||||
*/ |
||||
@PostMapping("/save") |
||||
@ApiOperationSupport(order = 4) |
||||
@ApiOperation(value = "新增", notes = "传入expenseOrderWarehouseTotal") |
||||
public R save(@Valid @RequestBody ExpenseOrderWarehouseTotalEntity expenseOrderWarehouseTotal) { |
||||
return R.status(expenseOrderWarehouseTotalService.save(expenseOrderWarehouseTotal)); |
||||
} |
||||
|
||||
/** |
||||
* 订单总仓储成本明细 修改 |
||||
*/ |
||||
@PostMapping("/update") |
||||
@ApiOperationSupport(order = 5) |
||||
@ApiOperation(value = "修改", notes = "传入expenseOrderWarehouseTotal") |
||||
public R update(@Valid @RequestBody ExpenseOrderWarehouseTotalEntity expenseOrderWarehouseTotal) { |
||||
return R.status(expenseOrderWarehouseTotalService.updateById(expenseOrderWarehouseTotal)); |
||||
} |
||||
|
||||
/** |
||||
* 订单总仓储成本明细 新增或修改 |
||||
*/ |
||||
@PostMapping("/submit") |
||||
@ApiOperationSupport(order = 6) |
||||
@ApiOperation(value = "新增或修改", notes = "传入expenseOrderWarehouseTotal") |
||||
public R submit(@Valid @RequestBody ExpenseOrderWarehouseTotalEntity expenseOrderWarehouseTotal) { |
||||
return R.status(expenseOrderWarehouseTotalService.saveOrUpdate(expenseOrderWarehouseTotal)); |
||||
} |
||||
|
||||
/** |
||||
* 订单总仓储成本明细 删除 |
||||
*/ |
||||
@PostMapping("/remove") |
||||
@ApiOperationSupport(order = 7) |
||||
@ApiOperation(value = "逻辑删除", notes = "传入ids") |
||||
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { |
||||
return R.status(expenseOrderWarehouseTotalService.deleteLogic(Func.toLongList(ids))); |
||||
} |
||||
|
||||
|
||||
/** |
||||
* 导出数据 |
||||
*/ |
||||
@GetMapping("/export-expenseOrderWarehouseTotal") |
||||
@ApiOperationSupport(order = 9) |
||||
@ApiOperation(value = "导出数据", notes = "传入expenseOrderWarehouseTotal") |
||||
public void exportExpenseOrderWarehouseTotal(@ApiIgnore @RequestParam Map<String, Object> expenseOrderWarehouseTotal, BladeUser bladeUser, HttpServletResponse response) { |
||||
QueryWrapper<ExpenseOrderWarehouseTotalEntity> queryWrapper = Condition.getQueryWrapper(expenseOrderWarehouseTotal, ExpenseOrderWarehouseTotalEntity.class); |
||||
//if (!AuthUtil.isAdministrator()) {
|
||||
// queryWrapper.lambda().eq(ExpenseOrderWarehouseTotal::getTenantId, bladeUser.getTenantId());
|
||||
//}
|
||||
queryWrapper.lambda().eq(ExpenseOrderWarehouseTotalEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); |
||||
List<ExpenseOrderWarehouseTotalExcel> list = expenseOrderWarehouseTotalService.exportExpenseOrderWarehouseTotal(queryWrapper); |
||||
ExcelUtil.export(response, "订单总仓储成本明细数据" + DateUtil.time(), "订单总仓储成本明细数据表", list, ExpenseOrderWarehouseTotalExcel.class); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,125 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.statistics.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.statistics.query.ExpenseWarehouseDayQuery; |
||||
import com.logpm.statistics.query.ExpenseWarehouseMonthQuery; |
||||
import com.logpm.statistics.query.ExpenseWarehouseOrderQuery; |
||||
import com.logpm.statistics.query.ExpenseWarehouseTransitMonthQuery; |
||||
import com.logpm.statistics.service.IExpenseOrderWarehouseTotalService; |
||||
import com.logpm.statistics.service.IExpenseWarehouseDayService; |
||||
import com.logpm.statistics.service.IExpenseWarehouseMonthService; |
||||
import com.logpm.statistics.service.IExpenseWarehousePackageDayService; |
||||
import com.logpm.statistics.vo.ExpenseWarehouseDayVO; |
||||
import com.logpm.statistics.vo.ExpenseWarehouseMonthVO; |
||||
import com.logpm.statistics.vo.ExpenseWarehouseOrderVO; |
||||
import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
import javax.servlet.http.HttpServletResponse; |
||||
|
||||
/** |
||||
* 仓储成本报表 控制器 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-09-23 |
||||
*/ |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/expenseWarehouse") |
||||
@Api(value = "仓储成本报表", tags = "仓储成本报表") |
||||
public class ExpenseWarehouseController extends BladeController { |
||||
|
||||
private final IExpenseWarehouseDayService expenseWarehouseDayService; |
||||
private final IExpenseWarehouseMonthService expenseWarehouseMonthService; |
||||
private final IExpenseOrderWarehouseTotalService expenseOrderWarehouseTotalService; |
||||
private final IExpenseWarehousePackageDayService packageDayService; |
||||
|
||||
/** |
||||
* 日仓储成本统计表 自定义分页 |
||||
*/ |
||||
@GetMapping("/day") |
||||
@ApiOperationSupport(order = 1) |
||||
@ApiOperation(value = "日仓储成本统计表", notes = "日仓储成本统计表") |
||||
public R<IPage<ExpenseWarehouseDayVO>> day(ExpenseWarehouseDayQuery query) { |
||||
IPage<ExpenseWarehouseDayVO> pages = expenseWarehouseDayService.dayPage(query); |
||||
return R.data(pages); |
||||
} |
||||
@GetMapping("/exporDay") |
||||
@ApiOperation(value = "导出日仓储成本统计表", notes = "导出日仓储成本统计表") |
||||
public void exporDay(HttpServletResponse response, ExpenseWarehouseDayQuery query) { |
||||
expenseWarehouseDayService.exporDay(response, query); |
||||
} |
||||
|
||||
/** |
||||
* 月度仓储成本统计表 自定义分页 |
||||
*/ |
||||
@GetMapping("/month") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "月度仓储成本统计表", notes = "月度仓储成本统计表") |
||||
public R<IPage<ExpenseWarehouseMonthVO>> month(ExpenseWarehouseMonthQuery query) { |
||||
IPage<ExpenseWarehouseMonthVO> pages = expenseWarehouseMonthService.monthPage(query); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
@GetMapping("/exporMonth") |
||||
@ApiOperation(value = "导出月度仓储成本统计表", notes = "导出月度仓储成本统计表") |
||||
public void exporMonth(HttpServletResponse response, ExpenseWarehouseMonthQuery query) { |
||||
expenseWarehouseMonthService.exporMonth(response, query); |
||||
} |
||||
|
||||
|
||||
/** |
||||
* 订单仓储成本报表 自定义分页 |
||||
*/ |
||||
@GetMapping("/order") |
||||
@ApiOperationSupport(order = 3) |
||||
@ApiOperation(value = "订单仓储成本报表", notes = "订单仓储成本报表") |
||||
public R<IPage<ExpenseWarehouseOrderVO>> order(ExpenseWarehouseOrderQuery query) { |
||||
IPage<ExpenseWarehouseOrderVO> pages = expenseOrderWarehouseTotalService.orderPage(query); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
@GetMapping("/exporOrder") |
||||
@ApiOperation(value = "导出订单仓储成本报表", notes = "导出订单仓储成本报表") |
||||
public void exporOrder(HttpServletResponse response, ExpenseWarehouseOrderQuery query) { |
||||
expenseOrderWarehouseTotalService.exporOrder(response, query); |
||||
} |
||||
|
||||
/** |
||||
* 中转仓月度收入报表 自定义分页 |
||||
*/ |
||||
@GetMapping("/transit") |
||||
@ApiOperationSupport(order = 4) |
||||
@ApiOperation(value = "中转仓月度收入报表", notes = "中转仓月度收入报表") |
||||
public R<IPage<ExpenseWarehouseTransitMonthVO>> transit(ExpenseWarehouseTransitMonthQuery query) { |
||||
IPage<ExpenseWarehouseTransitMonthVO> pages = packageDayService.transitPage(query); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
|
||||
|
||||
} |
||||
@ -1,78 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.statistics.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.statistics.entity.ExpenseWarehouseDayEntity; |
||||
import com.logpm.statistics.excel.ExpenseWarehouseDayExcel; |
||||
import com.logpm.statistics.service.IExpenseWarehouseDayService; |
||||
import com.logpm.statistics.vo.ExpenseWarehouseDayVO; |
||||
import com.logpm.statistics.wrapper.ExpenseWarehouseDayWrapper; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import io.swagger.annotations.ApiParam; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.excel.util.ExcelUtil; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.secure.BladeUser; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.constant.BladeConstant; |
||||
import org.springblade.core.tool.utils.DateUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.PostMapping; |
||||
import org.springframework.web.bind.annotation.RequestBody; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
import javax.servlet.http.HttpServletResponse; |
||||
import javax.validation.Valid; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 日仓储成本统计表 控制器 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-09-23 |
||||
*/ |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/expenseWarehouseDay") |
||||
@Api(value = "日仓储成本统计表", tags = "日仓储成本统计表接口") |
||||
public class ExpenseWarehouseDayController extends BladeController { |
||||
|
||||
private final IExpenseWarehouseDayService expenseWarehouseDayService; |
||||
|
||||
/** |
||||
* 日仓储成本统计表 自定义分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@ApiOperationSupport(order = 3) |
||||
@ApiOperation(value = "分页", notes = "传入expenseWarehouseDay") |
||||
public R<IPage<ExpenseWarehouseDayVO>> page(ExpenseWarehouseDayVO expenseWarehouseDay, Query query) { |
||||
IPage<ExpenseWarehouseDayVO> pages = expenseWarehouseDayService.selectExpenseWarehouseDayPage(Condition.getPage(query), expenseWarehouseDay); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
} |
||||
@ -1,156 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.statistics.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.statistics.entity.ExpenseWarehouseMonthEntity; |
||||
import com.logpm.statistics.excel.ExpenseWarehouseMonthExcel; |
||||
import com.logpm.statistics.service.IExpenseWarehouseMonthService; |
||||
import com.logpm.statistics.vo.ExpenseWarehouseMonthVO; |
||||
import com.logpm.statistics.wrapper.ExpenseWarehouseMonthWrapper; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import io.swagger.annotations.ApiParam; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.excel.util.ExcelUtil; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.secure.BladeUser; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.constant.BladeConstant; |
||||
import org.springblade.core.tool.utils.DateUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.PostMapping; |
||||
import org.springframework.web.bind.annotation.RequestBody; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
import javax.servlet.http.HttpServletResponse; |
||||
import javax.validation.Valid; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 月度仓储成本统计表 控制器 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-07-17 |
||||
*/ |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/expenseWarehouseMonth") |
||||
@Api(value = "月度仓储成本统计表", tags = "月度仓储成本统计表接口") |
||||
public class ExpenseWarehouseMonthController extends BladeController { |
||||
|
||||
private final IExpenseWarehouseMonthService expenseWarehouseMonthService; |
||||
|
||||
/** |
||||
* 月度仓储成本统计表 详情 |
||||
*/ |
||||
@GetMapping("/detail") |
||||
@ApiOperationSupport(order = 1) |
||||
@ApiOperation(value = "详情", notes = "传入expenseWarehouseMonth") |
||||
public R<ExpenseWarehouseMonthVO> detail(ExpenseWarehouseMonthEntity expenseWarehouseMonth) { |
||||
ExpenseWarehouseMonthEntity detail = expenseWarehouseMonthService.getOne(Condition.getQueryWrapper(expenseWarehouseMonth)); |
||||
return R.data(ExpenseWarehouseMonthWrapper.build().entityVO(detail)); |
||||
} |
||||
/** |
||||
* 月度仓储成本统计表 分页 |
||||
*/ |
||||
@GetMapping("/list") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "分页", notes = "传入expenseWarehouseMonth") |
||||
public R<IPage<ExpenseWarehouseMonthVO>> list(@ApiIgnore @RequestParam Map<String, Object> expenseWarehouseMonth, Query query) { |
||||
IPage<ExpenseWarehouseMonthEntity> pages = expenseWarehouseMonthService.page(Condition.getPage(query), Condition.getQueryWrapper(expenseWarehouseMonth, ExpenseWarehouseMonthEntity.class)); |
||||
return R.data(ExpenseWarehouseMonthWrapper.build().pageVO(pages)); |
||||
} |
||||
|
||||
/** |
||||
* 月度仓储成本统计表 自定义分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@ApiOperationSupport(order = 3) |
||||
@ApiOperation(value = "分页", notes = "传入expenseWarehouseMonth") |
||||
public R<IPage<ExpenseWarehouseMonthVO>> page(ExpenseWarehouseMonthVO expenseWarehouseMonth, Query query) { |
||||
IPage<ExpenseWarehouseMonthVO> pages = expenseWarehouseMonthService.selectExpenseWarehouseMonthPage(Condition.getPage(query), expenseWarehouseMonth); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
/** |
||||
* 月度仓储成本统计表 新增 |
||||
*/ |
||||
@PostMapping("/save") |
||||
@ApiOperationSupport(order = 4) |
||||
@ApiOperation(value = "新增", notes = "传入expenseWarehouseMonth") |
||||
public R save(@Valid @RequestBody ExpenseWarehouseMonthEntity expenseWarehouseMonth) { |
||||
return R.status(expenseWarehouseMonthService.save(expenseWarehouseMonth)); |
||||
} |
||||
|
||||
/** |
||||
* 月度仓储成本统计表 修改 |
||||
*/ |
||||
@PostMapping("/update") |
||||
@ApiOperationSupport(order = 5) |
||||
@ApiOperation(value = "修改", notes = "传入expenseWarehouseMonth") |
||||
public R update(@Valid @RequestBody ExpenseWarehouseMonthEntity expenseWarehouseMonth) { |
||||
return R.status(expenseWarehouseMonthService.updateById(expenseWarehouseMonth)); |
||||
} |
||||
|
||||
/** |
||||
* 月度仓储成本统计表 新增或修改 |
||||
*/ |
||||
@PostMapping("/submit") |
||||
@ApiOperationSupport(order = 6) |
||||
@ApiOperation(value = "新增或修改", notes = "传入expenseWarehouseMonth") |
||||
public R submit(@Valid @RequestBody ExpenseWarehouseMonthEntity expenseWarehouseMonth) { |
||||
return R.status(expenseWarehouseMonthService.saveOrUpdate(expenseWarehouseMonth)); |
||||
} |
||||
|
||||
/** |
||||
* 月度仓储成本统计表 删除 |
||||
*/ |
||||
@PostMapping("/remove") |
||||
@ApiOperationSupport(order = 7) |
||||
@ApiOperation(value = "逻辑删除", notes = "传入ids") |
||||
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { |
||||
return R.status(expenseWarehouseMonthService.deleteLogic(Func.toLongList(ids))); |
||||
} |
||||
|
||||
|
||||
/** |
||||
* 导出数据 |
||||
*/ |
||||
@GetMapping("/export-expenseWarehouseMonth") |
||||
@ApiOperationSupport(order = 9) |
||||
@ApiOperation(value = "导出数据", notes = "传入expenseWarehouseMonth") |
||||
public void exportExpenseWarehouseMonth(@ApiIgnore @RequestParam Map<String, Object> expenseWarehouseMonth, BladeUser bladeUser, HttpServletResponse response) { |
||||
QueryWrapper<ExpenseWarehouseMonthEntity> queryWrapper = Condition.getQueryWrapper(expenseWarehouseMonth, ExpenseWarehouseMonthEntity.class); |
||||
//if (!AuthUtil.isAdministrator()) {
|
||||
// queryWrapper.lambda().eq(ExpenseWarehouseMonth::getTenantId, bladeUser.getTenantId());
|
||||
//}
|
||||
queryWrapper.lambda().eq(ExpenseWarehouseMonthEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); |
||||
List<ExpenseWarehouseMonthExcel> list = expenseWarehouseMonthService.exportExpenseWarehouseMonth(queryWrapper); |
||||
ExcelUtil.export(response, "月度仓储成本统计表数据" + DateUtil.time(), "月度仓储成本统计表数据表", list, ExpenseWarehouseMonthExcel.class); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,37 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.statistics.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.logpm.statistics.entity.ExpenseWarehousePackageDayEntity; |
||||
import com.logpm.statistics.query.ExpenseWarehouseTransitMonthQuery; |
||||
import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO; |
||||
import org.apache.ibatis.annotations.Param; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 包件日仓储成本 Mapper 接口 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-07-17 |
||||
*/ |
||||
public interface ExpenseWarehousePackageDayMapper extends BaseMapper<ExpenseWarehousePackageDayEntity> { |
||||
|
||||
List<ExpenseWarehouseTransitMonthVO> transitPage(@Param("page") IPage<ExpenseWarehouseTransitMonthVO> page, @Param("query") ExpenseWarehouseTransitMonthQuery query); |
||||
} |
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="com.logpm.statistics.mapper.ExpenseWarehousePackageDayMapper"> |
||||
|
||||
<!-- 通用查询映射结果 --> |
||||
<resultMap id="expenseWarehouseMonthResultMap" type="com.logpm.statistics.entity.ExpenseWarehouseMonthEntity"> |
||||
</resultMap> |
||||
|
||||
<select id="transitPage" resultType="com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO"> |
||||
|
||||
</select> |
||||
</mapper> |
||||
@ -0,0 +1,17 @@
|
||||
package com.logpm.statistics.query; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.mp.support.Query; |
||||
|
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseWarehouseDayQuery extends Query { |
||||
@ApiModelProperty(value = "开始时间 年-月-日") |
||||
private String startDate; |
||||
@ApiModelProperty(value = "结束时间 年-月-日") |
||||
private String endDate; |
||||
@ApiModelProperty(value = "仓库 A,B,C") |
||||
private String warehouseName; |
||||
} |
||||
@ -0,0 +1,17 @@
|
||||
package com.logpm.statistics.query; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.mp.support.Query; |
||||
|
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseWarehouseMonthQuery extends Query { |
||||
@ApiModelProperty(value = "开始时间 年-月-日") |
||||
private String startDate; |
||||
@ApiModelProperty(value = "结束时间 年-月-日") |
||||
private String endDate; |
||||
@ApiModelProperty(value = "仓库 A,B,C") |
||||
private String warehouseName; |
||||
} |
||||
@ -0,0 +1,20 @@
|
||||
package com.logpm.statistics.query; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.mp.support.Query; |
||||
|
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseWarehouseOrderQuery extends Query { |
||||
@ApiModelProperty(value = "仓库 A,B,C") |
||||
private String warehouseName; |
||||
@ApiModelProperty(value = "订单号") |
||||
private String orderCode; |
||||
@ApiModelProperty(value = "运单号") |
||||
private String shipmentNumber; |
||||
@ApiModelProperty(value = "复核状态 已完成 未完成") |
||||
private String reviewStatus; |
||||
|
||||
} |
||||
@ -0,0 +1,11 @@
|
||||
package com.logpm.statistics.query; |
||||
|
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.mp.support.Query; |
||||
|
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseWarehousePackageDayQuery extends Query { |
||||
|
||||
} |
||||
@ -0,0 +1,11 @@
|
||||
package com.logpm.statistics.query; |
||||
|
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.mp.support.Query; |
||||
|
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseWarehouseTransitMonthQuery extends Query { |
||||
|
||||
} |
||||
@ -0,0 +1,37 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.statistics.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.logpm.statistics.entity.ExpenseWarehousePackageDayEntity; |
||||
import com.logpm.statistics.query.ExpenseWarehouseTransitMonthQuery; |
||||
import com.logpm.statistics.vo.ExpenseWarehouseDayVO; |
||||
import com.logpm.statistics.vo.ExpenseWarehousePackageDayVO; |
||||
import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
|
||||
/** |
||||
* 日仓储成本统计表 服务类 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-09-23 |
||||
*/ |
||||
public interface IExpenseWarehousePackageDayService extends BaseService<ExpenseWarehousePackageDayEntity> { |
||||
|
||||
IPage<ExpenseWarehouseTransitMonthVO> transitPage(ExpenseWarehouseTransitMonthQuery query); |
||||
|
||||
} |
||||
@ -0,0 +1,43 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.statistics.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.logpm.statistics.entity.ExpenseWarehousePackageDayEntity; |
||||
import com.logpm.statistics.mapper.ExpenseWarehousePackageDayMapper; |
||||
import com.logpm.statistics.query.ExpenseWarehouseTransitMonthQuery; |
||||
import com.logpm.statistics.service.IExpenseWarehousePackageDayService; |
||||
import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
/** |
||||
* 月度仓储成本统计表 服务实现类 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-07-17 |
||||
*/ |
||||
@Service |
||||
public class ExpenseWarehousePackageDayServiceImpl extends BaseServiceImpl<ExpenseWarehousePackageDayMapper, ExpenseWarehousePackageDayEntity> implements IExpenseWarehousePackageDayService { |
||||
|
||||
@Override |
||||
public IPage<ExpenseWarehouseTransitMonthVO> transitPage(ExpenseWarehouseTransitMonthQuery query) { |
||||
IPage<ExpenseWarehouseTransitMonthVO> page = Condition.getPage(query); |
||||
return page.setRecords(baseMapper.transitPage(page, query)); |
||||
} |
||||
} |
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,111 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.statistics.vo; |
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnore; |
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.math.BigDecimal; |
||||
|
||||
/** |
||||
* 订单总仓储成本明细 视图实体类 |
||||
* |
||||
* @author BladeX |
||||
* @since 2024-07-16 |
||||
*/ |
||||
@Data |
||||
@ApiModel(value = "ExpenseOrderWarehouseMonth对象", description = "月度订单仓储成本明细") |
||||
public class ExpenseWarehouseOrderVO { |
||||
private static final long serialVersionUID = 1L; |
||||
/** |
||||
* 事业线 |
||||
*/ |
||||
@ApiModelProperty(value = "事业线") |
||||
@ExcelIgnore |
||||
private String businessUnit; |
||||
/** |
||||
* 目的仓 |
||||
*/ |
||||
@ApiModelProperty(value = "目的仓") |
||||
@ExcelProperty("目的仓") |
||||
private String warehouseName; |
||||
/** |
||||
* 订单编号 |
||||
*/ |
||||
@ApiModelProperty(value = "订单编号") |
||||
@ExcelProperty("订单编号") |
||||
private String orderCode; |
||||
/** |
||||
* 运单编号 |
||||
*/ |
||||
@ApiModelProperty(value = "运单编号") |
||||
@ExcelProperty("运单编号") |
||||
private String shipmentNumber; |
||||
/** |
||||
* 收货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "收货单位") |
||||
@ExcelProperty("收货单位") |
||||
private String receivingUnit; |
||||
/** |
||||
* 发货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "发货单位") |
||||
@ExcelProperty("发货单位") |
||||
private String shippingUnit; |
||||
/** |
||||
* 发货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "配送类型") |
||||
@ExcelProperty("配送类型") |
||||
private String deliveryType; |
||||
/** |
||||
* 复核状态 |
||||
*/ |
||||
@ApiModelProperty(value = "复核状态 已完成 未完成") |
||||
@ExcelProperty("复核状态") |
||||
private String reviewStatus; |
||||
/** |
||||
* 发站仓 |
||||
*/ |
||||
@ApiModelProperty(value = "发站仓") |
||||
@ExcelProperty("发站仓") |
||||
private String originWarehouse; |
||||
|
||||
/** |
||||
* 订单总件数 |
||||
*/ |
||||
@ApiModelProperty(value = "订单总件数") |
||||
@ExcelProperty("订单总件数") |
||||
private Integer totalNumber; |
||||
|
||||
/** |
||||
* 出库件数 |
||||
*/ |
||||
@ApiModelProperty(value = "出库件数") |
||||
@ExcelProperty("出库件数") |
||||
private Integer outNumber; |
||||
/** |
||||
* 租赁成本 |
||||
*/ |
||||
@ApiModelProperty(value = "租赁成本") |
||||
@ExcelProperty("租赁成本") |
||||
private BigDecimal warehouseRentalCost; |
||||
} |
||||
@ -0,0 +1,34 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.statistics.vo; |
||||
|
||||
import com.logpm.statistics.entity.ExpenseWarehouseTransitMonthEntity; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
/** |
||||
* 月度仓储+ 视图实体类 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-09-23 |
||||
*/ |
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class ExpenseWarehouseTransitMonthVO extends ExpenseWarehouseTransitMonthEntity { |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,161 @@
|
||||
package com.logpm.trunkline.mq.waybil; |
||||
|
||||
import cn.hutool.core.util.ObjectUtil; |
||||
import cn.hutool.core.util.StrUtil; |
||||
import cn.hutool.json.JSONObject; |
||||
import cn.hutool.json.JSONUtil; |
||||
import com.logpm.trunkline.dto.WaybillLogDTO; |
||||
import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient; |
||||
import com.logpm.trunkline.mapper.TrunklineWaybillPackageMapper; |
||||
import com.logpm.trunkline.service.ITrunklineWaybillPackageService; |
||||
import com.logpm.trunkline.service.ITrunklineWaybillTrackService; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.common.constant.broadcast.FanoutConstants; |
||||
import org.springblade.common.enums.BizOperationEnums; |
||||
import org.springblade.common.model.DistributionReCheckSignVO; |
||||
import org.springblade.common.model.NodeFanoutMsg; |
||||
import org.springblade.common.model.PackageData; |
||||
import org.springblade.common.model.workNode.PickUpByReCheckVO; |
||||
import org.springframework.amqp.core.ExchangeTypes; |
||||
import org.springframework.amqp.rabbit.annotation.Exchange; |
||||
import org.springframework.amqp.rabbit.annotation.Queue; |
||||
import org.springframework.amqp.rabbit.annotation.QueueBinding; |
||||
import org.springframework.amqp.rabbit.annotation.RabbitListener; |
||||
import org.springframework.stereotype.Component; |
||||
import org.springframework.transaction.annotation.Transactional; |
||||
|
||||
import java.util.*; |
||||
import java.util.stream.Collectors; |
||||
|
||||
/** |
||||
* 运单日志和状态变更 |
||||
*/ |
||||
@Slf4j |
||||
@Component |
||||
@AllArgsConstructor |
||||
public class StatusLogListener { |
||||
|
||||
private final ITrunklineWaybillTrackClient trunklineWaybillTrackClient ; |
||||
|
||||
@RabbitListener(bindings = @QueueBinding( |
||||
value = @Queue(name = FanoutConstants.DeliveryOfPickup.BillSignReview.QUEUE.waybillStatusLog, durable = "true"), |
||||
exchange = @Exchange(name = FanoutConstants.DeliveryOfPickup.BillSignReview.EXCHANGE, type = ExchangeTypes.FANOUT) |
||||
)) |
||||
@Transactional(rollbackFor = Exception.class) |
||||
public void statusPickUpLog(String msg) { |
||||
|
||||
log.info("自提复核处理运单日志和状态: {}", msg); |
||||
if (StrUtil.isEmpty(msg)) { |
||||
return; |
||||
} |
||||
NodeFanoutMsg bean = JSONUtil.toBean(msg, NodeFanoutMsg.class); |
||||
Object main = bean.getMain(); |
||||
JSONObject entries = JSONUtil.parseObj(main); |
||||
PickUpByReCheckVO vo = JSONUtil.toBean(entries, PickUpByReCheckVO.class); |
||||
Long warehouseId = bean.getWarehouseId(); |
||||
BizOperationEnums bizOperation = bean.getBizOperation(); |
||||
List<PackageData> details = vo.getPackageDataList(); |
||||
|
||||
// 按照运单号进行分组 后面的集合 按照创建时间进行排序
|
||||
Map<String, List<PackageData>> map = details.stream().collect(Collectors.groupingBy(PackageData::getWaybillNumber)); |
||||
// 根据运单号 统计 每个运单的数量
|
||||
Map<String, Integer> waybillCountMap = new HashMap<>(); |
||||
|
||||
for (PackageData packageData : details) { |
||||
String waybillNumber = packageData.getWaybillNumber(); |
||||
waybillCountMap.put(waybillNumber, waybillCountMap.getOrDefault(waybillNumber, 0) + packageData.getNumber()); |
||||
} |
||||
Set<String> strings = waybillCountMap.keySet(); |
||||
|
||||
for (String waybillNumber : strings) { |
||||
|
||||
WaybillLogDTO t = new WaybillLogDTO(); |
||||
List<PackageData> packageDataList = map.get(waybillNumber); |
||||
if (packageDataList != null && !packageDataList.isEmpty()) { |
||||
packageDataList.sort(Comparator.comparing(PackageData::getSignTime)); |
||||
// 获取排序第一个
|
||||
t.setSignUser(packageDataList.get(0).getSignUser()); |
||||
t.setSignTime(packageDataList.get(0).getSignTime()); |
||||
} |
||||
t.setWaybillNo(waybillNumber); |
||||
t.setWarehouseName(bean.getWarehouse()); |
||||
t.setWarehouseId(warehouseId); |
||||
|
||||
t.setTrainNumber(vo.getPickupBatch()); |
||||
t.setCarNumber(vo.getCarNumber()); |
||||
t.setDriverName(vo.getDriverName()); |
||||
t.setDeliveryTime(vo.getDeliveryTime()); |
||||
t.setNum(waybillCountMap.get(waybillNumber)); |
||||
t.setSignOrderCode(vo.getPickupBatch()); |
||||
t.setType(3); |
||||
trunklineWaybillTrackClient.addSignWaybillLog(t); |
||||
|
||||
|
||||
} |
||||
|
||||
} |
||||
|
||||
|
||||
/** |
||||
* 配送签收复核 |
||||
* @param msg |
||||
*/ |
||||
@RabbitListener(bindings = @QueueBinding( |
||||
value = @Queue(name = FanoutConstants.distribution.DeliveryAndrecheck.QUEUE.waybillStatusLog, durable = "true"), |
||||
exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndrecheck.EXCHANGE, type = ExchangeTypes.FANOUT) |
||||
)) |
||||
@Transactional(rollbackFor = Exception.class) |
||||
public void statusDekiveryLog(String msg) { |
||||
|
||||
log.info("商/市配送 复核处理运单日志和状态: {}", msg); |
||||
if (StrUtil.isEmpty(msg)) { |
||||
return; |
||||
} |
||||
NodeFanoutMsg bean = JSONUtil.toBean(msg, NodeFanoutMsg.class); |
||||
Object main = bean.getMain(); |
||||
JSONObject entries = JSONUtil.parseObj(main); |
||||
DistributionReCheckSignVO vo = JSONUtil.toBean(entries, DistributionReCheckSignVO.class); |
||||
Long warehouseId = bean.getWarehouseId(); |
||||
BizOperationEnums bizOperation = bean.getBizOperation(); |
||||
List<PackageData> details = vo.getPackageDataList(); |
||||
|
||||
// 按照运单号进行分组 后面的集合 按照创建时间进行排序
|
||||
Map<String, List<PackageData>> map = details.stream().collect(Collectors.groupingBy(PackageData::getWaybillNumber)); |
||||
// 根据运单号 统计 每个运单的数量
|
||||
Map<String, Integer> waybillCountMap = new HashMap<>(); |
||||
|
||||
for (PackageData packageData : details) { |
||||
String waybillNumber = packageData.getWaybillNumber(); |
||||
waybillCountMap.put(waybillNumber, waybillCountMap.getOrDefault(waybillNumber, 0) + packageData.getNumber()); |
||||
} |
||||
Set<String> strings = waybillCountMap.keySet(); |
||||
|
||||
for (String waybillNumber : strings) { |
||||
|
||||
WaybillLogDTO t = new WaybillLogDTO(); |
||||
List<PackageData> packageDataList = map.get(waybillNumber); |
||||
if (packageDataList != null && !packageDataList.isEmpty()) { |
||||
packageDataList.sort(Comparator.comparing(PackageData::getSignTime)); |
||||
// 获取排序第一个
|
||||
t.setSignUser(packageDataList.get(0).getSignUser()); |
||||
t.setSignTime(packageDataList.get(0).getSignTime()); |
||||
} |
||||
t.setWaybillNo(waybillNumber); |
||||
t.setWarehouseName(bean.getWarehouse()); |
||||
t.setWarehouseId(warehouseId); |
||||
|
||||
t.setTrainNumber(vo.getTrainNumber()); |
||||
t.setCarNumber(vo.getVehicleName()); |
||||
t.setDriverName(vo.getDriverName()); |
||||
t.setDeliveryTime(vo.getDeliveryTime()); |
||||
t.setNum(waybillCountMap.get(waybillNumber)); |
||||
t.setSignOrderCode(vo.getReservationCode()); |
||||
t.setType(3); |
||||
trunklineWaybillTrackClient.addSignWaybillLog(t); |
||||
|
||||
} |
||||
|
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue