diff --git a/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs b/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs
index 33f168e..1f50bd3 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs
@@ -76,7 +76,6 @@ namespace DOAN.WebApi.Controllers.MES.mm
if (string.IsNullOrEmpty(task_code)) { return SUCCESS(null); }
var response = preparantTaskService.GetTaskMaterialBOMContrast(task_code);
return SUCCESS(response);
-
}
//TODO 新增任务
@@ -100,6 +99,18 @@ namespace DOAN.WebApi.Controllers.MES.mm
return SUCCESS(response);
}
+ //TODO 修改任务数量
+ [HttpPost("ModifyTask_num")]
+ public IActionResult ModifyTaskNum([FromBody] MmTaskMaterialInfoDto2 parm)
+ {
+ if(parm == null) { return SUCCESS(null); };
+
+ int response = preparantTaskService.ModifyTaskNum(parm,HttpContext.GetName());
+ return SUCCESS(response);
+ }
+
+
+
}
}
\ No newline at end of file
diff --git a/DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs b/DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs
index eeb046b..8bff4a3 100644
--- a/DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs
+++ b/DOAN.Model/MES/mm/Dto/MmPreparationTaskDto.cs
@@ -37,6 +37,7 @@ namespace DOAN.Model.MES.mm.Dto
}
+
///
/// 任务及其配料详情
///
diff --git a/DOAN.Model/MES/mm/Dto/MmTaskMaterialInfoDto.cs b/DOAN.Model/MES/mm/Dto/MmTaskMaterialInfoDto.cs
index 84c469f..3566851 100644
--- a/DOAN.Model/MES/mm/Dto/MmTaskMaterialInfoDto.cs
+++ b/DOAN.Model/MES/mm/Dto/MmTaskMaterialInfoDto.cs
@@ -42,6 +42,25 @@ namespace DOAN.Model.MES.mm.Dto
}
+ ///
+ /// 修改配料任务数量
+ ///
+ public class MmTaskMaterialInfoDto2
+ {
+ ///
+ /// 任务code
+ ///
+ public string FkTaskCode { get; set; }
+ ///
+ /// 物料code
+ ///
+ public string MaterialCode { get; set; }
+ ///
+ /// 数量
+ ///
+ public decimal Quantity { get; set; }
+
+ }
public class MmTaskMaterialInfoANDBOmDto
diff --git a/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs b/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs
index af91626..3281a9f 100644
--- a/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs
+++ b/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs
@@ -1,6 +1,7 @@
using DOAN.Model.MES.base_;
using DOAN.Model.MES.mm.Dto;
using DOAN.Model.MES.product;
+using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -27,6 +28,8 @@ namespace DOAN.Service.MES.mm.IService
int DeleteTask(string task_code);
+ int ModifyTaskNum(MmTaskMaterialInfoDto2 parm, string name);
+
}
}
diff --git a/DOAN.Service/MES/mm/MmPreparantTaskService.cs b/DOAN.Service/MES/mm/MmPreparantTaskService.cs
index a8a7bfe..6ca3614 100644
--- a/DOAN.Service/MES/mm/MmPreparantTaskService.cs
+++ b/DOAN.Service/MES/mm/MmPreparantTaskService.cs
@@ -8,6 +8,7 @@ using Infrastructure.Attribute;
using Mapster;
using Microsoft.AspNetCore.Http.HttpResults;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -31,7 +32,7 @@ namespace DOAN.Service.MES.mm
.WhereIF(!string.IsNullOrEmpty(route_code), it => it.FkRouteCode == route_code)
.ToList();
}
-
+
///
/// 获取任务
///
@@ -177,6 +178,38 @@ namespace DOAN.Service.MES.mm
}
+ public int ModifyTaskNum(MmTaskMaterialInfoDto2 parm, string name)
+ {
+ int result = 0;
+ MmTaskMaterialInfo info = new MmTaskMaterialInfo();
+ info.FkTaskCode = parm.FkTaskCode;
+ info.MaterialCode = parm.MaterialCode;
+ BaseMaterialList material = null;
+ if (parm.MaterialCode != null)
+ {
+ material = Context.Queryable().Where(it => it.Code == parm.MaterialCode).First();
+
+
+ }
+ info.MaterialName = material?.Name;
+ info.Specification = material?.Specification;
+ info.Quantity = parm.Quantity;
+
+ info.Unit = material?.Unit;
+ info.CreatedBy = name;
+ info.CreatedTime = DateTime.Now;
+ info.UpdatedBy = name;
+ info.UpdatedTime = DateTime.Now;
+ var x = Context.Storageable(info)
+ .WhereColumns(it => new { it.FkTaskCode, it.MaterialCode }).ToStorage();
+
+
+ result += x.AsInsertable.ExecuteCommand();
+ result += x.AsUpdateable.IgnoreColumns(z => new { z.CreatedBy, z.CreatedTime, z.MaterialName, z.Specification, z.Unit }).ExecuteCommand();
+
+ return result;
+
+ }