diff --git a/DOAN.Admin.WebApi/Controllers/MES/quality/QcDefectCollectionController.cs b/DOAN.Admin.WebApi/Controllers/MES/quality/QcDefectCollectionController.cs
index 27ebcdf..8e4cb9a 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/quality/QcDefectCollectionController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/quality/QcDefectCollectionController.cs
@@ -29,14 +29,14 @@ namespace DOAN.Admin.WebApi.Controllers
 
         //TODO 生成指定产线和日期的 缺陷收集计划
         [HttpGet("generate_defectCollection")]
-        public IActionResult GenerateDefectConllectionPlan(string line_code,DateTime dateTime)
+        public IActionResult GenerateDefectConllectionPlan(string line_code, DateTime dateTime)
         {
-            dateTime= ConvertDateTime.ConvertLocalDate(dateTime);
-            if(string.IsNullOrEmpty(line_code)||dateTime== DateTime.MinValue)
+            dateTime = ConvertDateTime.ConvertLocalDate(dateTime);
+            if (string.IsNullOrEmpty(line_code) || dateTime == DateTime.MinValue)
             {
                 throw new CustomException("请求数据为空");
             }
-            var response = _QcDefectCollectionService.GenerateDefectConllectionPlan( line_code,  dateTime,HttpContext.GetName());
+            var response = _QcDefectCollectionService.GenerateDefectConllectionPlan(line_code, dateTime, HttpContext.GetName());
             return SUCCESS(response);
         }
 
@@ -64,7 +64,7 @@ namespace DOAN.Admin.WebApi.Controllers
         public IActionResult GetQcDefectCollection(string Id)
         {
             var response = _QcDefectCollectionService.GetInfo(Id);
-            
+
             var info = response.Adapt<QcDefectCollection>();
             return SUCCESS(info);
         }
@@ -85,6 +85,19 @@ namespace DOAN.Admin.WebApi.Controllers
             return SUCCESS(response);
         }
 
+        //TODO 复制同种物料
+        [HttpGet]
+        public IActionResult  CopySameMaterial(string id)
+        {
+            if(string.IsNullOrEmpty(id))
+            {
+                throw new CustomException("id为空");
+            }
+            var response = _QcDefectCollectionService.CopySameMaterial(id);
+
+            return SUCCESS(response);
+        }
+
         /// <summary>
         /// 更新缺陷收集
         /// </summary>
diff --git a/DOAN.Service/MES/quality/IService/IQcDefectCollectionService.cs b/DOAN.Service/MES/quality/IService/IQcDefectCollectionService.cs
index 0fab5a3..00cbf06 100644
--- a/DOAN.Service/MES/quality/IService/IQcDefectCollectionService.cs
+++ b/DOAN.Service/MES/quality/IService/IQcDefectCollectionService.cs
@@ -16,14 +16,24 @@ namespace DOAN.Service.MES.quality
     {
 
         bool GenerateDefectConllectionPlan(string line_code, DateTime dateTime, string CreatedBy);
+
+
         PagedInfo<QcDefectCollectionDto> GetList(QcDefectCollectionQueryDto parm);
 
+
+
         QcDefectCollection GetInfo(string Id);
 
+
+
         QcDefectCollection AddQcDefectCollection(QcDefectCollection parm);
 
+        bool CopySameMaterial(string id);
+
         int UpdateQcDefectCollection(QcDefectCollection parm);
 
+
+
         List<BaseWorkRoute> GetAllLines();
 
     }
diff --git a/DOAN.Service/MES/quality/QcDefectCollectionService.cs b/DOAN.Service/MES/quality/QcDefectCollectionService.cs
index 8fd0a1b..ad61e68 100644
--- a/DOAN.Service/MES/quality/QcDefectCollectionService.cs
+++ b/DOAN.Service/MES/quality/QcDefectCollectionService.cs
@@ -33,7 +33,7 @@ namespace DOAN.Service.MES.quality
         /// <returns></returns>
         public bool GenerateDefectConllectionPlan(string line_code, DateTime dateTime, string CreatedBy)
         {
-            bool isGenerate=Context.Queryable<QcDefectCollection>().Where(it=>it.LineCode==line_code).Where(it=>it.DateTime==dateTime).Any();
+            bool isGenerate = Context.Queryable<QcDefectCollection>().Where(it => it.LineCode == line_code).Where(it => it.DateTime == dateTime).Any();
             if (isGenerate) { return false; }
             List<QcDefectCollection> qcDefectCollections = new List<QcDefectCollection>();
             //1  查询  产线物料需求计划
@@ -58,7 +58,7 @@ namespace DOAN.Service.MES.quality
                 qcDefect.DateTime = dateTime;
                 qcDefect.MaterialCode = item.MaterialCode;
                 qcDefect.MaterialName = item.MaterialName;
-                var itemm = ActualDistributionQuantityOfMaterials.Where(it => it.MaterialCode == item.MaterialCode).First();
+                var itemm = ActualDistributionQuantityOfMaterials.Where(it => it.MaterialCode == item.MaterialCode).FirstOrDefault();
                 qcDefect.Specification = item.Specification;
                 qcDefect.Unit = item.Unit;
                 qcDefect.PlanNum = item.RequireNum;
@@ -101,6 +101,7 @@ namespace DOAN.Service.MES.quality
 
             var response = Queryable()
                 .Where(predicate.ToExpression())
+                .OrderBy(it => it.MaterialCode)
                 .ToPage<QcDefectCollection, QcDefectCollectionDto>(parm);
 
             return response;
@@ -132,6 +133,40 @@ namespace DOAN.Service.MES.quality
             return Context.Insertable(model).ExecuteReturnEntity();
         }
 
+
+        public bool CopySameMaterial(string id)
+        {
+            QcDefectCollection qcDefect = Context.Queryable<QcDefectCollection>().Where(it => it.Id == id).First();
+
+            QcDefectCollection newqcDefect = new QcDefectCollection();
+            newqcDefect.Id = XueHua;
+            newqcDefect.LineCode = qcDefect.LineCode;
+            newqcDefect.DateTime = qcDefect.DateTime;
+            newqcDefect.MaterialCode = qcDefect.MaterialCode;
+            newqcDefect.MaterialName = qcDefect.MaterialName;
+            newqcDefect.Unit = qcDefect.Unit;
+            newqcDefect.Specification = qcDefect.Specification;
+            newqcDefect.PlanNum = qcDefect.PlanNum;
+            newqcDefect.ActualNum = qcDefect.ActualNum;
+            newqcDefect.CreatedBy = qcDefect.CreatedBy;
+            newqcDefect.CreatedTime=DateTime.Now;   
+
+
+
+
+
+            int result = Context.Insertable(newqcDefect).ExecuteCommand();
+            if (result == 0)
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+
+        }
+
         /// <summary>
         /// 修改缺陷收集
         /// </summary>