md
This commit is contained in:
linfso
parent
466f68a567
commit
6f9e25c13f
@ -18,6 +18,7 @@ import com.xdadan.erp.common.core.page.TableDataInfo;
|
||||
import com.xdadan.erp.common.enums.BusinessType;
|
||||
import com.xdadan.erp.common.utils.poi.ExcelUtil;
|
||||
import com.xdadan.erp.emis.domain.EmisBrand;
|
||||
import com.xdadan.erp.emis.domain.vo.WaybillOrder;
|
||||
import com.xdadan.erp.emis.service.IEmisBrandService;
|
||||
import com.xdadan.erp.emis.service.IEmisElectronicPagService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@ -54,4 +55,23 @@ public class EmisCommonController extends BaseController
|
||||
return AjaxResult.error(ex.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取电子运单信息
|
||||
*/
|
||||
@PostMapping(value = "/getWaybillDetail")
|
||||
public AjaxResult getWaybillDetail()
|
||||
{
|
||||
try {
|
||||
// String waybillNo = emisElectronicPagService.realMatchWaybill();
|
||||
|
||||
WaybillOrder waybillOrder = new WaybillOrder();
|
||||
waybillOrder.setBillCode("1232");
|
||||
|
||||
return AjaxResult.success("获取成功",waybillOrder);
|
||||
}catch (Exception ex){
|
||||
ex.printStackTrace();
|
||||
return AjaxResult.error(ex.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
package com.xdadan.erp.emis.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class Reciever implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
/* 国家 */
|
||||
private String country;
|
||||
/* 姓名 */
|
||||
private String name;
|
||||
/* 电话 */
|
||||
private String phone;
|
||||
/* 省 */
|
||||
private String province;
|
||||
/* 市 */
|
||||
private String city;
|
||||
/* 区 */
|
||||
private String district;
|
||||
/* 城镇 */
|
||||
private String town;
|
||||
/* 地址 */
|
||||
private String address;
|
||||
/* 邮编 */
|
||||
private String postCode;
|
||||
/* email */
|
||||
private String email;
|
||||
/* 公司 */
|
||||
private String company;
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package com.xdadan.erp.emis.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class Sender implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
/* 国家 */
|
||||
private String country;
|
||||
/* 姓名 */
|
||||
private String name;
|
||||
/* 电话 */
|
||||
private String phone;
|
||||
/* 省 */
|
||||
private String province;
|
||||
/* 市 */
|
||||
private String city;
|
||||
/* 区 */
|
||||
private String district;
|
||||
/* 城镇 */
|
||||
private String town;
|
||||
/* 地址 */
|
||||
private String address;
|
||||
/* 邮编 */
|
||||
private String postCode;
|
||||
/* email */
|
||||
private String email;
|
||||
/* 公司 */
|
||||
private String company;
|
||||
}
|
||||
@ -0,0 +1,182 @@
|
||||
package com.xdadan.erp.emis.domain.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class WaybillOrder implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
// 收件人
|
||||
private Reciever reciever;
|
||||
|
||||
// 发件人
|
||||
private Sender sender;
|
||||
|
||||
/* 客户单号，合同号 */
|
||||
private String custOrderId;
|
||||
|
||||
/* 运单号 */
|
||||
private String billCode;
|
||||
|
||||
/* 子单号,逗号隔开 */
|
||||
private String billCodeSub;
|
||||
|
||||
/* 下单时间 - 取客户当地时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date orderDate;
|
||||
|
||||
/* 客户ID */
|
||||
private Long userId;
|
||||
|
||||
/* wx openid */
|
||||
private String openId;
|
||||
|
||||
/* 支付方式 : 现金或月结 */
|
||||
private String paymentType;
|
||||
|
||||
/* 计费方式 01-按重量 02-按体积 03-一口价 */
|
||||
private String calcFeeType;
|
||||
|
||||
/* 支付月结编号 */
|
||||
private String custNo;
|
||||
|
||||
/* 快递线路 */
|
||||
private String transLine;
|
||||
|
||||
/* 快递产品类型 */
|
||||
private String productType;
|
||||
|
||||
/* 清关方式 */
|
||||
private String customsClear;
|
||||
|
||||
/* 报关方式 */
|
||||
private String customsEclaration;
|
||||
|
||||
/* 包装类型 */
|
||||
private String packType;
|
||||
|
||||
/* 派件方式:1-派送 2-自提 */
|
||||
private String dispatchMethod;
|
||||
|
||||
/* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */
|
||||
private String pickupMethod;
|
||||
|
||||
/* 预计上门取件开始时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date pickStartDate;
|
||||
/* 预计上门取件结束时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date pickFinishDate;
|
||||
|
||||
/* 入仓代码 */
|
||||
private String intoWarehouseCode;
|
||||
/* 入仓名称 */
|
||||
private String intoWarehouseName;
|
||||
/* 入仓地址 */
|
||||
private String intoWarehouseAddress;
|
||||
/* 入仓联系人 */
|
||||
private String intoWarehouseContact;
|
||||
/* 入仓联系人电话 */
|
||||
private String intoWarehousePhone;
|
||||
|
||||
/* 入仓单号 */
|
||||
private String intoWarehouseBillCode;
|
||||
/* 客户发货开始时间 */
|
||||
private String customerDeliveryBeginTime;
|
||||
|
||||
/* 货物大类 */
|
||||
private String goodsType;
|
||||
|
||||
/* 货物描述 */
|
||||
private String goodsInfo;
|
||||
|
||||
/* 总重量 */
|
||||
private BigDecimal totalWeight;
|
||||
|
||||
/* 总体积 */
|
||||
private BigDecimal totalVolume;
|
||||
|
||||
/* 件数 */
|
||||
private Integer parcelQty;
|
||||
|
||||
/* 实际重量 */
|
||||
private BigDecimal billWeight;
|
||||
|
||||
/* 体积重量 */
|
||||
private BigDecimal volumeWeight;
|
||||
|
||||
/* 费用币种 */
|
||||
private String currency;
|
||||
|
||||
/* 结算重量 */
|
||||
private BigDecimal settlementWeight;
|
||||
|
||||
/* 计费重量 */
|
||||
private BigDecimal feeWeight;
|
||||
|
||||
/* 运费 */
|
||||
private BigDecimal freight;
|
||||
|
||||
/* 是否超长 */
|
||||
private String blOverLong;
|
||||
|
||||
/* 是否超重 */
|
||||
private String blOverWeight;
|
||||
/* 超重重量 */
|
||||
private String overWeightNumber;
|
||||
|
||||
/* 费用备注 */
|
||||
private String feeRemaker;
|
||||
;
|
||||
/* 实际货值 */
|
||||
private String realValue;
|
||||
|
||||
/* 是否同行转单 */
|
||||
private String blDispFd;
|
||||
/* 转单快递代码 */
|
||||
private String transferCode;
|
||||
/* 转单单号 */
|
||||
private String transferBillcode;
|
||||
/* 转单时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date dispFdDate;
|
||||
|
||||
/* 取件员代码 */
|
||||
private String takePieceEmployeeCode;
|
||||
|
||||
/* 发件网点代码 */
|
||||
private String sendSiteCode;
|
||||
|
||||
|
||||
/* 目的地编号 */
|
||||
private String destinationCode;
|
||||
/* 目的省 */
|
||||
private String destinationProvince;
|
||||
/* 目的城市 */
|
||||
private String destinationCity;
|
||||
/* 目的国家 */
|
||||
private String destinationCounty;
|
||||
/* 目的地网点代码 */
|
||||
private String dispatchUnderlingSiteCode;
|
||||
/* 目的地财务中心代码 */
|
||||
private String destinationCenterCode;
|
||||
/* 业务人代码 */
|
||||
private String marketManCode;
|
||||
/* 销售回款人 */
|
||||
private String payee;
|
||||
/* 销售联系人 */
|
||||
private String salesmen;
|
||||
/* 操作员代码 */
|
||||
private String operateEmployeeCode;
|
||||
|
||||
/* 是否给寄件人发短信 */
|
||||
private String blMessage;
|
||||
/* 是否给收件人发短信 */
|
||||
private String blAcceptMessage;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user