|
@ -1,10 +1,14 @@ |
|
|
package com.ruoyi.manufacture.domain; |
|
|
package com.ruoyi.manufacture.domain; |
|
|
|
|
|
|
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat; |
|
|
import org.apache.commons.lang3.builder.ToStringBuilder; |
|
|
import org.apache.commons.lang3.builder.ToStringBuilder; |
|
|
import org.apache.commons.lang3.builder.ToStringStyle; |
|
|
import org.apache.commons.lang3.builder.ToStringStyle; |
|
|
import com.ruoyi.common.annotation.Excel; |
|
|
import com.ruoyi.common.annotation.Excel; |
|
|
import com.ruoyi.common.core.domain.BaseEntity; |
|
|
import com.ruoyi.common.core.domain.BaseEntity; |
|
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
|
|
import java.util.Date; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 发货通知单详情对象 delivery_goods_detail |
|
|
* 发货通知单详情对象 delivery_goods_detail |
|
|
* |
|
|
* |
|
@ -18,72 +22,136 @@ public class DeliveryGoodsDetail extends BaseEntity |
|
|
/** 发货通知单详情id */ |
|
|
/** 发货通知单详情id */ |
|
|
private Long deliveryGoodsDetailId; |
|
|
private Long deliveryGoodsDetailId; |
|
|
|
|
|
|
|
|
/** 通知单号 */ |
|
|
/** 出库单号 */ |
|
|
@Excel(name = "通知单号") |
|
|
@Excel(name = "出库单号") |
|
|
private String noticeOrderNumber; |
|
|
private String noticeOrderNumber; |
|
|
|
|
|
|
|
|
/** 订单号码 */ |
|
|
@Excel(name = "出库状态") |
|
|
@Excel(name = "订单号码") |
|
|
private String deliverStatus; |
|
|
|
|
|
|
|
|
|
|
|
/** 业务员 */ |
|
|
|
|
|
@Excel(name = "业务员") |
|
|
|
|
|
private String finishProductName; |
|
|
|
|
|
|
|
|
|
|
|
/** 关联销售单号 */ |
|
|
|
|
|
@Excel(name = "关联销售单号") |
|
|
private String salesOrderNumber; |
|
|
private String salesOrderNumber; |
|
|
|
|
|
|
|
|
/** 客户代码 */ |
|
|
/** 出库类型 */ |
|
|
@Excel(name = "客户代码") |
|
|
@Excel(name = "出库类型") |
|
|
|
|
|
private String outboundType; |
|
|
|
|
|
|
|
|
|
|
|
/** 订单类型 */ |
|
|
|
|
|
@Excel(name = "订单类型") |
|
|
|
|
|
private String orderType; |
|
|
|
|
|
|
|
|
|
|
|
/** 客户代码/ID */ |
|
|
|
|
|
@Excel(name = "客户ID") |
|
|
private String enterpriseCode; |
|
|
private String enterpriseCode; |
|
|
|
|
|
|
|
|
/** 客户名称 */ |
|
|
/** 客户公司名称 */ |
|
|
@Excel(name = "客户名称") |
|
|
@Excel(name = "客户公司名称") |
|
|
private String enterpriseName; |
|
|
private String enterpriseName; |
|
|
|
|
|
|
|
|
|
|
|
/** 客户订单 */ |
|
|
|
|
|
@Excel(name = "客户订单号") |
|
|
|
|
|
private String customerNumber; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** 数量 */ |
|
|
|
|
|
@Excel(name = "物料总量") |
|
|
|
|
|
private String productQuantity; |
|
|
|
|
|
|
|
|
|
|
|
/** 数量合计 */ |
|
|
|
|
|
@Excel(name = "数量合计") |
|
|
|
|
|
private String amountMoney; |
|
|
|
|
|
|
|
|
|
|
|
/** 不含税总价(RMB) */ |
|
|
|
|
|
@Excel(name = "不含税总价") |
|
|
|
|
|
private BigDecimal allPriceExcludingTaxRmb; |
|
|
|
|
|
|
|
|
|
|
|
/** 含税总价(RMB) */ |
|
|
|
|
|
@Excel(name = "含税总价") |
|
|
|
|
|
private BigDecimal allPriceIncludesTax; |
|
|
|
|
|
|
|
|
|
|
|
/** 不含税总价(美元) */ |
|
|
|
|
|
@Excel(name = "不含税总价") |
|
|
|
|
|
private BigDecimal allPriceExcludingTaxDollar; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** 计划交付时间 */ |
|
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd") |
|
|
|
|
|
@Excel(name = "计划交付时间", width = 30, dateFormat = "yyyy-MM-dd") |
|
|
|
|
|
private Date plannedDeliveryTime; |
|
|
|
|
|
|
|
|
|
|
|
/** 客户验收时间 */ |
|
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd") |
|
|
|
|
|
@Excel(name = "客户验收时间", width = 30, dateFormat = "yyyy-MM-dd") |
|
|
|
|
|
private Date acceptanceTime; |
|
|
|
|
|
|
|
|
|
|
|
/** 付款条件 */ |
|
|
|
|
|
@Excel(name = "付款条件") |
|
|
|
|
|
private String paymentCondition; |
|
|
|
|
|
|
|
|
|
|
|
/** 交付条件 */ |
|
|
|
|
|
@Excel(name = "交付条件") |
|
|
|
|
|
private String deliveryCondition; |
|
|
|
|
|
|
|
|
|
|
|
/** 收货联系人 */ |
|
|
|
|
|
@Excel(name = "收货联系人") |
|
|
|
|
|
private String customerContact; |
|
|
|
|
|
|
|
|
|
|
|
/** 联系电话 */ |
|
|
|
|
|
@Excel(name = "联系电话") |
|
|
|
|
|
private String contactNumber; |
|
|
|
|
|
|
|
|
|
|
|
/** 收货地址 */ |
|
|
|
|
|
@Excel(name = "收货地址") |
|
|
|
|
|
private String contactAddress; |
|
|
|
|
|
|
|
|
|
|
|
/** 送货日期*/ |
|
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd") |
|
|
|
|
|
@Excel(name = "送货日期", width = 30, dateFormat = "yyyy-MM-dd") |
|
|
|
|
|
private Date deliverTime; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** 成品代码 */ |
|
|
/** 成品代码 */ |
|
|
@Excel(name = "成品代码") |
|
|
|
|
|
private String finishProductCode; |
|
|
private String finishProductCode; |
|
|
|
|
|
|
|
|
/** 成品名称 */ |
|
|
|
|
|
@Excel(name = "成品名称") |
|
|
|
|
|
private String finishProductName; |
|
|
|
|
|
|
|
|
|
|
|
/** 规格型号 */ |
|
|
/** 规格型号 */ |
|
|
@Excel(name = "规格型号") |
|
|
|
|
|
private String specificationModel; |
|
|
private String specificationModel; |
|
|
|
|
|
|
|
|
/** 客户料号 */ |
|
|
|
|
|
@Excel(name = "客户料号") |
|
|
|
|
|
private String customerNumber; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** 机种 */ |
|
|
/** 机种 */ |
|
|
@Excel(name = "机种") |
|
|
|
|
|
private String typeMachine; |
|
|
private String typeMachine; |
|
|
|
|
|
|
|
|
/** 单位 */ |
|
|
/** 单位 */ |
|
|
@Excel(name = "单位") |
|
|
|
|
|
private String inventoryUnit; |
|
|
private String inventoryUnit; |
|
|
|
|
|
|
|
|
/** 币别 */ |
|
|
/** 币别 */ |
|
|
@Excel(name = "币别") |
|
|
|
|
|
private String commonCurrency; |
|
|
private String commonCurrency; |
|
|
|
|
|
|
|
|
/** 单价 */ |
|
|
/** 单价 */ |
|
|
@Excel(name = "单价") |
|
|
|
|
|
private String processPrice; |
|
|
private String processPrice; |
|
|
|
|
|
|
|
|
/** 数量 */ |
|
|
|
|
|
@Excel(name = "数量") |
|
|
|
|
|
private String productQuantity; |
|
|
|
|
|
|
|
|
|
|
|
/** 金额 */ |
|
|
|
|
|
@Excel(name = "金额") |
|
|
|
|
|
private String amountMoney; |
|
|
|
|
|
|
|
|
|
|
|
/** Line# */ |
|
|
/** Line# */ |
|
|
@Excel(name = "Line#") |
|
|
|
|
|
private String line; |
|
|
private String line; |
|
|
|
|
|
|
|
|
/** 版本号 */ |
|
|
/** 版本号 */ |
|
|
@Excel(name = "版本号") |
|
|
|
|
|
private String versionNumber; |
|
|
private String versionNumber; |
|
|
|
|
|
|
|
|
/** 说明 */ |
|
|
/** 说明 */ |
|
|
@Excel(name = "说明") |
|
|
|
|
|
private String salesExplain; |
|
|
private String salesExplain; |
|
|
|
|
|
|
|
|
/** 备用一 */ |
|
|
/** 备用一 */ |
|
@ -92,6 +160,10 @@ public class DeliveryGoodsDetail extends BaseEntity |
|
|
/** 备用二 */ |
|
|
/** 备用二 */ |
|
|
private String standbyTwo; |
|
|
private String standbyTwo; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setDeliveryGoodsDetailId(Long deliveryGoodsDetailId) |
|
|
public void setDeliveryGoodsDetailId(Long deliveryGoodsDetailId) |
|
|
{ |
|
|
{ |
|
|
this.deliveryGoodsDetailId = deliveryGoodsDetailId; |
|
|
this.deliveryGoodsDetailId = deliveryGoodsDetailId; |
|
@ -273,6 +345,118 @@ public class DeliveryGoodsDetail extends BaseEntity |
|
|
return standbyTwo; |
|
|
return standbyTwo; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String getDeliverStatus() { |
|
|
|
|
|
return deliverStatus; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setDeliverStatus(String deliverStatus) { |
|
|
|
|
|
this.deliverStatus = deliverStatus; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String getOutboundType() { |
|
|
|
|
|
return outboundType; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setOutboundType(String outboundType) { |
|
|
|
|
|
this.outboundType = outboundType; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String getOrderType() { |
|
|
|
|
|
return orderType; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setOrderType(String orderType) { |
|
|
|
|
|
this.orderType = orderType; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public BigDecimal getAllPriceExcludingTaxRmb() { |
|
|
|
|
|
return allPriceExcludingTaxRmb; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setAllPriceExcludingTaxRmb(BigDecimal allPriceExcludingTaxRmb) { |
|
|
|
|
|
this.allPriceExcludingTaxRmb = allPriceExcludingTaxRmb; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public BigDecimal getAllPriceIncludesTax() { |
|
|
|
|
|
return allPriceIncludesTax; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setAllPriceIncludesTax(BigDecimal allPriceIncludesTax) { |
|
|
|
|
|
this.allPriceIncludesTax = allPriceIncludesTax; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public BigDecimal getAllPriceExcludingTaxDollar() { |
|
|
|
|
|
return allPriceExcludingTaxDollar; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setAllPriceExcludingTaxDollar(BigDecimal allPriceExcludingTaxDollar) { |
|
|
|
|
|
this.allPriceExcludingTaxDollar = allPriceExcludingTaxDollar; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public Date getPlannedDeliveryTime() { |
|
|
|
|
|
return plannedDeliveryTime; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setPlannedDeliveryTime(Date plannedDeliveryTime) { |
|
|
|
|
|
this.plannedDeliveryTime = plannedDeliveryTime; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public Date getAcceptanceTime() { |
|
|
|
|
|
return acceptanceTime; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setAcceptanceTime(Date acceptanceTime) { |
|
|
|
|
|
this.acceptanceTime = acceptanceTime; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String getPaymentCondition() { |
|
|
|
|
|
return paymentCondition; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setPaymentCondition(String paymentCondition) { |
|
|
|
|
|
this.paymentCondition = paymentCondition; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String getDeliveryCondition() { |
|
|
|
|
|
return deliveryCondition; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setDeliveryCondition(String deliveryCondition) { |
|
|
|
|
|
this.deliveryCondition = deliveryCondition; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String getCustomerContact() { |
|
|
|
|
|
return customerContact; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setCustomerContact(String customerContact) { |
|
|
|
|
|
this.customerContact = customerContact; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String getContactNumber() { |
|
|
|
|
|
return contactNumber; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setContactNumber(String contactNumber) { |
|
|
|
|
|
this.contactNumber = contactNumber; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String getContactAddress() { |
|
|
|
|
|
return contactAddress; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setContactAddress(String contactAddress) { |
|
|
|
|
|
this.contactAddress = contactAddress; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public Date getDeliverTime() { |
|
|
|
|
|
return deliverTime; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setDeliverTime(Date deliverTime) { |
|
|
|
|
|
this.deliverTime = deliverTime; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public String toString() { |
|
|
public String toString() { |
|
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
|
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
|
|