diff --git a/DOAN.Admin.WebApi/Controllers/MES/Order/OrderPurchaseController.cs b/DOAN.Admin.WebApi/Controllers/MES/Order/OrderPurchaseController.cs
index fe73144..185a786 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Order/OrderPurchaseController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Order/OrderPurchaseController.cs
@@ -125,18 +125,19 @@ namespace DOAN.Admin.WebApi.Controllers
/// 采购导入
///
/// 使用IFromFile必须使用name属性否则获取不到文件
+ /// true-追加导入 false-覆盖导入
///
[HttpPost("importData")]
[Log(Title = "采购导入", BusinessType = BusinessType.IMPORT, IsSaveRequestData = false, IsSaveResponseData = true)]
[AllowAnonymous]
- public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile,bool? value)
+ public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile,bool? uploadType)
{
if (formFile == null)
{
return SUCCESS(null);
}
- int response = _OrderPurchaseService.ImportData(formFile, HttpContext.GetName(),value);
+ int response = _OrderPurchaseService.ImportData(formFile, HttpContext.GetName(), uploadType);
return SUCCESS(response);
}
diff --git a/DOAN.Service/MES/Order/IService/IOrderPurchaseService.cs b/DOAN.Service/MES/Order/IService/IOrderPurchaseService.cs
index 65b79cc..b5db1f0 100644
--- a/DOAN.Service/MES/Order/IService/IOrderPurchaseService.cs
+++ b/DOAN.Service/MES/Order/IService/IOrderPurchaseService.cs
@@ -13,7 +13,7 @@ namespace DOAN.Service.MES.order.IService
OrderPurchase GetInfo(string Id);
- int ImportData(IFormFile formFile, string username,bool? value);
+ int ImportData(IFormFile formFile, string username,bool? uploadType);
OrderPurchase AddOrderPurchase(OrderPurchase parm);
int UpdateOrderPurchase(OrderPurchase parm);
diff --git a/DOAN.Service/MES/Order/OrderPurchaseService.cs b/DOAN.Service/MES/Order/OrderPurchaseService.cs
index 86e92c7..d1fb8cb 100644
--- a/DOAN.Service/MES/Order/OrderPurchaseService.cs
+++ b/DOAN.Service/MES/Order/OrderPurchaseService.cs
@@ -91,7 +91,7 @@ namespace DOAN.Service.MES.order
}
- public int ImportData(IFormFile formFile, string username, bool? value)
+ public int ImportData(IFormFile formFile, string username, bool? uploadType)
{
List orderPurchases = new List();
DateTime importDate = DateTime.MinValue;
@@ -184,7 +184,8 @@ namespace DOAN.Service.MES.order
throw new Exception(ex.Message);
}
}
- if (value==true)
+ // 追加导入
+ if (uploadType == true)
{
int result = 0;
UseTran2(() =>