diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo
index 059e257..85bc629 100644
Binary files a/.vs/HighWayIot/v16/.suo and b/.vs/HighWayIot/v16/.suo differ
diff --git a/HighWayIot.Repository/HighWayIot.Repository.csproj b/HighWayIot.Repository/HighWayIot.Repository.csproj
index 46667a5..6308d87 100644
--- a/HighWayIot.Repository/HighWayIot.Repository.csproj
+++ b/HighWayIot.Repository/HighWayIot.Repository.csproj
@@ -64,6 +64,7 @@
     <Compile Include="domain\ProductPlanInfo.cs" />
     <Compile Include="domain\RealTaskInfo.cs" />
     <Compile Include="domain\SysUserInfo.cs" />
+    <Compile Include="enums\OperationType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repository.cs" />
     <Compile Include="service\IBaseBomInfoService.cs" />
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll
index 52660f1..0e56db6 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb
index d62bfc1..8707524 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot.Repository/enums/OperationType.cs b/HighWayIot.Repository/enums/OperationType.cs
new file mode 100644
index 0000000..fd6593f
--- /dev/null
+++ b/HighWayIot.Repository/enums/OperationType.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HighWayIot.Repository.enums
+{
+    public enum OperationType
+    {
+        /// <summary>
+        /// 入库
+        /// </summary>
+        inStore,
+
+        /// <summary>
+        /// 出库
+        /// </summary>
+        outStore
+    }
+}
diff --git a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 793dee9..6a2a6db 100644
Binary files a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
index 760f0a8..d024158 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache
index 58962f3..3609057 100644
--- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache
+++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cd309b8333415f420709774c635be812b73b5a82
+ee420817595965611deb28a84aebedb91656b671
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll
index 52660f1..0e56db6 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb
index d62bfc1..8707524 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot.Repository/service/IBaseSpaceInfoService.cs b/HighWayIot.Repository/service/IBaseSpaceInfoService.cs
index e00111a..29e6f58 100644
--- a/HighWayIot.Repository/service/IBaseSpaceInfoService.cs
+++ b/HighWayIot.Repository/service/IBaseSpaceInfoService.cs
@@ -1,4 +1,5 @@
 using HighWayIot.Repository.domain;
+using HighWayIot.Repository.enums;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,7 +19,7 @@ namespace HighWayIot.Repository.service
         /// <param name="store"></param>
         /// <param name="materialType"></param>
         /// <returns></returns>
-        BaseSpaceInfo GetSpaceInfoByMaterialType(string store, string materialType);
+        BaseSpaceInfo GetSpaceInfoByMaterialType(string store, string materialType,OperationType operation);
 
         /// <summary>
         /// 更新货道信息
diff --git a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs
index e36dd44..3fc7d3f 100644
--- a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs
+++ b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs
@@ -1,6 +1,7 @@
 using HighWayIot.Common;
 using HighWayIot.Log4net;
 using HighWayIot.Repository.domain;
+using HighWayIot.Repository.enums;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -24,14 +25,24 @@ namespace HighWayIot.Repository.service.Impl
         /// <param name="store"></param>
         /// <param name="materialType"></param>
         /// <returns></returns>
-        public BaseSpaceInfo GetSpaceInfoByMaterialType(string store, string materialType)
+        public BaseSpaceInfo GetSpaceInfoByMaterialType(string store, string materialType,OperationType operation)
         {
             BaseSpaceInfo spaceInfo = null;
             List<BaseSpaceInfo> spaceInfos;
             try
             {
                 Expression<Func<BaseSpaceInfo, bool>> exp = s1 => true;
-                exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1 && x.spaceCapacity != x.spaceStock); //相同型号、启用状态、库存未满的货道信息
+                exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1); //相同型号、启用状态的货道信息
+                
+                if(operation == OperationType.inStore)
+                {
+                    exp = exp.And(x => x.spaceCapacity != x.spaceStock); //库存未满
+                }
+                else if(operation == OperationType.outStore)
+                {
+                    exp = exp.And(x => x.spaceStock > 0); //库存不为空
+                }
+
                 spaceInfos = _mesRepository.GetList(exp);
 
                 if(spaceInfos.Count == 0) //没有指定该类型物料的货道信息，需获取空白货道信息进行分配
diff --git a/HighWayIot/Program.cs b/HighWayIot/Program.cs
index 54866ec..6dc7a99 100644
--- a/HighWayIot/Program.cs
+++ b/HighWayIot/Program.cs
@@ -22,7 +22,7 @@ namespace HighWayIot
         static void Main(string[] args)
         {
             logger.Info("初始化启动");
-            var info = spaceInfoService.GetSpaceInfoByMaterialType("X-001", "SC232");
+            var info = spaceInfoService.GetSpaceInfoByMaterialType("X-001", "SC232",Repository.enums.OperationType.inStore);
         }
     }
 }
diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.dll b/HighWayIot/bin/Debug/HighWayIot.Repository.dll
index 52660f1..0e56db6 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb
index d62bfc1..8707524 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.exe b/HighWayIot/bin/Debug/HighWayIot.exe
index 480fd38..620c15f 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.exe and b/HighWayIot/bin/Debug/HighWayIot.exe differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.pdb b/HighWayIot/bin/Debug/HighWayIot.pdb
index 3f97e52..9d63741 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.pdb and b/HighWayIot/bin/Debug/HighWayIot.pdb differ
diff --git a/HighWayIot/bin/Debug/Log/2023-09-27/LogInfo.txt b/HighWayIot/bin/Debug/Log/2023-09-27/LogInfo.txt
index 4a6258e..e48fd2e 100644
--- a/HighWayIot/bin/Debug/Log/2023-09-27/LogInfo.txt
+++ b/HighWayIot/bin/Debug/Log/2023-09-27/LogInfo.txt
@@ -14,4 +14,16 @@
 ��־ʱ�䣺2023-09-27 10:42:50,576 [1] 
 ��־����INFO  
 ��־���ݣ��ֿ�X-001�����ϣ�SC232��ƥ�����������Ϣ��{"objId":2,"spaceCode":"HD_002","spaceName":"����02","spaceCapacity":10,"spaceStock":1,"spaceStatus":1,"spaceType":1,"materialType":null,"storeCode":"X-001","isFlag":0} 
+ <-------------->
+��־ʱ�䣺2023-09-27 10:51:48,117 [1] 
+��־����INFO  
+��־���ݣ���ʼ������ 
+ <-------------->
+��־ʱ�䣺2023-09-27 10:51:51,547 [1] 
+��־����INFO  
+��־���ݣ����ݲֿ�X-001�����ϣ�SC232����ȡ���Ļ�����Ϣ��[{"objId":2,"spaceCode":"HD_002","spaceName":"����02","spaceCapacity":10,"spaceStock":1,"spaceStatus":1,"spaceType":1,"materialType":null,"storeCode":"X-001","isFlag":0}] 
+ <-------------->
+��־ʱ�䣺2023-09-27 10:51:51,550 [1] 
+��־����INFO  
+��־���ݣ��ֿ�X-001�����ϣ�SC232��ƥ�����������Ϣ��{"objId":2,"spaceCode":"HD_002","spaceName":"����02","spaceCapacity":10,"spaceStock":1,"spaceStatus":1,"spaceType":1,"materialType":null,"storeCode":"X-001","isFlag":0} 
  
\ No newline at end of file
diff --git a/HighWayIot/bin/Debug/Log/2023-09-27/SqlLog.txt b/HighWayIot/bin/Debug/Log/2023-09-27/SqlLog.txt
index 05f21c7..45529a0 100644
--- a/HighWayIot/bin/Debug/Log/2023-09-27/SqlLog.txt
+++ b/HighWayIot/bin/Debug/Log/2023-09-27/SqlLog.txt
@@ -14,4 +14,12 @@
 ��־ʱ�䣺2023-09-27 10:42:50,459 [1] 
 ��־����INFO  
 ��־���ݣ�SELECT "OBJ_ID","SPACE_CODE","SPACE_NAME","SPACE_CAPACITY","SPACE_STOCK","SPACE_STATUS","SPACE_TYPE","MATERIAL_TYPE","STORE_CODE","IS_FLAG" FROM "BASE_SPACEINFO"  WHERE (( 1 = 1 ) AND(( "MATERIAL_TYPE" IS NULL ) AND ( "SPACE_CAPACITY" <> "SPACE_STOCK" )))��������[] 
+ <-------------->
+��־ʱ�䣺2023-09-27 10:51:49,350 [1] 
+��־����INFO  
+��־���ݣ�SELECT "OBJ_ID","SPACE_CODE","SPACE_NAME","SPACE_CAPACITY","SPACE_STOCK","SPACE_STATUS","SPACE_TYPE","MATERIAL_TYPE","STORE_CODE","IS_FLAG" FROM "BASE_SPACEINFO"  WHERE ((( 1 = 1 ) AND((( "STORE_CODE" = :storeCode1 ) AND ( "MATERIAL_TYPE" = :materialType2 )) AND ( "SPACE_STATUS" = :spaceStatus3 ))) AND ( "SPACE_CAPACITY" <> "SPACE_STOCK" ))��������[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":storeCode1","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"X-001","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":materialType2","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"SC232","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":":spaceStatus3","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":1,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}] 
+ <-------------->
+��־ʱ�䣺2023-09-27 10:51:50,852 [1] 
+��־����INFO  
+��־���ݣ�SELECT "OBJ_ID","SPACE_CODE","SPACE_NAME","SPACE_CAPACITY","SPACE_STOCK","SPACE_STATUS","SPACE_TYPE","MATERIAL_TYPE","STORE_CODE","IS_FLAG" FROM "BASE_SPACEINFO"  WHERE (( 1 = 1 ) AND(( "MATERIAL_TYPE" IS NULL ) AND ( "SPACE_CAPACITY" <> "SPACE_STOCK" )))��������[] 
  
\ No newline at end of file
diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache
index 693bfeb..d66d137 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot/obj/Debug/HighWayIot.exe b/HighWayIot/obj/Debug/HighWayIot.exe
index 480fd38..620c15f 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.exe and b/HighWayIot/obj/Debug/HighWayIot.exe differ
diff --git a/HighWayIot/obj/Debug/HighWayIot.pdb b/HighWayIot/obj/Debug/HighWayIot.pdb
index 3f97e52..9d63741 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.pdb and b/HighWayIot/obj/Debug/HighWayIot.pdb differ