From 97edd18da0049ca22fa452618639469ab40ef0e6 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 19 十一月 2024 14:45:46 +0800
Subject: [PATCH] 优化包装行为获取包装在制品ID的获取方法
---
Tiger.Business.MES/Common/WorkBatch.cs | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/Tiger.Business.MES/Common/WorkBatch.cs b/Tiger.Business.MES/Common/WorkBatch.cs
index ec9412c..6e24526 100644
--- a/Tiger.Business.MES/Common/WorkBatch.cs
+++ b/Tiger.Business.MES/Common/WorkBatch.cs
@@ -601,26 +601,27 @@
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(),
- FinishQty = g.Count(q => q.STATUS == MES_WIP_DATA.STATUSs.Finished.GetValue()),
+ 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 => q.STATUS == MES_WIP_DATA.STATUSs.Finished.GetValue());
+ 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;
- db.Updateable(wo, user).UpdateColumns(q => new { q.INPUT_QTY, q.OUTPUT_QTY, q.SCRAP_QTY, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
+ 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
- foreach (var batch in batchs)
+ 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)
{
- db.Updateable<BIZ_MES_WO_BATCH>(user)
- .SetColumns(q => q.INPUT_QTY == q.INPUT_QTY - batch.Qty)
- .SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY - batch.FinishQty)
- .SetColumns(q => q.SCRAP_QTY == q.SCRAP_QTY + batch.Qty)
- .Where(q => q.BATCH_NO == q.BATCH_NO)
- .ExecuteCommand();
+ 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())
@@ -671,7 +672,18 @@
//鎶涘嚭寮傚父
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
--
Gitblit v1.9.3