From a3b21ee43b13ad79302aceb9a68405b45e6467a4 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 15 一月 2025 20:05:25 +0800
Subject: [PATCH] 更新 ReprintLabel 逻辑，增加 TemplateInput 类
---
Tiger.Business.MES/WorkAction/YadaWoReport.cs | 113 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 70 insertions(+), 43 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/YadaWoReport.cs b/Tiger.Business.MES/WorkAction/YadaWoReport.cs
index 912ffc9..47bb961 100644
--- a/Tiger.Business.MES/WorkAction/YadaWoReport.cs
+++ b/Tiger.Business.MES/WorkAction/YadaWoReport.cs
@@ -16,13 +16,14 @@
{
#region Propertys & Variables
#region 鍥哄畾鍐欐硶锛屽伐搴忎腑鐨勫繀瑕佷俊鎭�
+ public DbClient MainDB { get; set; }
public bool IsFinished { get; set; } = false;
public IWorkStep CurStep { get; set; }
public IPosition CurPosition { get; set; }
public MES_WO_NODE_ACT NodeAct { get; set; }
public MES_WO_ACTION Setting { get; set; }
#endregion
- private MES_WIP_PKG CurPkg;
+
#endregion Propertys & Variables
#region Functions
@@ -33,35 +34,16 @@
public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
{
#region 鍥哄畾鍐欐硶锛岀粰榛樿鍙橀噺璧嬪��
+ MainDB = position.MainDB;
CurStep = curStep;
CurPosition = position;
NodeAct = nodeAct;
Setting = setting;
#endregion
- CurPkg = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPosition.CurSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
- {
- AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
- AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = CurPosition.CurSN,
- PKG_TYPE = CurPosition.WorkBatch.WO.ItemInfo?.UNIT,
- ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE,
- QTY = CurPosition.CurWipSNs.Sum(q => q.QTY),
- UNIT = CurPosition.WorkBatch.WO.ItemInfo?.UNIT,
- WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER,
- BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO,
- ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE,
- NODE_ID = CurPosition.CurWipSNs.First().NODE_ID,
- NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME,
- FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE,
- WS_CODE = CurPosition.CurWipSNs.First().WS_CODE,
- LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE,
- POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
- OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
- SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
- };
+
- CurStep.Message = Biz.L("绛夊緟绉伴噸鏁版嵁");
+ CurStep.Message = Biz.L("鐢熶骇鎶ュ伐");
CurStep.Status = StepStatus.Normal;
}
@@ -71,8 +53,8 @@
/// <returns></returns>
public Locale GetBeginMsg()
{
- var msg = new Locale("MES.WorkAction.Weighing.BeginMsg", CurPosition.CurSN);
- //var msg = new Locale($"璇锋妸浜у搧[{CurPosition.CurSN}]涓婄О绉伴噸");
+ var msg = new Locale("MES.WorkAction.YadaWoReport.BeginMsg", CurPosition.WorkBatch.WO.ORDER_NO);
+ //var msg = new Locale($"宸ュ崟[{0}]鐢熶骇鎶ュ伐");
return msg;
}
@@ -87,10 +69,10 @@
action.LocaleMsg = GetBeginMsg();
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
- CurStep.Message = Biz.L("绉伴噸寮�濮�");
+ CurStep.Message = Biz.L("寮�濮嬬敓浜ф姤宸�");
CurStep.Status = StepStatus.Normal;
action.IsSuccessed = true;
- action.Data.ShortMsg = new("绉伴噸寮�濮�", ShortMessage.Types.Success);
+ action.Data.ShortMsg = new("寮�濮嬬敓浜ф姤宸�", ShortMessage.Types.Success);
return action;
}
@@ -102,7 +84,7 @@
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
- action = SaveWeightInfo(input, action);
+ action = ReportToERP(input, action);
//涓婃枡鏁版嵁淇濆瓨澶辫触
if (!action.IsSuccessed)
{
@@ -119,21 +101,20 @@
return action;
}
- public ApiAction<SubmitOutput> SaveWeightInfo(SubmitInput input, ApiAction<SubmitOutput> action)
+ public ApiAction<SubmitOutput> ReportToERP(SubmitInput input, ApiAction<SubmitOutput> action)
{
try
{
- var wInput = input?.Data?.JsonToObject<WeightInfo>();
- CurPkg.WEIGHT = wInput.Weight;
- CurPkg.WEIGHT_UNIT = wInput.Unit;
+
+
}
catch (System.Exception ex)
{
- CurStep.Message = Biz.L("绉伴噸寮傚父");
+ CurStep.Message = Biz.L("鐢熶骇鎶ュ伐寮傚父");
CurStep.Status = StepStatus.Error;
- action.Data.ShortMsg = new("绉伴噸寮傚父", ShortMessage.Types.Error);
- action.CatchExceptionWithLog(ex, $"绉伴噸琛屼负锛氭潯鐮乕{CurPosition.CurSN}]绉伴噸鏁版嵁[{input?.Data?.ToString()}]淇濆瓨寮傚父");
- action.LocaleMsg = new("MES.WorkAction.Weighing.SaveWeightInfoException", CurPosition.CurSN, input?.Data.ToString());
+ action.Data.ShortMsg = new("鐢熶骇鎶ュ伐寮傚父", ShortMessage.Types.Error);
+ action.CatchExceptionWithLog(ex, $"鐢熶骇鎶ュ伐琛屼负锛氬伐鍗昜{CurPosition.WorkBatch.WO.ORDER_NO}]鐢熶骇鎶ュ伐寮傚父");
+ action.LocaleMsg = new("MES.WorkAction.YadaWoReport.ReportToERPException", CurPosition.WorkBatch.WO.ORDER_NO);
}
return action;
}
@@ -148,6 +129,7 @@
//璁板綍琛屼负鎿嶄綔璁板綍
var wipActs = new List<MES_WIP_ACT>();
+ var wipVars = new List<MES_WIP_ACT_VAR>();
foreach (var wipSn in CurPosition.CurWipSNs)
{
var wipAct = new MES_WIP_ACT()
@@ -183,30 +165,75 @@
PRD_CODE = wipSn.PRD_CODE,
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
+ ACT_VAR_DIC = CurStep.ActionDic.ToJson(),
ACT_RESULT = "Y",
+ ACT_VALUE_1 = "鎶ュ叕鏁版嵁",
ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
- TRACE_INFO = $"鏉＄爜[{CurPosition.CurSN}]绉伴噸鏁版嵁[{CurPkg.WEIGHT} {CurPkg.WEIGHT_UNIT}]淇濆瓨鎴愬姛",
+ TRACE_INFO = $"宸ュ崟[{CurPosition.WorkBatch.WO.ORDER_NO}]鐢熶骇鎶ュ伐鎴愬姛",
};
wipActs.Add(wipAct);
+ foreach (var item in NodeAct.Variables)
+ {
+ var wipVar = new MES_WIP_ACT_VAR()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
+ WIP_ID = wipSn.ID,
+ SN = wipSn.SN,
+ ITEM_CODE = wipSn.ITEM_CODE,
+ WORK_ORDER = wipSn.WORK_ORDER,
+ BATCH_NO = wipSn.BATCH_NO,
+ CUST_CODE = CurPosition.WorkBatch.WO.CUST_CODE,
+ ROT_CODE = wipSn.ROT_CODE,
+ NODE_ID = wipSn.NODE_ID,
+ NODE_NAME = wipSn.NODE_NAME,
+ ACT_ID = NodeAct.ID,
+ ACT_NAME = NodeAct.ACT_NAME,
+ FTY_CODE = wipSn.FTY_CODE,
+ WS_CODE = wipSn.WS_CODE,
+ LINE_CODE = wipSn.LINE_CODE,
+ POST_CODE = wipSn.POST_CODE,
+ OPER_CODE = wipSn.OPER_CODE,
+ SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
+ TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
+ OPERATION_TIME = DateTime.Now,
+ SFTS_CODE = wipSn.SFTS_CODE,
+ SFT_CODE = wipSn.SFT_CODE,
+ PRD_CODE = wipSn.PRD_CODE,
+ VAR_CODE = item.VAR_CODE,
+ VAR_NAME = item.VAR_NAME,
+ VAR_CONTROL = item.VAR_CONTROL,
+ VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
+ INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
+ TRACE_INFO = CurStep.ActionDic.ToJson(),
+ };
+ wipVars.Add(wipVar);
+ }
}
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
var _wipActs = wipActs.Clone();
- var _CurPkg = CurPkg.Clone();
+ var _wipVars = wipVars.Clone();
//淇濆瓨鏁版嵁
CurStep.DBSubmitAction = () =>
{
var db = CurPosition.GetCommitDB();
db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
- db.Storageable(_CurPkg, CurPosition.UserCode).ExecuteCommand();
+ db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();
};
IsFinished = true;
- CurStep.Message = Biz.L("绉伴噸瀹屾垚");
+ CurStep.Message = Biz.L("鐢熶骇鎶ュ伐瀹屾垚");
CurStep.Status = StepStatus.Finished;
- action.Data.ShortMsg = new("绉伴噸瀹屾垚", ShortMessage.Types.Success);
- //action.LocaleMsg = new($"鏉＄爜[{CurPosition.CurSN}]绉伴噸鏁版嵁[{CurPkg.WEIGHT} {CurPkg.WEIGHT_UNIT}]淇濆瓨鎴愬姛");
- action.LocaleMsg = new("MES.WorkAction.Weighing.SaveSuccess", CurPosition.CurSN, CurPkg.WEIGHT, CurPkg.WEIGHT_UNIT);
+ action.Data.ShortMsg = new("鐢熶骇鎶ュ伐瀹屾垚", ShortMessage.Types.Success);
+ //action.LocaleMsg = new($"宸ュ崟[{0}]鐢熶骇鎶ュ伐鎴愬姛");
+ action.LocaleMsg = new("MES.WorkAction.YadaWoReport.SaveSuccess", CurPosition.WorkBatch.WO.ORDER_NO);
return action;
}
--
Gitblit v1.9.3