From 3ddaef6f21b25269ad0e9fb5b8ba5588090c9389 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 15 十月 2024 10:10:53 +0800
Subject: [PATCH] 白盒获取装配料号更新
---
Tiger.Business.MES/Transaction/Position.cs | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index a5433bb..460e71e 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -102,7 +102,7 @@
var action = new ApiAction();
try
{
- if (!WoContext.ExistsBatch(input.OrderNo, CurLine.LINE_CODE, batchNo))
+ 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();
//楠岃瘉鏄庣粏鏄惁姝ｇ‘
@@ -592,15 +592,15 @@
}
return $"{qtylist.Count}PCS";
case "GetModel":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Model);
- case "GetInput":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Input);
- case "GetOutput":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.OutPut);
- case "GetPower":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Power);
- case "GetAccuracy":
- return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Accuracy);
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Model);
+ case "GetInput":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Input);
+ case "GetOutput":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.OutPut);
+ case "GetPower":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Power);
+ case "GetAccuracy":
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Accuracy);
case "GetVarByWo":
return GetLabelVarWo(lv, "");
default:
@@ -724,8 +724,7 @@
var wo = WorkBatch.Batch.ORDER_NO;
var snList = string.Join("\r\n", minPkgList);
if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
- var _sn = minPkgList.FirstOrDefault() ?? CurSN;
- var itemCode = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == _sn || q.CUST_SN == _sn).First()?.ITEM_CODE;
+ var itemCode = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == CurWipSNs.First().FLOW_SN).First()?.ITEM_CODE;
var weight = action.CurPkg.WeightInfo.Weight;
var unit = action.CurPkg.WeightInfo.Unit.ToUpper();
var model = WorkBatch.Product.ExtInfo.Model;
@@ -782,6 +781,22 @@
}
}
#endregion
+ #region 鍖呰涓撶敤鏂规硶
+ 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
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3