From 7ef68be48528d855220aa32166954ef60e42a970 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Mon, 19 Feb 2024 15:52:31 +0800
Subject: [PATCH] =?UTF-8?q?change-=E6=B3=A1=E5=89=8D=E5=BA=93=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=96=B9=E6=B3=95=E5=A3=B0=E6=98=8E=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs | 8 ++++----
 Aucma.Core.BoxFoam/Business/InStoreBusiness.cs          | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs b/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs
index 36230dda..e947d9fe 100644
--- a/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs
+++ b/Admin.Core.Service/Service_New/BaseSpaceInfoServices.cs
@@ -35,11 +35,11 @@ namespace Admin.Core.Service
             _baseBomInfoRepository = baseBomInfoRepository;
         }
 
-        
 
-        #region 入库通过物料类型获取指定货道，如果没有对应类型的货道停住
+
+        #region 入库通过物料类型获取指定货道，泡前库如果没有对应类型的货道停住
         /// <summary>
-        /// 入库通过物料类型获取指定货道，如果没有对应类型的货道返回空白类型的货道
+        /// 入库通过物料类型获取指定货道
         /// </summary>
         /// <param name="store">物料条码</param>
         /// <param name="materialType">货道类型</param>
@@ -51,7 +51,7 @@ namespace Admin.Core.Service
             try
             {
                 spaceInfos = await _baseSpaceInfoRepository.QueryAsync(x => x.StoreCode == store && (x.MaterialType == materialType || x.typeCodeB == materialType  || x.typeCodeC == materialType ) && x.SpaceStatus == 1);
-                if (spaceInfos == null || spaceInfos.Count == 0) //没有指定该类型物料的货道信息，需获取空白货道信息进行分配
+                if (spaceInfos == null || spaceInfos.Count == 0)
                 return null;
 
                 logHelper.Info($"根据仓库{store}；物料：{materialType}；获取到的货道信息：{spaceInfos.ToJson()}");
diff --git a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs
index 35d59038..91273922 100644
--- a/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs
+++ b/Aucma.Core.BoxFoam/Business/InStoreBusiness.cs
@@ -222,7 +222,7 @@ namespace Aucma.Core.BoxFoam.Business
                     }
                     else
                     {
-                        logHelper.Info($"泡后入库任务：{taskInfo.TaskCode}；下发失败，请排除PLC连接");
+                        logHelper.Info($"泡前入库任务：{taskInfo.TaskCode}；下发失败，请排除PLC连接");
                     }
 
                 }
@@ -369,6 +369,8 @@ namespace Aucma.Core.BoxFoam.Business
         #endregion
 
 
+
+        /// <summary>
         /// 筛选货道
         /// </summary>
         /// <param name="storeCode"></param>
@@ -480,7 +482,7 @@ namespace Aucma.Core.BoxFoam.Business
                     obj.plc.WriteInt16("DB200.2", "1");
                     //写入货道物料类型
                     obj.plc.WriteString(spaceAddress.materialType, taskInfo.MaterialType);
-                    //写入货道号
+                    //写入货道号，plc收到货道号开始入库，并非应答字，所以货道号最后下发
                     obj.plc.WriteInt16("DB200.0", taskInfo.SpaceCode.Substring(7,1));
                     //写入完成后读取反馈号进行复位
                     ReadShellAnswer_InStore(taskInfo);