From c12c5426d8a433d3fb5a74c24dc6b8bc987397a5 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 30 Aug 2024 17:09:55 +0800
Subject: [PATCH] 5

---
 .../Controllers/MES/product/ProWorkorderController.cs           | 2 +-
 DOAN.Model/MES/base/Dto/BaseMaterialListDto.cs                  | 2 +-
 DOAN.Service/MES/product/IService/IProWorkorderService.cs       | 2 +-
 DOAN.Service/MES/product/ProWorkorderService.cs                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
index 0d2d43c..866ae29 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
@@ -222,7 +222,7 @@ namespace DOAN.Admin.WebApi.Controllers
 
         //TODO  获取物料
         [HttpPost("get_material")]
-        public IActionResult GetMaterialInfo([FromBody] BaseMaterialListQueryDto3 query)
+        public IActionResult GetMaterialInfo([FromBody] BaseMaterialListQueryDto5 query)
         {
             if (query == null)
             {
diff --git a/DOAN.Model/MES/base/Dto/BaseMaterialListDto.cs b/DOAN.Model/MES/base/Dto/BaseMaterialListDto.cs
index 62a25b7..6ba1f7c 100644
--- a/DOAN.Model/MES/base/Dto/BaseMaterialListDto.cs
+++ b/DOAN.Model/MES/base/Dto/BaseMaterialListDto.cs
@@ -27,7 +27,7 @@ namespace DOAN.Model.MES.base_.Dto
 
         public DateTime[] TimeRange { get; set; }
     }
-    public class BaseMaterialListQueryDto3
+    public class BaseMaterialListQueryDto5
     {
 
         /// <summary>
diff --git a/DOAN.Service/MES/product/IService/IProWorkorderService.cs b/DOAN.Service/MES/product/IService/IProWorkorderService.cs
index 4402d36..4e62ee0 100644
--- a/DOAN.Service/MES/product/IService/IProWorkorderService.cs
+++ b/DOAN.Service/MES/product/IService/IProWorkorderService.cs
@@ -36,7 +36,7 @@ namespace DOAN.Service.MES.product.IService
 
         public PagedInfo<ProWorkorder> WorkOrderExport(DateTime exportTime, PagerInfo pager);
 
-        List<BaseMaterialList> GetMaterialInfo(BaseMaterialListQueryDto3 parm);
+        List<BaseMaterialList> GetMaterialInfo(BaseMaterialListQueryDto5 parm);
         List<BaseCustom> GetCustomInfo(BaseCustomQueryDto2 parm);
 
     }
diff --git a/DOAN.Service/MES/product/ProWorkorderService.cs b/DOAN.Service/MES/product/ProWorkorderService.cs
index fd02911..d27e09a 100644
--- a/DOAN.Service/MES/product/ProWorkorderService.cs
+++ b/DOAN.Service/MES/product/ProWorkorderService.cs
@@ -557,7 +557,7 @@ namespace DOAN.Service.MES.product
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<BaseMaterialList> GetMaterialInfo(BaseMaterialListQueryDto3 parm)
+        public List<BaseMaterialList> GetMaterialInfo(BaseMaterialListQueryDto5 parm)
         {
             var predicate = Expressionable.Create<BaseMaterialList>()
             .AndIF(!string.IsNullOrEmpty(parm.Name_or_Code), it => it.Name.Contains(parm.Name_or_Code))