From 738df70120209daecd85566d0c50dbf56d9e4453 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 17 十二月 2024 21:06:59 +0800
Subject: [PATCH] 一些更改
---
Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs | 21 ++++
Tiger.IBusiness.MES/BIZ/IMES_WO.cs | 1
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 23 ++++
Tiger.Business.MES/Transaction/Position.cs | 21 ----
Tiger.Controllers.MES/Controllers/MESController.CollectNode.cs | 45 ---------
Tiger.Controllers.MES/Controllers/MESController.YadaPacking.cs | 40 --------
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 10 --
Tiger.IBusiness.MES/Transaction/IPosition.cs | 1
Tiger.Controllers.MES/Controllers/MESController.PackingNode.cs | 45 ---------
Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs | 11 ++
Tiger.Controllers.MES/Controllers/MESController.TestNode.cs | 45 ---------
11 files changed, 56 insertions(+), 207 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 575ea7f..11911d5 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -755,5 +755,28 @@
}
return result;
}
+
+ #region 鎻愪氦鍓嶉�氱敤鏂规硶
+ /// <summary>
+ /// 鎻愪氦鍓嶆鏌ユ槸鍚﹀矖浣嶃�佸伐鍗曞拰涓嶈壇浠ｇ爜
+ /// </summary>
+ /// <param name="code"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<CheckCodeOutput>> CheckCode(string code)
+ {
+ var action = new ApiAction<CheckCodeOutput>($"妫�鏌ユ潯鐮亄code}鎴愬姛", new CheckCodeOutput());
+ try
+ {
+ action.Data.Position = DbCache.Cache.Position[code];
+ action.Data.WorkOrder = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == code).FirstAsync();
+ action.Data.Defect = DbCache.Cache.Defect[code];
+ }
+ catch (Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, $"妫�鏌ユ潯鐮亄code}寮傚父");
+ }
+ return action;
+ }
+ #endregion
}
}
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 601f1a3..5e71779 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -993,27 +993,6 @@
return list;
}
#endregion
- #region 鎻愪氦鍓嶉�氱敤鏂规硶
- /// <summary>
- /// 鎻愪氦鍓嶆鏌ユ槸鍚﹀矖浣嶃�佸伐鍗曞拰涓嶈壇浠ｇ爜
- /// </summary>
- /// <param name="code"></param>
- /// <returns></returns>
- public async Task<ApiAction<CheckCodeOutput>> CheckCode(string code) {
- var action = new ApiAction<CheckCodeOutput>($"妫�鏌ユ潯鐮亄code}鎴愬姛", new CheckCodeOutput());
- try
- {
- action.Data.Position = DbCache.Cache.Position[code];
- action.Data.WorkOrder = await MainDB.Queryable<BIZ_MES_WO>().Where(q=>q.ORDER_NO == code).FirstAsync();
- action.Data.Defect = DbCache.Cache.Defect[code];
- }
- catch (Exception ex)
- {
- action.CatchExceptionWithLog(ex, $"妫�鏌ユ潯鐮亄code}寮傚父");
- }
- return action;
- }
- #endregion
#endregion Functions
public override bool Close(bool needSaveHistoryLog = false)
diff --git a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
index ee7bd5c..cb8cdb5 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
@@ -302,5 +302,26 @@
}
return Ok(response);
}
+
+ /// <summary>
+ /// 鎻愪氦鍓嶆鏌ユ槸鍚﹀矖浣嶃�佸伐鍗曞拰涓嶈壇浠ｇ爜
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> CheckCode([FromBody] ApiAction action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().CheckCode(action.Data?.ToString()));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
}
}
diff --git a/Tiger.Controllers.MES/Controllers/MESController.CollectNode.cs b/Tiger.Controllers.MES/Controllers/MESController.CollectNode.cs
index 27a358d..868fac5 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.CollectNode.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.CollectNode.cs
@@ -230,50 +230,5 @@
trans?.AddHistory(Request, action);
return Ok(response);
}
-
- /// <summary>
- /// 鎻愪氦鍓嶆鏌ユ槸鍚﹀矖浣嶃�佸伐鍗曞拰涓嶈壇浠ｇ爜
- /// </summary>
- /// <param name="action"></param>
- /// <returns></returns>
- [HttpPost]
- [Route("api/[controller]/CollectNode/CheckCode")]
- public async Task<IActionResult> CollectNode_CheckCodeAsync([FromBody] ApiAction action)
- {
- ApiAction response;
- ICollectNode trans = null;
- try
- {
- if (iBiz.MES.Context.GetTransDic().ContainsKey(action.ID))
- {
- trans = iBiz.MES.Context.GetTransDic()[action.ID] as ICollectNode;
- if (!trans.IsFinished)
- {
- if (action.IsAsync)
- {
- response = action.GetResponse(await trans.CheckCode(action.Data?.ToString()));
- }
- else
- {
- lock (trans.TransLock) { response = action.GetResponse(trans.CheckCode(action.Data?.ToString()).Result); }
- }
- }
- else
- {
- response = action.GetResponse($"Transaction Error: 宀椾綅[{trans.PostCode}]鐨勯噰闆嗗伐搴廩ID:{action.ID}]宸茬粡鍏抽棴", false);
- }
- }
- else
- {
- response = action.GetResponse($"Transaction Error: 宀椾綅鐨勯噰闆嗗伐搴廩ID:{action.ID}]宸茬粡琚叧闂�", false);
- }
- }
- catch (System.Exception ex)
- {
- response = action.GetResponse().CatchExceptionWithLog(ex);
- }
- trans?.AddHistory(Request, action);
- return Ok(response);
- }
}
}
diff --git a/Tiger.Controllers.MES/Controllers/MESController.PackingNode.cs b/Tiger.Controllers.MES/Controllers/MESController.PackingNode.cs
index eab6535..5a3c2bc 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.PackingNode.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.PackingNode.cs
@@ -276,50 +276,5 @@
trans?.AddHistory(Request, action);
return Ok(response);
}
-
- /// <summary>
- /// 鎻愪氦鍓嶆鏌ユ槸鍚﹀矖浣嶃�佸伐鍗曞拰涓嶈壇浠ｇ爜
- /// </summary>
- /// <param name="action"></param>
- /// <returns></returns>
- [HttpPost]
- [Route("api/[controller]/PackingNode/CheckCode")]
- public async Task<IActionResult> PackingNode_CheckCodeAsync([FromBody] ApiAction action)
- {
- ApiAction response;
- IPackingNode trans = null;
- try
- {
- if (iBiz.MES.Context.GetTransDic().ContainsKey(action.ID))
- {
- trans = iBiz.MES.Context.GetTransDic()[action.ID] as IPackingNode;
- if (!trans.IsFinished)
- {
- if (action.IsAsync)
- {
- response = action.GetResponse(await trans.CheckCode(action.Data?.ToString()));
- }
- else
- {
- lock (trans.TransLock) { response = action.GetResponse(trans.CheckCode(action.Data?.ToString()).Result); }
- }
- }
- else
- {
- response = action.GetResponse($"Transaction Error: 宀椾綅[{trans.PostCode}]鐨勫寘瑁呭伐搴廩ID:{action.ID}]宸茬粡鍏抽棴", false);
- }
- }
- else
- {
- response = action.GetResponse($"Transaction Error: 宀椾綅鐨勫寘瑁呭伐搴廩ID:{action.ID}]宸茬粡琚叧闂�", false);
- }
- }
- catch (System.Exception ex)
- {
- response = action.GetResponse().CatchExceptionWithLog(ex);
- }
- trans?.AddHistory(Request, action);
- return Ok(response);
- }
}
}
diff --git a/Tiger.Controllers.MES/Controllers/MESController.TestNode.cs b/Tiger.Controllers.MES/Controllers/MESController.TestNode.cs
index 4899fc2..2b29632 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.TestNode.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.TestNode.cs
@@ -269,50 +269,5 @@
return Ok(response);
}
- /// <summary>
- /// 鎻愪氦鍓嶆鏌ユ槸鍚﹀矖浣嶃�佸伐鍗曞拰涓嶈壇浠ｇ爜
- /// </summary>
- /// <param name="action"></param>
- /// <returns></returns>
- [HttpPost]
- [Route("api/[controller]/TestNode/CheckCode")]
- public async Task<IActionResult> TestNode_CheckCodeAsync([FromBody] ApiAction action)
- {
- ApiAction response;
- ITestNode trans = null;
- try
- {
- if (iBiz.MES.Context.GetTransDic().ContainsKey(action.ID))
- {
- trans = iBiz.MES.Context.GetTransDic()[action.ID] as ITestNode;
- if (!trans.IsFinished)
- {
- if (action.IsAsync)
- {
- response = action.GetResponse(await trans.CheckCode(action.Data?.ToString()));
- }
- else
- {
- lock (trans.TransLock) { response = action.GetResponse(trans.CheckCode(action.Data?.ToString()).Result); }
- }
- }
- else
- {
- response = action.GetResponse($"Transaction Error: 宀椾綅[{trans.PostCode}]鐨勬祴璇曞伐搴廩ID:{action.ID}]宸茬粡鍏抽棴", false);
- }
- }
- else
- {
- response = action.GetResponse($"Transaction Error: 宀椾綅鐨勬祴璇曞伐搴廩ID:{action.ID}]宸茬粡琚叧闂�", false);
- }
- }
- catch (System.Exception ex)
- {
- response = action.GetResponse().CatchExceptionWithLog(ex);
- }
- trans?.AddHistory(Request, action);
- return Ok(response);
- }
-
}//endClass
}
diff --git a/Tiger.Controllers.MES/Controllers/MESController.YadaPacking.cs b/Tiger.Controllers.MES/Controllers/MESController.YadaPacking.cs
index dc1176f..b55fbae 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.YadaPacking.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.YadaPacking.cs
@@ -366,45 +366,5 @@
trans?.AddHistory(Request, action);
return Ok(response);
}
-
- [HttpPost]
- [Route("api/[controller]/YadaPacking/CheckCode")]
- public async Task<IActionResult> YadaPacking_CheckCodeAsync([FromBody] ApiAction action)
- {
- ApiAction response;
- IYadaPacking trans = null;
- try
- {
- if (iBiz.MES.Context.GetTransDic().ContainsKey(action.ID))
- {
- trans = iBiz.MES.Context.GetTransDic()[action.ID] as IYadaPacking;
- if (!trans.IsFinished)
- {
- if (action.IsAsync)
- {
- response = action.GetResponse(await trans.CheckCode(action.Data?.ToString()));
- }
- else
- {
- lock (trans.TransLock) { response = action.GetResponse(trans.CheckCode(action.Data?.ToString()).Result); }
- }
- }
- else
- {
- response = action.GetResponse($"Transaction Error: 宀椾綅[{trans.PostCode}]鐨勯泤杈捐绠卞伐搴忎簨鍔ID:{action.ID}]宸茬粡鍏抽棴", false);
- }
- }
- else
- {
- response = action.GetResponse($"Transaction Error: 宀椾綅鐨勯泤杈捐绠卞伐搴忎簨鍔ID:{action.ID}]宸茬粡琚叧闂�", false);
- }
- }
- catch (System.Exception ex)
- {
- response = action.GetResponse().CatchExceptionWithLog(ex);
- }
- trans?.AddHistory(Request, action);
- return Ok(response);
- }
}
}
diff --git a/Tiger.IBusiness.MES/BIZ/IMES_WO.cs b/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
index e64d75c..f0535e1 100644
--- a/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
+++ b/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
@@ -25,5 +25,6 @@
public Task<ApiAction> SavePrintLabelInAct(string code);
public Task<ApiAction> UnbindWipSnFromWO(UnbindWipSnInput input);
public Task<ApiAction<InStoreInfo>> GetErpProdInBth(string code);
+ public Task<ApiAction<CheckCodeOutput>> CheckCode(string code);
}
}
diff --git a/Tiger.IBusiness.MES/Transaction/IPosition.cs b/Tiger.IBusiness.MES/Transaction/IPosition.cs
index 3ece515..75bc542 100644
--- a/Tiger.IBusiness.MES/Transaction/IPosition.cs
+++ b/Tiger.IBusiness.MES/Transaction/IPosition.cs
@@ -87,7 +87,6 @@
/// <param name="curAction"></param>
/// <returns></returns>
public string GenerateSN(string ruleCode, IWorkAction curAction);
- public Task<ApiAction<CheckCodeOutput>> CheckCode(string code);
#endregion Functions
}
}
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs
index 5fed7f1..49f0814 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs
@@ -62,4 +62,15 @@
public string BatchNo { get; set; }
public string NodeName { get; set; }
}
+
+
+ /// <summary>
+ /// 鎻愪氦鍓嶆鏌ヨ緭鍑哄弬鏁�
+ /// </summary>
+ public class CheckCodeOutput
+ {
+ public MES_POSITION Position { get; set; }
+ public BIZ_MES_WO WorkOrder { get; set; }
+ public BAS_DEFECT Defect { get; set; }
+ }
}
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 6f04db8..d74c353 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -335,14 +335,4 @@
public int ShipQty { get; set; }
}
- /// <summary>
- /// 鎻愪氦鍓嶆鏌ヨ緭鍑哄弬鏁�
- /// </summary>
- public class CheckCodeOutput
- {
- public MES_POSITION Position { get; set; }
- public BIZ_MES_WO WorkOrder { get; set; }
- public BAS_DEFECT Defect { get; set; }
- }
-
}
--
Gitblit v1.9.3