@ -3,6 +3,7 @@ package com.hw.mes.domain;
import java.math.BigDecimal ;
import java.math.BigDecimal ;
import java.util.Date ;
import java.util.Date ;
import java.util.List ;
import java.util.List ;
import java.util.Objects ;
import com.fasterxml.jackson.annotation.JsonFormat ;
import com.fasterxml.jackson.annotation.JsonFormat ;
import org.apache.commons.lang3.builder.ToStringBuilder ;
import org.apache.commons.lang3.builder.ToStringBuilder ;
@ -19,155 +20,235 @@ import com.hw.common.core.web.domain.BaseEntity;
public class MesPurchaseOrder extends BaseEntity {
public class MesPurchaseOrder extends BaseEntity {
private static final long serialVersionUID = 1L ;
private static final long serialVersionUID = 1L ;
/** 主键标识 */
/ * *
* 主 键 标 识
* /
private Long purchaseOrderId ;
private Long purchaseOrderId ;
/** ERP的主键信息;对应FID */
/ * *
* ERP 的 主 键 信 息 ; 对 应 FID
* /
@Excel ( name = "ERP的主键信息;对应FID" )
@Excel ( name = "ERP的主键信息;对应FID" )
private Long erpId ;
private Long erpId ;
/** 对应金蝶ERP订单明细的ID;对应FPOOrderEntry.FEntryID */
/ * *
* 对 应 金 蝶 ERP 订 单 明 细 的 ID ; 对 应 FPOOrderEntry . FEntryID
* /
@Excel ( name = "对应金蝶ERP订单明细的ID;对应FPOOrderEntry.FEntryID" )
@Excel ( name = "对应金蝶ERP订单明细的ID;对应FPOOrderEntry.FEntryID" )
private Long fentryId ;
private Long fentryId ;
/** 采购订单编号;对应FBillNo */
/ * *
* 采 购 订 单 编 号 ; 对 应 FBillNo
* /
@Excel ( name = "采购订单编号;对应FBillNo" )
@Excel ( name = "采购订单编号;对应FBillNo" )
private String poNo ;
private String poNo ;
/** 单据状态;FDocumentStatus */
/ * *
* 单 据 状 态 ; FDocumentStatus
* /
@Excel ( name = "单据状态;FDocumentStatus" )
@Excel ( name = "单据状态;FDocumentStatus" )
private String documentStatus ;
private String documentStatus ;
/** 物料ID,关联物料信息主键 */
/ * *
* 物 料 ID , 关 联 物 料 信 息 主 键
* /
@Excel ( name = "物料ID,关联物料信息主键" )
@Excel ( name = "物料ID,关联物料信息主键" )
private Long materialId ;
private Long materialId ;
/** 物料编码;对应FMaterialId.FNumber */
/ * *
* 物 料 编 码 ; 对 应 FMaterialId . FNumber
* /
@Excel ( name = "物料编码;对应FMaterialId.FNumber" )
@Excel ( name = "物料编码;对应FMaterialId.FNumber" )
private String materialCode ;
private String materialCode ;
/** 物料名称;对应FMaterialId.FName */
/ * *
* 物 料 名 称 ; 对 应 FMaterialId . FName
* /
@Excel ( name = "物料名称;对应FMaterialId.FName" )
@Excel ( name = "物料名称;对应FMaterialId.FName" )
private String materialName ;
private String materialName ;
/** 订单计划数量;对应FQty */
/ * *
* 订 单 计 划 数 量 ; 对 应 FQty
* /
@Excel ( name = "订单计划数量;对应FQty" )
@Excel ( name = "订单计划数量;对应FQty" )
private BigDecimal orderAmount ;
private BigDecimal orderAmount ;
/** 完成采购数量 */
/ * *
* 完 成 采 购 数 量
* /
@Excel ( name = "完成采购数量" )
@Excel ( name = "完成采购数量" )
private BigDecimal completeAmount ;
private BigDecimal completeAmount ;
/** 审核日期;对应FApproveDate */
/ * *
* 审 核 日 期 ; 对 应 FApproveDate
* /
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@Excel ( name = "审核日期;对应FApproveDate" , width = 30 , dateFormat = "yyyy-MM-dd" )
@Excel ( name = "审核日期;对应FApproveDate" , width = 30 , dateFormat = "yyyy-MM-dd" )
private Date approveDate ;
private Date approveDate ;
/** ERP最后修改日期;对应FModifyDate */
/ * *
* ERP 最 后 修 改 日 期 ; 对 应 FModifyDate
* /
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@Excel ( name = "ERP最后修改日期;对应FModifyDate" , width = 30 , dateFormat = "yyyy-MM-dd" )
@Excel ( name = "ERP最后修改日期;对应FModifyDate" , width = 30 , dateFormat = "yyyy-MM-dd" )
private Date erpModifyDate ;
private Date erpModifyDate ;
/** 计划交货日期;对应FDeliveryDate */
/ * *
* 计 划 交 货 日 期 ; 对 应 FDeliveryDate
* /
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@Excel ( name = "计划交货日期;对应FDeliveryDate" , width = 30 , dateFormat = "yyyy-MM-dd" )
@Excel ( name = "计划交货日期;对应FDeliveryDate" , width = 30 , dateFormat = "yyyy-MM-dd" )
private Date planDeliveryDate ;
private Date planDeliveryDate ;
/** 计划开始日期 */
/ * *
* 计 划 开 始 日 期
* /
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@Excel ( name = "计划开始日期" , width = 30 , dateFormat = "yyyy-MM-dd" )
@Excel ( name = "计划开始日期" , width = 30 , dateFormat = "yyyy-MM-dd" )
private Date beginDate ;
private Date beginDate ;
/** 计划结束日期 */
/ * *
* 计 划 结 束 日 期
* /
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@Excel ( name = "计划结束日期" , width = 30 , dateFormat = "yyyy-MM-dd" )
@Excel ( name = "计划结束日期" , width = 30 , dateFormat = "yyyy-MM-dd" )
private Date endDate ;
private Date endDate ;
/** 订单状态(1待采购2采购中3采购完成) */
/ * *
* 订 单 状 态 ( 1 待 采 购 2 采 购 中 3 采 购 完 成 )
* /
@Excel ( name = "订单状态(1待采购2采购中3采购完成)" )
@Excel ( name = "订单状态(1待采购2采购中3采购完成)" )
private String orderStatus ;
private String orderStatus ;
/** 完成日期 */
/ * *
* 完 成 日 期
* /
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@JsonFormat ( pattern = "yyyy-MM-dd hh:mm:ss" )
@Excel ( name = "完成日期" , width = 30 , dateFormat = "yyyy-MM-dd" )
@Excel ( name = "完成日期" , width = 30 , dateFormat = "yyyy-MM-dd" )
private Date completeDate ;
private Date completeDate ;
/** 是否标识: 1-是; 0-否 */
/ * *
* 是 否 标 识 : 1 - 是 ; 0 - 否
* /
@Excel ( name = "是否标识: 1-是; 0-否" )
@Excel ( name = "是否标识: 1-是; 0-否" )
private String isFlag ;
private String isFlag ;
/** 采购单位;FUnitId */
/ * *
* 采 购 单 位 ; FUnitId
* /
@Excel ( name = "采购单位;FUnitId" )
@Excel ( name = "采购单位;FUnitId" )
private Long unitId ;
private Long unitId ;
/** 库存单位;FStockUnitID */
/ * *
* 库 存 单 位 ; FStockUnitID
* /
@Excel ( name = "库存单位;FStockUnitID" )
@Excel ( name = "库存单位;FStockUnitID" )
private Long stockUnitId ;
private Long stockUnitId ;
/** 计价单位;FPriceUnitID */
/ * *
* 计 价 单 位 ; FPriceUnitID
* /
@Excel ( name = "计价单位;FPriceUnitID" )
@Excel ( name = "计价单位;FPriceUnitID" )
private Long priceUnitId ;
private Long priceUnitId ;
/** 辅助属性;FAuxPropId */
/ * *
* 辅 助 属 性 ; FAuxPropId
* /
@Excel ( name = "辅助属性;FAuxPropId" )
@Excel ( name = "辅助属性;FAuxPropId" )
private Long auxPropId ;
private Long auxPropId ;
/** 源单编号;FSrcBillNo */
/ * *
* 源 单 编 号 ; FSrcBillNo
* /
@Excel ( name = "源单编号;FSrcBillNo" )
@Excel ( name = "源单编号;FSrcBillNo" )
private String srcBillNo ;
private String srcBillNo ;
/** 采购组织;FPurchaseOrgId */
/ * *
* 采 购 组 织 ; FPurchaseOrgId
* /
@Excel ( name = "采购组织;FPurchaseOrgId" )
@Excel ( name = "采购组织;FPurchaseOrgId" )
private Long purchaseOrgId ;
private Long purchaseOrgId ;
/** 京源项目;F_TOND_Base */
/ * *
* 京 源 项 目 ; F_TOND_Base
* /
@Excel ( name = "京源项目;F_TOND_Base" )
@Excel ( name = "京源项目;F_TOND_Base" )
private String tondBase ;
private String tondBase ;
/** 供应商ID;FSupplierId */
/ * *
* 供 应 商 ID ; FSupplierId
* /
@Excel ( name = "供应商ID;FSupplierId" )
@Excel ( name = "供应商ID;FSupplierId" )
private Long supplierId ;
private Long supplierId ;
/** 采购销售订单绑定信息信息 */
/ * *
* 采 购 销 售 订 单 绑 定 信 息 信 息
* /
private List < MesOrderBind > mesOrderBindList ;
private List < MesOrderBind > mesOrderBindList ;
/**判断是否需要绑定*/
/ * *
* 判 断 是 否 需 要 绑 定
* /
private String bindFlag ;
private String bindFlag ;
/**规格参数*/
/ * *
* 规 格 参 数
* /
private String specificationParameter ;
private String specificationParameter ;
/**物料规格*/
/ * *
* 物 料 规 格
* /
private String materialSpec ;
private String materialSpec ;
/**销售订单主键*/
/ * *
* 销 售 订 单 主 键
* /
private Long saleOrderId ;
private Long saleOrderId ;
/**采购销售订单绑定主键*/
/ * *
* 采 购 销 售 订 单 绑 定 主 键
* /
private Long orderBindId ;
private Long orderBindId ;
/** 已绑定数 */
/ * *
* 已 绑 定 数
* /
private BigDecimal boundAmount ;
private BigDecimal boundAmount ;
/** 销售订单已绑定数 */
/ * *
* 销 售 订 单 已 绑 定 数
* /
private BigDecimal saleBindAmount ;
private BigDecimal saleBindAmount ;
/** 安全库存数 */
/ * *
* 安 全 库 存 数
* /
private BigDecimal safeAmount ;
private BigDecimal safeAmount ;
/** 条码数 */
/ * *
* 条 码 数
* /
private BigDecimal barcodeAmount ;
private BigDecimal barcodeAmount ;
/** 更新绑定数量 */
/ * *
* 更 新 绑 定 数 量
* /
private BigDecimal updateAmount ;
private BigDecimal updateAmount ;
/** 序号 */
/ * *
* 序 号
* /
private Long serialNumber ;
private Long serialNumber ;
/**订单绑定的数量和条码的数量,以-分割*/
/ * *
* 订 单 绑 定 的 数 量 和 条 码 的 数 量 , 以 - 分 割
* /
private String orderBindBarcodeAmount ;
private String orderBindBarcodeAmount ;
/**安全库存绑定的数量和条码的数量,以-分割*/
/ * *
* 安 全 库 存 绑 定 的 数 量 和 条 码 的 数 量 , 以 - 分 割
* /
private String safeBindBarcodeAmount ;
private String safeBindBarcodeAmount ;
private String batchFlag ;
private String batchFlag ;
@ -259,248 +340,219 @@ public class MesPurchaseOrder extends BaseEntity {
this . specificationParameter = specificationParameter ;
this . specificationParameter = specificationParameter ;
}
}
public void setPurchaseOrderId ( Long purchaseOrderId )
public void setPurchaseOrderId ( Long purchaseOrderId ) {
{
this . purchaseOrderId = purchaseOrderId ;
this . purchaseOrderId = purchaseOrderId ;
}
}
public Long getPurchaseOrderId ( )
public Long getPurchaseOrderId ( ) {
{
return purchaseOrderId ;
return purchaseOrderId ;
}
}
public void setErpId ( Long erpId )
{
public void setErpId ( Long erpId ) {
this . erpId = erpId ;
this . erpId = erpId ;
}
}
public Long getErpId ( )
public Long getErpId ( ) {
{
return erpId ;
return erpId ;
}
}
public void setFentryId ( Long fentryId )
{
public void setFentryId ( Long fentryId ) {
this . fentryId = fentryId ;
this . fentryId = fentryId ;
}
}
public Long getFentryId ( )
public Long getFentryId ( ) {
{
return fentryId ;
return fentryId ;
}
}
public void setPoNo ( String poNo )
{
public void setPoNo ( String poNo ) {
this . poNo = poNo ;
this . poNo = poNo ;
}
}
public String getPoNo ( )
public String getPoNo ( ) {
{
return poNo ;
return poNo ;
}
}
public void setDocumentStatus ( String documentStatus )
{
public void setDocumentStatus ( String documentStatus ) {
this . documentStatus = documentStatus ;
this . documentStatus = documentStatus ;
}
}
public String getDocumentStatus ( )
public String getDocumentStatus ( ) {
{
return documentStatus ;
return documentStatus ;
}
}
public void setMaterialId ( Long materialId )
{
public void setMaterialId ( Long materialId ) {
this . materialId = materialId ;
this . materialId = materialId ;
}
}
public Long getMaterialId ( )
public Long getMaterialId ( ) {
{
return materialId ;
return materialId ;
}
}
public void setMaterialCode ( String materialCode )
{
public void setMaterialCode ( String materialCode ) {
this . materialCode = materialCode ;
this . materialCode = materialCode ;
}
}
public String getMaterialCode ( )
public String getMaterialCode ( ) {
{
return materialCode ;
return materialCode ;
}
}
public void setMaterialName ( String materialName )
{
public void setMaterialName ( String materialName ) {
this . materialName = materialName ;
this . materialName = materialName ;
}
}
public String getMaterialName ( )
public String getMaterialName ( ) {
{
return materialName ;
return materialName ;
}
}
public void setOrderAmount ( BigDecimal orderAmount )
{
public void setOrderAmount ( BigDecimal orderAmount ) {
this . orderAmount = orderAmount ;
this . orderAmount = orderAmount ;
}
}
public BigDecimal getOrderAmount ( )
public BigDecimal getOrderAmount ( ) {
{
return orderAmount ;
return orderAmount ;
}
}
public void setCompleteAmount ( BigDecimal completeAmount )
{
public void setCompleteAmount ( BigDecimal completeAmount ) {
this . completeAmount = completeAmount ;
this . completeAmount = completeAmount ;
}
}
public BigDecimal getCompleteAmount ( )
public BigDecimal getCompleteAmount ( ) {
{
return completeAmount ;
return completeAmount ;
}
}
public void setApproveDate ( Date approveDate )
{
public void setApproveDate ( Date approveDate ) {
this . approveDate = approveDate ;
this . approveDate = approveDate ;
}
}
public Date getApproveDate ( )
public Date getApproveDate ( ) {
{
return approveDate ;
return approveDate ;
}
}
public void setErpModifyDate ( Date erpModifyDate )
{
public void setErpModifyDate ( Date erpModifyDate ) {
this . erpModifyDate = erpModifyDate ;
this . erpModifyDate = erpModifyDate ;
}
}
public Date getErpModifyDate ( )
public Date getErpModifyDate ( ) {
{
return erpModifyDate ;
return erpModifyDate ;
}
}
public void setPlanDeliveryDate ( Date planDeliveryDate )
{
public void setPlanDeliveryDate ( Date planDeliveryDate ) {
this . planDeliveryDate = planDeliveryDate ;
this . planDeliveryDate = planDeliveryDate ;
}
}
public Date getPlanDeliveryDate ( )
public Date getPlanDeliveryDate ( ) {
{
return planDeliveryDate ;
return planDeliveryDate ;
}
}
public void setBeginDate ( Date beginDate )
{
public void setBeginDate ( Date beginDate ) {
this . beginDate = beginDate ;
this . beginDate = beginDate ;
}
}
public Date getBeginDate ( )
public Date getBeginDate ( ) {
{
return beginDate ;
return beginDate ;
}
}
public void setEndDate ( Date endDate )
{
public void setEndDate ( Date endDate ) {
this . endDate = endDate ;
this . endDate = endDate ;
}
}
public Date getEndDate ( )
public Date getEndDate ( ) {
{
return endDate ;
return endDate ;
}
}
public void setOrderStatus ( String orderStatus )
{
public void setOrderStatus ( String orderStatus ) {
this . orderStatus = orderStatus ;
this . orderStatus = orderStatus ;
}
}
public String getOrderStatus ( )
public String getOrderStatus ( ) {
{
return orderStatus ;
return orderStatus ;
}
}
public void setCompleteDate ( Date completeDate )
{
public void setCompleteDate ( Date completeDate ) {
this . completeDate = completeDate ;
this . completeDate = completeDate ;
}
}
public Date getCompleteDate ( )
public Date getCompleteDate ( ) {
{
return completeDate ;
return completeDate ;
}
}
public void setIsFlag ( String isFlag )
{
public void setIsFlag ( String isFlag ) {
this . isFlag = isFlag ;
this . isFlag = isFlag ;
}
}
public String getIsFlag ( )
public String getIsFlag ( ) {
{
return isFlag ;
return isFlag ;
}
}
public void setUnitId ( Long unitId )
{
public void setUnitId ( Long unitId ) {
this . unitId = unitId ;
this . unitId = unitId ;
}
}
public Long getUnitId ( )
public Long getUnitId ( ) {
{
return unitId ;
return unitId ;
}
}
public void setStockUnitId ( Long stockUnitId )
{
public void setStockUnitId ( Long stockUnitId ) {
this . stockUnitId = stockUnitId ;
this . stockUnitId = stockUnitId ;
}
}
public Long getStockUnitId ( )
public Long getStockUnitId ( ) {
{
return stockUnitId ;
return stockUnitId ;
}
}
public void setPriceUnitId ( Long priceUnitId )
{
public void setPriceUnitId ( Long priceUnitId ) {
this . priceUnitId = priceUnitId ;
this . priceUnitId = priceUnitId ;
}
}
public Long getPriceUnitId ( )
public Long getPriceUnitId ( ) {
{
return priceUnitId ;
return priceUnitId ;
}
}
public void setAuxPropId ( Long auxPropId )
{
public void setAuxPropId ( Long auxPropId ) {
this . auxPropId = auxPropId ;
this . auxPropId = auxPropId ;
}
}
public Long getAuxPropId ( )
public Long getAuxPropId ( ) {
{
return auxPropId ;
return auxPropId ;
}
}
public void setSrcBillNo ( String srcBillNo )
{
public void setSrcBillNo ( String srcBillNo ) {
this . srcBillNo = srcBillNo ;
this . srcBillNo = srcBillNo ;
}
}
public String getSrcBillNo ( )
public String getSrcBillNo ( ) {
{
return srcBillNo ;
return srcBillNo ;
}
}
public void setPurchaseOrgId ( Long purchaseOrgId )
{
public void setPurchaseOrgId ( Long purchaseOrgId ) {
this . purchaseOrgId = purchaseOrgId ;
this . purchaseOrgId = purchaseOrgId ;
}
}
public Long getPurchaseOrgId ( )
public Long getPurchaseOrgId ( ) {
{
return purchaseOrgId ;
return purchaseOrgId ;
}
}
public void setTondBase ( String tondBase )
{
public void setTondBase ( String tondBase ) {
this . tondBase = tondBase ;
this . tondBase = tondBase ;
}
}
public String getTondBase ( )
public String getTondBase ( ) {
{
return tondBase ;
return tondBase ;
}
}
public void setSupplierId ( Long supplierId )
{
public void setSupplierId ( Long supplierId ) {
this . supplierId = supplierId ;
this . supplierId = supplierId ;
}
}
public Long getSupplierId ( )
public Long getSupplierId ( ) {
{
return supplierId ;
return supplierId ;
}
}
public List < MesOrderBind > getMesOrderBindList ( )
public List < MesOrderBind > getMesOrderBindList ( ) {
{
return mesOrderBindList ;
return mesOrderBindList ;
}
}
public void setMesOrderBindList ( List < MesOrderBind > mesOrderBindList )
public void setMesOrderBindList ( List < MesOrderBind > mesOrderBindList ) {
{
this . mesOrderBindList = mesOrderBindList ;
this . mesOrderBindList = mesOrderBindList ;
}
}
@ -562,7 +614,7 @@ public class MesPurchaseOrder extends BaseEntity {
@Override
@Override
public String toString ( ) {
public String toString ( ) {
return new ToStringBuilder ( this , ToStringStyle . MULTI_LINE_STYLE )
return new ToStringBuilder ( this , ToStringStyle . MULTI_LINE_STYLE )
. append ( "purchaseOrderId" , getPurchaseOrderId ( ) )
. append ( "purchaseOrderId" , getPurchaseOrderId ( ) )
. append ( "erpId" , getErpId ( ) )
. append ( "erpId" , getErpId ( ) )
. append ( "fentryId" , getFentryId ( ) )
. append ( "fentryId" , getFentryId ( ) )
@ -597,4 +649,18 @@ public class MesPurchaseOrder extends BaseEntity {
. append ( "mesOrderBindList" , getMesOrderBindList ( ) )
. append ( "mesOrderBindList" , getMesOrderBindList ( ) )
. toString ( ) ;
. toString ( ) ;
}
}
@Override
public boolean equals ( Object o ) {
if ( this = = o ) return true ;
if ( o = = null | | getClass ( ) ! = o . getClass ( ) ) return false ;
MesPurchaseOrder that = ( MesPurchaseOrder ) o ;
return Objects . equals ( purchaseOrderId , that . purchaseOrderId ) & & orderAmount . compareTo ( that . orderAmount ) = = 0 & & boundAmount . compareTo ( that . boundAmount ) = = 0
& & safeAmount . compareTo ( that . safeAmount ) = = 0 & & Objects . equals ( orderBindBarcodeAmount , that . orderBindBarcodeAmount ) ;
}
@Override
public int hashCode ( ) {
return Objects . hash ( purchaseOrderId , orderAmount , boundAmount , safeAmount , orderBindBarcodeAmount ) ;
}
}
}