From bb929bd0809eefc1108dd779846ff07d997f7ef0 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 19 七月 2024 09:25:14 +0800
Subject: [PATCH] 反馈MES工单完成
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_headService.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_headService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_headService.cs"
index 4d73059..95767ad 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_headService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_headService.cs"
@@ -21,6 +21,7 @@
using WIDESEA_WCS.JobsPart.Common;
using WIDESEA_Core.ManageUser;
using WIDESEA_Comm.LogInfo;
+using System.Collections.Generic;
namespace WIDESEA_WCS.Services
{
@@ -41,32 +42,77 @@
//澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
//base.Init(dbRepository);
}
+ /// <summary>
+ /// 鍙栨秷宸ュ崟鍑哄簱澶栧崗
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ public WebResponseContent CancelsorcingWorkOrder(SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ string compeletor = UserContext.Current.UserName;
+ List<string> list = new List<string>();
+ try
+ {
+ foreach (var Key in saveModel.DelKeys)
+ {
+ var mes_head = _repository.Find(x => x.mes_id.ToString() == Key.ToString()).FirstOrDefault();
+ if (mes_head != null)
+ {
+ mes_head.area = null;
+ _repository.Update(mes_head, x => new { x.area }, true);
+ list.Add(mes_head.jobID);
+ }
+ }
+ content.Data = list;
+ content.OK();
+ WriteDBLog.Success("鍙栨秷宸ュ崟鍑哄簱澶栧崗", content, "PCS", compeletor);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ WriteDBLog.Error("鍙栨秷宸ュ崟鍑哄簱澶栧崗", content, "PCS", compeletor);
+ }
+ return content;
+ }
+ /// <summary>
+ /// 宸ュ崟鍑哄簱澶栧崗
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
public WebResponseContent OutsorcingWorkOrder(SaveModel model)
{
WebResponseContent content = new WebResponseContent();
string compeletor = UserContext.Current.UserName;
+ List<string> list = new List<string>();
try
{
- List<string> list = new List<string>();
foreach (var Key in model.DelKeys)
{
var mes_head = _repository.Find(x => x.mes_id.ToString() == Key.ToString()).FirstOrDefault();
if (mes_head != null)
{
mes_head.area = "澶栧崗";
- _repository.Update(mes_head, true);
+ _repository.Update(mes_head, x => new { x.area }, true);
list.Add(mes_head.jobID);
}
}
+ content.Data = list;
content.OK();
- WriteDBLog.Success("鎸囧畾宸ュ崟鍑哄簱澶栧崗", $"宸ュ崟缂栧彿锛歿list}", "PCS", compeletor);
+ WriteDBLog.Success("鎸囧畾宸ュ崟鍑哄簱澶栧崗", content, "PCS", compeletor);
}
catch (Exception ex)
{
- WriteDBLog.Error("鎸囧畾宸ュ崟鍑哄簱澶栧崗", $"閿欒淇℃伅锛歿ex.Message}", "PCS", compeletor);
+ content.Error(ex.Message);
+ WriteDBLog.Error("鎸囧畾宸ュ崟鍑哄簱澶栧崗", content, "PCS", compeletor);
}
return content;
}
+ /// <summary>
+ /// 瀹屾垚宸ュ崟
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
public WebResponseContent FinishWorkOrder(SaveModel model)
{
WebResponseContent content = new WebResponseContent();
--
Gitblit v1.9.3