- 移除OrderPurchaseDto中Id字段的必填验证 - 修改ProWorkorderMaterialService中的订单筛选条件 - 增强AddOrderPurchase和UpdateOrderPurchase方法的验证逻辑 - 为订单添加初始状态值和事务处理 - 修复导入日期处理和空值判断
135 lines
3.9 KiB
C#
135 lines
3.9 KiB
C#
|
||
namespace DOAN.Model.MES.order.Dto
|
||
{
|
||
/// <summary>
|
||
/// 采购订单查询对象
|
||
/// </summary>
|
||
public class OrderPurchaseQueryDto : PagerInfo
|
||
{
|
||
/// <summary>
|
||
/// 导入日期
|
||
/// </summary>
|
||
public DateTime[] ImportDate { get; set; }
|
||
/// <summary>
|
||
/// 订单号(MES实际使用)
|
||
/// </summary>
|
||
public string OrderNoMes { get; set; }
|
||
/// <summary>
|
||
/// 采购订单号(对接ERP)
|
||
/// </summary>
|
||
public string PurchaseOrderErp { get; set; }
|
||
/// <summary>
|
||
/// 工单号
|
||
/// </summary>
|
||
public string WorkOrder { get; set; }
|
||
/// <summary>
|
||
/// 领料单号
|
||
/// </summary>
|
||
public string FeedOrder { get; set; }
|
||
|
||
/// <summary>
|
||
/// 物料号
|
||
/// </summary>
|
||
public string MaterialCode { get; set; }
|
||
/// <summary>
|
||
/// 是否完成订单
|
||
/// </summary>
|
||
public int Orderindicator { get; set; }
|
||
/// <summary>
|
||
/// 是否非标
|
||
/// </summary>
|
||
public int Specordindicator { get; set; }
|
||
}
|
||
|
||
/// <summary>
|
||
/// 采购订单输入输出对象
|
||
/// </summary>
|
||
public class OrderPurchaseDto
|
||
{
|
||
public string Id { get; set; }
|
||
|
||
public DateTime? ImportDate { get; set; }
|
||
|
||
public string OrderNoMes { get; set; }
|
||
|
||
public string PurchaseOrderErp { get; set; }
|
||
|
||
public string Poitem { get; set; }
|
||
|
||
public string Variety { get; set; }
|
||
|
||
public int Specordindicator { get; set; }
|
||
|
||
public string KdType { get; set; }
|
||
|
||
public DateTime? DocumentDate { get; set; }
|
||
|
||
public string Seller { get; set; }
|
||
|
||
public string SalesArea { get; set; }
|
||
|
||
public string MaterialName { get; set; }
|
||
|
||
public string MaterialCode { get; set; }
|
||
|
||
public int? DemandQuantity { get; set; }
|
||
|
||
public DateTime? DeliveryDate { get; set; }
|
||
|
||
public int? DeliveryQuantity { get; set; }
|
||
|
||
public DateTime? StartDate { get; set; }
|
||
|
||
public DateTime? EndDate { get; set; }
|
||
|
||
public int Orderindicator { get; set; }
|
||
|
||
public string RouteCode { get; set; }
|
||
|
||
public int? Status { get; set; }
|
||
|
||
public string Remark { get; set; }
|
||
|
||
public string CreatedBy { get; set; }
|
||
|
||
public DateTime? CreatedTime { get; set; }
|
||
|
||
public string UpdatedBy { get; set; }
|
||
|
||
public DateTime? UpdatedTime { get; set; }
|
||
|
||
}
|
||
|
||
/// <summary>
|
||
/// 采购订单导出对象
|
||
/// </summary>
|
||
public class OrderPurchaseExcelDto
|
||
{
|
||
[ExcelColumnName("系统编号(id)")]
|
||
public string Id { get; set; }
|
||
[ExcelColumnName("导入时间(import_date)")]
|
||
public DateTime? ImportDate { get; set; }
|
||
[ExcelColumnName("订单号(order_no_mes)")]
|
||
public string OrderNoMes { get; set; }
|
||
[ExcelColumnName("物料名称")]
|
||
public string MaterialName { get; set; }
|
||
[ExcelColumnName("物料编号")]
|
||
public string MaterialCode { get; set; }
|
||
[ExcelColumnName("交货日期(delivery_date)")]
|
||
public DateTime? DocumentDate { get; set; }
|
||
[ExcelColumnName("需求数量(demand_quantity)")]
|
||
public int? DemandQuantity { get; set; }
|
||
[ExcelColumnName("交货日期(delivery_date)")]
|
||
public DateTime? DeliveryDate { get; set; }
|
||
[ExcelColumnName("交货数量(delivery_quantity)")]
|
||
public int? DeliveryQuantity { get; set; }
|
||
[ExcelColumnName("订单开始时间(start_date)")]
|
||
public DateTime? StartDate { get; set; }
|
||
[ExcelColumnName("订单结束时间(end_date)")]
|
||
public DateTime? EndDate { get; set; }
|
||
[ExcelColumnName("订单是否完成(0-未完成/1-完成)")]
|
||
public int Orderindicator { get; set; }
|
||
[ExcelColumnName("备注")]
|
||
public string Remark { get; set; }
|
||
}
|
||
} |