From 3f364634b79a0f97a550c54f67313dfc0cfd4cb5 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 27 十一月 2024 22:16:01 +0800
Subject: [PATCH] 一大波签入来了
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 392 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 224 insertions(+), 168 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index a2058f2..528c272 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -6,6 +6,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Tiger.Business.MES.Transaction;
using Tiger.IBusiness;
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
@@ -17,6 +18,7 @@
{
#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; }
@@ -29,7 +31,7 @@
public WipPkgItem CurPkgItem { get; set; }
public PackingActionOutput CurCmd { get; set; }
public int PrintTimes = 0;
- public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; } = new();
+ public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; } = new();
public List<BAS_LABEL_PV> LabelPV { get; set; } = new();
public int FinishLevel = 0;
private bool IsManually => CurStep.IsNullOrEmpty();
@@ -47,19 +49,20 @@
CurPosition = position;
NodeAct = nodeAct;
Setting = setting;
+ MainDB = position.MainDB;
#endregion
//姝ｅ父鏉＄爜杩囩珯鎵ц鍖呰琛屼负
- PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
+ PkgRule = MainDB.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
//鏍规嵁琛屼负璁剧疆鑾峰彇澶氬眰鍖呰鐨勬爣绛炬墦鍗版ā鏉垮瓧鍏�
- var codes = (Setting.OPTION_1 ?? "").JsonToObject<List<WipPkgItem>>()?? new List<WipPkgItem>();
+ var codes = (Setting.OPTION_1 ?? "").JsonToObject<List<WipPkgItem>>() ?? new List<WipPkgItem>();
foreach (var code in codes)
{
- var label = code.LABEL_CODE.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
+ var label = code.LABEL_CODE.IsNullOrEmpty() ? null : MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
LabelDic.Add(code.PKG_LEVEL, label);
}
- LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
+ LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
//濡傛灉宸ュ簭涓婁笅鏂囦腑娌℃湁鍖呰璁板綍鍒欐柊寤轰竴涓紝鏈変笖鏈寘瑁呭畬鎴愬垯鑾峰彇褰撳墠鐨勫寘瑁呰褰�
if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty() && !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished)
@@ -74,7 +77,8 @@
WorkBatch = CurPosition.WorkBatch.Batch.BATCH_NO,
RULE_CODE = PkgRule.RULE_CODE,
RULE_NAME = PkgRule.RULE_NAME,
- ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE,
+ PROD_CODE = CurPosition.WorkBatch.WO.ITEM_CODE,
+ CustSN = MainDB.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == CurPosition.CurWipSNs.First().FLOW_SN).First(),
Item = new WipPkgItem()
{
PKG_CODE = max.PKG_CODE,
@@ -82,7 +86,8 @@
IS_MIN_PKG = max.PkgType.IS_MIN_PKG,
PKG_LEVEL = max.PKG_LEVEL,
PKG_QTY = max.PKG_QTY,
- LABEL_CODE = LabelDic.Count > max.PKG_LEVEL ? LabelDic[max.PKG_LEVEL]?.LABEL_CODE : null,
+ LABEL_CODE = LabelDic?.GetValueOrDefault(max.PKG_LEVEL, null)?.LABEL_CODE,//LabelDic.Count >= max.PKG_LEVEL ? LabelDic[max.PKG_LEVEL]?.LABEL_CODE : null,
+ SN = CurPosition.GenerateSN(max.SN_RULE, this),
}
};
WipPkgItem child = null;
@@ -97,7 +102,8 @@
IS_MIN_PKG = dtl.PkgType.IS_MIN_PKG,
PKG_LEVEL = dtl.PKG_LEVEL,
PKG_QTY = dtl.PKG_QTY,
- LABEL_CODE = LabelDic.Count > dtl.PKG_LEVEL ? LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE : null,
+ LABEL_CODE = LabelDic.Count >= dtl.PKG_LEVEL ? LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE : null,
+ SN = CurPosition.GenerateSN(dtl.SN_RULE, this),
};
if (!child.IsNullOrEmpty())
{
@@ -121,7 +127,7 @@
//鑾峰彇鏄惁鍖呰瀹屽悗闇�瑕佺О閲�
CurPkg.NeedWeighing = Setting.OPTION_2 == "Y";
//鑾峰彇鍖呰瑙勫垯鐨勭О閲嶈寖鍥�
- PkgProd = Biz.Db.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).First();
+ PkgProd = MainDB.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).First();
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("璁板綍鍖呰鏁版嵁"));
}
@@ -137,6 +143,7 @@
CurPosition = position;
NodeAct = null;
Setting = null;
+ MainDB = position.MainDB;
#endregion
//鑾峰彇褰撳墠鐨勫寘瑁呰褰�
if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty())
@@ -148,13 +155,14 @@
throw new Exception("鎵句笉鍒板寘瑁呮暟鎹紝璇烽噸鏂版壂鎻忛渶瑕佸寘瑁呯殑浜у搧");
}
//鎵嬪姩缁撴潫鍖呰涓撶敤锛屼复鏃舵墽琛岃涓�
- PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == CurPkg.RULE_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
+ PkgRule = MainDB.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == CurPkg.RULE_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
//鏍规嵁琛屼负璁剧疆鑾峰彇澶氬眰鍖呰鐨勬爣绛炬墦鍗版ā鏉垮瓧鍏�
LabelDic = CurPosition.Context["CurLabelDic"] as Dictionary<int, BAS_LABEL_TEMP>;
- LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
+ LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
//鑾峰彇鍖呰瑙勫垯鐨勭О閲嶈寖鍥�
- PkgProd = Biz.Db.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPkg.ITEM_CODE).First();
+ PkgProd = MainDB.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPkg.PROD_CODE).First();
+ //鎶�
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("璁板綍鍖呰鏁版嵁"));
}
@@ -191,6 +199,10 @@
action.LocaleMsg = GetBeginMsg();
var min = PkgRule.Details.OrderBy(q => q.PKG_LEVEL).First();
+ if (min.PKG_LEVEL == CurPkg.Item.PKG_LEVEL)
+ {
+ CurPkg.Item.WipSNs = CurPosition.CurWipSNs.ToDictionary(k => k.ID, v => v.SN);
+ }
if (min.PKG_LEVEL == CurPkg.Item.PKG_LEVEL && CurPkg.NeedWeighing)
{
var data = new PackingActionOutput() { PkgInfo = CurPkg };
@@ -224,6 +236,13 @@
data.ExecCode = "Print";
data.PkgLevel = min.PKG_LEVEL;
data.PrintLable = LabelDic[min.PKG_LEVEL];
+ data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
@@ -308,7 +327,7 @@
action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
- }
+ }
//瀹㈡埛绔墦鍗板け璐�
else
{
@@ -365,6 +384,7 @@
//鏈�澶栧眰鍖呰宸插鐞嗗畬鎴愬垯鐩存帴缁撴潫琛屼负
if (CurPkg.Item.PKG_LEVEL == FinishLevel)
{
+ CurPkg.Item.WipSNs = CurPosition.CurWipSNs.ToDictionary(k => k.ID, v => v.SN);
action = End(input);
}
//鏈�澶栧眰鍖呰鏈墦鍗版壂鎻忓垯缁х画
@@ -372,34 +392,41 @@
{
//濡傛灉涓虹┖鍒欎笉闇�瑕佹墦鍗�
if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
- {
- var data = new PackingActionOutput() { PkgInfo = CurPkg };
- data.ExecCode = "Scan";
- data.PkgLevel = dtl.PKG_LEVEL;
- CurCmd = data;
+ {
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Scan";
+ data.PkgLevel = dtl.PKG_LEVEL;
+ CurCmd = data;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵弿鏍囩"));
action.Data.Data = data;
- action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
- //action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
- action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
- }
- else
- {
- //璁剧疆鎵撳嵃鍙橀噺鍊�
- LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
-
- var data = new PackingActionOutput() { PkgInfo = CurPkg };
- data.ExecCode = "Print";
- data.PkgLevel = dtl.PKG_LEVEL;
- data.PrintLable = LabelDic[dtl.PKG_LEVEL];
- CurCmd = data;
- PrintTimes++;
+ action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
+ //action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
+ action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
+ }
+ else
+ {
+ //璁剧疆鎵撳嵃鍙橀噺鍊�
+ LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
+
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Print";
+ data.PkgLevel = dtl.PKG_LEVEL;
+ data.PrintLable = LabelDic[dtl.PKG_LEVEL];
+ data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
+ CurCmd = data;
+ PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
action.Data.Data = data;
- action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
- //action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
- action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
- }
+ action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
+ //action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
+ action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
+ }
}
}
else
@@ -489,6 +516,13 @@
data.ExecCode = "Print";
data.PkgLevel = dtl.PKG_LEVEL;
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
+ data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
@@ -531,19 +565,20 @@
PKG_LEVEL = dtl.PKG_LEVEL,
PKG_QTY = dtl.PKG_QTY,
LABEL_CODE = LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE,
+ SN = CurPosition.GenerateSN(dtl.SN_RULE, this).IsNullOrEmpty(pInput.PkgSN),
IsFinished = true,
};
- CurPkgItem.Package = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.SN == pInput.PkgSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
+ CurPkgItem.Package = MainDB.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPkgItem.SN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = pInput.PkgSN,
+ SN = CurPkgItem.SN,
};
CurPkgItem.Package.WIP_ID = CurPosition.CurWipSNs.Count == 1 ? CurPosition.CurWipSNs.First().ID : null;
CurPkgItem.Package.PKG_TYPE = dtl.PkgType.PKG_NAME;
CurPkgItem.Package.ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE;
- CurPkgItem.Package.QTY = CurPosition.CurWipSNs.First().QTY;
+ CurPkgItem.Package.QTY = CurPosition.CurWipSNs.Sum(q => q.QTY);
CurPkgItem.Package.UNIT = dtl.PkgType.PKG_NAME;
CurPkgItem.Package.WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER;
CurPkgItem.Package.BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO;
@@ -557,6 +592,11 @@
CurPkgItem.Package.OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE;
CurPkgItem.Package.SEGMENT = CurPosition.CurWipSNs.First().SEGMENT;
CurPkgItem.Package.ACT_ID = NodeAct.ID;
+ CurPkgItem.Package.ACT_NAME = NodeAct.ACT_NAME;
+ CurPkgItem.Package.FLOW_SN = CurPosition.CurWipSNs.First().FLOW_SN;
+
+ CurPkgItem.WipSNs = CurPosition.CurWipSNs.ToDictionary(k => k.ID, v => v.SN);
+
FinishLevel++;
//瀹屾垚鍖呰鐨勫眰绾у皬浜庢渶澶栧眰鍖呰灞傜骇
if (FinishLevel < PkgRule.Details.Max(q => q.PKG_LEVEL))
@@ -572,7 +612,7 @@
}
}
//澶勭悊鍏朵粬鍖呰灞傜骇鏁版嵁
- else
+ else
{
//瀹㈡埛绔彁浜ょ殑鍖呰灞傜骇绛変簬褰撳墠澶勭悊鐨勫寘瑁呭眰绾�
if (pInput.PkgLevel == dtl.PKG_LEVEL)
@@ -582,7 +622,7 @@
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = pInput.PkgSN,
+ SN = CurPkgItem.SN.IsNullOrEmpty(pInput.PkgSN),
PKG_TYPE = dtl.PkgType.PKG_NAME,
ITEM_CODE = CurPkgItem.Items.First().Package.ITEM_CODE,
QTY = CurPkgItem.Items.Sum(q => q.Package.QTY),
@@ -598,11 +638,13 @@
POST_CODE = CurPkgItem.Items.First().Package.POST_CODE,
OPER_CODE = CurPkgItem.Items.First().Package.OPER_CODE,
SEGMENT = CurPkgItem.Items.First().Package.SEGMENT,
+ ACT_ID = CurPkgItem.Items.First().Package.ACT_ID,
+ ACT_NAME = CurPkgItem.Items.First().Package.ACT_NAME,
} : new()
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = pInput.PkgSN,
+ SN = CurPkgItem.SN.IsNullOrEmpty(pInput.PkgSN),
PKG_TYPE = dtl.PkgType.PKG_NAME,
ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE,
QTY = CurPkgItem.Items.Sum(q => q.Package.QTY),
@@ -619,6 +661,8 @@
OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
ACT_ID = NodeAct.ID,
+ ACT_NAME = NodeAct.ACT_NAME,
+ FLOW_SN = CurPosition.CurWipSNs.First().FLOW_SN,
};
FinishLevel++;
//瀹屾垚鍖呰鐨勫眰绾у皬浜庢渶澶栧眰鍖呰灞傜骇
@@ -652,6 +696,7 @@
PKG_LEVEL = nextDtl.PKG_LEVEL,
PKG_QTY = nextDtl.PKG_QTY,
LABEL_CODE = LabelDic[nextDtl.PKG_LEVEL]?.LABEL_CODE,
+ SN = CurPosition.GenerateSN(nextDtl.SN_RULE, this),
};
curItem.Items.Add(next);
}
@@ -660,7 +705,7 @@
//娣诲姞褰撳墠鐨勫寘瑁呮槑缁嗗埌涓婁竴灞傚寘瑁呯殑鏄庣粏鍒楄〃
if (!curItem.Items.Contains(CurPkgItem))
{
- curItem.Items.Add(CurPkgItem);
+ curItem.Items.Add(CurPkgItem);
}
CurPkgItem = curItem;
@@ -679,39 +724,46 @@
action.Data.ShortMsg = new("涓婄О绉伴噸", ShortMessage.Types.Success);
//action.LocaleMsg = new($"璇锋妸澶栧寘瑁呬笂绉扮О閲�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseWeighing");
- }
+ }
else
{
- //濡傛灉涓虹┖鍒欎笉闇�瑕佹墦鍗�
- if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
- {
- var data = new PackingActionOutput() { PkgInfo = CurPkg };
- data.ExecCode = "Scan";
- data.PkgLevel = dtl.PKG_LEVEL;
- CurCmd = data;
+ //濡傛灉涓虹┖鍒欎笉闇�瑕佹墦鍗�
+ if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
+ {
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Scan";
+ data.PkgLevel = dtl.PKG_LEVEL;
+ CurCmd = data;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵弿鏍囩"));
action.Data.Data = data;
action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
- }
- else
- {
- //璁剧疆鎵撳嵃鍙橀噺鍊�
- LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
-
- var data = new PackingActionOutput() { PkgInfo = CurPkg };
- data.ExecCode = "Print";
- data.PkgLevel = dtl.PKG_LEVEL;
- data.PrintLable = LabelDic[dtl.PKG_LEVEL];
- CurCmd = data;
- PrintTimes++;
+ }
+ else
+ {
+ //璁剧疆鎵撳嵃鍙橀噺鍊�
+ LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL], this);
+
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Print";
+ data.PkgLevel = dtl.PKG_LEVEL;
+ data.PrintLable = LabelDic[dtl.PKG_LEVEL];
+ data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
+ CurCmd = data;
+ PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
action.Data.Data = data;
action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
- action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
- }
+ action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
+ }
}
}
//褰撳墠鍖呰灞傜骇鐨勬槑缁嗘暟閲忔湭杈惧埌鍖呰鏁伴噺锛屽垯瀹屾垚鏈鎵弿锛岀瓑寰呬笅涓骇鍝佽繘绔�
@@ -745,27 +797,6 @@
CurPosition.ResetNode();
}
return action;
- }
-
- public List<MES_WIP_PKG> GetMinPackageList(WipPkgItem parent)
- {
- List<MES_WIP_PKG> list = new();
- if (parent.Items.Any())
- {
- foreach (var item in parent.Items)
- {
- item.Package.PARENT_SN = parent.Package?.SN;
- list.AddRange(GetMinPackageList(item));
- }
- }
- else
- {
- if (!parent.Package.IsNullOrEmpty())
- {
- list.Add(parent.Package);
- }
- }
- return list;
}
public ApiAction<SubmitOutput> CompletePkg()
@@ -805,7 +836,7 @@
CurPkg.Item.Package.WEIGHT = CurPkg.WeightInfo.Weight;
CurPkg.Item.Package.WEIGHT_UNIT = CurPkg.WeightInfo.Unit;
}
-
+
//涓嶆槸鎵嬪姩缁撴潫鍖呰鍒欎繚瀛樿涓烘搷浣滆褰�
if (!IsManually)
{
@@ -848,6 +879,10 @@
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
ACT_RESULT = "Y",
+ ACT_VALUE_1 = CurPkg.IsFinished ? "Y" : "N",
+ ACT_VALUE_2 = CurPkg.ToJson(),
+ ACT_VALUE_3 = CurPkg.IsFinished ? LabelDic[CurPkg.Item.PKG_LEVEL].ToJson() : "",
+ ACT_VALUE_4 = "Customer",
ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"浜у搧鏉＄爜[{string.Join("锛�", CurPosition.CurSN)}]鍖呰瀹屾垚",
};
@@ -856,7 +891,8 @@
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
var _wipActs = wipActs.Clone();
- var _pkgList = CurPkg.IsFinished ? CurPosition.GetPackageList(CurPkg.Item) : new();
+ var _pkgList = CurPkg.IsFinished ? CurPosition.GetPackageList(CurPkg.Item).Clone() : new();
+ var _wipIDs = CurPkg.IsFinished ? CurPkg.Item.GetWipSnList().Select(q => q.Key).ToList().Clone() : new();
//淇濆瓨鏁版嵁
CurStep.DBSubmitAction = () =>
{
@@ -868,36 +904,37 @@
if (_pkgList.Any())
{
db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
- foreach (var pkg in _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()))
- {
- //鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
- db.Updateable<MES_WIP_DATA>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.INNER_SN == q.CARTON_SN)
- .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.ID == pkg.WIP_ID)
- .ExecuteCommand();
- //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
- db.Updateable<MES_WIP_HIS>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.INNER_SN == q.CARTON_SN)
- .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID)
- .ExecuteCommand();
- //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц涓鸿褰�
- db.Updateable<MES_WIP_ACT>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.INNER_SN == q.CARTON_SN)
- .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_ID == pkg.ACT_ID)
- .ExecuteCommand();
- //鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
- db.Updateable<BIZ_MES_WO_SN>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID)
- .ExecuteCommand();
- }
+ //var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
+ var nodeID = _pkgList.First().NODE_ID;
+ var actID = _pkgList.First().ACT_ID;
+ var wo = _pkgList.First().WORK_ORDER;
+ //鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
+ db.Updateable<MES_WIP_DATA>(CurPosition.UserCode)
+ .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
+ .SetColumns(q => q.INNER_SN == q.CARTON_SN)
+ .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.ID))
+ .ExecuteCommand();
+ //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
+ db.Updateable<MES_WIP_HIS>(CurPosition.UserCode)
+ .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
+ .SetColumns(q => q.INNER_SN == q.CARTON_SN)
+ .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && _wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
+ //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц涓鸿褰�
+ db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)
+ .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
+ .SetColumns(q => q.INNER_SN == q.CARTON_SN)
+ .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && _wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
+ //鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
+ db.Updateable<BIZ_MES_WO_SN>(CurPosition.UserCode)
+ .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
+ .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
}
};
}
@@ -905,54 +942,73 @@
{
if (CurPkg.IsFinished)
{
- var _pkgList = CurPosition.GetPackageList(CurPkg.Item);
-
- //鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
- CurPosition.NeedTemporaryStoreDBCommitAction = false;
- //淇濆瓨鏁版嵁
- CurPosition.SaveStepsCommitActionToDB(() =>
- {
- var db = CurPosition.GetCommitDB();
- if (_pkgList.Any())
- {
- db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
- foreach (var pkg in _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()))
- {
- //鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
- db.Updateable<MES_WIP_DATA>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.INNER_SN == q.CARTON_SN)
- .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.ID == pkg.WIP_ID)
- .ExecuteCommand();
- //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
- db.Updateable<MES_WIP_HIS>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.INNER_SN == q.CARTON_SN)
- .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID)
- .ExecuteCommand();
- //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц涓鸿褰�
- db.Updateable<MES_WIP_ACT>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.INNER_SN == q.CARTON_SN)
- .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_ID == pkg.ACT_ID)
- .ExecuteCommand();
- //鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
- db.Updateable<BIZ_MES_WO_SN>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID)
- .ExecuteCommand();
- }
- }
- });
- //濡傛灉褰撳墠鏉＄爜宸茬粡瀹屽伐锛屾鏌ュ綋鍓嶅伐鍗曟壒娆″拰宸ュ崟鏄惁瀹屽伐
- if (CurPkg.IsReachedEndNode)
- {
- CurPosition.WorkBatch.CheckIsComplete(CurPosition.UserCode);
- }
+ var _pkgList = CurPosition.GetPackageList(CurPkg.Item).Clone();
+ var _wipIDs = CurPkg.Item.GetWipSnList().Select(q => q.Key).ToList().Clone();
+ var _lastWipID = CurPosition.LastWipSNs?.FirstOrDefault()?.ID;
+
+ //鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
+ CurPosition.NeedTemporaryStoreDBCommitAction = false;
+ //淇濆瓨鏁版嵁
+ CurPosition.SaveStepsCommitActionToDB(() =>
+ {
+ var db = CurPosition.GetCommitDB();
+ if (_pkgList.Any())
+ {
+ db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
+ //var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
+ var nodeID = _pkgList.First(q => !q.NODE_ID.IsNullOrEmpty()).NODE_ID;
+ var actID = _pkgList.First(q => !q.ACT_ID.IsNullOrEmpty()).ACT_ID;
+ var wo = _pkgList.First(q => !q.WORK_ORDER.IsNullOrEmpty()).WORK_ORDER;
+ //鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
+ db.Updateable<MES_WIP_DATA>(CurPosition.UserCode)
+ .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
+ .SetColumns(q => q.INNER_SN == q.CARTON_SN)
+ .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.ID))
+ .ExecuteCommand();
+ //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
+ var endOperCode = CurPkg.IsReachedEndNode ? "EndNode" : "NotReachedEndNode";
+ db.Updateable<MES_WIP_HIS>(CurPosition.UserCode)
+ .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
+ .SetColumns(q => q.INNER_SN == q.CARTON_SN)
+ .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == wo && (q.NODE_ID == nodeID || q.OPER_CODE == endOperCode) && _wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
+ //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц涓鸿褰�
+ db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)
+ .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
+ .SetColumns(q => q.INNER_SN == q.CARTON_SN)
+ .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && _wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
+ db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)
+ .SetColumns(q => q.ACT_VALUE_1 == (CurPkg.IsFinished ? "Y" : "N"))
+ .SetColumns(q => q.ACT_VALUE_2 == CurPkg.ToJson())
+ .SetColumns(q => q.ACT_VALUE_3 == (CurPkg.IsFinished ? LabelDic[CurPkg.Item.PKG_LEVEL].ToJson() : ""))
+ .SetColumns(q => q.ACT_VALUE_4 == "Customer")
+ .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && q.WIP_ID == _lastWipID)
+ .ExecuteCommand();
+ var InStoreLabel = CurPkg.IsFinished ? CurPkg.InStoreLabel?.ToJson() : "";
+ db.Updateable<MES_WIP_ACT>(CurPosition.UserCode)
+ .SetColumns(q => q.ACT_VALUE_1 == (CurPkg.IsFinished ? "Y" : "N"))
+ .SetColumns(q => q.ACT_VALUE_2 == CurPkg.ToJson())
+ .SetColumns(q => q.ACT_VALUE_3 == InStoreLabel)
+ .SetColumns(q => q.ACT_VALUE_4 == "InStore")
+ .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == CurPkg.InStoreActID && q.WIP_ID == _lastWipID)
+ .ExecuteCommand();
+ //鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
+ db.Updateable<BIZ_MES_WO_SN>(CurPosition.UserCode)
+ .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
+ .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
+ }
+ });
+ //濡傛灉褰撳墠鏉＄爜宸茬粡瀹屽伐锛屾鏌ュ綋鍓嶅伐鍗曟壒娆″拰宸ュ崟鏄惁瀹屽伐
+ //if (CurPkg.IsReachedEndNode)
+ {
+ CurPosition.WorkBatch.CheckIsComplete(CurPosition.UserCode);
+ }
}
}
@@ -976,7 +1032,7 @@
IsFinished = true;
CurStep?.SetStatusMessage(StepStatus.Finished, Biz.L("鍖呰瀹屾垚"));
action.Data.ShortMsg = new("鍖呰瀹屾垚", ShortMessage.Types.Success);
-
+
return action;
}
--
Gitblit v1.9.3