From 076b02953240cce6d6194f9b53ec59d6620d8b1b Mon Sep 17 00:00:00 2001
From: majian <780924089@qq.com>
Date: Mon, 22 Jul 2024 18:25:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E5=B7=A5=E4=BD=8D=E3=80=81=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs   |  5 +++--
 .../Consts/WmsWareHouseConst.cs                      | 12 ++++++------
 WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs |  2 +-
 WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs     |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
index 1b8a9a6d..53863ad3 100644
--- a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
@@ -732,7 +732,7 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
                 LoggerTimer.LogInformation($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} 开始执行YCLWXDPJInstock");
 
                 Dictionary<string, string[]> getdic = new Dictionary<string, string[]>();
-                getdic.Add("未定", new string[] { "CP3-3", "AllowGetFullBox" });
+                getdic.Add("SCW-YCL", new string[] { "CP3-3", "AllowGetFullBox" });
 
                 await db_YCLWXDPJInstocktimer.Ado.BeginTranAsync();
                 foreach (var key in getdic.Keys)
@@ -2172,8 +2172,9 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
                     return;
                 }
 
+                DateTime now = DateTime.Now;
                 List<WmsSterilizationInstockH> wmsSterilizationInstockHs = db_Floor4DMC2CPK.Queryable<WmsSterilizationInstockH>()
-                    .Where(r => DateTime.Now.Subtract(r.instock_time.Value).TotalHours > hours && r.status == WmsWareHouseConst.BILLSTATUS_ON_ID).ToList();
+                    .Where(r => (DateTime.Now - r.instock_time.Value).TotalHours > hours && r.status == WmsWareHouseConst.BILLSTATUS_ON_ID).ToList();
 
                 foreach (WmsSterilizationInstockH wmsSterilizationInstockH in wmsSterilizationInstockHs)
                 {
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
index 2f04548c..f5d98623 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
@@ -446,17 +446,17 @@
         /// </summary>
         public const string Floor1GLSGWOutstockStation5 = "34863907485461";
         /// <summary>
-        /// todo 一楼外协三工位库位 
+        /// 一楼外协三工位库位 
         /// </summary>
-        public const string Floor1WXSGWOutstockStation1 = "111";
+        public const string Floor1WXSGWOutstockStation1 = "35704220754709";
         /// <summary>
-        /// todo 一楼外协三工位库位
+        /// 一楼外协三工位库位
         /// </summary>
-        public const string Floor1WXSGWOutstockStation2 = "222";
+        public const string Floor1WXSGWOutstockStation2 = "35704226358805";
         /// <summary>
-        /// todo 一楼外协三工位库位
+        /// 一楼外协三工位库位
         /// </summary>
-        public const string Floor1WXSGWOutstockStation3 = "333";
+        public const string Floor1WXSGWOutstockStation3 = "35704230368021";
         /// <summary>
         /// 分拣任务生成Encode
         /// </summary>
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
index 8a2e275d..1d4a88c8 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
@@ -180,7 +180,7 @@ namespace Tnb.WarehouseMgr
             {
                 Logger.LogError(ex.Message);
                 Logger.LogError(ex.StackTrace);
-                throw new AppFriendlyException($"绑定失败(1.可能是存在已被绑定的条码 2.存在与此载具编号相同的载具 3.存在字段传了空值) {ex.Message}", 500);
+                throw new AppFriendlyException($"绑定失败(1.可能是存在已被绑定的条码 2.存在其他与此载具编号相同的载具 3.存在字段传了空值) {ex.Message}", 500);
             }
             catch (Exception ex)
             {
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
index 6dd076f1..75e6715b 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
@@ -345,7 +345,7 @@ namespace Tnb.WarehouseMgr
             {
                 Logger.LogError(ex.Message);
                 Logger.LogError(ex.StackTrace);
-                throw new AppFriendlyException($"绑定失败(1.可能是存在已被绑定的条码 2.存在与此载具编号相同的载具 3.存在字段传了空值) {ex.Message}", 500);
+                throw new AppFriendlyException($"绑定失败(1.可能是存在已被绑定的条码 2.存在其他与此载具编号相同的载具 3.存在字段传了空值) {ex.Message}", 500);
             }
             catch (Exception ex)
             {