This commit is contained in:
余宇波 2025-06-17 10:37:50 +08:00
parent 7828dcc618
commit aa59d9b452
4 changed files with 17 additions and 2 deletions

View File

@ -198,6 +198,11 @@ namespace MyCode.Project.Domain.Message.Response.InvoiceOrder
/// </summary> /// </summary>
public string Remark { get; set; } public string Remark { get; set; }
/// <summary>
/// Desc:采购类型
/// Default:
/// Nullable:True
/// </summary>
public string FBILLTYPEID { get; set; }
} }
} }

View File

@ -36,5 +36,12 @@ namespace MyCode.Project.Domain.Message.Response.InvoiceOrder
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string SupplierName { get; set; } public string SupplierName { get; set; }
/// <summary>
/// Desc:采购类型
/// Default:
/// Nullable:True
/// </summary>
public string FBILLTYPEID { get; set; }
} }
} }

View File

@ -85,7 +85,7 @@ namespace MyCode.Project.Repositories
,[FBillTaxAmount] ,[FBillTaxAmount]
,[PurchaseOrderItemId] ,[PurchaseOrderItemId]
,[FSupplierLot] ,[FSupplierLot]
,[MSSSupplierLot] ,[MSSSupplierLot],a.[FBILLTYPEID]
,(select FDEMANDBILLNO from [PurchaseOrderItem] bbb where bbb.id=b.[PurchaseOrderItemId] ) as FDEMANDBILLNO ,(select FDEMANDBILLNO from [PurchaseOrderItem] bbb where bbb.id=b.[PurchaseOrderItemId] ) as FDEMANDBILLNO
,[PurchaseEntityId] FROM [InvoiceOrder] a left join [InvoiceOrderItem] b on a.id=b.[InvoiceOrderId] "; ,[PurchaseEntityId] FROM [InvoiceOrder] a left join [InvoiceOrderItem] b on a.id=b.[InvoiceOrderId] ";
var list= this.SelectListPage<InvoiceOrderPageList>(sql, where, search.Page, search.PageSize, " [CreateTime] desc ,FormId,MaterialCode "); var list= this.SelectListPage<InvoiceOrderPageList>(sql, where, search.Page, search.PageSize, " [CreateTime] desc ,FormId,MaterialCode ");

View File

@ -292,6 +292,7 @@ namespace MyCode.Project.Services.Implementation
t.SupplierName = order.SupplierName; t.SupplierName = order.SupplierName;
t.Fdemandbillno = purchaseOrderItem.FDEMANDBILLNO; t.Fdemandbillno = purchaseOrderItem.FDEMANDBILLNO;
t.Remart = purchaseOrderItem.Remark; t.Remart = purchaseOrderItem.Remark;
t.FBILLTYPEID = order.FBILLTYPEID;
}); });
@ -328,6 +329,7 @@ namespace MyCode.Project.Services.Implementation
tiaoMa.InvoceOrderItemId = orderItem.Id; tiaoMa.InvoceOrderItemId = orderItem.Id;
tiaoMa.Fdemandbillno = purchaseOrderItem.FDEMANDBILLNO; tiaoMa.Fdemandbillno = purchaseOrderItem.FDEMANDBILLNO;
tiaoMa.Remart = purchaseOrderItem.Remark; tiaoMa.Remart = purchaseOrderItem.Remark;
tiaoMa.FBILLTYPEID = order.FBILLTYPEID;
addList.Add(tiaoMa); addList.Add(tiaoMa);
} }
if (yu > 0) if (yu > 0)
@ -346,6 +348,7 @@ namespace MyCode.Project.Services.Implementation
tiaoMa.InvoceOrderItemId = orderItem.Id; tiaoMa.InvoceOrderItemId = orderItem.Id;
tiaoMa.Fdemandbillno = purchaseOrderItem.FDEMANDBILLNO; tiaoMa.Fdemandbillno = purchaseOrderItem.FDEMANDBILLNO;
tiaoMa.Remart = purchaseOrderItem.Remark; tiaoMa.Remart = purchaseOrderItem.Remark;
tiaoMa.FBILLTYPEID = order.FBILLTYPEID;
addList.Add(tiaoMa); addList.Add(tiaoMa);
} }
if (addList.Count > 0) if (addList.Count > 0)