From 91b3014f920903721af7590ce1049d91b20bfd96 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期三, 11 六月 2025 17:25:22 +0800
Subject: [PATCH] 临时取消容器ID的解析

---
 wms/SpecHelper.cs |    4 ++--
 api/ApiHelper.cs  |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index a9ae649..d05b32b 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -678,15 +678,15 @@
             LogHelper.Info("瑙﹀彂API锛歅DA婊℃墭涓嬬嚎鍏ュ簱" + JsonConvert.SerializeObject(model), "API");
             try
             {
-                if( model.RfId.Length < 16)
-                {
-                    result.resultCode = 1;
-                    result.resultMsg = $"杈撳叆鐨凴FID锛岄暱搴︿笉澶燂紝瑕佸ぇ浜�6浣�;
-                    LogHelper.Info(result.resultMsg);
-                    return result;
-                }
+                //if( model.RfId.Length < 16)
+                //{
+                //    result.resultCode = 1;
+                //    result.resultMsg = $"杈撳叆鐨凴FID锛岄暱搴︿笉澶燂紝瑕佸ぇ浜�6浣�;
+                //    LogHelper.Info(result.resultMsg);
+                //    return result;
+                //}
 
-                model.RfId = WMSHelper.ConvertHexToAscii(model.RfId);
+                //model.RfId = WMSHelper.ConvertHexToAscii(model.RfId);
 
                 //璇ヤ骇绾跨殑婊℃墭涓嬬嚎浣嶇疆锛岃捣鐐�                 var startPoint = Settings.ProductionLines.FirstOrDefault(a => a.PointOut == model.StartLoc);
diff --git a/wms/SpecHelper.cs b/wms/SpecHelper.cs
index 9803712..257bb58 100644
--- a/wms/SpecHelper.cs
+++ b/wms/SpecHelper.cs
@@ -354,7 +354,7 @@
                 var target = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == cntId);
                 if (target != null)
                 {
-                    var targetM = db.Queryable<TN_InventoryM>().First(a => a.S_ID == target.S_ID);
+                    var targetM = db.Queryable<TN_InventoryM>().First(a => a.S_ID == target.S_ID || a.RFID == cntId);
 
                     if (targetM != null)
                     {
@@ -403,7 +403,7 @@
             }
             catch (Exception ex)
             {
-                LogHelper.Error("鏇存柊WMS搴撳瓨鏄庣粏鐨勮繃鏈熸椂闂村け璐�, ex);
+                LogHelper.Error("鍒犻櫎WMS搴撳瓨鏄庣粏", ex);
             }
         }
 

--
Gitblit v1.9.1