RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
gcw_MV9p2JJN 2025-09-05 11:44:50 +08:00
parent 9ad57c8218
commit c0f6d6c2f3
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DOAN.Admin.WebApi/Controllers/MES/product/ProweekplanManageController.cs
View File

@ -1,4 +1,5 @@
using DOAN.Admin.WebApi.Filters;
using DOAN.Model;
using DOAN.Model.MES.product.Dto;
using DOAN.Service.MES.group.IService;
using DOAN.Service.MES.product;
@ -37,9 +38,9 @@ namespace DOAN.WebApi.Controllers.MES.product
{
return SUCCESS(null);
}
_proweekplanManageService.ImportExcel(formFile, HttpContext.GetName());
int result = _proweekplanManageService.ImportExcel(formFile, HttpContext.GetName());
return SUCCESS(null);
return SUCCESS(result);
}
@ -64,9 +65,9 @@ namespace DOAN.WebApi.Controllers.MES.product
[Log(Title = "查询计划列表 年周零件号", BusinessType = BusinessType.EXPORT, IsSaveRequestData = true, IsSaveResponseData = false)]
public IActionResult SearchWeekplan([FromBody] WeekplanQueryDto weekplanQuery)
{
_proweekplanManageService.SearchWeekplan(weekplanQuery);
PagedInfo<ProWeeklyPlanAndDateDto> result = _proweekplanManageService.SearchWeekplan(weekplanQuery);
return SUCCESS(result);
}

7
DOAN.Service/MES/product/IService/IProweekplanManageService.cs
View File

@ -1,4 +1,5 @@
using DOAN.Model.MES.product;
using DOAN.Model;
using DOAN.Model.MES.product;
using DOAN.Model.MES.product.Dto;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@ -13,9 +14,9 @@ namespace DOAN.Service.MES.product.IService
public interface IProweekplanManageService
{
void ImportExcel(IFormFile formFile,string username);
int ImportExcel(IFormFile formFile,string username);
void SearchWeekplan(WeekplanQueryDto weekplanQuery);
PagedInfo<ProWeeklyPlanAndDateDto> SearchWeekplan(WeekplanQueryDto weekplanQuery);
}
}

3
DOAN.Service/MES/product/ProweekplanManageService.cs
View File

@ -271,7 +271,8 @@ namespace DOAN.Service.MES.product
UseTran2(() =>
{
// 先删除本周计划
Context.Deleteable<ProWeeklyPlan>().Where(p => p.PlanYear == proWeeklyPlan.PlanYear && p.PlanWeek == proWeeklyPlan.PlanWeek).ExecuteCommand();
Context.Insertable<ProWeeklyPlan>(proWeeklyPlan).ExecuteCommand();
Context.Insertable<ProWeeklyDate>(proWeeklyDatePlan).ExecuteCommand();
Context.Insertable<ProWeeklyDate>(proWeeklyDatePlan2).ExecuteCommand();