From 9868cc20725ecd73f37e4bcfad0bac3bbb181526 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 21 十一月 2024 16:29:13 +0800
Subject: [PATCH] 标签数量更新
---
Tiger.Business.MES/Common/WorkBatch.cs | 161 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 147 insertions(+), 14 deletions(-)
diff --git a/Tiger.Business.MES/Common/WorkBatch.cs b/Tiger.Business.MES/Common/WorkBatch.cs
index 214a269..d431e97 100644
--- a/Tiger.Business.MES/Common/WorkBatch.cs
+++ b/Tiger.Business.MES/Common/WorkBatch.cs
@@ -10,6 +10,8 @@
using Tiger.IBusiness;
using Tiger.Model.Entitys.MES.Position;
using Tiger.Business.MES;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
+using Org.BouncyCastle.Ocsp;
namespace Tiger.Business
{
@@ -60,17 +62,17 @@
return this;
}
- public void Update()
+ public void Update(bool updateAll = false)
{
var wo = Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == OrderNo).IncludesAllFirstLayer().First();
var batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => q.BATCH_NO == Batch.BATCH_NO).First();
if (WoContext.WoBatchDic.ContainsKey(batch.BATCH_NO))
{
- if (wo.STATUS > BIZ_MES_WO.STATUSs.Working.GetValue() || batch.STATUS > BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())
+ if (wo.STATUS < BIZ_MES_WO.STATUSs.Release.GetValue() || batch.STATUS > BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())
{
WoContext.WoBatchDic.Remove(Batch.BATCH_NO);
}
- else if(wo.UPDATE_TIME > WO.UPDATE_TIME || batch.UPDATE_TIME > Batch.UPDATE_TIME)
+ else if(updateAll || wo.UPDATE_TIME > WO.UPDATE_TIME || batch.UPDATE_TIME > Batch.UPDATE_TIME)
{
GetBatchInfo();
}
@@ -149,7 +151,7 @@
action.IsSuccessed = false;
action.Data.SetValue(this, null);
//action.LocaleMsg = new($"宸ュ崟鎵规[{Batch.BATCH_NO}]鐘舵�乕{Batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName()}]涓嶆槸鍏佽鐢熶骇鐨勭姸鎬侊紝璇锋壂鎻忓厑璁哥敓浜х殑浜у搧鏉＄爜");
- action.LocaleMsg = new("MES.WorkBatch.WoBatchStatusCanNotWork", Batch.BATCH_NO, Batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
+ action.LocaleMsg = new("MES.WorkBatch.WoBatchStatusCanNotWork", Batch.BATCH_NO, Batch.STATUS.GetEnumDesc<BIZ_MES_WO_BATCH.STATUSs>());
}
//宸ュ崟鐘舵�佷笉鏄凡涓嬪彂鎴栬�呯敓浜т腑锛屽垯涓嶅厑璁哥敓浜�
if (WO.STATUS != BIZ_MES_WO.STATUSs.Release.GetValue() && WO.STATUS != BIZ_MES_WO.STATUSs.Working.GetValue())
@@ -157,24 +159,23 @@
action.IsSuccessed = false;
action.Data.SetValue(this, null);
//action.LocaleMsg = new($"宸ュ崟[{WO.ORDER_NO}]鐘舵�乕{Batch.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName()}]涓嶆槸鍏佽鐢熶骇鐨勭姸鎬侊紝璇锋壂鎻忓厑璁哥敓浜х殑浜у搧鏉＄爜");
- action.LocaleMsg = new("MES.WorkBatch.WoStatusCanNotWork", WO.ORDER_NO, Batch.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName());
+ action.LocaleMsg = new("MES.WorkBatch.WoStatusCanNotWork", WO.ORDER_NO, Batch.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>());
}
//宸ュ崟鎵规鎶曞叆鏁伴噺鍑忓幓鎶ュ簾鏁伴噺濡傛灉澶т簬绛変簬璁″垝鏁伴噺锛屽垯涓嶅厑璁哥敓浜�
- //if (curNode.IS_INPUT == "Y" && Batch.INPUT_QTY - Batch.SCRAP_QTY >= Batch.PLAN_QTY)
- if (curNodeSetting.IS_INPUT == "Y" && WoSNs.Count(q => q.STATUS > BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() && q.BATCH_NO == Batch.BATCH_NO) - Batch.SCRAP_QTY >= Batch.PLAN_QTY)
+ if (curNode.IS_FIRST_NODE == "Y" && WoSNs.Count(q => q.BATCH_NO == Batch.BATCH_NO && BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() < q.STATUS && q.STATUS <= BIZ_MES_WO_SN.STATUSs.Finished.GetValue()) >= Batch.PLAN_QTY)
{
action.IsSuccessed = false;
action.Data.SetValue(this, null);
//action.LocaleMsg = new($"宸ュ崟鎵规[{0}]宸叉姇鍏� {1}锛屽叾涓姤搴� {2}锛屼互婊¤冻璁″垝鏁伴噺[{3}]锛屾棤闇�缁х画鎶曞叆");
- action.LocaleMsg = new("MES.WorkBatch.BatchInputEnough", Batch.BATCH_NO, WoSNs.Count(q => q.BATCH_NO == Batch.BATCH_NO), Batch.SCRAP_QTY, Batch.PLAN_QTY);
+ action.LocaleMsg = new("MES.WorkBatch.BatchInputEnough", Batch.BATCH_NO, WoSNs.Count(q => q.BATCH_NO == Batch.BATCH_NO), WoSNs.Count(q => q.BATCH_NO == Batch.BATCH_NO && q.STATUS > BIZ_MES_WO_SN.STATUSs.Finished.GetValue()), Batch.PLAN_QTY);
}
//宸ュ崟鎶曞叆鏁伴噺鍑忓幓鎶ュ簾鏁伴噺濡傛灉澶т簬绛変簬璁″垝鏁伴噺锛屽垯涓嶅厑璁哥敓浜�
- if (curNodeSetting.IS_INPUT == "Y" && WoSNs.Count(q => q.STATUS > BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() && q.WORK_ORDER == WO.ORDER_NO) - WO.SCRAP_QTY >= WO.PLAN_QTY)
+ if (curNode.IS_FIRST_NODE == "Y" && WoSNs.Count(q =>q.WORK_ORDER == WO.ORDER_NO && BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() < q.STATUS && q.STATUS <= BIZ_MES_WO_SN.STATUSs.Finished.GetValue()) >= WO.PLAN_QTY)
{
action.IsSuccessed = false;
action.Data.SetValue(this, null);
//action.LocaleMsg = new($"宸ュ崟[{0}]宸叉姇鍏� {1}锛屽叾涓姤搴� {2}锛屼互婊¤冻璁″垝鏁伴噺[{3}]锛屾棤闇�缁х画鎶曞叆");
- action.LocaleMsg = new("MES.WorkBatch.WoInputEnough", WO.ORDER_NO, WoSNs.Count(q => q.WORK_ORDER == WO.ORDER_NO), WO.SCRAP_QTY, WO.PLAN_QTY);
+ action.LocaleMsg = new("MES.WorkBatch.WoInputEnough", WO.ORDER_NO, WoSNs.Count(q => q.WORK_ORDER == WO.ORDER_NO), WoSNs.Count(q => q.WORK_ORDER == WO.ORDER_NO && q.STATUS > BIZ_MES_WO_SN.STATUSs.Finished.GetValue()), WO.PLAN_QTY);
}
return action;
@@ -273,6 +274,19 @@
//throw dbTran.ErrorException;
Logger.Default.Fatal(dbTran.ErrorException, $"妫�鏌ュ伐鍗曟壒娆{Batch.BATCH_NO}]鏄惁瀹屽伐寮傚父");
return false;
+ }
+ //鍒犻櫎缂撳瓨
+ if (Batch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Closed.GetValue())
+ {
+ WoContext.WoBatchDic.Remove(Batch.BATCH_NO);
+ }
+ if (WO.STATUS == BIZ_MES_WO.STATUSs.Closed.GetValue())
+ {
+ var list = WoContext.WoBatchDic.Where(q => q.Value.WO.ORDER_NO == OrderNo).Select(q => q.Key);
+ foreach (var item in list)
+ {
+ WoContext.WoBatchDic.Remove(item);
+ }
}
return true;
@@ -407,7 +421,7 @@
{
//鍦ㄥ墠缃伐搴忔煡鎵捐繕鏈夋病鏈夊悗缁伐搴忔病瀹屾垚鐨勫墠缃伐搴�
var prepIDs = curNode.PrepNodeIDs.Where(id =>
- Edges.Any(e => e.SRC_NODE == id && !wipSN.History.Any(h => h.WORK_ORDER == WO.ORDER_NO && h.NODE_ID == e.TGT_NODE && h.IsFinished))
+ Edges.Any(e => e.SRC_NODE == id && !wipSN.History.Any(h => h.WORK_ORDER == WO.ORDER_NO && h.UNBIND_FLAG != "Y" && h.NODE_ID == e.TGT_NODE && h.IsFinished))
).ToList();
foreach (var prepID in prepIDs)
{
@@ -448,13 +462,13 @@
var result = new List<MES_WO_NODE>();
var nextNodes = Nodes.Where(q => q.Operation.OPER_TYPE != MES_OPERATION.OPER_TYPEs.Repair.GetValue()
&& Edges.Any(e => e.SRC_NODE == parent.ID && e.TGT_NODE == q.ID)
- && !wipSN.History.Any(h => h.WORK_ORDER == WO.ORDER_NO && h.NODE_ID == q.ID && h.IsFinished)
+ && !wipSN.History.Any(h => h.WORK_ORDER == WO.ORDER_NO && h.UNBIND_FLAG != "Y" && h.NODE_ID == q.ID && h.IsFinished)
).ToList();
//灏濊瘯灏嗗綋鍓嶅伐搴忕殑鍚庣画宸ュ簭娣诲姞鍒板彲浠ユ墽琛岀殑宸ュ簭鍒楄〃
foreach (var next in nextNodes)
{
//鏌ユ壘鏈夋病鏈夊墠缃伐搴忔壘涓嶅埌宸茶壇鍝佽繃绔欑殑鍘嗗彶璁板綍锛岃嫢鏈夊垯涓嶅厑璁哥户缁墽琛�
- if (!next.PrepNodeIDs.Any(id => !wipSN.History.Any(h => h.WORK_ORDER == WO.ORDER_NO && h.NODE_ID == id && h.IsFinished)) || parent.IS_FIRST_NODE == "Y")
+ if (!next.PrepNodeIDs.Any(id => !wipSN.History.Any(h => h.WORK_ORDER == WO.ORDER_NO && h.UNBIND_FLAG != "Y" && h.NODE_ID == id && h.IsFinished)) || parent.IS_FIRST_NODE == "Y")
{
var setting = NodeSets.FirstOrDefault(q => q.NODE_ID == next.ID);
//鍚庣画宸ュ簭鏄惎鐢ㄧ殑锛屽垯娣诲姞
@@ -508,7 +522,7 @@
{
//鍦ㄥ墠缃伐搴忔煡鎵捐繕鏈夋病鏈夊悗缁伐搴忔病瀹屾垚鐨勫墠缃伐搴�
var prepIDs = curNode.PrepNodeIDs.Where(id =>
- Edges.Any(e => e.SRC_NODE == id && !wipSN.History.Any(h => h.WORK_ORDER == WO.ORDER_NO && h.NODE_ID == e.TGT_NODE && h.IsFinished))
+ Edges.Any(e => e.SRC_NODE == id && !wipSN.History.Any(h => h.WORK_ORDER == WO.ORDER_NO && h.UNBIND_FLAG != "Y" && h.NODE_ID == e.TGT_NODE && h.IsFinished))
).ToList();
foreach (var prepID in prepIDs)
{
@@ -556,6 +570,125 @@
return result;
}
+ /// <summary>
+ /// 浠庡伐鍗曚腑绉婚櫎姝ｅ湪鐢熶骇鐨勬潯鐮�
+ /// </summary>
+ /// <param name="wipList"></param>
+ /// <returns></returns>
+ public ApiAction RemoveWipSn(List<MES_WIP_DATA> wipList, string user)
+ {
+ var action = UnbindWipSnFromWO(WO, wipList, user);
+ //绉婚櫎鎴愬姛鍒欏鐞嗗伐鍗曠紦瀛樹腑鐨勬暟鎹�
+ if (action.IsSuccessed)
+ {
+ Update(true);
+ }
+
+ return action;
+ }
+
+ /// <summary>
+ /// 浠庡伐鍗曚腑瑙ｇ粦姝ｅ湪鐢熶骇鐨勬潯鐮�
+ /// </summary>
+ /// <param name="wo"></param>
+ /// <param name="wipList"></param>
+ /// <returns></returns>
+ public static ApiAction UnbindWipSnFromWO(BIZ_MES_WO wo, List<MES_WIP_DATA> wipList, string user)
+ {
+ var action = new ApiAction();
+
+ var wipIDs = wipList.Select(q => q.ID);
+ var batchs = wipList.Where(q => !q.BATCH_NO.IsNullOrEmpty()).GroupBy(q => new { q.BATCH_NO }).Select(g => new {
+ g.Key.BATCH_NO,
+ Qty = g.Count(),
+ OutQty = g.Count(q => MES_WIP_DATA.STATUSs.Output.GetValue() <= q.STATUS && q.STATUS < MES_WIP_DATA.STATUSs.InStorage.GetValue()),
+ });
+ var db = Biz.Db;
+ var dbTran = db.UseTran(() =>
+ {
+ //BIZ_MES_WO
+ wo.INPUT_QTY -= wipList.Count;
+ wo.OUTPUT_QTY -= wipList.Count(q => MES_WIP_DATA.STATUSs.Output.GetValue() <= q.STATUS && q.STATUS < MES_WIP_DATA.STATUSs.InStorage.GetValue());
+ wo.SCRAP_QTY += wipList.Count;
+ wo.STATUS = wo.STATUS.GetEnum<BIZ_MES_WO.STATUSs>() == BIZ_MES_WO.STATUSs.Closed ? BIZ_MES_WO.STATUSs.Working.GetValue() : wo.STATUS;
+ db.Updateable(wo, user).UpdateColumns(q => new { q.INPUT_QTY, q.OUTPUT_QTY, q.SCRAP_QTY, q.UPDATE_USER, q.UPDATE_TIME, q.STATUS }).ExecuteCommand();
+ //BIZ_MES_WO_BATCH
+ var wobatchs = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => batchs.Select(x => x.BATCH_NO).Contains(q.BATCH_NO)).ToList();
+ foreach (var batch in wobatchs)
+ {
+ batch.INPUT_QTY -= batchs.Where(q=>q.BATCH_NO == batch.BATCH_NO).First().Qty;
+ batch.OUTPUT_QTY -= batchs.Where(q => q.BATCH_NO == batch.BATCH_NO).First().OutQty;
+ batch.SCRAP_QTY += batchs.Where(q => q.BATCH_NO == batch.BATCH_NO).First().Qty;
+ batch.STATUS = batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>() == BIZ_MES_WO_BATCH.STATUSs.Closed ? BIZ_MES_WO_BATCH.STATUSs.Working.GetValue() : batch.STATUS;
+ }
+ db.Updateable(wobatchs, user).UpdateColumns(q => new { q.INPUT_QTY, q.OUTPUT_QTY, q.SCRAP_QTY, q.UPDATE_USER, q.UPDATE_TIME, q.STATUS }).ExecuteCommand();
+ //BIZ_MES_WO_SN
+ db.Updateable<BIZ_MES_WO_SN>(user)
+ .SetColumns(q => q.STATUS == BIZ_MES_WO_SN.STATUSs.Offline.GetValue())
+ .SetColumns(q => q.TRAY_SN == null).SetColumns(q => q.OUTER_SN == null)
+ .Where(q => q.WORK_ORDER == wo.ORDER_NO && wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
+ //MES_WIP_DATA & MES_WIP_HIS
+ var wipHiss = new List<MES_WIP_HIS>();
+ foreach (var wipSN in wipList.Where(q => q.STATUS != MES_WIP_DATA.STATUSs.Offline.GetValue()))
+ {
+ wipSN.STATUS = MES_WIP_DATA.STATUSs.Offline.GetValue();
+ wipSN.TRAY_SN = wipSN.INNER_SN = wipSN.CARTON_SN = wipSN.PALLET_SN = wipSN.SHIPPING_ORDER = null;
+ wipSN.FINISHED_FLAG = wipSN.HOLD_FLAG = "N";
+ wipSN.UNBIND_FLAG = "Y";
+ wipSN.NODE_ID = "";
+ wipSN.NODE_NAME = "涓嬬嚎閫�搴�";
+ wipSN.OPERATION_TIME = DateTime.Now;
+ var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]涓嬬嚎");
+ wipHiss.Add(his);
+ }
+ db.Storageable(wipList, user).ExecuteCommand();
+ db.Storageable(wipHiss, user).ExecuteCommand();
+ db.Updateable<MES_WIP_HIS>(user)
+ .SetColumns(q => q.UNBIND_FLAG == "Y")
+ .Where(q => q.WORK_ORDER == wo.ORDER_NO && wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
+ //MES_WIP_PKG
+ var curpkg = db.Queryable<MES_WIP_PKG>().Where(q => wipIDs.Contains(q.WIP_ID)).ToList();
+ db.Deleteable(curpkg).ExecuteCommand();
+ var pkgs = new List<MES_WIP_PKG>();
+ do
+ {
+ var parentSns = curpkg.Where(q => !q.PARENT_SN.IsNullOrEmpty()).Select(q => q.PARENT_SN).Distinct();
+ curpkg = db.Queryable<MES_WIP_PKG>().Where(q => parentSns.Contains(q.SN)).ToList();
+ foreach (var pkg in curpkg)
+ {
+ pkg.QTY = db.Queryable<MES_WIP_PKG>().Where(q => q.PARENT_SN == pkg.SN).Sum(q => q.QTY);
+ pkgs.Add(pkg);
+ }
+ }
+ while (curpkg.Any());
+ db.Updateable(pkgs, user).ExecuteCommand();
+ //MES_WIP_DFT锛屽湪涓婁粨搴撹閰嶅拰缁翠慨涔嬪墠锛屽厛鎶婁笉鑹褰曟爣璁颁负宸插鐞�
+ db.Updateable<MES_WIP_DFT>(user)
+ .SetColumns(q => q.STATUS == MES_WIP_DFT.STATUSs.Resolved.GetValue())
+ .Where(q => q.WORK_ORDER == wo.ORDER_NO && wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+ //鏇存柊宸ュ崟姹犱腑鐨勫伐鍗曟潯鐮佽〃鏁版嵁鐨勭姸鎬�
+ foreach (var item in WoContext.WoBatchDic)
+ {
+ if (item.Value.WO.ORDER_NO == wo.ORDER_NO)
+ {
+ foreach (var woSn in item.Value.WoSNs.Where(q => wipIDs.Contains(q.WIP_ID)))
+ {
+ woSn.STATUS = BIZ_MES_WO_SN.STATUSs.Offline.GetValue();
+ }
+ item.Value.Update();
+ }
+ }
+ return action;
+ }
#endregion
/// <summary>
--
Gitblit v1.9.3