From c9d8baca46a7c6ee27a1f8844112dd5f3a52e44b Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 27 九月 2024 01:30:08 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Api/Controllers/Test/TestController.R.cs | 3 ++-
Tiger.Business.WMS/iSRM/SrmToWms.cs | 2 +-
Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_SUM.cs | 4 ----
Tiger.Business.MES/Transaction/CollectNode.cs | 2 +-
Tiger.IBusiness.MES/Transaction/ILoadingMaterial.cs | 2 +-
Tiger.Business.WMS/BS/BS.MaterialrReq.cs | 2 +-
Tiger.Business.MES/Transaction/TestNode.cs | 2 +-
Tiger.Business.WMS/Transaction/OutSplit.cs | 2 +-
Tiger.IBusiness.WMS/Transaction/IOutOther.cs | 2 +-
Tiger.IBusiness.WMS/Transaction/IOutWorkOrder.cs | 2 +-
Tiger.Business.WMS/ERP/T100.cs | 2 +-
Tiger.Business.MES/WorkAction/VerifyCustomSN.cs | 2 +-
Tiger.Business.WMS/Transaction/ShelfRemote.cs | 2 +-
Tiger.Business.WMS/Transaction/InFinished.cs | 2 +-
Tiger.IBusiness.WMS/Transaction/IOutTransfer.cs | 2 +-
15 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/Tiger.Api/Controllers/Test/TestController.R.cs b/Tiger.Api/Controllers/Test/TestController.R.cs
index e4a11ff..462deb6 100644
--- a/Tiger.Api/Controllers/Test/TestController.R.cs
+++ b/Tiger.Api/Controllers/Test/TestController.R.cs
@@ -308,6 +308,7 @@
[HttpGet]
public async Task<IActionResult> DoSomething(int duration)
{
+ Barcode b = new("asdasd");
var begin = DateTime.Now;
while ((DateTime.Now - begin).TotalSeconds <= duration)
{
@@ -317,7 +318,7 @@
ConsoleExt.WriteLine($"Working {begin:mmssfff} ... {(percent > 1 ? 1 : percent):P0} ...", ConsoleColor.Green);
}
Logger.Default.Info($"{begin:mmssfff} completed");
- return Ok($"{begin:mmssfff} completed");
+ return Ok($"{begin:mmssfff} completed {b.DateCode}");
}
[HttpPost]
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 8eda39e..b8bf30e 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -105,7 +105,7 @@
info.InputQty = CurOperInfo(input.Locale).InputQty;
action.Data.OperInfo = info;
}
- else if (!IsFinishAllSteps)
+ else if (Steps.Any() && !IsFinishAllSteps)
{
action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
}
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 45f7ebe..3dce6a1 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -106,7 +106,7 @@
info.InputQty = CurOperInfo(input.Locale).InputQty;
action.Data.OperInfo = info;
}
- else if (!IsFinishAllSteps)
+ else if (Steps.Any() && !IsFinishAllSteps)
{
action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
}
diff --git a/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs b/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs
index 1f273c6..9c18553 100644
--- a/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs
+++ b/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs
@@ -1,4 +1,4 @@
-锘縰sing Org.BouncyCastle.Ocsp;
+锘�
using Rhea.Common;
using SqlSugar;
using System;
diff --git a/Tiger.Business.WMS/BS/BS.MaterialrReq.cs b/Tiger.Business.WMS/BS/BS.MaterialrReq.cs
index 6f43d81..7d87800 100644
--- a/Tiger.Business.WMS/BS/BS.MaterialrReq.cs
+++ b/Tiger.Business.WMS/BS/BS.MaterialrReq.cs
@@ -1,6 +1,6 @@
锘縰sing Apache.NMS;
using Newtonsoft.Json;
-using Org.BouncyCastle.Ocsp;
+
using Rhea.Common;
using SqlSugar;
using System;
diff --git a/Tiger.Business.WMS/ERP/T100.cs b/Tiger.Business.WMS/ERP/T100.cs
index 7d53ce6..5b14732 100644
--- a/Tiger.Business.WMS/ERP/T100.cs
+++ b/Tiger.Business.WMS/ERP/T100.cs
@@ -1,7 +1,7 @@
锘縰sing Apache.NMS.ActiveMQ.Commands;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-using Org.BouncyCastle.Ocsp;
+
using Rhea.Common;
using System;
using System.Collections.Generic;
diff --git a/Tiger.Business.WMS/Transaction/InFinished.cs b/Tiger.Business.WMS/Transaction/InFinished.cs
index 2c0706f..55e2d44 100644
--- a/Tiger.Business.WMS/Transaction/InFinished.cs
+++ b/Tiger.Business.WMS/Transaction/InFinished.cs
@@ -1,5 +1,5 @@
锘縰sing Newtonsoft.Json;
-using Org.BouncyCastle.Ocsp;
+
using Rhea.Common;
using SqlSugar;
using System;
diff --git a/Tiger.Business.WMS/Transaction/OutSplit.cs b/Tiger.Business.WMS/Transaction/OutSplit.cs
index 742796b..69da3fa 100644
--- a/Tiger.Business.WMS/Transaction/OutSplit.cs
+++ b/Tiger.Business.WMS/Transaction/OutSplit.cs
@@ -9,7 +9,7 @@
using System.Threading;
using System.Threading.Tasks;
using Tiger.Model;
-using Org.BouncyCastle.Ocsp;
+
using Newtonsoft.Json;
using Tiger.IBusiness;
diff --git a/Tiger.Business.WMS/Transaction/ShelfRemote.cs b/Tiger.Business.WMS/Transaction/ShelfRemote.cs
index 939e53d..64f00ed 100644
--- a/Tiger.Business.WMS/Transaction/ShelfRemote.cs
+++ b/Tiger.Business.WMS/Transaction/ShelfRemote.cs
@@ -9,7 +9,7 @@
using System.Threading;
using System.Threading.Tasks;
using Tiger.Model;
-using Org.BouncyCastle.Ocsp;
+
using Newtonsoft.Json;
using Apache.NMS.ActiveMQ.Commands;
using Tiger.IBusiness;
diff --git a/Tiger.Business.WMS/iSRM/SrmToWms.cs b/Tiger.Business.WMS/iSRM/SrmToWms.cs
index c9dbeff..315ff3b 100644
--- a/Tiger.Business.WMS/iSRM/SrmToWms.cs
+++ b/Tiger.Business.WMS/iSRM/SrmToWms.cs
@@ -11,7 +11,7 @@
using Tiger.Model.Minsun;
using System.Diagnostics;
using SqlSugar;
-using Org.BouncyCastle.Ocsp;
+
namespace Tiger.Business.WMS
{
diff --git a/Tiger.IBusiness.MES/Transaction/ILoadingMaterial.cs b/Tiger.IBusiness.MES/Transaction/ILoadingMaterial.cs
index f358089..f9f9a2f 100644
--- a/Tiger.IBusiness.MES/Transaction/ILoadingMaterial.cs
+++ b/Tiger.IBusiness.MES/Transaction/ILoadingMaterial.cs
@@ -1,4 +1,4 @@
-锘縰sing Org.BouncyCastle.Ocsp;
+锘�
using Rhea.Common;
using System;
using System.Collections.Generic;
diff --git a/Tiger.IBusiness.WMS/Transaction/IOutOther.cs b/Tiger.IBusiness.WMS/Transaction/IOutOther.cs
index 2860fdc..6c79d19 100644
--- a/Tiger.IBusiness.WMS/Transaction/IOutOther.cs
+++ b/Tiger.IBusiness.WMS/Transaction/IOutOther.cs
@@ -1,4 +1,4 @@
-锘縰sing Org.BouncyCastle.Ocsp;
+锘�
using Rhea.Common;
using System;
using System.Collections.Generic;
diff --git a/Tiger.IBusiness.WMS/Transaction/IOutTransfer.cs b/Tiger.IBusiness.WMS/Transaction/IOutTransfer.cs
index bc57490..554d34c 100644
--- a/Tiger.IBusiness.WMS/Transaction/IOutTransfer.cs
+++ b/Tiger.IBusiness.WMS/Transaction/IOutTransfer.cs
@@ -1,4 +1,4 @@
-锘縰sing Org.BouncyCastle.Ocsp;
+锘�
using Rhea.Common;
using System;
using System.Collections.Generic;
diff --git a/Tiger.IBusiness.WMS/Transaction/IOutWorkOrder.cs b/Tiger.IBusiness.WMS/Transaction/IOutWorkOrder.cs
index 18d8c81..ff5195c 100644
--- a/Tiger.IBusiness.WMS/Transaction/IOutWorkOrder.cs
+++ b/Tiger.IBusiness.WMS/Transaction/IOutWorkOrder.cs
@@ -1,4 +1,4 @@
-锘縰sing Org.BouncyCastle.Ocsp;
+锘�
using Rhea.Common;
using System;
using System.Collections.Generic;
diff --git a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_SUM.cs b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_SUM.cs
index 01d4ecd..7215a21 100644
--- a/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_SUM.cs
+++ b/Tiger.Model.Net/Entitys/WMS/V_WMS_ITEM_SUM.cs
@@ -25,10 +25,6 @@
#endregion
#region 鍏叡灞炴��
- /// <summary>
- /// 鎹偣
- /// </summary>
- public string AUTH_ORG { get; set; }
/// <summary>
/// 浠撳簱
--
Gitblit v1.9.3