diff --git a/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs b/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs
index 0d0017e..d75c5a9 100644
--- a/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs
+++ b/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs
@@ -198,6 +198,11 @@ namespace MyCode.Project.Domain.Message.Response.InvoiceOrder
///
public string Remark { get; set; }
-
+ ///
+ /// Desc:采购类型
+ /// Default:
+ /// Nullable:True
+ ///
+ public string FBILLTYPEID { get; set; }
}
}
diff --git a/MyCode.Project.Domain/Message/Response/InvoiceOrder/TiaoMaResp.cs b/MyCode.Project.Domain/Message/Response/InvoiceOrder/TiaoMaResp.cs
index 7a429ec..5abe23c 100644
--- a/MyCode.Project.Domain/Message/Response/InvoiceOrder/TiaoMaResp.cs
+++ b/MyCode.Project.Domain/Message/Response/InvoiceOrder/TiaoMaResp.cs
@@ -36,5 +36,12 @@ namespace MyCode.Project.Domain.Message.Response.InvoiceOrder
/// Nullable:True
///
public string SupplierName { get; set; }
+
+ ///
+ /// Desc:采购类型
+ /// Default:
+ /// Nullable:True
+ ///
+ public string FBILLTYPEID { get; set; }
}
}
diff --git a/MyCode.Project.Repositories/InvoiceOrderRepository.cs b/MyCode.Project.Repositories/InvoiceOrderRepository.cs
index bc1ff9d..4c1287a 100644
--- a/MyCode.Project.Repositories/InvoiceOrderRepository.cs
+++ b/MyCode.Project.Repositories/InvoiceOrderRepository.cs
@@ -85,7 +85,7 @@ namespace MyCode.Project.Repositories
,[FBillTaxAmount]
,[PurchaseOrderItemId]
,[FSupplierLot]
- ,[MSSSupplierLot]
+ ,[MSSSupplierLot],a.[FBILLTYPEID]
,(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] ";
var list= this.SelectListPage(sql, where, search.Page, search.PageSize, " [CreateTime] desc ,FormId,MaterialCode ");
diff --git a/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs b/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
index af1e57b..e9ef9a8 100644
--- a/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
+++ b/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
@@ -292,6 +292,7 @@ namespace MyCode.Project.Services.Implementation
t.SupplierName = order.SupplierName;
t.Fdemandbillno = purchaseOrderItem.FDEMANDBILLNO;
t.Remart = purchaseOrderItem.Remark;
+ t.FBILLTYPEID = order.FBILLTYPEID;
});
@@ -328,6 +329,7 @@ namespace MyCode.Project.Services.Implementation
tiaoMa.InvoceOrderItemId = orderItem.Id;
tiaoMa.Fdemandbillno = purchaseOrderItem.FDEMANDBILLNO;
tiaoMa.Remart = purchaseOrderItem.Remark;
+ tiaoMa.FBILLTYPEID = order.FBILLTYPEID;
addList.Add(tiaoMa);
}
if (yu > 0)
@@ -346,6 +348,7 @@ namespace MyCode.Project.Services.Implementation
tiaoMa.InvoceOrderItemId = orderItem.Id;
tiaoMa.Fdemandbillno = purchaseOrderItem.FDEMANDBILLNO;
tiaoMa.Remart = purchaseOrderItem.Remark;
+ tiaoMa.FBILLTYPEID = order.FBILLTYPEID;
addList.Add(tiaoMa);
}
if (addList.Count > 0)