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 | 111 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 91 insertions(+), 20 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index f32f651..80df811 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -30,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;
}
@@ -75,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>
/// 鏄惁闇�瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽緟闇�瑕佺殑鏃跺�欏啀鎻愪氦
@@ -107,7 +110,7 @@
{
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())
{
@@ -123,7 +126,7 @@
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)
+ 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();
@@ -141,8 +144,7 @@
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, batchNo);
@@ -242,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>
@@ -592,6 +650,10 @@
{
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":
@@ -614,6 +676,10 @@
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);
@@ -659,11 +725,11 @@
if (_orderAction != null)
{
var snList = _orderAction.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
- if (!snList.Any())
+ //if (!snList.Any())
{
snList.Add(_orderAction.CurPkg.CustSN?.FLOW_SN);
}
- _lotnos = string.Join(",", Biz.Db.Queryable<MES_CUST_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;
@@ -675,9 +741,14 @@
case "GetXH":
return "";
case "GetCardNo":
- return "";
+ return $"{Context.GetOrDefault("CurWaitShipmentCarton").ToInt32() + 1}";
case "GetCardTotal":
- return "";
+ 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":
@@ -715,9 +786,9 @@
switch (pv.VAR_METHOD)
{
case "GetCartonGenerate":
- return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("B", $"{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 "";
}
@@ -737,7 +808,7 @@
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;
@@ -774,7 +845,7 @@
/// <returns></returns>
private string GetBoxCode()
{
- return Biz.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ return Cache.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
}
/// <summary>
@@ -783,7 +854,7 @@
/// <returns></returns>
private string GetCardCode()
{
- return Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+ return Cache.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
}
/// <summary>
@@ -849,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)
@@ -893,7 +964,7 @@
/// <returns></returns>
public string GenerateSN(string ruleCode, IWorkAction curAction)
{
- var rule = Biz.CodeRule[ruleCode ?? ""];
+ var rule = Cache.CodeRule[ruleCode ?? ""];
if (!rule.IsNullOrEmpty())
{
switch (rule.RULE_CODE)
--
Gitblit v1.9.3