From 9da953619f214dd390deba954ddc512125384ffa Mon Sep 17 00:00:00 2001 From: hjx <577364224@qq.com> Date: Thu, 15 Jan 2026 02:40:58 +0800 Subject: [PATCH] =?UTF-8?q?nc=E9=80=9A=E5=AE=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/system/api/WlhyServiceFeign.java | 2 +- .../api/domain/TmsInvoiceListDetailsVO.java | 176 ++++ .../system/api/domain/TmsMakeOutInvoice.java | 130 +++ .../com/mhd/system/api/domain/TmsOrderVO.java | 771 ++++++++++++++++++ .../factory/RemoteWlhyFallbackFactory.java | 4 +- .../persistence/ReconciliationImpl.java | 12 +- 6 files changed, 1087 insertions(+), 8 deletions(-) create mode 100644 mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsInvoiceListDetailsVO.java create mode 100644 mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsMakeOutInvoice.java create mode 100644 mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsOrderVO.java diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index 4d07a787a..c11478ccc 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -309,7 +309,7 @@ public interface WlhyServiceFeign { * @return */ @GetMapping(value = "/feign/invoiceList/selectById") - public R selectInvoiceListById(@RequestParam(value = "id") String id); + public R selectInvoiceListById(@RequestParam(value = "id") String id); /** * 运输单表-支付回调 * @param tmsPayCallbackList diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsInvoiceListDetailsVO.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsInvoiceListDetailsVO.java new file mode 100644 index 000000000..4833cf450 --- /dev/null +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsInvoiceListDetailsVO.java @@ -0,0 +1,176 @@ +package com.mhd.system.api.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * @Description: 销项发票表 + * @Author: lfs + * @Date: 2020-02-19 08:50:47 + * @Version: V1.0 + */ +@Data +public class TmsInvoiceListDetailsVO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ID_WORKER_STR) + private String id; + /**发票抬头*/ + @ApiModelProperty(value = "发票抬头") + + private String invoiceTitle; + /**发票金额*/ + @ApiModelProperty(value = "发票金额") + + private BigDecimal invoiceValue; + /**发票备注*/ + @ApiModelProperty(value = "发票备注") + + private String remark; + /**发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）*/ + @ApiModelProperty(value = "发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）") + + private Integer invoiceState; + /**发票申请时间*/ + @ApiModelProperty(value = "发票申请时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date invoiceApplyTime; + /**申请人ID*/ + @ApiModelProperty(value = "申请人ID") + + private String applicantId; + /**驳回原因*/ + @ApiModelProperty(value = "驳回原因") + + private String rejectReason; + /**退票备注*/ + @ApiModelProperty(value = "退票备注") + + private String refundRemark; + /**处理人ID（取消申请/开票/驳回）*/ + @ApiModelProperty(value = "处理人ID（取消申请/开票/驳回）") + + private String managerId; + /**处理时间*/ + @ApiModelProperty(value = "处理时间") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date managerTime; + /**寄出人ID*/ + @ApiModelProperty(value = "寄出人ID") + + private String sendById; + /**寄出时间*/ + @ApiModelProperty(value = "寄出时间") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date sendTime; + /**寄出邮费*/ + @ApiModelProperty(value = "寄出邮费") + + private BigDecimal sendPostage; + /**快递公司*/ + @ApiModelProperty(value = "快递公司") + + private String courierServicesCompany; + /**收件地址id*/ + @ApiModelProperty(value = "收件地址id") + + private String receivingAddressId; + /**收件姓名*/ + @ApiModelProperty(value = "收件姓名") + + private String receivingName; + /**收件地址*/ + @ApiModelProperty(value = "收件地址") + + private String location; + /**手机号*/ + @ApiModelProperty(value = "手机号") + + private String phone; + /**运输单ids*/ + @ApiModelProperty(value = "运输单ids") + + private String transportationIds; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**税务登记证号*/ + @ApiModelProperty(value = "税务登记证号") + + private String taxRegAccount; + /**运输单列表*/ + /* @ApiModelProperty(value = "运输单列表") + + private List tmsOrderVOList;*/ + /**发票类型（0-增值税专用发票，1-普通发票）*/ + @ApiModelProperty(value = "发票类型（0-增值税专用发票，1-普通发票）") + + private String invoiceType; + /**发票性质（0-纸质发票，1-电子发票）*/ + @ApiModelProperty(value = "发票性质（0-纸质发票，1-电子发票）") + + private String invoiceNature; + /**发票号*/ + @ApiModelProperty(value = "发票号") + + private String invoiceNumber; + /**快递单号*/ + @ApiModelProperty(value = "快递单号") + + private String trackingNumber; + + /**开票表集合*/ + @ApiModelProperty(value = "开票表集合") + + private List tmsMakeOutInvoices; + + /**账单项目费用*/ + @ApiModelProperty(value = "账单项目费用") + + private List> feeList; + + /**货主信息id*/ + @ApiModelProperty(value = "货主信息id") + + private String shipperId; + + /**货主信息id*/ + @ApiModelProperty(value = "货主姓名") + + private String shipperName; + + /**货主电话*/ + @ApiModelProperty(value = "货主电话") + + private String shipperPhone; + + /**货主信息id*/ + @ApiModelProperty(value = "货主公司名称") + + private String companyName; + + @ApiModelProperty(value = "统一社会信用代码") + private String regAccount; + + + +} diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsMakeOutInvoice.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsMakeOutInvoice.java new file mode 100644 index 000000000..9d39b3b26 --- /dev/null +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsMakeOutInvoice.java @@ -0,0 +1,130 @@ +package com.mhd.system.api.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 销项发票表 + * @Author: lfs + * @Date: 2020-02-19 08:50:47 + * @Version: V1.0 + */ +@Data +@TableName("tms_make_out_invoice") +public class TmsMakeOutInvoice implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ID_WORKER_STR) + private String id; + /**发票ID*/ + @ApiModelProperty(value = "发票ID") + + private String invoiceId; + /**发票抬头*/ + @ApiModelProperty(value = "发票抬头") + + private String invoiceTitle; + /**发票金额*/ + @ApiModelProperty(value = "发票金额") + + private BigDecimal invoiceValue; + /**发票备注*/ + @ApiModelProperty(value = "发票备注") + + private String remark; + /**发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）*/ + @ApiModelProperty(value = "发票状态（0-未开票，1-已取消申请，2-已开票，3-已驳回，4-已寄出，5-已作废）") + + private Integer invoiceState; + /**发票申请时间*/ + @ApiModelProperty(value = "发票申请时间") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date invoiceApplyTime; + /**创建人*/ + @ApiModelProperty(value = "创建人") + + private String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + + private String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**是否删除（0-否，1-是）*/ + @ApiModelProperty(value = "是否删除（0-否，1-是）") + + private Integer isDelete; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + + private String sysOrgCode; + /**开票号码*/ + @ApiModelProperty(value = "开票号码") + + private String invoiceNumber; + /**开票人ID*/ + @ApiModelProperty(value = "开票人ID") + + private String makeOutInvoiceId; + /**开票时间*/ + @ApiModelProperty(value = "开票时间") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date makeOutInvoiceTime; + /**开票代码*/ + @ApiModelProperty(value = "开票代码") + + private String invoiceCode; + + /**上报状态：0-未上报，1-已上报，2-上报失败*/ + @ApiModelProperty(value = "上报状态：0-未上报，1-已上报，2-上报失败") + + private Integer isReport; + /**上报时间*/ + @ApiModelProperty(value = "上报时间") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date reportTime; + /**失败原因*/ + @ApiModelProperty(value = "失败原因") + + private String errMsg; + + @ApiModelProperty(value = "电子发票地址") + private String invoiceFileUrl; + + @ApiModelProperty(value = "发票摘要") + private String invoiceAbstract; + + @ApiModelProperty(value = "开票项目") + private String invoiceItem; + @ApiModelProperty(value = "实际开票客户id") + private String actualInvoiceCustomerId; + @ApiModelProperty(value = "实际开票客户名称") + private String actualInvoiceCustomerName; +} diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsOrderVO.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsOrderVO.java new file mode 100644 index 000000000..1bdc4fe28 --- /dev/null +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsOrderVO.java @@ -0,0 +1,771 @@ +/* +package com.mhd.system.api.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; +import java.util.Map; + +*/ +/** + * @Description: 货源表 + * @Author: lfs + * @Date: 2020-02-14 09:49:27 + * @Version: V1.0 + *//* + +@Data +public class TmsOrderVO implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ID_WORKER_STR) + private String id = ""; + @ApiModelProperty(value = "创建人") + private String createBy = ""; + @ApiModelProperty(value = "创建人") + private String createrAvatar = ""; + @ApiModelProperty(value = "创建日期") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + @ApiModelProperty(value = "更新人") + private String updateBy = ""; + @ApiModelProperty(value = "更新日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + @ApiModelProperty(value = "所属部门") + private String sysOrgCode = ""; + @ApiModelProperty(value = "货源单号") + + private String goodsNumber = ""; + @ApiModelProperty(value = "线路名称ID") + private String lineNameId = ""; + @ApiModelProperty(value = "线路名称") + private String lineName = ""; + @ApiModelProperty(value = "运距（千米）") + + private BigDecimal haulDistance = new BigDecimal("0"); + @ApiModelProperty(value = "装货地名称") + + private String loadingName = ""; + @ApiModelProperty(value = "装货地县区编码") + private String loadingAreaId = ""; + @ApiModelProperty(value = "装货地详细地址") + + private String loadingAddress = ""; + @ApiModelProperty(value = "装货地经度") + private String loadingLongitude = ""; + @ApiModelProperty(value = "装货地纬度") + private String loadingLatitude = ""; + @ApiModelProperty(value = "装货单位") + private String loadingUnit = ""; + @ApiModelProperty(value = "发货人姓名") + + private String freighterName = ""; + @ApiModelProperty(value = "装货电话") + + private String loadingPhone = ""; + @ApiModelProperty(value = "装货时间日期（年月日）") + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date loadingDate; + @ApiModelProperty(value = "装货时间（上午、下午、24小时）") + + private String loadingTime = ""; + @ApiModelProperty(value = "装货时间id") + private String loadingTimeId; + @ApiModelProperty(value = "卸货地名称") + + private String unloadName = ""; + @ApiModelProperty(value = "卸货地县区编码") + private String unloadAreaId = ""; + @ApiModelProperty(value = "卸货地详细地址") + + private String unloadAddress = ""; + @ApiModelProperty(value = "卸货地经度") + private String unloadLongitude = ""; + @ApiModelProperty(value = "卸货地纬度") + private String unloadLatitude = ""; + @ApiModelProperty(value = "卸货单位") + private String unloadUnit = ""; + @ApiModelProperty(value = "收货人姓名") + + private String dischargerName = ""; + @ApiModelProperty(value = "卸货电话") + + private String unloadPhone = ""; + @ApiModelProperty(value = "卸货时间日期（年月日）") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date unloadingData; + @ApiModelProperty(value = "卸货时间（上午、下午、24小时）") + private String unloadingTime = ""; + @ApiModelProperty(value = "卸货时间Id") + private String unloadingTimeId = ""; + @ApiModelProperty(value = "货物名称ID") + private String goodsNameId = ""; + @ApiModelProperty(value = "货物大类型") + private String goodsType=""; + @ApiModelProperty(value = "货物小类型") + private String goodsName=""; + @ApiModelProperty(value = "重量小（吨）") + private BigDecimal weightMin = new BigDecimal("0"); + @ApiModelProperty(value = "重量大（吨）") + private BigDecimal weightMax = new BigDecimal("0"); + @ApiModelProperty(value = "货物数量单位（吨/方/件）") + + private String goodsUntis = ""; + @ApiModelProperty(value = "货物数量单位（吨/方/件）ID") + private String goodsUntisId = ""; + @ApiModelProperty(value = "配载方式ID（0-数量，1-车次）") + private Integer transportationModeId =0; + @ApiModelProperty(value = "是否接单（0-否，1-是）") + private Integer isOrder = 0; + @ApiModelProperty(value = "配载方式名称") + + private String transportationName= ""; + @ApiModelProperty(value = "现已承运车次") + private Integer realTrainNumber = 0; + @ApiModelProperty(value = "车型车长ID") + private String carType = ""; + @ApiModelProperty(value = "车型车长名称") + + private String carTypeName=""; + @ApiModelProperty(value = "指定司机ID") + private String appointDriverId = ""; + @ApiModelProperty(value = "指定司机姓名") + private String appointDriver = ""; + @ApiModelProperty(value = "指定司机电话") + private String appointDriverPhone = ""; + @ApiModelProperty(value = "指定司机车牌号") + private String appointDriverLicense = ""; + @ApiModelProperty(value = "服务要求ID") + private String serviceRequireId = ""; + @ApiModelProperty(value = "服务要求名称") + + private String serviceRequire = ""; + @ApiModelProperty(value = "备注") + + private String remarks = ""; + @ApiModelProperty(value = "上游客户ID") + private String upstreamCustomersId = ""; + @ApiModelProperty(value = "上游客户姓名") + private String upstreamCustomersName = ""; + @ApiModelProperty(value = "上游客户电话") + private String upstreamCustomersPhone = ""; + @ApiModelProperty(value = "运单类型（0-企业普货、1-企业批量货、2-撮合货、3-客服运单、4-线下运单）") + private Integer waybillType ; + @ApiModelProperty(value = "运单类型（0-企业普货、1-企业批量货、2-撮合货、3-客服运单、4-线下运单）") + private String waybillTypeName = ""; + @ApiModelProperty(value = "运单来源（0-后台发布、1-app发布、2-导入）") + private Integer waybillFrom; + @ApiModelProperty(value = "定金") + private BigDecimal earnestMoney = new BigDecimal("0"); + @ApiModelProperty(value = "确认协议重量和") + private BigDecimal agreementWeights = new BigDecimal("0"); + @ApiModelProperty(value = "装货重量和") + private BigDecimal loadingNumbers = new BigDecimal("0"); + @ApiModelProperty(value = "货源是否关闭（0-否，1-是）") + private Integer isSource = 0; + @ApiModelProperty(value = "货源关闭时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date sourceCloseTime; + @ApiModelProperty(value = "货源关闭人用户ID") + private String executorId = ""; + @ApiModelProperty(value = "是否删除（0-否，1-是）") + private Integer isDelete = 0; + @ApiModelProperty(value = "运输单号") + private String waybillNumber=""; + @ApiModelProperty(value = "公司名称") + private String companyName=""; + @ApiModelProperty(value = "姓名") + + private String shipperName=""; + @ApiModelProperty(value = "电话") + private String shipperPhone=""; + @ApiModelProperty(value = "用户ID") + private String shipperId = ""; + @ApiModelProperty(value = "运输司机ID") + private String transportationDriverId =""; + @ApiModelProperty(value = "运输司机姓名") + private String transportationDriver =""; + @ApiModelProperty(value = "运输司机电话") + private String transportationPhone =""; + @ApiModelProperty(value = "运输车辆ID") + private String transportationCarId =""; + @ApiModelProperty(value = "运输车辆车牌号") + private String transportationPlate = ""; + @ApiModelProperty(value = "货源单创建企业ID") + private String createCompanyId = ""; + @ApiModelProperty(value = "期望运费") + + private BigDecimal freightHope = new BigDecimal("0"); + @ApiModelProperty(value = "运输状态（0-待确认，1-运输中，2-已完成，3-待评价，4-已评价，5-已取消，6-已关闭）") + private Integer waybillStatus; + @ApiModelProperty(value = "承运货物数量") + private String loadingNumber =""; + @ApiModelProperty(value = "车队名称") + private String motorcadeName=""; + @ApiModelProperty(value = "货物类型ID") + private String goodsTypeId=""; + @ApiModelProperty(value = "创建人手机号") + private String phone=""; + @ApiModelProperty(value = "创建人名称") + private String realname=""; + @ApiModelProperty(value = "货运线路（装货市县）") + private String lineTitleLeft=""; + @ApiModelProperty(value = "货运线路（卸货市县）") + private String lineTitleRight=""; + @ApiModelProperty(value = "发货时间距当前时间差") + private String daysAgo=""; + @ApiModelProperty(value = "交易量") + private String transportCount = ""; + @ApiModelProperty(value = "好评率") + private String praiseNumber ="100%"; + @ApiModelProperty(value = "装货时间日期（年月日）") + private String loadingDateDay=""; + @ApiModelProperty(value = "装货时间日期（年-月-日）") + private String loadingDateTime=""; + @ApiModelProperty(value = "卸货时间日期（年-月-日）") + private String unloadingDateTime=""; + @ApiModelProperty(value = "卸货时间日期（年月日）") + private String unloadingDateDay=""; + @ApiModelProperty(value = "是否为常发货源（0-否，1-是）") + private Integer isCommon = 0; + @ApiModelProperty(value = "审核状态") + private String auditStatus; + @ApiModelProperty(value = "审核状态中文") + private String auditStatusName =""; + @ApiModelProperty(value = "运输单号") + private String transportationNumber=""; + @ApiModelProperty(value = "发货运费") + private BigDecimal deliveryFreight = new BigDecimal("0"); + @ApiModelProperty(value = "审核人手机号") + private String auditByPhone=""; + @ApiModelProperty(value = "审核人") + private String auditBy=""; + @ApiModelProperty(value = "审核人名称") + private String auditByName=""; + @ApiModelProperty(value = "审核人公司名称") + private String auditByCompanyName=""; + @ApiModelProperty(value = "所属公司名称") + private String platformCompanyName; + @ApiModelProperty(value = "运费单价（元/吨）") + private BigDecimal transportationUnitPrice; + @ApiModelProperty(value = "赫达订单号") + private String orderNumber=""; + @ApiModelProperty(value = "是否长期货源：0-否，1-是") + private Integer isLongOrder = 0; + @ApiModelProperty(value = "微信小程序图片地址") + private String wxaQrcode=""; + @ApiModelProperty(value = "微信小程序AppID") + private String wxaAppID=""; + @ApiModelProperty(value = "代运营人员用户ID") + private String orderAgentUserId=""; + @ApiModelProperty(value = "代运营人员名称") + private String orderAgentUserName=""; + @ApiModelProperty(value = "代运营人员手机") + private String orderAgentUserPhone=""; + + @ApiModelProperty(value = "公司经营模式(0-总公司,1-总+分公司)") + private Integer isTypeInsuranceUse = 0; + @ApiModelProperty(value = "指定平台公司") + private String appointCompanyId; + @ApiModelProperty(value = "指定平台公司名称") + private String appointCompanyName; + @ApiModelProperty(value = "服务费") + private String serviceRate; + @ApiModelProperty(value = "指定货主编号") + private String appointShipperId; + @ApiModelProperty(value = "指定货主") + private String appointShipper; + @ApiModelProperty(value = "结算方式:1-按趟结算,2-按数量结算") + private Integer radioValue; + + @ApiModelProperty(value = "指定平台公司名称") + private String appointCompany; + + + + @ApiModelProperty(value = "短驳装货地址") + private String shortLoadingAddress; + + @ApiModelProperty(value = "短驳卸货地址") + private String shortUnloadAddress; + + @ApiModelProperty(value = "指定设备号") + private String appointVehicleDevice; + + @ApiModelProperty(value = "车牌号") + private String vehicleLicenseNumber; + + @ApiModelProperty(value = "司机") + private String driverName; + + @ApiModelProperty(value = "指定车辆") + private String appointVehicle; + + + + @ApiModelProperty(value = "发布货源方式 0-未指定;1-企业货源;2-平台货源") + private Integer publishOrderType; + + @ApiModelProperty(value = "剩余吨数") + private BigDecimal surplusTonnage; + + */ +/**是否开启路耗（0-否 1-是）*//* + + @ApiModelProperty(value = "是否开启路耗（0-否 1-是）") + @Excel(name = "是否开启路耗（0-否 1-是）", width = 15) + private Integer isRoadLoss; + */ +/**货物价值(元/吨)*//* + + @ApiModelProperty(value = "货物价值(元/吨)") + @Excel(name = "货物价值(元/吨)", width = 15) + private BigDecimal goodsValue=BigDecimal.ZERO; + */ +/**路耗模式（0-按比例% 1-按数量(吨)）*//* + + @ApiModelProperty(value = "路耗模式（0-按比例% 1-按数量(吨)）") + @Excel(name = "路耗模式（0-按比例% 1-按数量(吨)）", width = 15) + private Integer roadLossMode; + */ +/**路耗结算方式(0-无 1-取装货重量 2-取卸货重量 3-装卸货取大 4-装卸货取小)*//* + + @ApiModelProperty(value = "路耗结算方式(0-无 1-取装货重量 2-取卸货重量 3-装卸货取大 4-装卸货取小)") + @Excel(name = "路耗结算方式(0-无 1-取装货重量 2-取卸货重量 3-装卸货取大 4-装卸货取小)", width = 15) + private Integer roadLossSettlementMethod; + + */ +/**允许货物亏损*//* + + @ApiModelProperty(value = "允许货物亏损（吨或%）") + @Excel(name = "允许货物亏损（吨或%）", width = 15) + private BigDecimal allowableLoss=BigDecimal.ZERO; + + */ +/**超出亏损扣除金额（元/吨)*//* + + @ApiModelProperty(value = "超出亏损扣除金额（元/吨)") + @Excel(name = "超出亏损扣除金额（元/吨)", width = 15) + private BigDecimal lossDeductionAmount=BigDecimal.ZERO; + @ApiModelProperty(value = "上游客户id") + @Excel(name = "上游客户id", width = 15) + private String upClientId=""; + + @ApiModelProperty(value = "货单二维码图片地址") + private String qrCodeImgUrl; + + */ +/**回单付金额*//* + + @ApiModelProperty(value = "回单付金额") + @Excel(name = "回单付金额", width = 15) + private BigDecimal receiptPaymentAmount=BigDecimal.ZERO; + */ +/**预付运费金额*//* + + @ApiModelProperty(value = "预付现金金额") + @Excel(name = "预付现金金额", width = 15) + private BigDecimal cashAdvance=BigDecimal.ZERO; + */ +/**到付运费金额*//* + + @ApiModelProperty(value = "到付运费金额") + @Excel(name = "到付运费金额", width = 15) + private BigDecimal freightAmount=BigDecimal.ZERO; + */ +/**预付平台油卡金额*//* + + @ApiModelProperty(value = "预付平台油卡金额") + @Excel(name = "预付平台油卡金额", width = 15) + private BigDecimal oilCardOnline=BigDecimal.ZERO; + @ApiModelProperty(value = "是否协议费用生成：0否 1是") + private Integer isAutoGenerateProtocol; + + */ +/**单车重量*//* + + @ApiModelProperty(value = "单车重量",required = true) + private BigDecimal singleVehicleWeight; + + */ +/**单车总费用*//* + + @ApiModelProperty(value = "单车总费用") + @Excel(name = "单车总费用", width = 15) + private BigDecimal freightGross=BigDecimal.ZERO; + + @ApiModelProperty(value = "运费抹零 0-不抹零 ，1-抹零小数位，2-抹零个位，3-抹零十位") + private Integer isFreightNullification; + + @ApiModelProperty(value = "运费抹零 0-不抹零 ，1-抹零小数位，2-抹零个位，3-抹零十位") + private String isFreightNullificationName; + + @ApiModelProperty(value = "是否允许接多单：0否 1是") + private Integer isMultipleOrdersAllowed; + + @ApiModelProperty(value = "发货备注") + private String shippingNote; + + @ApiModelProperty(value = "绑卡状态 0-未绑卡 1-已绑卡未完成回填 2-已绑卡已完成回填") + private Integer strappedStatus=2; + + @ApiModelProperty("应收结算类型：1-月结，2-现结") + private Integer receivableType; + + @ApiModelProperty("项目表ID") + private Long projectManagementId; + + @ApiModelProperty(value = "接单司机ID") + private String orderDriverId; + + @ApiModelProperty(value = "货物数量") + private String goodsQuantity; + @ApiModelProperty(value = "货物数量单位code") + private String goodsQuantityUnitId; + @ApiModelProperty(value = "货物数量单位") + private String goodsQuantityUnit; + + @ApiModelProperty(value = "运单数量") + private Integer transportNoteCount=0; + + + @ApiModelProperty(value = "常用货主id") + private String topOrder; + + + //=================批量货派单相关============================= + @ApiModelProperty(value = "需求车次") + private Integer demandTrainNumber; + @ApiModelProperty(value = "承运车次默认0") + private Integer carriageNumber; + @ApiModelProperty(value = "剩余需求车次") + private Integer remainingDemandTrainNumber; + + */ +/**货物重量*//* + + @ApiModelProperty(value = "货物重量") + private BigDecimal goodsWeight; + @ApiModelProperty(value = "货源剩余货物数量") + private BigDecimal residueGoodsWeight; + @ApiModelProperty(value = "承运货物数量") + private BigDecimal transportGoodsWeight; + + //=================竞价相关============================= + @ApiModelProperty(value = "查看报价数量") + private Integer quotationQuantity = 0; + @ApiModelProperty(value = "运单模式(0-普通模式,1-竞价模式)") + private Integer waybillMode; + @ApiModelProperty(value = "竞价截止时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date latestBiddingTime; + @ApiModelProperty(value = "预设竞标价") + private BigDecimal presetPrice; + @ApiModelProperty(value = "竞价单位（元/车，元/吨）") + private String biddingUnit; + @ApiModelProperty(value = "最高心理价") + private BigDecimal highestPrice; + + @ApiModelProperty(value = "订单状态（1-未审核，2-未通过，3-进行中，4-已完成，5-已关闭）") + private Integer orderStatus; + + @ApiModelProperty(value = "货源对应运单数量") + private Integer transportNum = 0; + @ApiModelProperty(value = "货源对应货运单数量") + private Integer truckOrderCount = 0; + @ApiModelProperty(value = "订单模式（0-手动竞价，1-自动竞价，2-普通模式，其他-全部）") + private Integer orderMode; + @ApiModelProperty(value = "评标类型(0-自动评标,1-手动评标)") + private Integer bidEvaluationType; + + @ApiModelProperty(value = "订单类型：0-自有订单，1-tms订单") + private Integer orderType; + + @ApiModelProperty(value = "多装多卸类型") + private String layType; + + + + @ApiModelProperty(value = "拼单类型（0-不拼单(主单)，1-拼单-子单，2-拼单-合单）") + private Integer splicingOrderType; + + @ApiModelProperty(value = "拼单发布状态（0-否，1-是）") + private Integer splicingStatus; + + @ApiModelProperty(value = "拼单主单id") + private String mainOrderId; + + @ApiModelProperty(value = "拼单主单号") + private String mainOrderNum; + + @ApiModelProperty(value = "拼单合单id") + private String mergeOrderId; + + @ApiModelProperty(value = "拼单合单号") + private String mergeOrderNum; + + + + @ApiModelProperty(value = "来源系统") + private String orderSource; + + @ApiModelProperty(value = "通知单号") + private String noticeNumber; + + @ApiModelProperty(value = "司机税率") + private BigDecimal driverTaxRate; + + @ApiModelProperty(value = "tms到付运费金额") + private BigDecimal tmsFreightAmount; + + @ApiModelProperty(value = "订单其他信息") + private Map otherOrderInfo; + + + + @ApiModelProperty(value = "订单类型") + private Integer orderShippingType; + @ApiModelProperty(value = "订单类型") + private String orderShippingName; + @ApiModelProperty(value = "付款方") + private String payerTypeName; + + @ApiModelProperty(value = "付款方类型（0-委托方，1-收货方）") + @Excel(name = "付款方类型（0-委托方，1-收货方）", width = 15) + private Integer payerType; + + @ApiModelProperty(value = "整机编号") + private String machineNumber; + + @ApiModelProperty(value = "收货方") + private String recipientName; + @ApiModelProperty(value = "委托方") + private String appointDriverEnterprise; + @ApiModelProperty(value = "收货方id") + private String recipientId; + @ApiModelProperty(value = "委托方id") + private String appointDriverEnterpriseId; + + @ApiModelProperty(value = "数字物流平台用户Id") + private Long szwlUserId; + + @ApiModelProperty("运费单价") + private BigDecimal freightUnitPrice; + + @ApiModelProperty(value = "信息费") + private BigDecimal infoFee; + + @ApiModelProperty(value = "信息费状态") + private BigDecimal infoFeeStatus; + + @ApiModelProperty(value = "信息费应付单据号") + private String infoFeeDocumentNumber; + + @ApiModelProperty(value = "车辆类型Id") + private String vehicleTypeId; + + @ApiModelProperty(value = "承运人Id(订单为济南专线使用)") + private String carrier; + + + @ApiModelProperty(value = "第三方订单号") + private String thirdPartyOrderNumber; + @ApiModelProperty(value = "电子回单状态(0-无状态 1-未上传 2-已上传 3-已拒绝 4-已确认)") + private Integer receiptTotalStatus; + @ApiModelProperty(value = "已收运费") + private BigDecimal collectedFreight; + @ApiModelProperty(value = "未收运费") + private BigDecimal uncollectedFreight; + @ApiModelProperty(value = "订单结算状态：1未出账、2已出账、3部分结算、4已结算") + private Integer settlementStatus; + @ApiModelProperty(value = "订单运费结算时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date settlementTime; + @ApiModelProperty(value = "运单发票开具状态（0-未索取，1-已索取，2-已开票，3-部分索取）") + private Integer isInvoice; + @ApiModelProperty(value = "签收时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date signTime; + @ApiModelProperty(value = "创建人") + private String realCreateName; + + @ApiModelProperty(value = "主运单单号") + private String mainOrderNumber; + @ApiModelProperty(value = "信息费账单号") + private String recordNumber; + @ApiModelProperty(value = "信息费收款方") + private String infoFeePayee; + @ApiModelProperty(value = "信息费收款方方式") + private Integer infoFeePayeeType; + + @ApiModelProperty(value = "竞价状态 0-竞价中,1-已完成,2-已关闭") + private Integer biddingStatus; + + @ApiModelProperty(value = "目的地") + private String destination; + + @ApiModelProperty("运费") + private BigDecimal freightCharges; + + @ApiModelProperty(value = "开票时间") + @Excel(name = "开票时间", width = 25, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date invoiceMakeTime; + + @ApiModelProperty("业务员ID") + private String salesmanId; + + @ApiModelProperty("业务员ID") + private String salesmanName; + + @ApiModelProperty(value = "组织id") + private String orgId; + + @ApiModelProperty(value = "所属组织") + @Excel(name = "所属组织", width = 15) + private String orgName; + + @ApiModelProperty("是否报关（0：否，1：是）") + private Integer isDeclare; + + @ApiModelProperty("线路") + private String route; + + @ApiModelProperty("柜类型") + private String containerType; + + @ApiModelProperty("柜类型名称") + private String containerTypeName; + + @ApiModelProperty("卡类型") + private String cardType; + + @ApiModelProperty("卡类型名称") + private String cardTypeName; + + @ApiModelProperty("外来柜号") + private String externalContainerNo; + + @ApiModelProperty("中转地") + private String transitPlace; + + @ApiModelProperty("托运人ID") + private String shipper; + + @ApiModelProperty("托运人ID") + private String customsShipper; + + @ApiModelProperty("托运人电话") + private String customsShipperTel; + + @ApiModelProperty("卸货单位") + private String unloadingCompany; + + @ApiModelProperty("合同编号") + private String contractNo; + + @ApiModelProperty("运费") + private BigDecimal freightFee; + + @ApiModelProperty("卸货费") + private BigDecimal unloadingFee; + + @ApiModelProperty("报关费") + private BigDecimal customsFee; + + @ApiModelProperty("差货费") + private BigDecimal shortageFee; + + @ApiModelProperty("杂费") + private BigDecimal miscellaneousFee; + + @ApiModelProperty("其他费用") + private BigDecimal otherFee; + + @ApiModelProperty("滞车费") + private BigDecimal detentionFee; + + @ApiModelProperty("税率") + private BigDecimal taxRate; + + @ApiModelProperty("结算币种") + private String settlementCurrency; + + @ApiModelProperty("体积") + private BigDecimal volume; + + @ApiModelProperty("内容详情") + private String detailContent; + + @ApiModelProperty("报关线路") + private String customsRoute; + + @ApiModelProperty("报关关口") + private String customsPort; + + @ApiModelProperty("报关联系人") + private String customsContact; + + @ApiModelProperty("报关联系人电话") + private String customsContactPhone; + + @ApiModelProperty("报关备注") + private String customsRemark; + @ApiModelProperty(value = "单据日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date documentDate; + + @ApiModelProperty("组织ID") + private Long organizationId; + + @ApiModelProperty("组织名称") + private String organizationName; + + @ApiModelProperty("上级组织ID") + private Long topOrganizationId; + + //订单审核相关 + @ApiModelProperty("审核业务员ID") + private String auditSalesmanId; + @ApiModelProperty("审核业务员") + private String auditSalesmanName; + @ApiModelProperty("业务确认状态") + private Integer businessConfirmStatus; + @ApiModelProperty("业务审核状态") + private Integer businessAuditStatus; + @ApiModelProperty("确认意见") + private String opinion; + @ApiModelProperty("业务主管id") + private String businessManagerId; + @ApiModelProperty("业务主管名称") + private String businessManagerName; + @ApiModelProperty("审核意见") + private String auditOpinion; + + + @ApiModelProperty("费用科目明细") + private String tmsOrderAccountListJsonStr; + +} +*/ diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java index 20d0368cb..eea807c53 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java @@ -213,8 +213,8 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory selectInvoiceListById(String id) { - R res = new R<>(); + public R selectInvoiceListById(String id) { + R res = new R<>(); res.setMsg("获取发票信息失败"+cause.getMessage()); res.setCode(R.FAIL); return res; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index 4b10d015d..5a693fb0c 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -41,6 +41,7 @@ import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.UserServiceFeign; import com.mhd.system.api.WlhyServiceFeign; import com.mhd.system.api.domain.TmsInvoiceList; +import com.mhd.system.api.domain.TmsInvoiceListDetailsVO; import com.mhd.system.api.domain.TmsTransportNote; import com.mhd.system.api.model.LoginUser; import org.apache.http.client.methods.CloseableHttpResponse; @@ -612,6 +613,7 @@ public class ReconciliationImpl extends ServiceImpl ajaxResult1=wlhyServiceFeign.selectByOrderNum(tmsOrder.getGoodsNumber()); @@ -635,17 +637,17 @@ public class ReconciliationImpl extends ServiceImpl ajaxResult2=wlhyServiceFeign.selectInvoiceListById(reconciliation.getInvoiceId()); + R ajaxResult2=wlhyServiceFeign.selectInvoiceListById(reconciliation.getInvoiceId()); if(ajaxResult2.getCode()==200){ - TmsInvoiceList tmsInvoiceList= ajaxResult2.getData(); - if(ObjectUtil.isNotNull(tmsInvoiceList)) { - invoiceNumber=tmsInvoiceList.getInvoiceNumber(); + TmsInvoiceListDetailsVO tmsInvoiceListDetailsVO= ajaxResult2.getData(); + if(ObjectUtil.isNotNull(tmsInvoiceListDetailsVO)) { + invoiceNumber=tmsInvoiceListDetailsVO.getTmsMakeOutInvoices().get(0).getInvoiceNumber(); } } List reconciliationAccountList=reconciliationAccountMapper.selectList(new QueryWrapper().lambda() .eq(ReconciliationAccount::getReconciliationId,businessDocumentDetaliId) - .eq(ReconciliationAccount::getDelFlag,0)); + .eq(ReconciliationAccount::getDelFlag,1)); if (ObjectUtil.isNotNull(reconciliationAccountList)&&reconciliationAccountList.size()>0){ for (ReconciliationAccount reconciliationAccount:reconciliationAccountList){ Ysitem item=new Ysitem();