From 86af82de39f36b5c763b1d0e02ac8d8193fdf077 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 14 八月 2024 23:01:34 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/Transaction/Position.cs | 32 ++------------------------------
1 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 6e26cf6..757ae4e 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -17,7 +17,7 @@
/// <summary>
/// MES宀椾綅浜嬪姟
/// </summary>
- public class Position : MESTransactionBase, IPosition, ICloneable
+ public class Position : MESTransactionBase, IPosition
{
public IPosition Init(string id, string apiHost, string userCode, string postCode)
{
@@ -330,15 +330,6 @@
return result;
}
- public object Clone()
- {
- var newObject = this.MemberwiseClone() as Position;
- newObject.Steps = Steps.Clone();
- newObject.CurWipSNs = CurWipSNs.Clone();
-
- return newObject;
- }
-
/// <summary>
/// 淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版暟鎹簱
/// </summary>
@@ -374,25 +365,6 @@
throw dbTran.ErrorException;
}
}
-
-
- //if (NeedTemporaryStoreDBCommitAction)
- //{
-
-
- // NodeCommitList.Add(this.Clone() as Position);
- //}
- //else
- //{
- // //淇濆瓨鎴愬姛鍒欐竻绌烘彁浜ゆ搷浣滃垪琛�
- // foreach (var item in NodeCommitList)
- // {
- // item?.DoSaveToDB();
- // item?.Dispose();
- // }
- // DoSaveToDB();
- // NodeCommitList.Clear();
- //}
}
protected void DoSaveToDB()
@@ -503,7 +475,7 @@
switch (pv.VAR_METHOD)
{
case "GetCartonGenerate":
- return Biz.CodeRule[lv.BARCODE_RULE].Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString();
+ return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
default:
return "";
}
--
Gitblit v1.9.3