Browse Source
# Conflicts: # blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java # blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java # blade-service/logpm-distribution/pom.xml # blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java # blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml # blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java # blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanService.java # blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java # blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanServiceImpl.java # blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java # blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.javadist.1.3.0
246 changed files with 9540 additions and 2465 deletions
@ -0,0 +1,53 @@
|
||||
package com.logpm.aftersales.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; |
||||
|
||||
@Data |
||||
@TableName("logpm_aftersales_abnormal_record_zero_detail") |
||||
@ApiModel(value = "AftersalesAbnormalRecordZeroDetail对象", description = "异常记录零担明细表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class AftersalesAbnormalRecordZeroDetailEntity extends TenantEntity { |
||||
|
||||
/** 预留1 */ |
||||
@ApiModelProperty(name = "预留1",notes = "") |
||||
private String reserve1 ; |
||||
/** 预留2 */ |
||||
@ApiModelProperty(name = "预留2",notes = "") |
||||
private String reserve2 ; |
||||
/** 预留3 */ |
||||
@ApiModelProperty(name = "预留3",notes = "") |
||||
private String reserve3 ; |
||||
/** 预留4 */ |
||||
@ApiModelProperty(name = "预留4",notes = "") |
||||
private String reserve4 ; |
||||
/** 预留5 */ |
||||
@ApiModelProperty(name = "预留5",notes = "") |
||||
private String reserve5 ; |
||||
|
||||
@ApiModelProperty(name = "异常记录id",notes = "") |
||||
private Long abnormalRecordId; |
||||
|
||||
@ApiModelProperty(name = "包件id",notes = "") |
||||
private Long packageId; |
||||
|
||||
@ApiModelProperty(name = "品类id",notes = "") |
||||
private Long goodsId; |
||||
|
||||
@ApiModelProperty(name = "品类名称",notes = "") |
||||
private String goodsName; |
||||
|
||||
@ApiModelProperty(name = "异常数量",notes = "") |
||||
private Integer abnormalNum; |
||||
|
||||
@ApiModelProperty(name = "回库数量",notes = "") |
||||
private Integer returnNum; |
||||
|
||||
@ApiModelProperty(name = "入库数量",notes = "") |
||||
private Integer incomingNum; |
||||
|
||||
} |
||||
@ -0,0 +1,44 @@
|
||||
/* |
||||
* 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.aftersales.feign; |
||||
|
||||
import com.logpm.aftersales.entity.AftersalesAbnormalRecordZeroDetailEntity; |
||||
import org.springblade.common.constant.ModuleNameConstant; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.PostMapping; |
||||
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 货位 Feign接口类 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-09-02 |
||||
*/ |
||||
@FeignClient( |
||||
value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME |
||||
) |
||||
public interface IAftersalesAbnormalRecordZeroDetailClient { |
||||
|
||||
String API_PREFIX = "abormal/client"; |
||||
String TOP = API_PREFIX + "/top"; |
||||
|
||||
@PostMapping(API_PREFIX+"/addAbnormalRecordZeroDetail") |
||||
void addAbnormalRecordZeroDetail(@RequestBody List<AftersalesAbnormalRecordZeroDetailEntity> abnormalRecordZeroDetailEntityList); |
||||
|
||||
} |
||||
@ -0,0 +1,16 @@
|
||||
package com.logpm.distribution.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class ZeroPackageSupplyVO implements Serializable { |
||||
|
||||
private Long stockArticleId; |
||||
private Long packageId; |
||||
private Long goodsId; |
||||
private String goodsName;//品类名称
|
||||
private Integer stockNum;//品类在库件数
|
||||
|
||||
} |
||||
@ -0,0 +1,492 @@
|
||||
package com.logpm.report.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.Builder; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import lombok.NoArgsConstructor; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
import java.math.BigDecimal; |
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* 配送明细 |
||||
* |
||||
* @author zqb |
||||
* @create 2024-08-23 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_quality_deliver") |
||||
@ApiModel(value = "QualityDeliver对象", description = "配送明细") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
@AllArgsConstructor |
||||
@NoArgsConstructor |
||||
@Builder |
||||
public class QualityDeliverEntity extends TenantEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
/** |
||||
* 事业线 |
||||
*/ |
||||
@ApiModelProperty(value = "事业线") |
||||
private String businessUnit; |
||||
/** |
||||
* 作业仓库 |
||||
*/ |
||||
@ApiModelProperty(value = "作业仓库") |
||||
private String warehouseName; |
||||
/** |
||||
* 作业仓库ID |
||||
*/ |
||||
@ApiModelProperty(value = "作业仓库ID") |
||||
private Long warehouseId; |
||||
/** |
||||
* 品牌 |
||||
*/ |
||||
@ApiModelProperty(value = "品牌") |
||||
private String brandName; |
||||
/** |
||||
* 客户名称 |
||||
*/ |
||||
@ApiModelProperty(value = "客户名称") |
||||
private String customName; |
||||
/** |
||||
* 客户电话 |
||||
*/ |
||||
@ApiModelProperty(value = "客户电话") |
||||
private String customPhone; |
||||
/** |
||||
* 客户地址 |
||||
*/ |
||||
@ApiModelProperty(value = "客户地址") |
||||
private String customAddress; |
||||
/** |
||||
* 运单发货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "运单发货单位") |
||||
private String shipperUnit; |
||||
/** |
||||
* 运单发货人 |
||||
*/ |
||||
@ApiModelProperty(value = "运单发货人") |
||||
private String shipperPerson; |
||||
/** |
||||
* 运单发货电话 |
||||
*/ |
||||
@ApiModelProperty(value = "运单发货电话") |
||||
private String shipperMobile; |
||||
/** |
||||
* 运单发货地址 |
||||
*/ |
||||
@ApiModelProperty(value = "运单发货地址") |
||||
private String shipperAddress; |
||||
/** |
||||
* 运单收货单位 |
||||
*/ |
||||
@ApiModelProperty(value = "运单收货单位") |
||||
private String consigneeUnit; |
||||
/** |
||||
* 运单收货人 |
||||
*/ |
||||
@ApiModelProperty(value = "运单收货人") |
||||
private String consigneePerson; |
||||
/** |
||||
* 运单收货电话 |
||||
*/ |
||||
@ApiModelProperty(value = "运单收货电话") |
||||
private String consigneeMobile; |
||||
/** |
||||
* 运单收货地址 |
||||
*/ |
||||
@ApiModelProperty(value = "运单收货地址") |
||||
private String consigneeAddress; |
||||
/** |
||||
* 运单号 |
||||
*/ |
||||
@ApiModelProperty(value = "运单号") |
||||
private String waybillNumber; |
||||
/** |
||||
* 商场名称 |
||||
*/ |
||||
@ApiModelProperty(value = "商场名称") |
||||
private String mallName; |
||||
/** |
||||
* 商场ID |
||||
*/ |
||||
@ApiModelProperty(value = "商场ID") |
||||
private Long mallId; |
||||
/** |
||||
* 入库批次号 |
||||
*/ |
||||
@ApiModelProperty(value = "入库批次号") |
||||
private String incomingBatch; |
||||
/** |
||||
* 订单号 |
||||
*/ |
||||
@ApiModelProperty(value = "订单号") |
||||
private String orderCode; |
||||
/** |
||||
* 包条码 |
||||
*/ |
||||
@ApiModelProperty(value = "包条码") |
||||
private String orderPackageCode; |
||||
/** |
||||
* 客户车次号 |
||||
*/ |
||||
@ApiModelProperty(value = "客户车次号") |
||||
private String trainNumber; |
||||
/** |
||||
* 数据类型 1 定制品 2 库存品 3零担 |
||||
*/ |
||||
@ApiModelProperty(value = "数据类型 1 定制品 2 库存品 3零担") |
||||
private Integer conditions; |
||||
/** |
||||
* 一级品 |
||||
*/ |
||||
@ApiModelProperty(value = "一级品") |
||||
private String firstsProduct; |
||||
/** |
||||
* 二级品 |
||||
*/ |
||||
@ApiModelProperty(value = "二级品") |
||||
private String secondProduct; |
||||
/** |
||||
* 三级品 |
||||
*/ |
||||
@ApiModelProperty(value = "三级品") |
||||
private String thirdProduct; |
||||
/** |
||||
* 体积 |
||||
*/ |
||||
@ApiModelProperty(value = "体积") |
||||
private BigDecimal volume; |
||||
/** |
||||
* 重量 |
||||
*/ |
||||
@ApiModelProperty(value = "重量") |
||||
private BigDecimal weight; |
||||
/** |
||||
* 成本结算品类 |
||||
*/ |
||||
@ApiModelProperty(value = "成本结算品类") |
||||
private String costCategory; |
||||
/** |
||||
* 收入结算品类 |
||||
*/ |
||||
@ApiModelProperty(value = "收入结算品类") |
||||
private String revenueCategory; |
||||
/** |
||||
* 物料信息 |
||||
*/ |
||||
@ApiModelProperty(value = "物料信息") |
||||
private String materielName; |
||||
/** |
||||
* 物料编码 |
||||
*/ |
||||
@ApiModelProperty(value = "物料编码") |
||||
private String materielCode; |
||||
/** |
||||
* 始发仓 |
||||
*/ |
||||
@ApiModelProperty(value = "始发仓") |
||||
private String beginWarehouseName; |
||||
/** |
||||
* 始发仓入库时间 |
||||
*/ |
||||
@ApiModelProperty(value = "始发仓入库时间") |
||||
private Date beginWarehouseInTime; |
||||
/** |
||||
* 始发仓发货时间 |
||||
*/ |
||||
@ApiModelProperty(value = "始发仓发货时间") |
||||
private Date beginWarehouseOutTime; |
||||
/** |
||||
* 末端仓入库时间 |
||||
*/ |
||||
@ApiModelProperty(value = "末端仓入库时间") |
||||
private String endWarehouseInTime; |
||||
/** |
||||
* 计划配送单号 包含配送车次和自提车次 直发商家 对应干线车次 三方中转 三方中转车次号 |
||||
*/ |
||||
@ApiModelProperty(value = "计划配送单号 包含配送车次和自提车次 直发商家 对应干线车次 三方中转 三方中转车次号") |
||||
private String planTrainNumber; |
||||
/** |
||||
* 计划预约单号 只有商市配，自提采用自提车次号 三方中转采用三方中转车次号 |
||||
*/ |
||||
@ApiModelProperty(value = "计划预约单号 只有商市配，自提采用自提车次号 三方中转采用三方中转车次号") |
||||
private String planReservationCode; |
||||
/** |
||||
* 配送日期 |
||||
*/ |
||||
@ApiModelProperty(value = "配送日期") |
||||
private Date deliveryTime; |
||||
/** |
||||
* 配送类型2市配 1商配 3自提 4三方中转（5直发商家 【签收节点进行驱动】) 没有这个字段 |
||||
*/ |
||||
@ApiModelProperty(value = "配送类型2市配 1商配 3自提 4三方中转（5直发商家 【签收节点进行驱动】) 没有这个字段") |
||||
private String deliveryType; |
||||
/** |
||||
* 配送种类 |
||||
*/ |
||||
@ApiModelProperty(value = "配送种类") |
||||
private String deliveryKind; |
||||
/** |
||||
* 配送车辆 存在多个逗号拼接 |
||||
*/ |
||||
@ApiModelProperty(value = "配送车辆 存在多个逗号拼接") |
||||
private String vehicleName; |
||||
/** |
||||
* 配送司机 存在多个逗号拼接 |
||||
*/ |
||||
@ApiModelProperty(value = "配送司机 存在多个逗号拼接") |
||||
private String driverName; |
||||
/** |
||||
* 配送公司 |
||||
*/ |
||||
@ApiModelProperty(value = "配送公司") |
||||
private String distributionCompany; |
||||
/** |
||||
* 计划时间 |
||||
*/ |
||||
@ApiModelProperty(value = "计划时间") |
||||
private Date deliveryPlanTime; |
||||
/** |
||||
* 计划数量 |
||||
*/ |
||||
@ApiModelProperty(value = "计划数量") |
||||
private Integer planNum; |
||||
/** |
||||
* 计划类型（新增 补录） |
||||
*/ |
||||
@ApiModelProperty(value = "计划类型（新增 补录）") |
||||
private String planType; |
||||
/** |
||||
* 计划人 |
||||
*/ |
||||
@ApiModelProperty(value = "计划人") |
||||
private String deliveryCreateUserName; |
||||
/** |
||||
* 备货单号 |
||||
*/ |
||||
@ApiModelProperty(value = "备货单号") |
||||
private String stockupCode; |
||||
/** |
||||
* 备货人 |
||||
*/ |
||||
@ApiModelProperty(value = "备货人") |
||||
private String stockupUserName; |
||||
/** |
||||
* 备货时间 |
||||
*/ |
||||
@ApiModelProperty(value = "备货时间") |
||||
private Date stockupFinishTime; |
||||
/** |
||||
* 备货数量 |
||||
*/ |
||||
@ApiModelProperty(value = "备货数量") |
||||
private Integer stockNum; |
||||
/** |
||||
* 备货区 |
||||
*/ |
||||
@ApiModelProperty(value = "备货区") |
||||
private String stockAllocation; |
||||
/** |
||||
* 备货类型（新增 补录） |
||||
*/ |
||||
@ApiModelProperty(value = "备货类型（新增 补录）") |
||||
private String stockupType; |
||||
/** |
||||
* 装车人 |
||||
*/ |
||||
@ApiModelProperty(value = "装车人") |
||||
private String loadUserName; |
||||
/** |
||||
* 装车时间 |
||||
*/ |
||||
@ApiModelProperty(value = "装车时间") |
||||
private Date loadTime; |
||||
/** |
||||
* 装车配送单号 包含配送车次和自提车次 直发商家 对应干线车次 三方中转 三方中转车次号 |
||||
*/ |
||||
@ApiModelProperty(value = "装车配送单号 包含配送车次和自提车次 直发商家 对应干线车次 三方中转 三方中转车次号") |
||||
private String loadTrainNumber; |
||||
/** |
||||
* 装车数量 |
||||
*/ |
||||
@ApiModelProperty(value = "装车数量") |
||||
private Integer loadNum; |
||||
/** |
||||
* 装车类型（按件装车 一键装车 补录） |
||||
*/ |
||||
@ApiModelProperty(value = "装车类型（按件装车 一键装车 补录）") |
||||
private String loadType; |
||||
/** |
||||
* 发车人 |
||||
*/ |
||||
@ApiModelProperty(value = "发车人") |
||||
private String startCarUserName; |
||||
/** |
||||
* 发车时间 |
||||
*/ |
||||
@ApiModelProperty(value = "发车时间") |
||||
private String startCarTime; |
||||
/** |
||||
* 到达人 |
||||
*/ |
||||
@ApiModelProperty(value = "到达人") |
||||
private String arriveCarUserName; |
||||
/** |
||||
* 到达时间 |
||||
*/ |
||||
@ApiModelProperty(value = "到达时间") |
||||
private String arriveCarTime; |
||||
/** |
||||
* 到达省 |
||||
*/ |
||||
@ApiModelProperty(value = "到达省") |
||||
private String arriveProvince; |
||||
/** |
||||
* 到达市 |
||||
*/ |
||||
@ApiModelProperty(value = "到达市") |
||||
private String arriveCity; |
||||
/** |
||||
* 到达区/县 |
||||
*/ |
||||
@ApiModelProperty(value = "到达区/县") |
||||
private String arriveDistrict; |
||||
/** |
||||
* 到达地址 |
||||
*/ |
||||
@ApiModelProperty(value = "到达地址") |
||||
private String arriveAddress; |
||||
/** |
||||
* 签收人 |
||||
*/ |
||||
@ApiModelProperty(value = "签收人") |
||||
private String signUserName; |
||||
/** |
||||
* 签收时间 |
||||
*/ |
||||
@ApiModelProperty(value = "签收时间") |
||||
private String signTime; |
||||
/** |
||||
* 签收状态 1.已签收 0 未签收 -1 已回库 -2 滞留 |
||||
*/ |
||||
@ApiModelProperty(value = "签收状态 1.已签收 0 未签收 -1 已回库 -2 滞留") |
||||
private String signStatus; |
||||
/** |
||||
* 签收数量 |
||||
*/ |
||||
@ApiModelProperty(value = "签收数量") |
||||
private String signNum; |
||||
/** |
||||
* 签收配送单号 包含配送车次和自提车次 直发商家 对应干线车次 三方中转 三方中转车次号 |
||||
*/ |
||||
@ApiModelProperty(value = "签收配送单号 包含配送车次和自提车次 直发商家 对应干线车次 三方中转 三方中转车次号") |
||||
private String signTrainNumber; |
||||
/** |
||||
* 签收预约单号 只有商市配，自提没有该字段 |
||||
*/ |
||||
@ApiModelProperty(value = "签收预约单号 只有商市配，自提没有该字段") |
||||
private String signReservationCode; |
||||
/** |
||||
* 签收车牌 |
||||
*/ |
||||
@ApiModelProperty(value = "签收车牌") |
||||
private String signCarNumber; |
||||
/** |
||||
* 签收类型（按件签收 批量签收 补录） |
||||
*/ |
||||
@ApiModelProperty(value = "签收类型（按件签收 批量签收 补录）") |
||||
private String signType; |
||||
/** |
||||
* 车辆类型 |
||||
*/ |
||||
@ApiModelProperty(value = "车辆类型") |
||||
private String signCarType; |
||||
/** |
||||
* 复核人 |
||||
*/ |
||||
@ApiModelProperty(value = "复核人") |
||||
private String reviewUserName; |
||||
/** |
||||
* 复核时间 复核时间=回库时间 |
||||
*/ |
||||
@ApiModelProperty(value = "复核时间 复核时间=回库时间") |
||||
private String reviewTime; |
||||
/** |
||||
* 滞留人 |
||||
*/ |
||||
@ApiModelProperty(value = "滞留人") |
||||
private String retentionUserName; |
||||
/** |
||||
* 滞留时间 |
||||
*/ |
||||
@ApiModelProperty(value = "滞留时间") |
||||
private String retentionTime; |
||||
/** |
||||
* 配送成本 |
||||
*/ |
||||
@ApiModelProperty(value = "配送成本") |
||||
private String distributionCost; |
||||
/** |
||||
* 分货费成本 |
||||
*/ |
||||
@ApiModelProperty(value = "分货费成本") |
||||
private String apartCost; |
||||
/** |
||||
* 上楼费成本 |
||||
*/ |
||||
@ApiModelProperty(value = "上楼费成本") |
||||
private String apstairsCost; |
||||
/** |
||||
* 平移费成本 |
||||
*/ |
||||
@ApiModelProperty(value = "平移费成本") |
||||
private String moveCost; |
||||
/** |
||||
* 装卸费成本 |
||||
*/ |
||||
@ApiModelProperty(value = "装卸费成本") |
||||
private String stevedoreCost; |
||||
/** |
||||
* 公里数成本 |
||||
*/ |
||||
@ApiModelProperty(value = "公里数成本") |
||||
private String kiloAllowCost; |
||||
/** |
||||
* 补贴公里数成本 |
||||
*/ |
||||
@ApiModelProperty(value = "补贴公里数成本") |
||||
private String allowKiloAllowCost; |
||||
/** |
||||
* 超区公里数成本 |
||||
*/ |
||||
@ApiModelProperty(value = "超区公里数成本") |
||||
private String ultrAllpwCost; |
||||
/** |
||||
* 点位补贴成本 |
||||
*/ |
||||
@ApiModelProperty(value = "点位补贴成本") |
||||
private String pointAllowCost; |
||||
/** |
||||
* 保底费成本 |
||||
*/ |
||||
@ApiModelProperty(value = "保底费成本") |
||||
private String guarCost; |
||||
/** |
||||
* 油费成本 |
||||
*/ |
||||
@ApiModelProperty(value = "油费成本") |
||||
private String fuelCost; |
||||
/** |
||||
* 其它成本 |
||||
*/ |
||||
@ApiModelProperty(value = "其它成本") |
||||
private String otherCost; |
||||
|
||||
} |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.statistics.dto; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.math.BigDecimal; |
||||
|
||||
@Data |
||||
public class AftersalesOrderDTO implements Serializable { |
||||
|
||||
private String aftersaleOrder; |
||||
private BigDecimal aftersalesFee; |
||||
|
||||
} |
||||
@ -0,0 +1,55 @@
|
||||
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; |
||||
|
||||
@Data |
||||
@TableName("logpm_statistics_aftersales_order_record") |
||||
@ApiModel(value = "StatisticsAftersalesOrderRecord对象", description = "售后单记录表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class StatisticsAftersalesOrderRecordEntity extends TenantEntity { |
||||
|
||||
|
||||
/** |
||||
* 预留1 |
||||
*/ |
||||
@ApiModelProperty(value = "预留1") |
||||
private String reserve1; |
||||
/** |
||||
* 预留2 |
||||
*/ |
||||
@ApiModelProperty(value = "预留2") |
||||
private String reserve2; |
||||
/** |
||||
* 预留3 |
||||
*/ |
||||
@ApiModelProperty(value = "预留3") |
||||
private String reserve3; |
||||
/** |
||||
* 预留4 |
||||
*/ |
||||
@ApiModelProperty(value = "预留4") |
||||
private String reserve4; |
||||
/** |
||||
* 预留5 |
||||
*/ |
||||
@ApiModelProperty(value = "预留5") |
||||
private String reserve5; |
||||
|
||||
|
||||
private Long reconciliationOrderId; |
||||
|
||||
private Long balanceOrderId; |
||||
|
||||
private String aftersaleOrderCode; |
||||
|
||||
private BigDecimal aftersalesFee; |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,105 @@
|
||||
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; |
||||
import java.util.Date; |
||||
|
||||
@Data |
||||
@TableName("logpm_statistics_reconciliation_order_info") |
||||
@ApiModel(value = "StatisticsReconciliationOrderInfo对象", description = "对账单表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class StatisticsReconciliationOrderInfoEntity extends TenantEntity { |
||||
|
||||
/** |
||||
* 预留1 |
||||
*/ |
||||
@ApiModelProperty(value = "预留1") |
||||
private String reserve1; |
||||
/** |
||||
* 预留2 |
||||
*/ |
||||
@ApiModelProperty(value = "预留2") |
||||
private String reserve2; |
||||
/** |
||||
* 预留3 |
||||
*/ |
||||
@ApiModelProperty(value = "预留3") |
||||
private String reserve3; |
||||
/** |
||||
* 预留4 |
||||
*/ |
||||
@ApiModelProperty(value = "预留4") |
||||
private String reserve4; |
||||
/** |
||||
* 预留5 |
||||
*/ |
||||
@ApiModelProperty(value = "预留5") |
||||
private String reserve5; |
||||
|
||||
@ApiModelProperty(value = "对账单号") |
||||
private String reconciliationOrderNo;//对账单号
|
||||
|
||||
private String waybillNo;//运单号
|
||||
|
||||
private String orderCode;//订单号
|
||||
|
||||
@ApiModelProperty(value = "品牌") |
||||
private String brand;//品牌
|
||||
|
||||
private Long consigneeId;//收货单位ID
|
||||
private String consignee;//收货单位
|
||||
|
||||
private Long destinationWarehouseId;//目的仓id
|
||||
private String destinationWarehouseName;//目的仓名称
|
||||
|
||||
private Integer totalNum;//总数量
|
||||
private BigDecimal totalWeight;//总重量
|
||||
private BigDecimal totalVolume;//总体积
|
||||
|
||||
private BigDecimal realTotalFee;//实际费用
|
||||
private BigDecimal pickupFee;//提货费
|
||||
private BigDecimal freightFee;//运费
|
||||
private BigDecimal warehouseServiceFee;//仓库服务费
|
||||
private BigDecimal warehouseFee;//仓储费
|
||||
private BigDecimal warehouseManageFee;//仓储管理费
|
||||
private BigDecimal warehouseSortingFee;//仓储分拣费
|
||||
private BigDecimal warehouseOperatingFee;//仓储操作费
|
||||
private BigDecimal deliveryFee;//配送费
|
||||
private BigDecimal deliveryServiceFee;//配送服务费
|
||||
private BigDecimal deliveryLoadingFee;//配送装卸费
|
||||
private BigDecimal deliverySortingFee;//配送分拣费
|
||||
private BigDecimal deliveryUpfloorFee;//配送上楼费
|
||||
private BigDecimal deliveryMoveFee;//配送平移费
|
||||
private BigDecimal deliveryOtherFee;//配送其他费
|
||||
private BigDecimal deliveryCrossingFee;//超区费
|
||||
private BigDecimal installFee;//安装费
|
||||
private BigDecimal otherFee;//其他费
|
||||
|
||||
private Integer isAftersale;//是否有售后
|
||||
private String aftersaleOrder;//售后单号
|
||||
private BigDecimal aftersalesFee;//售后金额
|
||||
|
||||
private String createUserName; |
||||
|
||||
private Integer isChanges;//是否有异动 0 否 1是
|
||||
private BigDecimal changesFee;//异动金额
|
||||
private String changesItems;//异动栏目
|
||||
private String changesRemark;//异动备注
|
||||
private Date changesTime;//异动时间
|
||||
|
||||
private Integer checkStatus;//确认结算状态 0为确认 1已确认
|
||||
private String checkUserName; |
||||
private Date checkTime; |
||||
|
||||
private String balanceOrderNo; |
||||
private Long balanceOrderId; |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,19 @@
|
||||
package com.logpm.statistics.feign; |
||||
|
||||
import org.springblade.common.constant.ModuleNameConstant; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
||||
@FeignClient( |
||||
value = ModuleNameConstant.APPLICATION_BASICDATA_NAME |
||||
) |
||||
public interface IOrderInfoClient { |
||||
|
||||
String API_PREFIX = "/orderInfo/client"; |
||||
|
||||
|
||||
@GetMapping(API_PREFIX+"/findCreateRencilitionOrderStatus") |
||||
Integer findCreateRencilitionOrderStatus(@RequestParam Long waybillId); |
||||
|
||||
} |
||||
@ -0,0 +1,16 @@
|
||||
package com.logpm.trunkline.dto; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class ZeroPackageDTO implements Serializable { |
||||
|
||||
private Long id; |
||||
private Long packageId; |
||||
private Long goodsId; |
||||
private String goodsName;//品类名称
|
||||
private Integer enterNum;//装车数量
|
||||
|
||||
} |
||||
@ -0,0 +1,51 @@
|
||||
package com.logpm.trunkline.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; |
||||
|
||||
@Data |
||||
@TableName("logpm_trunkline_scan_zero_detail") |
||||
@ApiModel(value = "TrunklineScanZeroDetail对象", description = "装车扫描零担明细表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class TrunklineScanZeroDetailEntity extends TenantEntity { |
||||
|
||||
/** 预留1 */ |
||||
@ApiModelProperty(name = "预留1",notes = "") |
||||
private String reserve1 ; |
||||
/** 预留2 */ |
||||
@ApiModelProperty(name = "预留2",notes = "") |
||||
private String reserve2 ; |
||||
/** 预留3 */ |
||||
@ApiModelProperty(name = "预留3",notes = "") |
||||
private String reserve3 ; |
||||
/** 预留4 */ |
||||
@ApiModelProperty(name = "预留4",notes = "") |
||||
private String reserve4 ; |
||||
/** 预留5 */ |
||||
@ApiModelProperty(name = "预留5",notes = "") |
||||
private String reserve5 ; |
||||
/** scanId */ |
||||
@ApiModelProperty(name = "装车扫描id",notes = "") |
||||
private Long scanId ; |
||||
/** packageId */ |
||||
@ApiModelProperty(name = "包件id",notes = "") |
||||
private Long packageId ; |
||||
/** goodsId */ |
||||
@ApiModelProperty(name = "品类id",notes = "") |
||||
private Long goodsId ; |
||||
/** goodsName */ |
||||
@ApiModelProperty(name = "品类名称",notes = "") |
||||
private String goodsName ; |
||||
/** loadingNum */ |
||||
@ApiModelProperty(name = "装车数量",notes = "") |
||||
private Integer loadingNum ; |
||||
/** unloadNum */ |
||||
@ApiModelProperty(name = "卸车数量",notes = "") |
||||
private Integer unloadNum ; |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,18 @@
|
||||
package com.logpm.trunkline.feign; |
||||
|
||||
import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; |
||||
import org.springblade.common.constant.ModuleNameConstant; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
||||
@FeignClient( |
||||
value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME |
||||
) |
||||
public interface IExtractedDataClient { |
||||
|
||||
String API_PREFIX = "extractedData/client"; |
||||
@GetMapping(API_PREFIX+"/findEntityByCarsNo") |
||||
void execute(@RequestParam String tenantId,@RequestParam String wallbillNum); |
||||
|
||||
} |
||||
@ -0,0 +1,26 @@
|
||||
package com.logpm.trunkline.feign; |
||||
|
||||
import com.logpm.trunkline.entity.TrunklineScanZeroDetailEntity; |
||||
import org.springblade.common.constant.ModuleNameConstant; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
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.RequestParam; |
||||
|
||||
import java.util.List; |
||||
|
||||
@FeignClient( |
||||
value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME |
||||
) |
||||
public interface ITrunklineScanZeroDetailClient { |
||||
|
||||
String API_PREFIX = "trunklineScanZeroDetail/client"; |
||||
|
||||
@GetMapping(API_PREFIX+"/findListByCarsLoadScanId") |
||||
List<TrunklineScanZeroDetailEntity> findListByCarsLoadScanId(@RequestParam Long carsLoadScanId); |
||||
|
||||
@PostMapping(API_PREFIX+"/updateBetch") |
||||
void updateBetch(@RequestBody List<TrunklineScanZeroDetailEntity> updateScanZeroDetailEntityList); |
||||
|
||||
} |
||||
@ -0,0 +1,13 @@
|
||||
package com.logpm.trunkline.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class GoodsLoadingNumVO implements Serializable { |
||||
|
||||
private Long goodsId; |
||||
private Integer loadingNum; |
||||
|
||||
} |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.trunkline.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class OrderCodeNumVO implements Serializable { |
||||
|
||||
private String orderCode; |
||||
|
||||
private Integer totalNum; |
||||
|
||||
} |
||||
@ -0,0 +1,11 @@
|
||||
package com.logpm.trunkline.vo; |
||||
|
||||
import com.logpm.trunkline.entity.TrunklineScanZeroDetailEntity; |
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class TrunklineScanZeroDetailVO extends TrunklineScanZeroDetailEntity { |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,16 @@
|
||||
package com.logpm.trunkline.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class ZeroPackageVO implements Serializable { |
||||
|
||||
private Long packageId; |
||||
private Long goodsId; |
||||
private String goodsName;//品类名称
|
||||
private Integer stockNum;//品类在库件数
|
||||
private Integer loadingNum;//品类装车件数
|
||||
|
||||
} |
||||
@ -0,0 +1,40 @@
|
||||
package com.logpm.trunkline.vo; |
||||
|
||||
import com.alibaba.fastjson.JSONObject; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.math.BigDecimal; |
||||
import java.util.ArrayList; |
||||
import java.util.Date; |
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class ZeroSuppleListVO implements Serializable { |
||||
|
||||
|
||||
private Long orderId; |
||||
private String waybillNo; |
||||
private String orderCode; |
||||
private Integer stockNum;//在库数量
|
||||
private Date createTime;//开单时间
|
||||
private String destination;//到站
|
||||
private String destinationWarehouseName;//目的仓
|
||||
private String shipper;//发货单位
|
||||
private String shipperName;//发货人
|
||||
private String consignee;//收货单位
|
||||
private String consigneeName;//收货人
|
||||
private String goodsName;//货物名称
|
||||
private Integer totalNum;//运单总件数
|
||||
private BigDecimal weight;//运单总重量
|
||||
private BigDecimal volume;//运单总体积
|
||||
private String customerTrain;//客户车次号
|
||||
private String remark;//备注
|
||||
private String loadSignCode;//签收单号
|
||||
private Long signOrderId;//签收单id
|
||||
private BigDecimal totalFreight;//总运费
|
||||
private BigDecimal price;//总运费
|
||||
|
||||
private List<JSONObject> zeroPackageSupplyVOS = new ArrayList<>(); |
||||
|
||||
} |
||||
@ -0,0 +1,25 @@
|
||||
package com.logpm.warehouse.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
@TableName("logpm_warehouse_setting") |
||||
@ApiModel(value = "WarehouseSetting对象", description = "仓库设置") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
@Data |
||||
public class WarehouseSettingEntity extends TenantEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 仓库id |
||||
*/ |
||||
private Long warehouseId; |
||||
|
||||
/** |
||||
* 强制装车：0=不限制，1=强制 |
||||
*/ |
||||
private Integer mandatoryLoading; |
||||
} |
||||
@ -0,0 +1,19 @@
|
||||
package com.logpm.warehouse.feign; |
||||
|
||||
import org.springblade.common.constant.ModuleNameConstant; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
|
||||
/** |
||||
* 仓库设置 Feign接口 |
||||
*/ |
||||
@FeignClient( |
||||
value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME |
||||
) |
||||
public interface IWarehouseSettingClient { |
||||
|
||||
String API_PREFIX = "warehouse-setting/client"; |
||||
|
||||
@GetMapping(API_PREFIX + "/is-mandatory-loading") |
||||
Boolean isMandatoryLoading(Long warehouseId); |
||||
} |
||||
@ -0,0 +1,204 @@
|
||||
package com.logpm.warehouse.vo; |
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnore; |
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.math.BigDecimal; |
||||
import java.util.Date; |
||||
|
||||
@Data |
||||
public class FinanceWaybillExportVO implements Serializable { |
||||
|
||||
@ExcelIgnore |
||||
private Long waybillId; |
||||
|
||||
@ExcelProperty(value = "品牌") |
||||
private String brand; |
||||
|
||||
@ExcelProperty(value = "运单号") |
||||
private String waybillNo; |
||||
|
||||
@ExcelProperty(value = "订单号") |
||||
private String orderNo; |
||||
|
||||
|
||||
@ExcelProperty(value = "收货单位") |
||||
private String consignee; |
||||
|
||||
@ExcelProperty(value = "收货人") |
||||
private String consigneeName; |
||||
|
||||
@ExcelProperty(value = "收货人电话") |
||||
private String consigneeMobile; |
||||
|
||||
|
||||
@ExcelProperty(value = "收货人地址") |
||||
private String consigneeAddress; |
||||
|
||||
@ExcelProperty(value = "发货单位") |
||||
private String shipper; |
||||
|
||||
@ExcelProperty(value = "发货人") |
||||
private String shipperName; |
||||
|
||||
|
||||
@ExcelProperty(value = "发货人电话") |
||||
private String shipperMobile; |
||||
|
||||
@ExcelProperty(value = "发货地址") |
||||
private String shipperAddress; |
||||
|
||||
@ExcelProperty(value = "到站") |
||||
private String destination; |
||||
@ExcelProperty(value = "发站") |
||||
private String departure; |
||||
@ExcelProperty(value = "发站仓") |
||||
private String departureWarehouseName; |
||||
@ExcelProperty(value = "目的仓") |
||||
private String destinationWarehouseName; |
||||
|
||||
@ExcelProperty(value = "目的仓") |
||||
private String deliveryWay; |
||||
|
||||
@ExcelProperty(value = "车次号") |
||||
private String customerTrain; |
||||
|
||||
@ExcelProperty(value = "备注") |
||||
private String remark; |
||||
|
||||
@ExcelProperty(value = "备注") |
||||
private String cleanObjType; |
||||
|
||||
@ExcelProperty(value = "支付方式") |
||||
private String payType; |
||||
|
||||
@ExcelProperty(value = "付款方式") |
||||
private String payWay; |
||||
|
||||
@ExcelProperty(value = "现付") |
||||
private BigDecimal xPay; |
||||
|
||||
@ExcelProperty(value = "到付") |
||||
private BigDecimal dPay; |
||||
|
||||
@ExcelProperty(value = "回付") |
||||
private BigDecimal hPay; |
||||
|
||||
@ExcelProperty(value = "月结") |
||||
private BigDecimal yPay; |
||||
|
||||
@ExcelProperty(value = "服务类型") |
||||
private String serviceType; |
||||
|
||||
@ExcelProperty(value = "是否改单") |
||||
private String updateStatus; |
||||
|
||||
@ExcelProperty(value = "是否审单") |
||||
private String checkStatus; |
||||
|
||||
@ExcelProperty(value = "审核原因") |
||||
private String checkReson; |
||||
|
||||
@ExcelProperty(value = "审核备注") |
||||
private String checkRemark; |
||||
|
||||
@ExcelProperty(value = "审核人") |
||||
private String checkUserName; |
||||
|
||||
@ExcelProperty(value = "审核时间") |
||||
private Date checkTime; |
||||
|
||||
@ExcelProperty(value = "取消审核备注") |
||||
private String cancleCheckRemark; |
||||
|
||||
@ExcelProperty(value = "取消审核人") |
||||
private String cancleCheckUserName; |
||||
|
||||
@ExcelProperty(value = "取消审核时间") |
||||
private Date cancleCheckTime; |
||||
|
||||
@ExcelProperty(value = "运单状态") |
||||
private String waybillStatus; |
||||
|
||||
@ExcelProperty(value = "开单时间") |
||||
private Date openTime; |
||||
|
||||
@ExcelProperty(value = "货物品类") |
||||
private String goodsName; |
||||
|
||||
@ExcelProperty(value = "总数量") |
||||
private Integer totalCount; |
||||
|
||||
@ExcelProperty(value = "总重量") |
||||
private BigDecimal totalWeight; |
||||
|
||||
@ExcelProperty(value = "总重量") |
||||
private BigDecimal totalVolume; |
||||
|
||||
@ExcelProperty(value = "总费用") |
||||
private BigDecimal totalFee; |
||||
|
||||
@ExcelProperty(value = "开单费用") |
||||
private BigDecimal systemTotalFee; |
||||
|
||||
@ExcelProperty(value = "提货费") |
||||
private BigDecimal pickupFee; |
||||
|
||||
@ExcelProperty(value = "运费") |
||||
private BigDecimal freightFee; |
||||
@ExcelProperty(value = "仓库服务费合计") |
||||
private BigDecimal warehouseServiceFee; |
||||
@ExcelProperty(value = "仓储费") |
||||
private BigDecimal warehouseFee; |
||||
@ExcelProperty(value = "仓储管理费") |
||||
private BigDecimal warehouseManagementFee; |
||||
@ExcelProperty(value = "仓储分拣费") |
||||
private BigDecimal warehouseSortingFee; |
||||
@ExcelProperty(value = "仓储操作费") |
||||
private BigDecimal warehouseOprationFee; |
||||
@ExcelProperty(value = "配送服务费合计") |
||||
private BigDecimal deliveryServiceFee; |
||||
@ExcelProperty(value = "配送费") |
||||
private BigDecimal deliveryFee; |
||||
@ExcelProperty(value = "配送装卸费") |
||||
private BigDecimal deliveryHandlingFee; |
||||
@ExcelProperty(value = "配送分货费") |
||||
private BigDecimal deliverySortingFee; |
||||
@ExcelProperty(value = "配送上楼费") |
||||
private BigDecimal deliveryUpfloorFee; |
||||
@ExcelProperty(value = "配送平移费") |
||||
private BigDecimal deliveryMoveFee; |
||||
@ExcelProperty(value = "配送公里数") |
||||
private BigDecimal deliveryLine; |
||||
@ExcelProperty(value = "超区公里费") |
||||
private BigDecimal deliveryLineFee; |
||||
@ExcelProperty(value = "其他费用") |
||||
private BigDecimal otherFee; |
||||
@ExcelProperty(value = "安装费") |
||||
private BigDecimal installFee; |
||||
@ExcelProperty(value = "保价费") |
||||
private BigDecimal insuranceFee; |
||||
@ExcelProperty(value = "申明价值") |
||||
private BigDecimal claimingValue; |
||||
@ExcelProperty(value = "三方操作费") |
||||
private BigDecimal thirdOperationFee; |
||||
@ExcelProperty(value = "回扣") |
||||
private BigDecimal rebate; |
||||
@ExcelProperty(value = "品类数量") |
||||
private BigDecimal goodsTypeNum; |
||||
@ExcelProperty(value = "品类开单运费") |
||||
private BigDecimal goodsTypePrice; |
||||
@ExcelProperty(value = "品类系统配送单价") |
||||
private BigDecimal goodsTypeDeliveryPrice; |
||||
@ExcelProperty(value = "品类系统提货单价") |
||||
private BigDecimal goodsTypePickupPrice; |
||||
@ExcelProperty(value = "品类系统运费单价") |
||||
private BigDecimal goodsTypeFreightPrice; |
||||
@ExcelProperty(value = "品类数") |
||||
private BigDecimal goodsTypeCount; |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,87 @@
|
||||
package com.logpm.warehouse.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.math.BigDecimal; |
||||
import java.util.Date; |
||||
|
||||
@Data |
||||
public class FinanceWaybillVO implements Serializable { |
||||
|
||||
private Long id; |
||||
private String brand; |
||||
private String waybillNo; |
||||
private String orderNo; |
||||
private String consignee; |
||||
private String consigneeName; |
||||
private String consigneeMobile; |
||||
private String consigneeAddress; |
||||
private String shipper; |
||||
private String shipperName; |
||||
private String shipperMobile; |
||||
private String shipperAddress; |
||||
private String destination; |
||||
private String departure; |
||||
private String departureWarehouseName; |
||||
private String destinationWarehouseName; |
||||
private String deliveryWay; |
||||
private String customerTrain; |
||||
private Integer returnStatus; |
||||
private String remark; |
||||
private String cleanObjType; |
||||
private String payType; |
||||
private String payWay; |
||||
private BigDecimal xPay; |
||||
private BigDecimal dPay; |
||||
private BigDecimal hPay; |
||||
private BigDecimal yPay; |
||||
private String serviceType; |
||||
private Integer updateStatus; |
||||
private Integer checkStatus; |
||||
private String checkReson; |
||||
private String checkRemark; |
||||
private String checkUserName; |
||||
private Date checkTime; |
||||
private String cancleCheckRemark; |
||||
private String cancleCheckUserName; |
||||
private Date cancleCheckTime; |
||||
private String waybillStatus; |
||||
private Date openTime; |
||||
private String goodsName; |
||||
private Integer totalCount; |
||||
private BigDecimal totalWeight; |
||||
private BigDecimal totalVolume; |
||||
private BigDecimal totalFee; |
||||
private BigDecimal systemTotalFee; |
||||
private BigDecimal pickupFee; |
||||
private BigDecimal freightFee; |
||||
private BigDecimal warehouseServiceFee; |
||||
private BigDecimal warehouseFee; |
||||
private BigDecimal warehouseManagementFee; |
||||
private BigDecimal warehouseSortingFee; |
||||
private BigDecimal warehouseOprationFee; |
||||
private BigDecimal deliveryServiceFee; |
||||
private BigDecimal deliveryFee; |
||||
private BigDecimal deliveryHandlingFee; |
||||
private BigDecimal deliverySortingFee; |
||||
private BigDecimal deliveryUpfloorFee; |
||||
private BigDecimal deliveryMoveFee; |
||||
private BigDecimal deliveryLine; |
||||
private BigDecimal deliveryLineFee; |
||||
private BigDecimal otherFee; |
||||
private BigDecimal installFee; |
||||
private BigDecimal insuranceFee; |
||||
private BigDecimal claimingValue; |
||||
private BigDecimal thirdOperationFee; |
||||
private BigDecimal rebate; |
||||
private BigDecimal goodsTypeNum; |
||||
private BigDecimal goodsTypePrice; |
||||
private BigDecimal goodsTypeDeliveryPrice; |
||||
private BigDecimal goodsTypePickupPrice; |
||||
private BigDecimal goodsTypeFreightPrice; |
||||
private BigDecimal goodsTypeCount; |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,22 @@
|
||||
package com.logpm.aftersales.feign; |
||||
|
||||
import com.logpm.aftersales.entity.AftersalesAbnormalRecordZeroDetailEntity; |
||||
import com.logpm.aftersales.service.IAftersalesAbnormalRecordZeroDetailService; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
import java.util.List; |
||||
|
||||
@ApiIgnore() |
||||
@RestController |
||||
@AllArgsConstructor |
||||
public class AftersalesAbnormalRecordZeroDetailClient implements IAftersalesAbnormalRecordZeroDetailClient { |
||||
|
||||
private final IAftersalesAbnormalRecordZeroDetailService abnormalRecordZeroDetailService; |
||||
|
||||
@Override |
||||
public void addAbnormalRecordZeroDetail(List<AftersalesAbnormalRecordZeroDetailEntity> abnormalRecordZeroDetailEntityList) { |
||||
abnormalRecordZeroDetailService.saveBatch(abnormalRecordZeroDetailEntityList); |
||||
} |
||||
} |
||||
@ -0,0 +1,9 @@
|
||||
package com.logpm.aftersales.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.logpm.aftersales.entity.AftersalesAbnormalRecordZeroDetailEntity; |
||||
import org.mapstruct.Mapper; |
||||
|
||||
@Mapper |
||||
public interface AftersalesAbnormalRecordZeroDetailMapper extends BaseMapper<AftersalesAbnormalRecordZeroDetailEntity> { |
||||
} |
||||
@ -0,0 +1,12 @@
|
||||
package com.logpm.aftersales.service; |
||||
|
||||
import com.logpm.aftersales.entity.AftersalesAbnormalRecordZeroDetailEntity; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
|
||||
import java.util.List; |
||||
|
||||
public interface IAftersalesAbnormalRecordZeroDetailService extends BaseService<AftersalesAbnormalRecordZeroDetailEntity> { |
||||
|
||||
List<AftersalesAbnormalRecordZeroDetailEntity> findListByAbnormalRecordId(Long abnormalRecordId); |
||||
|
||||
} |
||||
@ -0,0 +1,25 @@
|
||||
package com.logpm.aftersales.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.logpm.aftersales.entity.AftersalesAbnormalRecordZeroDetailEntity; |
||||
import com.logpm.aftersales.mapper.AftersalesAbnormalRecordZeroDetailMapper; |
||||
import com.logpm.aftersales.service.IAftersalesAbnormalRecordZeroDetailService; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Service |
||||
@AllArgsConstructor |
||||
@Slf4j |
||||
public class AftersalesAbnormalRecordZeroDetailServiceImpl extends BaseServiceImpl<AftersalesAbnormalRecordZeroDetailMapper, AftersalesAbnormalRecordZeroDetailEntity> implements IAftersalesAbnormalRecordZeroDetailService { |
||||
@Override |
||||
public List<AftersalesAbnormalRecordZeroDetailEntity> findListByAbnormalRecordId(Long abnormalRecordId) { |
||||
|
||||
QueryWrapper<AftersalesAbnormalRecordZeroDetailEntity> queryWrapper = new QueryWrapper<>(); |
||||
queryWrapper.eq("abnormal_record_id",abnormalRecordId); |
||||
return baseMapper.selectList(queryWrapper); |
||||
} |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue