From a592da60f0db0d4eb950a81a8530e965444be7b1 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 16 十月 2024 09:14:02 +0800
Subject: [PATCH] 工艺路线默认优化
---
Tiger.Business.MES/Transaction/Position.cs | 65 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 1277758..ffd085e 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();
//楠岃瘉鏄庣粏鏄惁姝ｇ‘
@@ -225,7 +225,12 @@
if (CurWipSNs.Any())
{
info.CurNode = CurWipSNs.First().NODE_NAME;
- info.NextNode = string.Join(",", CurBatch.GetNextNodes(CurWipSNs.First()).Select(q => q.NODE_NAME));
+ var nextNodes = CurBatch.GetNextNodes(CurWipSNs.First());
+ info.NextNode = string.Join(",", nextNodes.Select(q => q.NODE_NAME));
+ if (nextNodes.Count == 1 && nextNodes.Single().OPER_CODE == "EndNode")
+ {
+ info.IsReachedEndNode = true;
+ }
}
else
{
@@ -410,11 +415,11 @@
{
commitList.Add(step.DBSubmitAction);
}
- //璁板綍宸ュ簭鑰楁椂
- commitList.Add(() =>
+ //璁板綍宸ュ簭鑰楁椂
+ var ids = CurWipSNHiss.Select(q => q.ID).ToList().Clone();
+ commitList.Add(() =>
{
EndAt = DateTime.Now;
- var ids = CurWipSNHiss.Select(q => q.ID).ToList();
GetCommitDB().Updateable<MES_WIP_HIS>().SetColumns(q => q.ELAPSED_TIME == ElapsedTime.TotalMilliseconds.ToInt64()).Where(q => ids.Contains(q.ID)).ExecuteCommand();
});
//澧炲姞闄勫姞鐨勪繚瀛樺唴瀹�
@@ -548,6 +553,8 @@
return CurSN;
case "GetBAS_ITEM":
return WorkBatch.Product.CUST_PROD_CODE;
+ case "GetItemName":
+ return WorkBatch.Product.ITEM_NAME;
case "GetCustomer":
return WorkBatch.Batch.Customer.ToJson();
case "GetBoxQR":
@@ -569,7 +576,7 @@
case "GetPAndO":
return WorkBatch.WO.SALES_CONTRACT;
case "GetLTD":
- return WorkBatch.Batch.Customer.SHORT_NAME;
+ return WorkBatch.Batch.Customer.CUST_NAME_CN;
case "GetHWDate":
List<string> list = new List<string>();
var _action = action is PackingAction ? action as PackingAction : null;
@@ -587,17 +594,21 @@
}
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, "");
+ case "GetLOTNO":
+ return "";
+ case "GetNOTES":
+ return WorkBatch.Product.ExtInfo?.Remark;
default:
return "";
}
@@ -719,8 +730,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 = action.CurPkg.ITEM_CODE;
var weight = action.CurPkg.WeightInfo.Weight;
var unit = action.CurPkg.WeightInfo.Unit.ToUpper();
var model = WorkBatch.Product.ExtInfo.Model;
@@ -777,6 +787,27 @@
}
}
#endregion
+ #region 鍖呰涓撶敤鏂规硶
+ /// <summary>
+ /// 鏍规嵁浼犲叆鐨勫寘瑁呭璞¤繑鍥炴墍鏈夌殑鍖呰瀹炰綋鍒楄〃
+ /// </summary>
+ /// <param name="parent"></param>
+ /// <returns></returns>
+ 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