diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java index 8b3bd1347..87bb24e7f 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java @@ -5,7 +5,7 @@ public class DictBizConstant { public static final String DELIVERY_METHOD = "delivery_method";//发送方式 public static final String URGENCY = "urgency";//紧急程度 public static final String WAY_BILL_STATUS = "way_bill_status";//运单状态 - public static final String DISTRIBUTION_TYPE = "distribution_type";//服务类型 + public static final String DISTRIBUTION_TYPE = "distribution_type";//客户配送类型 public static final String FREEZE_STATUS = "freeze_status";//冻结状态 public static final String DEFAULT_PASSWORD = "default_password";//默认密码 public static final String DEFAULT_MALL_ROLE_ID = "default_mall_role_id";//默认角色 @@ -115,6 +115,12 @@ public class DictBizConstant { //---------------2023-11-18 public static final String OPEN_ORDER_PAY_TYPE = "open_order_pay_type"; public static final String OPEN_ORDER_PAY_WAY = "open_order_pay_way"; + + /** + * 结算对象类型 + */ + public static final String CLEAN_OBJ_TYPE = "clean_obj_type"; + public static final String OPEN_ORDER_DELIVERY_WAY = "open_order_delivery_way"; public static final String OPEN_ORDER_URGENCY = "open_order_urgency"; public static final String OPEN_ORDER_RECEIPT = "open_order_receipt"; diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java index 7832953a1..01bbbdc5e 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java @@ -312,6 +312,10 @@ public class AftersalesWorkOrderEntity extends TenantEntity { private String totalAmountNum; @TableField(exist=false) private String workOrderStatusNameS; + @TableField(exist=false) + private String resultTypes; + @TableField(exist=false) + private String compensationMethods; diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java index 3f708f90c..6f13a1fc2 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java @@ -142,10 +142,15 @@ public class BasicdataClientEntity extends TenantEntity { */ @ApiModelProperty(value = "联系电话") private String phone; + + /** - * 客户类型;1 C端 2 B端 + * 配送服务类型 + * 1.商配 2市配 3自提 4三方中转 + * 该值未 配送包含配送的服务类中 存在的配送服务方式 + * 为了减少查询 做的冗余字段 */ - @ApiModelProperty(value = "客户类型;1 C端 2 B端") + @ApiModelProperty(value = "配送服务类型") private Integer typeService; /** @@ -213,13 +218,13 @@ public class BasicdataClientEntity extends TenantEntity { * 合同开始时间 */ @ApiModelProperty(value = "合同开始时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date contractStartTime; /** * 合同结束时间 */ @ApiModelProperty(value = "合同结束时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date contractEntTime; @ApiModelProperty(value = "默认付款方式 1现付 2到付 3月结 4回付 5内部结算 ") diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 95c66d924..946f44790 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -213,5 +213,6 @@ public class LoadCarsDTO implements Serializable { private String arriveTime; private String createUserName; private String createTime; + private String ids; } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java index 426965b38..3566703e6 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java @@ -28,4 +28,13 @@ public interface ITrunklineAdvanceDetailClient { @GetMapping(API_PREFIX+"/findListByWaybillId") List findListByWaybillId(@RequestParam Long waybillId); + + /** + * 查询暂存单详情 + * @param orderCode + * @param warehouseIds + * @return + */ + @GetMapping(API_PREFIX+"/selectByOrderCodeAndWarehouseId") + List selectByOrderCodeAndWarehouseId(@RequestParam String orderCode,@RequestParam String warehouseIds); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java index 48068c879..85d95ced0 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -722,6 +722,20 @@ public class AftersalesWorkOrderController extends BladeController { ExcelUtil.export(response, "异常工单数据" + DateUtil.time(), "异常工单数据", list, AftersalesWorkOrderExcel.class); } + /** + * 导出数据 + * + */ + @GetMapping("/exportWorkOrder") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入aftersalesWorkOrder") + public void exportWorkOrder(@ApiIgnore @RequestParam Map aftersalesWorkOrder, BladeUser bladeUser, HttpServletResponse response) { + +// List list = aftersalesWorkOrderService.exportAftersalesWorkOrder(aftersalesWorkOrder); + List list = aftersalesWorkOrderService.exportWorkOrder(aftersalesWorkOrder); + ExcelUtil.export(response, "异常工单数据" + DateUtil.time(), "异常工单数据", list, AftersalesWorkOrderExcel.class); + } + @GetMapping("/exportAftersalesWorkOrderList") @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入aftersalesWorkOrder") diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java index 15b1889c4..075924d59 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderExcel.java @@ -49,8 +49,7 @@ public class AftersalesWorkOrderExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("工单异常类型") private String workOrderTypeName; - @ExcelIgnore //工单异常类型 - private String workOrderType; + /** * 发现节点;提货，发货，干线，库内，配送，其他，签收（PC），安装（PC） */ @@ -107,7 +106,8 @@ public class AftersalesWorkOrderExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("工单状态") - private String workOrderStatus; + private String workOrderStatusName; + @ColumnWidth(20) @ExcelProperty("品牌") private String brandName; @@ -241,4 +241,27 @@ public class AftersalesWorkOrderExcel implements Serializable { private String processNumber; + /** + * 钉钉流程号 + */ + @ColumnWidth(20) + @ExcelProperty("赔款金额") + private String totalAmountNum; + + /** + * 钉钉流程号 + */ + @ColumnWidth(20) + @ExcelProperty("处理结果") + private String resultTypes; + + + /** + * 钉钉流程号 + */ + @ColumnWidth(20) + @ExcelProperty("赔付方式") + private String compensationMethods; + + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java index 0928abf36..56da449b3 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java @@ -108,4 +108,7 @@ public interface AftersalesWorkOrderMapper extends BaseMapper selectWaitAftersalesWorkOrderList(@Param("warehouseIds")List warehouseListIds); + + List exportListOwn(@Param("param") AftersalesWorkOrderEntity workOrderEntity); + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml index f6ba90a33..487798509 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml @@ -89,7 +89,183 @@ lawo.customer_service_name customerServiceName, lawo.warehouse_id warehouseId, lawo.investigation_process investigationProcess, - lawo.customer_service_id customerServiceId + lawo.customer_service_id customerServiceId, + IFNULL( sum( lapr.money ), 0 ) AS totalAmountNum, + GROUP_CONCAT(DISTINCT lapr.result_type) AS resultTypes, + GROUP_CONCAT(DISTINCT lapr.compensation_method) AS compensationMethods + FROM + logpm_aftersales_work_order lawo + LEFT JOIN logpm_aftersales_processor lap ON lawo.id = lap.work_order_id + AND lap.types_of = '2' + AND lap.conditions IN ( 1, 2 ) + LEFT JOIN logpm_aftersales_completion_record lacr ON lacr.work_order_id = lawo.id + AND lacr.is_deleted = '0' + LEFT JOIN (SELECT + a.id, + group_concat( DISTINCT b.`first` SEPARATOR ',' ) AS `first`, + group_concat( DISTINCT b.secondary SEPARATOR ',' ) AS secondary, + group_concat( DISTINCT b.brand_name SEPARATOR ',' ) AS brand_name, + group_concat( DISTINCT b.package_code SEPARATOR ',' ) AS package_code, + group_concat( DISTINCT b.waybill_number SEPARATOR ',' ) AS waybill_number + FROM + logpm_aftersales_work_order AS a + LEFT JOIN logpm_aftersales_abnormal_package AS b ON a.id = b.work_order_id + WHERE + a.is_deleted = 0 + AND b.is_deleted = 0 + GROUP BY + a.id) AS t ON t.id = lawo.id + LEFT JOIN logpm_aftersales_processing_results AS lapr ON lapr.work_order_id = lawo.id + + lawo.is_deleted = 0 + and lawo.work_order_status = #{param.workOrderStatusNameS } + and lawo.id = #{param.id } + and lawo.work_order_type = #{param.workOrderType } + and lawo.initiation_identification = #{param.initiationIdentification } + and lawo.discovery_node = #{param.discoveryNode } + and lawo.work_order_number like concat('%',#{param.workOrderNumber },'%') + and lawo.waybill_number like concat('%', #{param.waybillNumber },'%') + and lawo.order_code like concat('%', #{param.orderCode },'%') + and lawo.train_number like concat('%', #{param.trainNumber },'%') + and lawo.vehicle_route like concat('%', #{param.vehicleRoute },'%') + and date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d') + and date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d') + and date_format(from_unixtime(lawo.warehousing_time),'%Y-%m-%d') = date_format( #{param.warehousingTime},'%Y-%m-%d') + and date_format(from_unixtime( lawo.delivery_time),'%Y-%m-%d') = date_format(#{param.deliveryTime} param.deliveryTime,'%Y-%m-%d') + and date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d') + and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') + and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') + and lawo.waybill_mall like concat('%', #{param.waybillMall },'%') + and lawo.delivery_driver = #{param.deliveryDriver } + and lawo.work_order_status in ('40') + and lawo.work_order_status in ('20') + and lawo.work_order_status in ('30') + and lawo.work_order_status in ('30') + and lawo.work_order_status in ('70','80','100') + and lawo.customer_service_id = #{param.customerServiceId } + and lawo.customer_service_name like concat('%', #{param.customerServiceName },'%') + and lawo.waybill_mall_id = #{param.waybillMallId } + and lawo.problem_description = #{param.problemDescription} + and (lap.warehouse_id = #{param.warehouseId} OR lap.business_id = #{param.warehouseId}) + and lawo.person_responsible = #{param.personResponsible } + and lawo.process_number = #{param.processNumber } + and lawo.reviewed_by = #{param.reviewedBy } + and lawo.operator = #{param.operator } + and lawo.responsible_person = #{param.responsiblePerson } + and lawo.processed_by = #{param.processedBy} + and lawo.investigation_process = #{param.investigationProcess } + and lawo.related_work_orders_id = #{param.relatedWorkOrdersId } + and lawo.work_order_status in( #{param.workOrderStatus }) + + and lawo.work_order_status IN ( '10', '20', '21', '30', '40', '50', '60', '70', '80', '90' ,'100','110') + + and lawo.work_order_status in ('10') and lap.types_of = '2' and lap.processing_status in ('1') + and lawo.work_order_status in ('20') and lap.types_of = '2' + and lawo.work_order_status in (21,30) and lap.processing_status = '4' + and lap.types_of = '2' + and ((lawo.work_order_status in (80,100,70) OR lacr.warehouse_id=#{param.warehouseId})) + and lawo.work_order_type = #{param.workOrderType } + and lawo.discovery_node = #{param.discoveryNode } + and lawo.work_order_number like concat('%',#{param.workOrderNumber },'%') + and lawo.train_number like concat('%', #{param.trainNumber },'%') + and lawo.vehicle_route like concat('%', #{param.vehicleRoute },'%') + and lawo.work_order_status in ( #{param.workOrderStatus }) + and lawo.work_order_status in ('10') + and t.first like concat('%',#{param.first},'%') + and t.secondary like concat('%',#{param.secondary},'%') + and t.brand_name like concat('%',#{param.brandName},'%') + and t.waybill_number like concat('%',#{param.waybillNumber},'%') + and t.package_code like concat('%',#{param.packageCode},'%') + + group by lawo.id + ORDER BY lawo.create_time DESC + + + select id id, + waybill_no waybillNo, + status status + from deal_with_waybill_pay_type + where status = 0 + + + + update deal_with_waybill_pay_type + set status = 1 + where id = #{id} + + + + update logpm_warehouse_waybill + set pay_way = #{payWay}, + check_status = 1 + where waybill_no = #{waybillNo} + + + + + delete from logpm_statistics_trunkline_package + where waybill_no = #{waybillNo} + + + + delete from logpm_statistics_warehouse_package + where waybill_no = #{waybillNo} + + + + + delete from logpm_statistics_distribution_package + where waybill_no = #{waybillNo} + + + + delete from logpm_statistics_order_info + where waybill_no = #{waybillNo} + + + + delete from logpm_statistics_balance_order_info + where waybill_no = #{waybillNo} + + + diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java index 4e75daf17..1c00269b6 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java @@ -129,4 +129,14 @@ public interface IWarehouseMappingDataService { void updateRepairParcelListWaybillById(Integer id, int status); void updatePackageStatusList(List orderPackageCodes, Long warehouseId, String packageStatus); + + List findAllDealWithWaybillNo(); + + + void updateStatusDealwithWaybillById(Integer id); + + void deleteStatisticsdata(String waybillNo); + + + } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java index a5991c919..82dc78361 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java @@ -311,4 +311,31 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer warehouseMappingDataMapper.updatePackageStatusList(orderPackageCodes,warehouseId,packageStatus); } + + @Override + public List findAllDealWithWaybillNo() { + return warehouseMappingDataMapper.findAllDealWithWaybillNo(); + } + + @Override + public void updateStatusDealwithWaybillById(Integer id) { + warehouseMappingDataMapper.updateStatusDealwithWaybillById(id); + } + + @Override + public void deleteStatisticsdata(String waybillNo) { + + warehouseMappingDataMapper.udpateWaybillPayWay(waybillNo,"3"); + + warehouseMappingDataMapper.deletedTrunklinePackageByWaybillNo(waybillNo); + + warehouseMappingDataMapper.deletedWarehousePackageByWaybillNo(waybillNo); + + warehouseMappingDataMapper.deletedDistributionPackageByWaybillNo(waybillNo); + + warehouseMappingDataMapper.deletedOrderByWaybillNo(waybillNo); + + warehouseMappingDataMapper.deletedBalanceOrderByWaybillNo(waybillNo); + + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index f201e98a2..c6d3c19f8 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -8,6 +8,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.trunkline.dto.*; import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; +import com.logpm.trunkline.excel.TrunklineCarsLoadExcel; import com.logpm.trunkline.service.ITrunklineCarsLoadService; import com.logpm.trunkline.vo.LoadingDetailExportVO; import com.logpm.trunkline.vo.TrunklineCarsLoadVO; @@ -18,17 +19,17 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.exception.CustomerException; import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.StringUtil; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; -import java.util.Objects; +import java.util.*; @Slf4j @RestController @@ -2819,4 +2820,40 @@ public class CarsLoadController { } } + + @ResponseBody + @PostMapping("/exportLoadCarsPageList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "配载计划分页列表", notes = "传入loadCarsDTO") + public void exportLoadCarsPageList(@RequestBody LoadCarsDTO loadCarsDTO, HttpServletRequest request, HttpServletResponse response) { + String method = "############loadCarsPageList: "; + log.info(method+"请求参数{}",loadCarsDTO); + try{ + + Enumeration headerNames = request.getHeaderNames(); + + //当前登录人选择的仓库 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + List warehouseIds = new ArrayList<>(); + if(!Objects.isNull(myCurrentWarehouse)){ + Long warehouseId = myCurrentWarehouse.getId(); + warehouseIds.add(warehouseId); + }else{ + List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); + myWatchWarehouse.forEach(warehouseEntity -> { + warehouseIds.add(warehouseEntity.getId()); + }); + } + loadCarsDTO.setWarehouseIds(warehouseIds); + + List list = carsLoadService.exportLoadCarsPageList(loadCarsDTO); + ExcelUtil.export(response, "车辆配载数据" + DateUtil.time(), "车辆配载数据", list, TrunklineCarsLoadExcel.class); + }catch (CustomerException e){ + log.error(e.message,e); + }catch (Exception e){ + log.error(method+"系统异常",e); + } + } + + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/excel/TrunklineCarsLoadExcel.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/excel/TrunklineCarsLoadExcel.java new file mode 100644 index 000000000..f016d88db --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/excel/TrunklineCarsLoadExcel.java @@ -0,0 +1,144 @@ +package com.logpm.trunkline.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class TrunklineCarsLoadExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ColumnWidth(20) + @ExcelProperty("车次号") + private String carsNo; + + @ColumnWidth(20) + @ExcelProperty("路线") + private String carsLineName; + + @ColumnWidth(20) + @ExcelProperty("计划装车") + private String planLoadingNumber; + + @ColumnWidth(20) + @ExcelProperty("装车件数") + private String realLoadingNumber; + + + @ColumnWidth(20) + @ExcelProperty("在库件数") + private String stockCarsNum; + + + @ColumnWidth(20) + @ExcelProperty("卸车件数") + private String unloadNumber; + + +// @ColumnWidth(20) +// @ExcelProperty("路线") +// private String loadingType; + + + @ColumnWidth(20) + @ExcelProperty("满载率") + private String fullLoadRate; + + @ColumnWidth(20) + @ExcelProperty("车辆状态") + private String loadStatusName; + + @ColumnWidth(20) + @ExcelProperty("主驾司机") + private String driverName; + + @ColumnWidth(20) + @ExcelProperty("主驾司机手机号") + private String driverMobile; + + @ColumnWidth(20) + @ExcelProperty("车牌号") + private String carNumber; + + @ColumnWidth(20) + @ExcelProperty("起点仓库") + private String startWarehouseName; + + + @ColumnWidth(20) + @ExcelProperty("终点仓库") + private String endWarehouseNames; + + @ColumnWidth(20) + @ExcelProperty("到车时间") + private String arriveTime; + + @ColumnWidth(20) + @ExcelProperty("实际发车时间") + private String startTime; + + @ColumnWidth(20) + @ExcelProperty("经办人") + private String createUserName; + + @ColumnWidth(20) + @ExcelProperty("创建时间") + private String createTime; + + @ColumnWidth(20) + @ExcelProperty("现付运输费") + private String nowTransportCost; + + + @ColumnWidth(20) + @ExcelProperty("到付油卡费") + private String oilCost; + + @ColumnWidth(20) + @ExcelProperty("路桥费") + private String tollFee; + + @ColumnWidth(20) + @ExcelProperty("回付运输费") + private String backTransportCost; + + + @ColumnWidth(20) + @ExcelProperty("到付运输费") + private String reachTransportCost; + + @ColumnWidth(20) + @ExcelProperty("整车信息费") + private String wholeCarInfoCost; + + @ColumnWidth(20) + @ExcelProperty("整车保险费") + private String wholeCarInsuranceCost; + + + @ColumnWidth(20) + @ExcelProperty("整车落地费") + private String wholeCarGroundCost; + + @ColumnWidth(20) + @ExcelProperty("发站装车费") + private String hairWholeCost; + + @ColumnWidth(20) + @ExcelProperty("发站其他费") + private String hairWholeOtherCost; + + @ColumnWidth(20) + @ExcelProperty("到站卸车费") + private String unloadCost; + + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java index 95f0ff045..0b39e384f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java @@ -1,11 +1,13 @@ package com.logpm.trunkline.feign; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -41,4 +43,12 @@ public class TrunklineAdvanceDetailClient implements ITrunklineAdvanceDetailClie .eq("is_deleted",0); return advanceDetailService.list(queryWrapper); } + + @Override + public List selectByOrderCodeAndWarehouseId(String orderCode, String warehouseIds) { + return advanceDetailService.list(Wrappers.query().lambda() + .eq(TrunklineAdvanceDetailEntity::getOrderCode,orderCode) + .in(TrunklineAdvanceDetailEntity::getWarehouseId, Func.toLongList(warehouseIds)) + ); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java index 0348ad393..8fd913ebf 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.LoadCarsDTO; import com.logpm.trunkline.dto.LoadScanBrandDTO; import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; +import com.logpm.trunkline.excel.TrunklineCarsLoadExcel; import com.logpm.trunkline.vo.CarsLoadAllOrderVO; import com.logpm.trunkline.vo.TripartiteTransferVO; import com.logpm.trunkline.vo.TrunklineCarsLoadVO; @@ -49,5 +50,12 @@ public interface TrunklineCarsLoadMapper extends BaseMapper carsOrderIdList, @Param("isCustomer") String isCustomer); List fingPackageCodeByLoadId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); + + /** + * 导出查询 + * @param loadCarsDTO + * @return + */ + List exportLoadCarsList(@Param("param") LoadCarsDTO loadCarsDTO,@Param("idList")List idList); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index c9809b7e1..61cee9a18 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -838,6 +838,158 @@ and Locate(#{param.waybillNo},lww.waybill_no) > 0 + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index 027d3308a..f9e6e5bfe 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -6,6 +6,7 @@ import com.logpm.trunkline.dto.LoadCarsDTO; import com.logpm.trunkline.dto.TrunklineCarsLoadDTO; import com.logpm.trunkline.dto.ZeroPackageDTO; import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; +import com.logpm.trunkline.excel.TrunklineCarsLoadExcel; import com.logpm.trunkline.vo.LoadingDetailExportVO; import com.logpm.trunkline.vo.TripartiteTransferVO; import com.logpm.trunkline.vo.TrunklineCarsLoadVO; @@ -254,4 +255,10 @@ public interface ITrunklineCarsLoadService extends BaseService exportLoadCarsPageList(LoadCarsDTO loadCarsDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 83165947c..803e0973d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -42,6 +42,7 @@ import com.logpm.factorydata.vo.PushData; import com.logpm.trunkline.bean.Resp; import com.logpm.trunkline.dto.*; import com.logpm.trunkline.entity.*; +import com.logpm.trunkline.excel.TrunklineCarsLoadExcel; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; import com.logpm.trunkline.mapper.TrunklineCarsLoadMapper; import com.logpm.trunkline.service.*; @@ -7706,13 +7707,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl page = new Page<>(); @@ -10344,6 +10394,28 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl exportLoadCarsPageList(LoadCarsDTO loadCarsDTO) { + + loadCarsDTO.setCreateTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getCreateTimeStartStr())); + loadCarsDTO.setCreateTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getCreateTimeEndStr())); + + loadCarsDTO.setStartTime(CommonUtil.getStartByDateStr(loadCarsDTO.getStartDate())); + loadCarsDTO.setEndTime(CommonUtil.getEndByDateStr(loadCarsDTO.getEndDate())); + + loadCarsDTO.setArriveTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getArriveTimeStartStr())); + loadCarsDTO.setArriveTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getArriveTimeEndStr())); + List idList =null; + if (!Objects.isNull(loadCarsDTO.getIds())){ + idList = new ArrayList<>(); + idList.addAll(Arrays.asList(Func.toLongArray(loadCarsDTO.getIds()))); + } + + List pageList = baseMapper.exportLoadCarsList(loadCarsDTO,idList); + + return pageList; + } + @Override public R unloadZero(Long carsLoadScanId,Long loadId, String waybillNo, Integer enterNun, Long warehouseId, Integer unbindTray, String trayCode, String orderCode, String remark,String unloadTrayName,String unloadTrayCode,List zeroPackageList) {