diff --git a/RIZO.Admin.WebApi/Controllers/Mes/ProductionPreparation/QualityControlController.cs b/RIZO.Admin.WebApi/Controllers/Mes/ProductionPreparation/QualityControlController.cs
index c7b5f87..b141e0d 100644
--- a/RIZO.Admin.WebApi/Controllers/Mes/ProductionPreparation/QualityControlController.cs
+++ b/RIZO.Admin.WebApi/Controllers/Mes/ProductionPreparation/QualityControlController.cs
@@ -109,5 +109,18 @@ namespace RIZO.Admin.WebApi.Controllers.Mes.ProductionPreparation
var response = _QualityControlService.AddQC(parm);
return response;
}
+
+ ///
+ /// 更新质量控制主表是否合格状态
+ ///
+ ///
+ [HttpPut]
+ [ActionPermissionFilter(Permission = "qualitycontrol:edit")]
+ [Log(Title = "质量控制主表", BusinessType = BusinessType.UPDATE)]
+ public ApiResult ChangeQCStatus([FromBody] QualityControlDto parm)
+ {
+ var response = _QualityControlService.ChangeQCStatus(parm);
+ return response;
+ }
}
}
\ No newline at end of file
diff --git a/RIZO.Service/Mes/IMesService/ProductionPreparation/IQualityControlService.cs b/RIZO.Service/Mes/IMesService/ProductionPreparation/IQualityControlService.cs
index cf0f76b..268ab95 100644
--- a/RIZO.Service/Mes/IMesService/ProductionPreparation/IQualityControlService.cs
+++ b/RIZO.Service/Mes/IMesService/ProductionPreparation/IQualityControlService.cs
@@ -19,5 +19,7 @@ namespace RIZO.Service.Mes.IMesService.ProductionPreparation
int UpdateQualityControl(QualityControl parm);
ApiResult AddQC(QualityControlDto parm);
+
+ ApiResult ChangeQCStatus(QualityControlDto parm);
}
}
diff --git a/RIZO.Service/Mes/ProductionPreparation/QualityControlService.cs b/RIZO.Service/Mes/ProductionPreparation/QualityControlService.cs
index 334fa62..0c04b11 100644
--- a/RIZO.Service/Mes/ProductionPreparation/QualityControlService.cs
+++ b/RIZO.Service/Mes/ProductionPreparation/QualityControlService.cs
@@ -69,6 +69,35 @@ namespace RIZO.Service.Mes
return Update(model, true);
}
+ public ApiResult ChangeQCStatus(QualityControlDto parm)
+ {
+ try
+ {
+ var qc = Queryable().Where(it => it.Id == parm.Id).First();
+ if (qc == null)
+ {
+ return new ApiResult(400, "质控数据不存在!");
+ }
+ qc.CheckResult = parm.CheckResult;
+ qc.UpdatedBy = parm.UpdatedBy;
+ qc.UpdatedName = parm.UpdatedName;
+ qc.UpdatedTime = parm.UpdatedTime;
+ qc.Remark = parm.Remark;
+ int iResult = Update(qc);
+ if (iResult > 0)
+ {
+ return ApiResult.Success(qc);
+ }
+ else
+ {
+ return ApiResult.Error("变更状态失败!");
+ }
+ }
+ catch (Exception ex)
+ {
+ return ApiResult.Error("出现错误!");
+ }
+ }
///
/// 查询导出表达式
///