From 7597357e268f6ecf19b50a122e42ccb896295329 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 26 九月 2024 00:48:38 +0800
Subject: [PATCH] 过程变量更新
---
Tiger.Business.MES/Transaction/Position.cs | 87 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 11 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 1eb3e09..06c902b 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -11,6 +11,7 @@
using Tiger.Model;
using static Tiger.Business.Biz;
using Tiger.Model.Entitys.MES.Position;
+using System.Globalization;
namespace Tiger.Business.MES.Transaction
{
@@ -48,6 +49,9 @@
#region Propertys & Variables
public string UserCode { get; set; }
public string PostCode { get; set; }
+ protected DateTime BeginAt;
+ protected DateTime EndAt;
+ public TimeSpan ElapsedTime => EndAt - BeginAt;
public MES_FACTORY CurFactory { get; set; }
public MES_WORKSHOP CurWorkshop { get; set; }
public MES_LINE CurLine { get; set; }
@@ -64,7 +68,7 @@
public WorkStep CurStep { get; set; }
public List<WorkStep> NextSteps { get; set; } = new();
public bool IsFinishNodeSteps => !Steps.Any(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished);
- public bool IsFinishAllSteps => !Steps.Any() || !Steps.Any(q => !q.IsFinished);
+ public bool IsFinishAllSteps => Steps.Any() && !Steps.Any(q => !q.IsFinished);
//public int CurStep => Steps.Where(q => !q.IsFinished).OrderBy(q => q.Sequence).FirstOrDefault()?.Sequence ?? 0;
private DbClient CommitDB;
/// <summary>
@@ -137,7 +141,7 @@
{
OperInfoDic.Add(CurBatch.Batch.BATCH_NO, new());
}
-
+
action.Data = new { WorkOrder = CurBatch.WO, Bacth = CurBatch.Batch };
}
catch (Exception ex)
@@ -202,7 +206,7 @@
OperInfo info = new();
if (CurBatch?.Batch?.BATCH_NO != null)
{
- info = OperInfoDic[CurBatch.Batch.BATCH_NO ];
+ info = OperInfoDic[CurBatch.Batch.BATCH_NO];
info.StepsInfo = Steps.Select(q => q.GetInfo(locale)).ToList();
}
return info;
@@ -355,14 +359,19 @@
if (CurStep.IsFinished && NextSteps.Any())
{
result = BeginNextActionStep(input);
- }
+ }
else
{
- //杩斿洖缁撴灉鍒板鎴风
- result = canBegin;
- result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
+ //杩斿洖缁撴灉鍒板鎴风
+ result = canBegin;
+ result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
}
return result;
+ }
+ //宸ュ簭琚噸缃�
+ else if (Steps.IsNullOrEmpty())
+ {
+ return canBegin;
}
}
@@ -410,6 +419,10 @@
action.Invoke();
}
}
+ //璁板綍宸ュ簭鑰楁椂
+ EndAt = DateTime.Now;
+ var ids = CurWipSNHiss.Select(q => q.ID).ToList();
+ GetCommitDB().Updateable<MES_WIP_HIS>().SetColumns(q => q.ELAPSED_TIME == ElapsedTime.TotalMilliseconds.ToInt64()).Where(q => ids.Contains(q.ID)).ExecuteCommand();
});
if (dbTran.IsSuccess)
{
@@ -498,8 +511,18 @@
return WorkBatch.Product.ToJson();
case "GetCustomer":
return WorkBatch.Batch.ToJson();
+ case "GetModel":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Model);
+ case "GetInput":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Input);
+ case "GetOutput":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.OutPut);
+ case "GetPower":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Power);
+ case "GetAccuracy":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Accuracy);
case "GetVarByWo":
- return GetLabelVarWo(lv);
+ return GetLabelVarWo(lv, "");
default:
return "";
}
@@ -535,7 +558,7 @@
case "GetCartonGenerate":
return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
case "GetHW21SNGenerate":
- return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("SN:","05").Data.ToString() ?? "";
+ return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("SN:", "05").Data.ToString() ?? "";
default:
return "";
}
@@ -552,7 +575,7 @@
/// </summary>
/// <param name="labelId"></param>
/// <returns></returns>
- private string GetLabelVarWo(BAS_LABEL_VAR lv)
+ private string GetLabelVarWo(BAS_LABEL_VAR lv, string value)
{
string result = "";
var labelVarwos = Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == lv.LABEL_ID && x.VAR_NAME == lv.VAR_NAME).ToList();
@@ -562,11 +585,53 @@
}
else
{
- result = labelVarwos.Count > 0 ? labelVarwos[0].DEFAULT_VALUE : "";
+ result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First().DEFAULT_VALUE : "") : value;
}
return result;
}
+ /// <summary>
+ /// 鏍规嵁鍖呰宸ュ崟鍜屾潯鐮佽幏鍙栧崕涓鸿姹傜殑鐢熶骇鍛ㄦ湡
+ /// </summary>
+ /// <param name="snList"></param>
+ /// <returns></returns>
+ private string GetHuaWeiWeek(string pkgOrder, List<string> snList)
+ {
+ Dictionary<string, string> dic = new();
+ var snOrder = Biz.Db.Queryable<MES_CUST_SN, BIZ_MES_WO>((q, w) => new JoinQueryInfos(JoinType.Left, q.WORK_ORDER == w.ORDER_NO))
+ .Where((q, w) => q.PKG_ORDER == pkgOrder && (snList.Contains(q.FLOW_SN) || snList.Contains(q.CUST_SN)))
+ .Select((q, w) => new { q.PKG_ORDER, q.WORK_ORDER, w.ACT_START_TIME, w.PLAN_START_TIME, q.FLOW_SN, q.CUST_SN }).ToList();
+ foreach (var sn in snList)
+ {
+ var item = snOrder.FirstOrDefault(q => q.FLOW_SN == sn || q.CUST_SN == sn);
+ if (!item.IsNullOrEmpty())
+ {
+ var date = item.ACT_START_TIME < new DateTime(2000, 1, 1) ? item.PLAN_START_TIME : item.ACT_START_TIME; ;
+ var firstDay = new DateTime(date.Year, 1, 1);
+ int daysOffset = firstDay.DayOfWeek.GetValue() > 3 ? (firstDay.DayOfWeek.GetValue() - 7) : 0;
+ int year = date.Year + ((date - firstDay).TotalDays + daysOffset < 0 ? -1 : 0);
+ int week = CultureInfo.CurrentCulture.Calendar.GetWeekOfYear(date, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Sunday);
+ dic.Add(sn, $"{year.ToString().Substring(2, 2)}{week:00}");
+ }
+ else
+ {
+ dic.Add(sn, "");
+ }
+ }
+ var weeks = dic.Select(q => q.Value).Where(q => !q.IsNullOrEmpty()).Distinct().OrderBy(q => q).ToList();
+
+ switch (weeks.Count)
+ {
+ case 0:
+ return "";
+ case 1:
+ return weeks.First();
+ case 2:
+ return string.Join("/", weeks.Select(q => q + $"({dic.Count(d => d.Value == q)})"));
+ default:
+ return string.Join("/", weeks.Take(2)) + " (+)";
+ }
+ }
#endregion
#endregion Functions
--
Gitblit v1.9.3