增加追加导入逻辑
This commit is contained in:
parent
0ae5525c72
commit
e0425af58e
@ -129,18 +129,19 @@ namespace DOAN.Admin.WebApi.Controllers
|
||||
[HttpPost("importData")]
|
||||
[Log(Title = "采购导入", BusinessType = BusinessType.IMPORT, IsSaveRequestData = false, IsSaveResponseData = true)]
|
||||
[AllowAnonymous]
|
||||
public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile)
|
||||
public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile,bool? value)
|
||||
{
|
||||
|
||||
if (formFile == null)
|
||||
{
|
||||
return SUCCESS(null);
|
||||
}
|
||||
int response = _OrderPurchaseService.ImportData(formFile, HttpContext.GetName());
|
||||
int response = _OrderPurchaseService.ImportData(formFile, HttpContext.GetName(),value);
|
||||
|
||||
return SUCCESS(response);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 采购订单excel导出
|
||||
|
||||
@ -13,12 +13,11 @@ namespace DOAN.Service.MES.order.IService
|
||||
|
||||
OrderPurchase GetInfo(string Id);
|
||||
|
||||
int ImportData(IFormFile formFile, string username);
|
||||
int ImportData(IFormFile formFile, string username,bool? value);
|
||||
OrderPurchase AddOrderPurchase(OrderPurchase parm);
|
||||
int UpdateOrderPurchase(OrderPurchase parm);
|
||||
|
||||
List<OrderPurchaseDto> SelectOrderList(OrderPurchaseQueryDto orderPurchaseDto);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,6 +10,7 @@ using NPOI.XSSF.UserModel;
|
||||
using NPOI.SS.Formula.Functions;
|
||||
using Aliyun.OSS;
|
||||
using Mapster;
|
||||
using ZXing;
|
||||
|
||||
namespace DOAN.Service.MES.order
|
||||
{
|
||||
@ -90,7 +91,7 @@ namespace DOAN.Service.MES.order
|
||||
}
|
||||
|
||||
|
||||
public int ImportData(IFormFile formFile, string username)
|
||||
public int ImportData(IFormFile formFile, string username, bool? value)
|
||||
{
|
||||
List<OrderPurchase> orderPurchases = new List<OrderPurchase>();
|
||||
DateTime importDate = DateTime.MinValue;
|
||||
@ -183,7 +184,16 @@ namespace DOAN.Service.MES.order
|
||||
throw new Exception(ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
if (value==true)
|
||||
{
|
||||
int result = 0;
|
||||
UseTran2(() =>
|
||||
{
|
||||
|
||||
result = Context.Insertable(orderPurchases).ExecuteCommand();
|
||||
});
|
||||
return result;
|
||||
}
|
||||
if(orderPurchases.Count>0)
|
||||
{
|
||||
int result = 0;
|
||||
@ -210,5 +220,6 @@ namespace DOAN.Service.MES.order
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user