From 0176d9a772244829011fc6b1bed8e26187e3ab62 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 10 八月 2024 19:20:07 +0800
Subject: [PATCH] 修复了一些已知问题

---
 Tiger.Business.MES/Transaction/Position.cs |   83 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index ccd93fd..757ae4e 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -55,8 +55,10 @@
         public MES_SHIFT_SYS CurShiftSys { get; set; }
         public WorkBatch CurBatch { get; set; }
         public IWorkBatch WorkBatch => CurBatch;
-        public MES_WIP_DATA CurWipSN { get; set; }
-        public MES_WIP_HIS CurWipSNHis { get; set; }
+        public List<MES_WIP_DATA> CurWipSNs { get; set; } = new();
+        public string CurSN => CurWipSNs.Any() ? (CurWipSNs.First().TRAY_SN.IsNullOrEmpty() ? CurWipSNs.First().SN : CurWipSNs.First().TRAY_SN) : "";
+        public List<MES_WIP_HIS> CurWipSNHiss { get; set; } = new();
+        public List<MES_WIP_DFT> CurDefects { get; set; } = new();
         public Dictionary<string, object> Context { get; set; } = new();
         public List<WorkStep> Steps { get; set; } = new();
         public WorkStep CurStep { get; set; }
@@ -70,6 +72,7 @@
         /// </summary>
         public bool NeedTemporaryStoreDBCommitAction { get; set; } = false;
         protected List<Action> DBCommitList { get; set; } = new();
+        protected List<Position> NodeCommitList { get; set; } = new();
 
         #endregion Propertys & Variables
 
@@ -174,9 +177,10 @@
         public virtual void ResetNode()
         {
             Steps.Clear();
-            CurWipSN = null;
-            CurWipSNHis = null;
+            CurWipSNs.Clear();
+            CurWipSNHiss.Clear();
             CurStep = null;
+            CurDefects.Clear();
         }
 
         /// <summary>
@@ -343,15 +347,15 @@
                 NeedTemporaryStoreDBCommitAction = false;
 
                 var dbTran = GetCommitDB().UseTran(() =>
-	            {
-	                //鍦ㄥ悓涓�涓簨鍔′腑淇濆瓨鎵�鏈夊伐姝ョ殑鏁版嵁
-	                foreach (var action in DBCommitList)
-	                {
+                {
+                    //鍦ㄥ悓涓�涓簨鍔′腑淇濆瓨鎵�鏈夊伐姝ョ殑鏁版嵁
+                    foreach (var action in DBCommitList)
+                    {
                         action.Invoke();
-	                }
-	            });
-	            if (dbTran.IsSuccess)
-	            {
+                    }
+                });
+                if (dbTran.IsSuccess)
+                {
                     //淇濆瓨鎴愬姛鍒欐竻绌烘彁浜ゆ搷浣滃垪琛�
                     DBCommitList.Clear();
                 }
@@ -360,6 +364,23 @@
                     //鎶涘嚭寮傚父
                     throw dbTran.ErrorException;
                 }
+            }
+        }
+
+        protected void DoSaveToDB()
+        {
+            var dbTran = GetCommitDB().UseTran(() =>
+            {
+                //鍦ㄥ悓涓�涓簨鍔′腑淇濆瓨鎵�鏈夊伐姝ョ殑鏁版嵁
+                foreach (var step in Steps.OrderBy(q => q.Sequence))
+                {
+                    step.DBSubmitAction.Invoke();
+                }
+            });
+            if (!dbTran.IsSuccess)
+            {
+                //鎶涘嚭寮傚父
+                throw dbTran.ErrorException;
             }
         }
 
@@ -383,6 +404,9 @@
                         break;
                     case BAS_LABEL_VAR.VAR_TYPEs.DateVariable:
                         item.Value = DateTime.Now.ToString(item.VAR_VALUE);
+                        break;
+                    case BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate:
+                        item.Value = GetGeneratePValue(labelPVs, item);
                         break;
                     case BAS_LABEL_VAR.VAR_TYPEs.CustomVariable:
                     default:
@@ -411,7 +435,7 @@
                             switch (pv.VAR_METHOD)
                             {
                                 case "GetSN":
-                                    return CurWipSN.SN;
+                                    return CurSN;
                                 case "GetBAS_ITEM":
                                     return WorkBatch.Product.ToJson();
                                 case "GetCustomer":
@@ -422,7 +446,7 @@
                                     return "";
                             }
                         }
-                    case BAS_LABEL_PV.VAR_TYPEs.WebApiWebApi:
+                    case BAS_LABEL_PV.VAR_TYPEs.WebApi:
                         break;
                     case BAS_LABEL_PV.VAR_TYPEs.StoredProcedure:
                         break;
@@ -432,6 +456,37 @@
             }
             return "";
         }
+
+        /// <summary>
+        /// 鑾峰彇鏍规嵁鏉＄爜瑙勫垯鐢熸垚鏍囩妯℃澘鐨勮繃绋嬪彉閲忓��
+        /// </summary>
+        /// <param name="labelPVs"></param>
+        /// <param name="lv"></param>
+        /// <returns></returns>
+        public string GetGeneratePValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv)
+        {
+            var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
+            if (!pv.IsNullOrEmpty())
+            {
+                switch (pv.VAR_TYPE.GetEnum<BAS_LABEL_PV.VAR_TYPEs>())
+                {
+                    case BAS_LABEL_PV.VAR_TYPEs.BarcodeGenerate:
+                        {
+                            switch (pv.VAR_METHOD)
+                            {
+                                case "GetCartonGenerate":
+                                    return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+                                default:
+                                    return "";
+                            }
+                        }
+                    default:
+                        break;
+                }
+            }
+            return "";
+        }
+
         /// <summary>
         /// 鑾峰彇宸ュ崟缁存姢鐨勬ā鏉垮彉閲�
         /// </summary>

--
Gitblit v1.9.3