From aecffc1fac016281d4c835fafe23c002906acef5 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 02 一月 2025 10:27:38 +0800
Subject: [PATCH] Handle packaging barcodes and improve weighing logic
---
Tiger.Business.MES/WorkAction/Weighing.cs | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/Weighing.cs b/Tiger.Business.MES/WorkAction/Weighing.cs
index 2cd4152..10dcc41 100644
--- a/Tiger.Business.MES/WorkAction/Weighing.cs
+++ b/Tiger.Business.MES/WorkAction/Weighing.cs
@@ -41,27 +41,7 @@
Setting = setting;
#endregion
- CurPkg = MainDB.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPosition.CurSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
- {
- AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
- AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = CurPosition.CurSN,
- PKG_TYPE = CurPosition.WorkBatch.WO.ItemInfo?.UNIT,
- ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE,
- QTY = CurPosition.CurWipSNs.Sum(q => q.QTY),
- UNIT = CurPosition.WorkBatch.WO.ItemInfo?.UNIT,
- WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER,
- BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO,
- ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE,
- NODE_ID = CurPosition.CurWipSNs.First().NODE_ID,
- NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME,
- FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE,
- WS_CODE = CurPosition.CurWipSNs.First().WS_CODE,
- LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE,
- POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
- OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
- SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
- };
+
CurStep.Message = Biz.L("绛夊緟绉伴噸鏁版嵁");
CurStep.Status = StepStatus.Normal;
@@ -86,6 +66,28 @@
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
+ CurPkg = MainDB.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPosition.CurSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ SN = CurPosition.CurSN,
+ PKG_TYPE = CurPosition.WorkBatch.WO.ItemInfo?.UNIT,
+ ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE,
+ QTY = CurPosition.CurWipSNs.Sum(q => q.QTY),
+ UNIT = CurPosition.WorkBatch.WO.ItemInfo?.UNIT,
+ WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER,
+ BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO,
+ ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE,
+ NODE_ID = CurPosition.CurWipSNs.First().NODE_ID,
+ NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME,
+ FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE,
+ WS_CODE = CurPosition.CurWipSNs.First().WS_CODE,
+ LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE,
+ POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
+ OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
+ SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
+ };
+
action.LocaleMsg = GetBeginMsg();
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
--
Gitblit v1.9.3