From baaa18ee787727779745ebf0de7f2be66353ada2 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 19 十二月 2024 12:09:08 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/Transaction/Position.cs | 457 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 377 insertions(+), 80 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 30ef901..80df811 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -13,6 +13,9 @@
using Tiger.Model.Entitys.MES.Position;
using System.Globalization;
using Tiger.Business.MES.WorkAction;
+using System.Collections;
+using Tiger.IBusiness.MES.WorkAction;
+using Dm.parser;
namespace Tiger.Business.MES.Transaction
{
@@ -27,22 +30,23 @@
UserCode = userCode;
ApiHost = apiHost;
PostCode = postCode;
+ _MainDB = Biz.Db;
- CurPosition = Biz.Db.Queryable<MES_POSITION>().Where(q => q.POST_CODE == postCode).First();
+ CurPosition = MainDB.Queryable<MES_POSITION>().Where(q => q.POST_CODE == postCode).First();
//if (CurPosition.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.PositionNotExistsException", new Exception($"{postCode}|"));
if (CurPosition.IsNullOrEmpty()) throw new InvalidDataException($"宀椾綅[{postCode}]涓嶅瓨鍦紝璇锋彁浜ゆ纭殑宀椾綅浠ｇ爜", new Exception($"{postCode}|"));
- CurLine = Biz.Db.Queryable<MES_LINE>().Where(q => q.LINE_CODE == CurPosition.LINE_CODE).First();
+ CurLine = MainDB.Queryable<MES_LINE>().Where(q => q.LINE_CODE == CurPosition.LINE_CODE).First();
//if (CurLine.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.LineNotExistsException", new Exception($"{postCode}|{CurPosition.LINE_CODE}"));
if (CurLine.IsNullOrEmpty()) throw new InvalidDataException($"宀椾綅[{postCode}]鎵�灞炵殑浜х嚎[{CurPosition.LINE_CODE}]涓嶅瓨鍦紝璇峰厛璁剧疆鎵�灞炰骇绾�", new Exception($"{postCode}|{CurPosition.LINE_CODE}"));
- CurWorkshop = Biz.Db.Queryable<MES_WORKSHOP>().Where(q => q.WS_CODE == CurLine.WS_CODE).First();
+ CurWorkshop = MainDB.Queryable<MES_WORKSHOP>().Where(q => q.WS_CODE == CurLine.WS_CODE).First();
//if (CurWorkshop.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.WorkshopNotExistsException", new Exception($"{postCode}|{CurLine.WS_CODE}"));
if (CurWorkshop.IsNullOrEmpty()) throw new InvalidDataException($"宀椾綅[{postCode}]鎵�灞炵殑杞﹂棿[{CurLine.WS_CODE}]涓嶅瓨鍦紝璇峰厛璁剧疆鎵�灞炶溅闂�", new Exception($"{postCode}|{CurLine.WS_CODE}"));
- CurFactory = Biz.Db.Queryable<MES_FACTORY>().Where(q => q.FTY_CODE == CurWorkshop.FTY_CODE).First();
+ CurFactory = MainDB.Queryable<MES_FACTORY>().Where(q => q.FTY_CODE == CurWorkshop.FTY_CODE).First();
//if (CurFactory.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.FactoryNotExistsException", new Exception($"{postCode}|{CurWorkshop.FTY_CODE}"));
if (CurFactory.IsNullOrEmpty()) throw new InvalidDataException($"宀椾綅[{postCode}]鎵�灞炵殑宸ュ巶[{CurWorkshop.FTY_CODE}]涓嶅瓨鍦紝璇峰厛璁剧疆鎵�灞炲伐鍘�", new Exception($"{postCode}|{CurWorkshop.FTY_CODE}"));
//鍔犺浇褰撳墠浜х嚎鐨勭彮鍒�
- CurShiftSys = Biz.Db.Queryable<MES_SHIFT_SYS>().Where(q => q.SFTS_CODE == CurLine.SFTS_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Shifts).First();
+ CurShiftSys = MainDB.Queryable<MES_SHIFT_SYS>().Where(q => q.SFTS_CODE == CurLine.SFTS_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Shifts).First();
return this;
}
@@ -61,6 +65,7 @@
public WorkBatch CurBatch { get; set; }
public IWorkBatch WorkBatch => CurBatch;
public List<MES_WIP_DATA> CurWipSNs { get; set; } = new();
+ public List<MES_WIP_DATA> LastWipSNs { get; set; } = new();
public string CurSN => (CurWipSNs.Any() ? (CurWipSNs.First().TRAY_SN.IsNullOrEmpty() ? CurWipSNs.First().SN : CurWipSNs.First().TRAY_SN) : "");
public List<MES_WIP_HIS> CurWipSNHiss { get; set; } = new();
public List<MES_WIP_DFT> CurDefects { get; set; } = new();
@@ -71,6 +76,8 @@
public bool IsFinishNodeSteps => !Steps.Any(q => q.NodeType == IWorkStep.NodeTypes.Node && !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 _MainDB;
+ public DbClient MainDB => _MainDB;
private DbClient CommitDB;
/// <summary>
/// 鏄惁闇�瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽緟闇�瑕佺殑鏃跺�欏啀鎻愪氦
@@ -96,14 +103,14 @@
/// </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();
+ var wo = await MainDB.Queryable<BIZ_MES_WO>().ByAuth(input.AuthOption).Where(q => q.ORDER_NO == input.OrderNo).FirstAsync();
//楠岃瘉鏄庣粏鏄惁姝ｇ‘
if (wo.IsNullOrEmpty())
{
@@ -115,11 +122,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("MES.Transaction.Position.SelectOrder.StatusException", 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.GetEnumDesc<BIZ_MES_WO.STATUSs>());
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 MainDB.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;
@@ -130,14 +140,14 @@
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.GetEnumDesc<BIZ_MES_WO_BATCH.STATUSs>());
return action;
}
- var wb = new WorkBatch(input.OrderNo).Init(CurLine.LINE_CODE);
- WoContext.WoBatchDic.Add(wb.Batch.BATCH_NO, wb);
+ var wb = WoContext.Add(input.OrderNo, CurLine.LINE_CODE);
+ batchNo = wb.Batch.BATCH_NO;
}
- 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());
@@ -221,7 +231,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
{
@@ -229,6 +244,62 @@
info.NextNode = " 鈥� ";
}
return info;
+ }
+
+ /// <summary>
+ /// 璁剧疆褰撳墠鏉＄爜鐨勫伐搴忎俊鎭�
+ /// </summary>
+ public ApiAction<SubmitOutput> SetOutPutMqttMsg(ApiAction<SubmitOutput> action, string locale = null)
+ {
+ MQTT.Message msg = new()
+ {
+ IsSuccessed = action.IsSuccessed,
+ Content = Biz.T(action.LocaleMsg, locale),
+ };
+ switch (action.Status)
+ {
+ case ApiAction.StatusCodes.Success:
+ msg.Voice = MQTT.Voice.Success;
+ msg.Color = "#FF1E90FF";
+ break;
+ case ApiAction.StatusCodes.Warning:
+ msg.Voice = MQTT.Voice.Warning;
+ msg.Color = "#FFB8860B";
+ break;
+ case ApiAction.StatusCodes.Error:
+ case ApiAction.StatusCodes.Failed:
+ msg.Voice = MQTT.Voice.Fail;
+ msg.Color = "#FFFF0000";
+ break;
+ case ApiAction.StatusCodes.Exception:
+ msg.Voice = MQTT.Voice.Fail;
+ msg.Color = "#FF8B0000";
+ break;
+ case ApiAction.StatusCodes.Normal:
+ case ApiAction.StatusCodes.NeedConfrim:
+ case ApiAction.StatusCodes.Confrimed:
+ default:
+ msg.Voice = MQTT.Voice.Silent;
+ msg.Color = "#FF000000";
+ break;
+ }
+ if (action.Data.IsFinished && action.IsSuccessed)
+ {
+ msg.Voice = MQTT.Voice.Pass;
+ msg.Color = "#FF228B22";
+ }
+ else if (!action.IsSuccessed)
+ {
+ msg.Voice = MQTT.Voice.Fail;
+ msg.Color = "#FFFF0000";
+ }
+ else
+ {
+ msg.Voice = MQTT.Voice.Silent;
+ msg.Color = "#FF000000";
+ }
+ action.Data.MqttMsg = msg;
+ return action;
}
/// <summary>
@@ -395,15 +466,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);
+ }
+ //璁板綍宸ュ簭鑰楁椂
+ var ids = CurWipSNHiss.Select(q => q.ID).ToList().Clone();
+ commitList.Add(() =>
+ {
+ EndAt = DateTime.Now;
+ 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)
{
@@ -413,17 +514,21 @@
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();
}
}
- //璁板綍宸ュ簭鑰楁椂
- 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 (DBCommitList.ContainsKey("AppendSaveAction"))
+ {
+ foreach (var action in DBCommitList["AppendSaveAction"])
+ {
+ action.Invoke();
+ }
+ }
});
if (dbTran.IsSuccess)
{
@@ -436,6 +541,9 @@
throw dbTran.ErrorException;
}
}
+ //璁板綍鏈�鍚庢垚鍔熻繃绔欑殑鏉＄爜
+ LastWipSNs.Clear();
+ LastWipSNs.AddRange(CurWipSNs);
}
protected void DoSaveToDB()
@@ -464,6 +572,11 @@
/// <returns></returns>
public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
{
+ return SetLabelVariables(labelPVs, label, action, null);
+ }
+
+ public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action, WipPkg? CurPkg)
+ {
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>())
@@ -472,7 +585,7 @@
item.Value = item.VAR_VALUE;
break;
case BAS_LABEL_VAR.VAR_TYPEs.ProcessVariable:
- item.Value = GetPrintProcessValue(labelPVs, item, label.Variables, action);
+ item.Value = GetPrintProcessValue(labelPVs, item, label.Variables, action, CurPkg);
break;
case BAS_LABEL_VAR.VAR_TYPEs.DateVariable:
item.Value = DateTime.Now.ToString(item.VAR_VALUE);
@@ -495,7 +608,7 @@
/// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
/// <param name="lv">鏍囩妯℃澘鍙橀噺</param>
/// <returns></returns>
- public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction action)
+ public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg)
{
var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
if (!pv.IsNullOrEmpty())
@@ -508,44 +621,138 @@
{
case "GetSN":
return CurSN;
+ case "GetItemCode":
+ return GetLabelVarWo(lv, WorkBatch.Product.ITEM_CODE);
case "GetBAS_ITEM":
- return WorkBatch.Product.CUST_PROD_CODE;
+ return GetLabelVarWo(lv, WorkBatch.Product.CUST_PROD_CODE);
+ case "GetItemName":
+ return GetLabelVarWo(lv, WorkBatch.Product.ITEM_NAME);
case "GetCustomer":
- return WorkBatch.Batch.Customer.ToJson();
+ return GetLabelVarWo(lv, WorkBatch.Batch.Customer.ToJson());
+ case "GetSalesOrder":
+ return GetLabelVarWo(lv, WorkBatch.WO.SALES_ORDER);
+ case "GetPackNumber":
+ return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
case "GetBoxQR":
- return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
+ return GetCardOrBoxQR(GetBoxCode(), curAction, CurPkg);
case "GetCardQR":
- return action is PackingAction ? GetCardCode(lvars, action as PackingAction) : "";
- case "GetDescription":
- return WorkBatch.Product.ITEM_DESC;
- 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.CurPkg.Item.PKG_LEVEL == 1)
+ return GetCardOrBoxQR("", curAction, CurPkg);
+ case "GetCardSN":
+ List<string> minPkgList = new List<string>();
+ if (!CurPkg.IsNullOrEmpty())
{
- list.Add(CurSN);
+ minPkgList = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
}
else
{
- list = _action != null ? _action.GetMinPackageList(_action.CurPkg.Item).Select(q => q.SN).ToList() : new List<string>();
+ var _pkaction = curAction is PackingAction ? curAction as PackingAction : null;
+ if (!_pkaction.IsNullOrEmpty())
+ {
+ minPkgList = GetMinPkgList(_pkaction);
+ }
+ if (curAction is PrintInStoreLabel)
+ {
+ minPkgList = (curAction as PrintInStoreLabel).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ }
+ return string.Join("\r\n", minPkgList);
+ case "GetDescription":
+ return GetLabelVarWo(lv, WorkBatch.Product.ITEM_DESC);
+ case "GetFengZ":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Packaging);
+ case "GetPAndO":
+ return GetLabelVarWo(lv, WorkBatch.WO.SALES_CONTRACT);
+ case "GetLTD":
+ return GetLabelVarWo(lv, WorkBatch.WO.Customer?.CUST_NAME_CN);
+ case "GetHWDate":
+ List<string> list = new List<string>();
+ if (!CurPkg.IsNullOrEmpty())
+ {
+ list = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ else
+ {
+ var _action = curAction is PackingAction ? curAction as PackingAction : null;
+ if (_action != null)
+ {
+ list = _action.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ if (curAction is PrintInStoreLabel)
+ {
+ list = (curAction as PrintInStoreLabel).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
}
return GetHuaWeiWeek(WorkBatch.Batch.ORDER_NO, list);
+ case "GetQty":
+ List<string> qtylist = new List<string>();
+ if (!CurPkg.IsNullOrEmpty())
+ {
+ qtylist = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ else
+ {
+ if (curAction is PackingAction)
+ {
+ qtylist = (curAction as PackingAction).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ if (curAction is PrintInStoreLabel)
+ {
+ qtylist = (curAction as PrintInStoreLabel).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ }
+ return $"{qtylist.Count}";
case "GetModel":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Model);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Model);
case "GetInput":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Input);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Input);
case "GetOutput":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.OutPut);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.OutPut);
case "GetPower":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Power);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Power);
case "GetAccuracy":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Accuracy);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Accuracy);
case "GetVarByWo":
return GetLabelVarWo(lv, "");
+ case "GetLOTNO":
+ string _lotnos = "";
+ var _orderAction = curAction is PackingAction ? curAction as PackingAction : null;
+ if (!CurPkg.IsNullOrEmpty())
+ {
+ qtylist = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ else
+ {
+ if (_orderAction != null)
+ {
+ var snList = _orderAction.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ //if (!snList.Any())
+ {
+ snList.Add(_orderAction.CurPkg.CustSN?.FLOW_SN);
+ }
+ _lotnos = string.Join(",", MainDB.Queryable<MES_CUST_SN>()
+ .Where((q) => snList.Contains(q.FLOW_SN))
+ .Select((q) => q.WORK_ORDER).Distinct().ToList());
+ return _lotnos;
+ }
+ }
+ return "";
+ case "GetNOTES":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Remark);
+ case "GetXH":
+ return "";
+ case "GetCardNo":
+ return $"{Context.GetOrDefault("CurWaitShipmentCarton").ToInt32() + 1}";
+ case "GetCardTotal":
+ var total = "";
+ var _curaction = curAction is PackingAction ? curAction as PackingAction : null;
+ if (!_curaction.IsNullOrEmpty()) {
+ total = $"{Math.Ceiling(Context.GetOrDefault("CurShipQty").ToDecimal()/_curaction.PkgRule.GetTotalQty().ToDecimal())}";
+ }
+ return total;
+ case "GetModelSpec": //Model+绌烘牸+SPEC,
+ return GetLabelVarWo(lv, $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}");
+ case "GetDATE":
+ return GetLabelVarWo(lv, $"{DateTime.Now.ToString("yyyy/MM/dd")}");
default:
return "";
}
@@ -579,9 +786,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 Cache.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 Cache.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("SN:", "05").Data.ToString() ?? "";
default:
return "";
}
@@ -601,39 +808,53 @@
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();
+ var labelVarwos = MainDB.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == lv.LABEL_ID && x.VAR_NAME == lv.VAR_NAME).ToList();
if (labelVarwos.Any(q => q.WORK_ORDER == WorkBatch.Batch.ORDER_NO))
{
result = labelVarwos.First(q => q.WORK_ORDER == WorkBatch.Batch.ORDER_NO).VAR_VALUE;
}
else
{
- result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First().DEFAULT_VALUE : "") : value;
+ result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First(q => q.WORK_ORDER.IsNullOrEmpty()).DEFAULT_VALUE : "") : value;
}
return result;
}
/// <summary>
- /// 鑾峰彇鐧界洅鏉＄爜
+ /// 鑾峰彇鏈�灏忓寘瑁呮潯鐮佸垪琛�
/// </summary>
/// <param name="action"></param>
/// <returns></returns>
- private string GetBoxCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
+ private List<string> GetMinPkgList(PackingAction action)
{
- var boxCode = Biz.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
- return GetCardOrBoxQR(boxCode, lvars, action);
+ List<string> list = new List<string>();
+ if (action.CurPkg.IsNullOrEmpty())
+ {
+ list.Add(CurSN);
+ }
+ else
+ {
+ list = action.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ }
+ return list;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐧界洅鏉＄爜
+ /// </summary>
+ /// <returns></returns>
+ private string GetBoxCode()
+ {
+ return Cache.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
}
/// <summary>
/// 鑾峰彇绠辨潯鐮�
/// </summary>
- /// <param name="lvars"></param>
- /// <param name="action"></param>
/// <returns></returns>
- private string GetCardCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
+ private string GetCardCode()
{
- var cardCode = Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "" ;
- return GetCardOrBoxQR(cardCode, lvars, action);
+ return Cache.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
}
/// <summary>
@@ -643,23 +864,52 @@
/// <param name="lvars"></param>
/// <param name="action"></param>
/// <returns></returns>
- private string GetCardOrBoxQR(string code, List<BAS_LABEL_VAR> lvars, PackingAction action)
+ private string GetCardOrBoxQR(string code, IWorkAction action, WipPkg? CurPkg)
{
- var itemCode = WorkBatch.Product.CUST_PROD_CODE;
+ List<string> minPkgList = new List<string>();
+ var itemCode = "";
+ double weight = 0;
+ var unit = "";
+ if (!CurPkg.IsNullOrEmpty())
+ {
+ minPkgList = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ itemCode = CurPkg.CustSN?.ITEM_CODE;
+ weight = CurPkg.WeightInfo.Weight;
+ unit = CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
+ }
+ else
+ {
+ if (action is PackingAction)
+ {
+ var pkg = action as PackingAction;
+ //minPkgList = pkg.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ minPkgList = pkg.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ itemCode = pkg.CurPkg.CustSN?.ITEM_CODE;
+ weight = pkg.CurPkg.WeightInfo.Weight;
+ unit = pkg.CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
+ }
+ if (action is PrintInStoreLabel)
+ {
+ var print = action as PrintInStoreLabel;
+ //minPkgList = print.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ minPkgList = print.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ itemCode = print.CurPkg.CustSN?.ITEM_CODE;
+ weight = print.CurPkg.WeightInfo.Weight;
+ unit = print.CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
+ }
+ }
var wo = WorkBatch.Batch.ORDER_NO;
- var snList = string.Join("\r\n", action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN));
+ var snList = string.Join("\r\n", minPkgList);
if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
- 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;
+ 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}|鍨嬪彿:{model},杈撳叆:{Input},鏄剧ず:{Display},杈撳嚭:{OutPut},鐢垫簮:{Power},绮惧害:{Accuracy},澶囨敞:{Remark}";
+ return $"{code}|{itemCode}|{wo}|\r\n{snList}|{weight}{unit}|鍨嬪彿:{model},杈撳叆:{Input},鏄剧ず:{Display},杈撳嚭:{OutPut},鐢垫簮:{Power},绮惧害:{Accuracy},澶囨敞:{Remark}";
}
/// <summary>
@@ -670,7 +920,7 @@
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))
+ var snOrder = MainDB.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)
@@ -683,7 +933,7 @@
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}");
+ dic.Add(sn, $"{year.ToString("0000").Substring(2, 2)}{week:00}");
}
else
{
@@ -699,10 +949,56 @@
case 1:
return weeks.First();
case 2:
- return string.Join("/", weeks.Select(q => q + $"({dic.Count(d => d.Value == q)})"));
+ return string.Join("銆�", weeks.Select(q => q + $"({dic.Count(d => d.Value == q)}PCS)"));
default:
- return string.Join("/", weeks.Take(2)) + " (+)";
+ return string.Join("銆�", weeks.Take(2)) + " (+)";
}
+ }
+ #endregion
+ #region 鏉＄爜瑙勫垯鏂规硶
+ /// <summary>
+ /// 鑾峰彇鏍规嵁鏉＄爜瑙勫垯鐢熸垚鏉＄爜
+ /// </summary>
+ /// <param name="ruleCode"></param>
+ /// <param name="curAction"></param>
+ /// <returns></returns>
+ public string GenerateSN(string ruleCode, IWorkAction curAction)
+ {
+ var rule = Cache.CodeRule[ruleCode ?? ""];
+ if (!rule.IsNullOrEmpty())
+ {
+ switch (rule.RULE_CODE)
+ {
+ case "WhiteBoxNo":
+ return rule.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ case "CartonNo":
+ return rule.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ default:
+ return rule.Generate().Data.ToString() ?? "";
+ }
+ }
+ return "";
+ }
+ #endregion
+ #region 鍖呰涓撶敤鏂规硶
+ /// <summary>
+ /// 鏍规嵁浼犲叆鐨勫寘瑁呭璞¤繑鍥炴墍鏈夌殑鍖呰瀹炰綋鍒楄〃
+ /// </summary>
+ /// <param name="parent"></param>
+ /// <returns></returns>
+ public List<MES_WIP_PKG> GetPackageList(WipPkgItem parent)
+ {
+ List<MES_WIP_PKG> list = new();
+ if (!parent.Package.IsNullOrEmpty())
+ {
+ list.Add(parent.Package);
+ }
+ foreach (var item in parent.Items)
+ {
+ item.Package.PARENT_SN = parent.Package?.SN;
+ list.AddRange(GetPackageList(item));
+ }
+ return list;
}
#endregion
#endregion Functions
@@ -715,5 +1011,6 @@
this.IsFinished = true;
return IsFinished ? base.Close(needSaveHistoryLog) : IsFinished;
}
+
}//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3