From 07a89d9d534aab73d4e7a4812a0d78312af72b58 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 14 十月 2024 15:41:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/Transaction/Position.cs | 284 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 253 insertions(+), 31 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 700e73a..ee00d86 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -11,6 +11,9 @@
using Tiger.Model;
using static Tiger.Business.Biz;
using Tiger.Model.Entitys.MES.Position;
+using System.Globalization;
+using Tiger.Business.MES.WorkAction;
+using System.Collections;
namespace Tiger.Business.MES.Transaction
{
@@ -48,6 +51,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 +70,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>
@@ -91,12 +97,12 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<ApiAction> SelectOrder(WoInput input)
+ public async Task<ApiAction> SelectOrder(WoInput input, string batchNo = "")
{
var action = new ApiAction();
try
{
- if (!WoContext.ExistsBatch(input.OrderNo, CurLine.LINE_CODE))
+ if (!WoContext.ExistsBatch(input.OrderNo, CurLine.LINE_CODE, batchNo, true))
{
var wo = await Biz.Db.Queryable<BIZ_MES_WO>().ByAuth(input.AuthOption).Where(q => q.ORDER_NO == input.OrderNo).FirstAsync();
//楠岃瘉鏄庣粏鏄惁姝ｇ‘
@@ -110,11 +116,14 @@
if (wo.STATUS != BIZ_MES_WO.STATUSs.Release.GetValue() && wo.STATUS != BIZ_MES_WO.STATUSs.Working.GetValue())
{
action.IsSuccessed = false;
- //action.LocaleMsg = new($"宸ュ崟[{input.OrderNo}]鐘舵�乕{wo.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName()}]涓嶈兘鐢熶骇");
+ //action.LocaleMsg = new($"宸ュ崟[{0}]鐘舵�乕{1}]涓嶈兘鐢熶骇");
action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, wo.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName());
return action;
}
- var batch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().ByAuth(input.AuthOption).Where(q => q.ORDER_NO == input.OrderNo && q.ACT_LINE == CurLine.LINE_CODE).FirstAsync();
+ var batch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().ByAuth(input.AuthOption)
+ .Where(q => q.ORDER_NO == input.OrderNo && q.ACT_LINE == CurLine.LINE_CODE)
+ .WhereIF(!batchNo.IsNullOrEmpty(), q => q.BATCH_NO == batchNo)
+ .OrderBy(q => q.STATUS).FirstAsync();
if (batch.IsNullOrEmpty())
{
action.IsSuccessed = false;
@@ -125,19 +134,19 @@
if (batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() && batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())
{
action.IsSuccessed = false;
- //action.LocaleMsg = new($"宸ュ崟[{input.OrderNo}]鐘舵�乕{wo.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName()}]涓嶈兘鐢熶骇");
- action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
+ //action.LocaleMsg = new($"宸ュ崟[{0}]鎵规[1]鐘舵�乕{2}]涓嶈兘鐢熶骇");
+ action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.BatchStatusException", input.OrderNo, batch.BATCH_NO, batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
return action;
}
var wb = new WorkBatch(input.OrderNo).Init(CurLine.LINE_CODE);
WoContext.WoBatchDic.Add(wb.Batch.BATCH_NO, wb);
}
- CurBatch = WoContext.GetBatch(input.OrderNo, CurLine.LINE_CODE);
+ CurBatch = WoContext.GetBatch(input.OrderNo, CurLine.LINE_CODE, batchNo);
if (!OperInfoDic.ContainsKey(CurBatch.Batch.BATCH_NO))
{
OperInfoDic.Add(CurBatch.Batch.BATCH_NO, new());
}
-
+
action.Data = new { WorkOrder = CurBatch.WO, Bacth = CurBatch.Batch };
}
catch (Exception ex)
@@ -202,7 +211,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;
@@ -216,7 +225,12 @@
if (CurWipSNs.Any())
{
info.CurNode = CurWipSNs.First().NODE_NAME;
- info.NextNode = string.Join(",", CurBatch.GetNextNodes(CurWipSNs.First()).Select(q => q.NODE_NAME));
+ var nextNodes = CurBatch.GetNextNodes(CurWipSNs.First());
+ info.NextNode = string.Join(",", nextNodes.Select(q => q.NODE_NAME));
+ if (nextNodes.Count == 1 && nextNodes.Single().OPER_CODE == "EndNode")
+ {
+ info.IsReachedEndNode = true;
+ }
}
else
{
@@ -351,11 +365,23 @@
CurStep = step;
//鏇存柊鍚庣画鍙墽琛岀殑宸ユ鍒楄〃
NextSteps = GetNextSteps(CurStep);
- //杩斿洖缁撴灉鍒板鎴风
- result = canBegin;
- result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
-
+ //濡傛灉褰撳墠鎵ц宸ユ灏濊瘯鎵ц鍚庡氨宸茬粡瀹屾垚锛屼笉闇�瑕佸悗缁氦浜掞紝涓旓紝鍒欑户缁紑濮嬩笅涓�宸ユ
+ if (CurStep.IsFinished && NextSteps.Any())
+ {
+ result = BeginNextActionStep(input);
+ }
+ else
+ {
+ //杩斿洖缁撴灉鍒板鎴风
+ result = canBegin;
+ result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
+ }
return result;
+ }
+ //宸ュ簭琚噸缃�
+ else if (Steps.IsNullOrEmpty())
+ {
+ return canBegin;
}
}
@@ -378,15 +404,45 @@
/// <summary>
/// 淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版暟鎹簱
/// </summary>
- protected void SaveStepsCommitActionToDB()
+ /// <param name="appendToSave">鎻愪氦瀹屽伐姝ユ暟鎹悗锛屾彁浜ら檮鍔犵殑淇濆瓨鍐呭</param>
+ public void SaveStepsCommitActionToDB(Action appendToSave = null)
{
//淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版彁浜ゆ搷浣滃垪琛�
- var commitList = new List<Action>();
- foreach (var step in Steps.OrderBy(q => q.Sequence))
+ if (!Steps.IsNullOrEmpty())
{
- commitList.Add(step.DBSubmitAction);
+ var commitList = new List<Action>();
+ foreach (var step in Steps.OrderBy(q => q.Sequence))
+ {
+ commitList.Add(step.DBSubmitAction);
+ }
+ //璁板綍宸ュ簭鑰楁椂
+ commitList.Add(() =>
+ {
+ 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 (!appendToSave.IsNullOrEmpty())
+ {
+ commitList.Add(appendToSave);
+ }
+ DBCommitList.Add(CurSN, commitList);
}
- DBCommitList.Add(CurSN, commitList);
+ else
+ {
+ //澧炲姞闄勫姞鐨勪繚瀛樺唴瀹�
+ if (!appendToSave.IsNullOrEmpty())
+ {
+ if (!DBCommitList.ContainsKey("AppendSaveAction"))
+ {
+ DBCommitList.Add("AppendSaveAction", new List<Action>());
+ }
+ var commitList = DBCommitList["AppendSaveAction"];
+ commitList.Add(appendToSave);
+ }
+ }
+
//濡傛灉涓嶉渶瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽垯鎶婃彁浜ゆ搷浣滃垪琛ㄦ彁浜ゅ埌鏁版嵁搴�
if (!NeedTemporaryStoreDBCommitAction)
{
@@ -396,9 +452,17 @@
var dbTran = GetCommitDB().UseTran(() =>
{
//鍦ㄥ悓涓�涓簨鍔′腑淇濆瓨鎵�鏈夊伐姝ョ殑鏁版嵁
- foreach (var wipSn in DBCommitList.Keys)
+ foreach (var wipSn in DBCommitList.Keys.Where(q => q != "AppendSaveAction"))
{
foreach (var action in DBCommitList[wipSn])
+ {
+ action.Invoke();
+ }
+ }
+ //闄勫姞鐨勪繚瀛樺唴瀹�
+ if (DBCommitList.ContainsKey("AppendSaveAction"))
+ {
+ foreach (var action in DBCommitList["AppendSaveAction"])
{
action.Invoke();
}
@@ -443,7 +507,7 @@
/// <returns></returns>
public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
{
- foreach (var item in label.Variables)
+ foreach (var item in label.Variables.OrderBy(q => q.VAR_TYPE == BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate.GetValue() ? 0 : 1))
{
switch (item.VAR_TYPE.GetEnum<BAS_LABEL_VAR.VAR_TYPEs>())
{
@@ -451,7 +515,7 @@
item.Value = item.VAR_VALUE;
break;
case BAS_LABEL_VAR.VAR_TYPEs.ProcessVariable:
- item.Value = GetPrintProcessValue(labelPVs, item, action);
+ item.Value = GetPrintProcessValue(labelPVs, item, label.Variables, action);
break;
case BAS_LABEL_VAR.VAR_TYPEs.DateVariable:
item.Value = DateTime.Now.ToString(item.VAR_VALUE);
@@ -474,7 +538,7 @@
/// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
/// <param name="lv">鏍囩妯℃澘鍙橀噺</param>
/// <returns></returns>
- public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, IWorkAction action)
+ public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction action)
{
var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
if (!pv.IsNullOrEmpty())
@@ -488,11 +552,57 @@
case "GetSN":
return CurSN;
case "GetBAS_ITEM":
- return WorkBatch.Product.ToJson();
+ return WorkBatch.Product.CUST_PROD_CODE;
case "GetCustomer":
- return WorkBatch.Batch.ToJson();
+ return WorkBatch.Batch.Customer.ToJson();
+ case "GetBoxQR":
+ return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
+ case "GetCardQR":
+ return action is PackingAction ? GetCardCode(lvars, action as PackingAction) : "";
+ case "GetCardSN":
+ List<string> minPkgList = new List<string>();
+ var _pkaction = action is PackingAction ? action as PackingAction : null;
+ if (_pkaction != null)
+ {
+ minPkgList = GetMinPkgList(_pkaction);
+ }
+ return string.Join("\r\n", minPkgList);
+ case "GetDescription":
+ return WorkBatch.Product.ITEM_DESC;
+ case "GetFengZ":
+ return WorkBatch.Product.ExtInfo.Packaging;
+ case "GetPAndO":
+ return WorkBatch.WO.SALES_CONTRACT;
+ case "GetLTD":
+ return WorkBatch.Batch.Customer.SHORT_NAME;
+ case "GetHWDate":
+ List<string> list = new List<string>();
+ var _action = action is PackingAction ? action as PackingAction : null;
+ if (_action!=null)
+ {
+ list = GetMinPkgList(_action);
+ }
+ return GetHuaWeiWeek(WorkBatch.Batch.ORDER_NO, list);
+ case "GetQty":
+ List<string> qtylist = new List<string>();
+ var _qtyAction = action is PackingAction ? action as PackingAction : null;
+ if (_qtyAction != null)
+ {
+ qtylist = GetMinPkgList(_qtyAction);
+ }
+ return $"{qtylist.Count}PCS";
+ 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 "";
}
@@ -526,9 +636,9 @@
switch (pv.VAR_METHOD)
{
case "GetCartonGenerate":
- return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("B", $"{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 "";
}
@@ -545,7 +655,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();
@@ -555,11 +665,122 @@
}
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="action"></param>
+ /// <returns></returns>
+ private List<string> GetMinPkgList(PackingAction action) {
+ List<string> list = new List<string>();
+ if (action.CurPkg.Item.PKG_LEVEL == 1)
+ {
+ list.Add(CurSN);
+ }
+ else
+ {
+ list = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN).ToList();
+ }
+ return list;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐧界洅鏉＄爜
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ private string GetBoxCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
+ {
+ var boxCode = Biz.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ return GetCardOrBoxQR(boxCode, lvars, action);
+ }
+
+ /// <summary>
+ /// 鑾峰彇绠辨潯鐮�
+ /// </summary>
+ /// <param name="lvars"></param>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ private string GetCardCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
+ {
+ var cardCode = Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "" ;
+ return GetCardOrBoxQR(cardCode, lvars, action);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐧界洅鎴栬�呯浜岀淮鐮�
+ /// </summary>
+ /// <param name="code"></param>
+ /// <param name="lvars"></param>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ private string GetCardOrBoxQR(string code, List<BAS_LABEL_VAR> lvars, PackingAction action)
+ {
+ var minPkgList = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN);
+ var wo = WorkBatch.Batch.ORDER_NO;
+ var snList = string.Join("\r\n", minPkgList);
+ if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
+ var _sn = minPkgList.FirstOrDefault() ?? CurSN;
+ var itemCode = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == _sn || q.CUST_SN == _sn).First()?.ITEM_CODE;
+ var weight = action.CurPkg.WeightInfo.Weight;
+ var unit = action.CurPkg.WeightInfo.Unit.ToUpper();
+ var model = WorkBatch.Product.ExtInfo.Model;
+ var Input = WorkBatch.Product.ExtInfo.Input;
+ var OutPut = WorkBatch.Product.ExtInfo.OutPut;
+ var Power = WorkBatch.Product.ExtInfo.Power;
+ var Accuracy = WorkBatch.Product.ExtInfo.Accuracy;
+ var Display = WorkBatch.Product.ExtInfo.Display;
+ var Remark = WorkBatch.Product.ExtInfo.Remark;
+
+ return $"{code}|{itemCode}|{wo}|\r\n{snList}|{weight}{unit}|鍨嬪彿:{model},杈撳叆:{Input},鏄剧ず:{Display},杈撳嚭:{OutPut},鐢垫簮:{Power},绮惧害:{Accuracy},澶囨敞:{Remark}";
+ }
+
+ /// <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("0000").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)}PCS)"));
+ default:
+ return string.Join("銆�", weeks.Take(2)) + " (+)";
+ }
+ }
#endregion
#endregion Functions
@@ -571,5 +792,6 @@
this.IsFinished = true;
return IsFinished ? base.Close(needSaveHistoryLog) : IsFinished;
}
+
}//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3