From 304f901589af15b782c17709b0aac3d6315cd4b8 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 05 九月 2024 15:35:39 +0800
Subject: [PATCH] 增加雅达专用上料行为 优化行为提示信息
---
Tiger.Business.MES/WorkAction/IPQC.cs | 7 +++++++
Tiger.Business.MES/WorkAction/ThreeInOne.cs | 5 +++++
Tiger.Business.MES/WorkAction/VerifyItem.cs | 5 +++--
Tiger.Business.MES/WorkAction/Assembly.cs | 3 +++
Tiger.Business.MES/WorkAction/Weighing.cs | 4 ++++
Tiger.Business.MES/WorkAction/YadaAssembly.cs | 18 ++++++++++++++++++
Tiger.Business.MES/WorkAction/PackingAction.cs | 4 +++-
Tiger.Business.MES/WorkAction/PrintLabel.cs | 3 +++
Tiger.Business.MES/WorkAction/WipExtInfo.cs | 3 +++
9 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/Assembly.cs b/Tiger.Business.MES/WorkAction/Assembly.cs
index 9dc8ee7..d184442 100644
--- a/Tiger.Business.MES/WorkAction/Assembly.cs
+++ b/Tiger.Business.MES/WorkAction/Assembly.cs
@@ -86,6 +86,9 @@
CurAssembly.Items.Add(item);
}
}
+
+ CurStep.Message = Biz.L("鎵弿涓婃枡鐗╂枡");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
diff --git a/Tiger.Business.MES/WorkAction/IPQC.cs b/Tiger.Business.MES/WorkAction/IPQC.cs
index ecd6bf3..f2f42b2 100644
--- a/Tiger.Business.MES/WorkAction/IPQC.cs
+++ b/Tiger.Business.MES/WorkAction/IPQC.cs
@@ -15,11 +15,13 @@
public class IPQC : IIPQC
{
#region Propertys & Variables
+ #region 鍥哄畾鍐欐硶锛屽伐搴忎腑鐨勫繀瑕佷俊鎭�
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
#endregion Propertys & Variables
#region Functions
@@ -29,10 +31,15 @@
/// <returns></returns>
public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
{
+ #region 鍥哄畾鍐欐硶锛岀粰榛樿鍙橀噺璧嬪��
CurStep = curStep;
CurPosition = position;
NodeAct = nodeAct;
Setting = setting;
+ #endregion
+
+ CurStep.Message = Biz.L("绛夊緟娴嬭瘯缁撴灉");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 5172731..4156ed2 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -118,8 +118,10 @@
{
CurPkg.Item.Items.Add(child);
}
-
}
+
+ CurStep.Message = Biz.L("璁板綍鍖呰鏁版嵁");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
diff --git a/Tiger.Business.MES/WorkAction/PrintLabel.cs b/Tiger.Business.MES/WorkAction/PrintLabel.cs
index ba7dd94..bb597f5 100644
--- a/Tiger.Business.MES/WorkAction/PrintLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintLabel.cs
@@ -42,6 +42,9 @@
Label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
+
+ CurStep.Message = Biz.L("绛夊緟鏍囩鎵撳嵃");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
diff --git a/Tiger.Business.MES/WorkAction/ThreeInOne.cs b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
index 1299575..7fbdc25 100644
--- a/Tiger.Business.MES/WorkAction/ThreeInOne.cs
+++ b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
@@ -43,9 +43,14 @@
Setting = setting;
#endregion
+ //鑾峰彇鎵撳嵃妯℃澘
Label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
+ //鑾峰彇宸ュ崟澶囨枡淇℃伅
MoPickList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MOPickList>().Where(q => q.MoDocNo == CurPosition.WorkBatch.WO.ORDER_NO).ToList();
+
+ CurStep.Message = Biz.L("鎵弿鍘傚唴鏉＄爜");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
diff --git a/Tiger.Business.MES/WorkAction/VerifyItem.cs b/Tiger.Business.MES/WorkAction/VerifyItem.cs
index 6dd675a..be5a039 100644
--- a/Tiger.Business.MES/WorkAction/VerifyItem.cs
+++ b/Tiger.Business.MES/WorkAction/VerifyItem.cs
@@ -39,7 +39,8 @@
Setting = setting;
#endregion
-
+ CurStep.Message = Biz.L("楠岃瘉浜у搧鏁版嵁");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
@@ -80,7 +81,7 @@
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
action = Verify(input, action);
- //涓婃枡鏁版嵁淇濆瓨澶辫触
+ //鏁版嵁淇濆瓨澶辫触
if (!action.IsSuccessed)
{
//濡傛灉琛屼负璁剧疆涓哄嚭閿欓渶瑕侀噸缃伐搴忔搷浣�
diff --git a/Tiger.Business.MES/WorkAction/Weighing.cs b/Tiger.Business.MES/WorkAction/Weighing.cs
index 6829cc4..1851b67 100644
--- a/Tiger.Business.MES/WorkAction/Weighing.cs
+++ b/Tiger.Business.MES/WorkAction/Weighing.cs
@@ -38,6 +38,7 @@
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,
@@ -59,6 +60,9 @@
OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
};
+
+ CurStep.Message = Biz.L("绛夊緟绉伴噸鏁版嵁");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
diff --git a/Tiger.Business.MES/WorkAction/WipExtInfo.cs b/Tiger.Business.MES/WorkAction/WipExtInfo.cs
index e8e81fe..ebe7ec5 100644
--- a/Tiger.Business.MES/WorkAction/WipExtInfo.cs
+++ b/Tiger.Business.MES/WorkAction/WipExtInfo.cs
@@ -58,6 +58,9 @@
});
}
}
+
+ CurStep.Message = Biz.L("鎵弿瑕佺粦瀹氱殑鏍囩");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
diff --git a/Tiger.Business.MES/WorkAction/YadaAssembly.cs b/Tiger.Business.MES/WorkAction/YadaAssembly.cs
index 506c8d8..6f9e879 100644
--- a/Tiger.Business.MES/WorkAction/YadaAssembly.cs
+++ b/Tiger.Business.MES/WorkAction/YadaAssembly.cs
@@ -9,6 +9,7 @@
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
+using Tiger.Model.MES.Yada;
namespace Tiger.Business.MES.WorkAction
{
@@ -24,6 +25,7 @@
#endregion
public List<BAS_PROD_BOM> Boms { get; set; } = new();
public AssemblyInfo CurAssembly { get; set; } = new();
+ public List<mes_MOPickList> MoPickList { get; set; }
#endregion Propertys & Variables
#region Functions
@@ -86,6 +88,11 @@
CurAssembly.Items.Add(item);
}
}
+ //鑾峰彇宸ュ崟澶囨枡淇℃伅
+ MoPickList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MOPickList>().Where(q => q.MoDocNo == CurPosition.WorkBatch.WO.ORDER_NO).ToList();
+
+ CurStep.Message = Biz.L("鎵弿涓婃枡鐗╂枡");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
@@ -195,6 +202,17 @@
}
}
}
+ //濡傛灉褰撳墠鐗╂枡瀛樺湪澶囨枡琛ㄤ腑瀛樺湪鎺ㄨ崘鎵规锛屽垯涓婃枡鐗╂枡蹇呴』灞炰簬鍏舵帹鑽愭壒娆＄殑鐗╂枡
+ var suggest = MoPickList.Where(q => q.Code == item.ItemInfo.ITEM_CODE && !q.SuggestedBatch.IsNullOrEmpty()).Select(q => q.SuggestedBatch).ToList();
+ if (isOK && suggest.Any())
+ {
+ isOK = false;
+ //鍦ㄦ帹鑽愭壒娆℃墍灞炲伐鍗曠殑鏉＄爜涓瓨鍦�
+ if (Biz.Db.Queryable<BIZ_MES_WO_SN>().Any(q => suggest.Contains(q.WORK_ORDER) && (q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN)))
+ {
+ isOK = true;
+ }
+ }
//楠岃瘉閫氳繃鍒欎繚瀛樹笂鏂欎俊鎭�
if (isOK)
{
--
Gitblit v1.9.3