From c0f6d6c2f393e4d3545e381a6498a257d00246e0 Mon Sep 17 00:00:00 2001
From: gcw_MV9p2JJN <gcw_MV9p2JJN@noreply.gitcode.com>
Date: Fri, 5 Sep 2025 11:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/product/ProweekplanManageController.cs           | 9 +++++----
 .../MES/product/IService/IProweekplanManageService.cs    | 7 ++++---
 DOAN.Service/MES/product/ProweekplanManageService.cs     | 3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProweekplanManageController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProweekplanManageController.cs
index 71ef84f..375540b 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/product/ProweekplanManageController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProweekplanManageController.cs
@@ -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);
         }
 
 
diff --git a/DOAN.Service/MES/product/IService/IProweekplanManageService.cs b/DOAN.Service/MES/product/IService/IProweekplanManageService.cs
index e28606d..9da47f6 100644
--- a/DOAN.Service/MES/product/IService/IProweekplanManageService.cs
+++ b/DOAN.Service/MES/product/IService/IProweekplanManageService.cs
@@ -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);
     }
 }
diff --git a/DOAN.Service/MES/product/ProweekplanManageService.cs b/DOAN.Service/MES/product/ProweekplanManageService.cs
index 104b6cb..039b6fe 100644
--- a/DOAN.Service/MES/product/ProweekplanManageService.cs
+++ b/DOAN.Service/MES/product/ProweekplanManageService.cs
@@ -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();