From 86722aca20973a1e73d0a446c124eb6a5790496b Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 17 十二月 2024 09:34:17 +0800
Subject: [PATCH] 任务优化，工单状态修改优化
---
Tiger.Business.MES/Transaction/Position.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index d7fc0b3..83c2ad7 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -144,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);
@@ -779,9 +778,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 "";
}
@@ -838,7 +837,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>
@@ -847,7 +846,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>
@@ -957,7 +956,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)
@@ -994,6 +993,20 @@
return list;
}
#endregion
+ #region 鎻愪氦鍓嶉�氱敤鏂规硶
+ public async Task<ApiAction> CheckCode(string code) {
+ var action = new ApiAction();
+ try
+ {
+
+ }
+ catch (Exception ex)
+ {
+ action.CatchExceptionWithLog(ex, $"妫�鏌ユ潯鐮亄code}寮傚父");
+ }
+ return action;
+ }
+ #endregion
#endregion Functions
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3