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 | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 601f1a3..80df811 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -650,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":
@@ -672,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);
@@ -991,27 +999,6 @@
list.AddRange(GetPackageList(item));
}
return list;
- }
- #endregion
- #region 鎻愪氦鍓嶉�氱敤鏂规硶
- /// <summary>
- /// 鎻愪氦鍓嶆鏌ユ槸鍚﹀矖浣嶃�佸伐鍗曞拰涓嶈壇浠ｇ爜
- /// </summary>
- /// <param name="code"></param>
- /// <returns></returns>
- public async Task<ApiAction<CheckCodeOutput>> CheckCode(string code) {
- var action = new ApiAction<CheckCodeOutput>($"妫�鏌ユ潯鐮亄code}鎴愬姛", new CheckCodeOutput());
- try
- {
- action.Data.Position = DbCache.Cache.Position[code];
- action.Data.WorkOrder = await MainDB.Queryable<BIZ_MES_WO>().Where(q=>q.ORDER_NO == code).FirstAsync();
- action.Data.Defect = DbCache.Cache.Defect[code];
- }
- catch (Exception ex)
- {
- action.CatchExceptionWithLog(ex, $"妫�鏌ユ潯鐮亄code}寮傚父");
- }
- return action;
}
#endregion
#endregion Functions
--
Gitblit v1.9.3