修改

ZR.Model/MES/mm/Dto/IngredientTaskDto.cs

@@ -17,7 +17,9 @@ namespace ZR.Model.MES.mm.Dto
     public class Workerorder_Ingredient
     {
         public string workorder { set; get; }
-        public string partnumber { set; get; }
+
+        public  string blanknumber { set; get; }
+  
         public int previousNumber { set; get; }
         public int previousNumbered { set; get; }
     }

ZR.Model/MES/mm/MmFkWorkorderIngredient.cs

@@ -25,6 +25,12 @@ namespace ZR.Service.mes.mm
         [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_workorder")]
         public string FkWorkorder { get; set; }
 
+        /// <summary>
+        /// 毛坯号
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_blanknumber")]
+        public string  FkBlanknumber { get; set; }
+
         /// <summary>
         /// 是否完成配料 
         /// </summary>
@@ -33,7 +39,11 @@ namespace ZR.Service.mes.mm
         /// <summary>
         /// 剩余的待上件数量 
         /// </summary>
-        public int? Remian { get; set; }
+        [SugarColumn(ColumnName = "previous_numbered")]
+        public int? Previous_numbered { get; set; }
+
+
+
 
         /// <summary>
         /// CreatedBy 

ZR.Model/MES/mm/MmIngredientTask.cs

@@ -36,9 +36,10 @@ namespace ZR.Model.MES.mm
         public string Workorder { get; set; }
 
         /// <summary>
-        /// 零件号id 
+        ///  毛坯号
         /// </summary>
-        public string Partnumber { get; set; }
+        [SugarColumn(ColumnName = "blanknumber")]
+        public string Blanknumber { get; set; }
 
         /// <summary>
         /// 上件数 

ZR.Service/mes/mm/MaterialInputService.cs

@@ -97,6 +97,7 @@ namespace ZR.Service.mes.mm
                  .Where(it => it.Year == year)
                  .Where(it => it.Week == week)
                  .Where(it => it.Date == dayOfWeekNumber)
+                 .Where(it=>it.Status==0)
                  .Where(it => it.Remark3 == "是" || it.Remark1 == "调试")
                  .ToList();
             // .ToPageList(query.pageNum??1, query.pageSize??10, ref total);
@@ -110,6 +111,7 @@ namespace ZR.Service.mes.mm
                 // 配料任务
                 bool isExist = Context.Queryable<MmFkWorkorderIngredient>()
                     .Where(it => it.FkWorkorder == workorder.ClientWorkorder)
+                    .Where(it => it.FkBlanknumber == workorder.BlankNumber)
                     .Any();
 
                 if (!isExist)
@@ -117,21 +119,26 @@ namespace ZR.Service.mes.mm
                     //插入配料任务
                     MmFkWorkorderIngredient ingredient = new MmFkWorkorderIngredient();
                     ingredient.FkWorkorder = workorder.ClientWorkorder ?? ("调试:" + workorder.Id);
+                    ingredient.FkBlanknumber = workorder.BlankNumber;
                     ingredient.Isingredient = 0;
-                    ingredient.Remian = workorder.PreviousNumber;
+                    ingredient.Previous_numbered = workorder.PreviousNumber;
                     ingredient.CreatedTime = DateTime.Now;
                     Context.Insertable(ingredient).ExecuteCommand();
                 }
                 else
                 {
+                    // todo  有个漏洞  如果计划单 修改数量  remian 就不对
                     var ingredient = Context.Queryable<MmFkWorkorderIngredient>()
                     .Where(it => it.FkWorkorder == workorder.ClientWorkorder)
+                    .Where(it => it.FkBlanknumber == workorder.BlankNumber)
                     .First();
+
                     if (ingredient != null)
                     {
-                        workorder.PreviousNumber = ingredient.Remian ?? 0;
-                       
+                        workorder.PreviousNumber = workorder.PreviousNumber - ingredient.Previous_numbered ?? 0;
                     }
+
+
                 }
             }
             WorkorderList.RemoveAll(num => num.PreviousNumber <= 0);
@@ -164,7 +171,8 @@ namespace ZR.Service.mes.mm
                 {
                     Context.Updateable<MmFkWorkorderIngredient>()
                     .Where(it => it.FkWorkorder == item.workorder)
-                    .SetColumns(it => it.Remian == remian)
+                    .Where(it => it.FkBlanknumber == item.blanknumber)
+                    .SetColumns(it => it.Previous_numbered == item.previousNumbered)
                       .SetColumns(it => it.Isingredient == 1)
                       .SetColumns(it => it.UpdatedTime == DateTime.Now)
                     .ExecuteCommand();
@@ -174,8 +182,10 @@ namespace ZR.Service.mes.mm
                 {
                     Context.Updateable<MmFkWorkorderIngredient>()
                       .Where(it => it.FkWorkorder == item.workorder)
-                      .SetColumns(it => it.Remian == remian)
+                         .Where(it => it.FkBlanknumber == item.blanknumber)
+                      .SetColumns(it => it.Previous_numbered == item.previousNumbered)
                       .SetColumns(it => it.UpdatedTime == DateTime.Now)
+                       .SetColumns(it => it.Isingredient == 0)
                       .ExecuteCommand();
 
                 }
@@ -185,7 +195,7 @@ namespace ZR.Service.mes.mm
                 ingredientTask.AgvPosition = task.agv_position;
                 ingredientTask.TaskId = taskid.ToString();
                 ingredientTask.Workorder = item.workorder;
-                ingredientTask.Partnumber = item.partnumber;
+                ingredientTask.Blanknumber = item.blanknumber;
                 ingredientTask.Isfinal = 0;
                 ingredientTask.PreviousNumber = item.previousNumber;
                 ingredientTask.PreviousNumbered = item.previousNumbered;