功能完善

Author: lula.jin

Dll/TopSdk.dll

@@ -24,6 +24,12 @@ public interface IAssSalesOrderService
         /// <returns></returns>
         DataTable GetOrders(string UserId);
 
+        /// <summary>
+        /// 得到用户的未完成销售单列表
+        /// </summary>
+        /// <param name="UserId">用户编号</param>
+        /// <returns></returns>
+        List<AssSOListOutputDto> GetIncompleteOrders(string UserId);
         /// <summary>
         /// 得到销售单行项
         /// </summary>

SMOSEC.Application/IServices/IAssSalesOrderService.cs

@@ -53,9 +53,17 @@ public interface ISettingService
         /// 根据SN或者名称查询资产
         /// </summary>
         /// <param name="SNOrName">SN或者名称</param>
-        /// <param name="Type">一级资产编号</param>
+        /// <param name="Type">一级类别</param>
         /// <returns></returns>
         DataTable QueryAssets(string SNOrName,string Type);
+        /// <summary>
+        /// 根据SN或者名称和类别、仓库查询资产
+        /// </summary>
+        /// <param name="SNOrName">SN或者名称</param>
+        /// <param name="Type">一级类别编号</param>
+        /// <param name="WareID">仓库编号</param>
+        /// <returns></returns>
+        DataTable QueryAssets(string SNOrName, string Type,string WareID);
 
         /// <summary>
         /// 根据SN得到资产信息

SMOSEC.Application/IServices/ISettingService.cs

@@ -118,8 +118,9 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
-    <Reference Include="TopSdk">
-      <HintPath>..\..\Dll\TopSdk.dll</HintPath>
+    <Reference Include="TopSdk, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Dll\TopSdk.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

SMOSEC.Application/SMOWMS.Application.csproj

@@ -233,10 +233,10 @@ from storageType in _SMOWMSDbContext.WHStorageTypes
 
             foreach (DataRow row in tempTable.Rows)
             {
-                if (int.Parse(row["RESULT"].ToString()) != (int)ResultStatus.存在)
-                {
+                //if (int.Parse(row["RESULT"].ToString()) != (int)ResultStatus.存在)
+                //{
                     row["RESULTNAME"] = Enum.GetName(typeof(ResultStatus), int.Parse(row["RESULT"].ToString()));
-                }
+                //}
 
             }
             return tempTable;

SMOSEC.Application/Services/AssInventoryService.cs

@@ -138,7 +138,32 @@ orderby assSalesOrder.CREATEDATE descending
             }
             return temTable;
         }
+        /// <summary>
+        /// 得到用户的未完成销售单列表
+        /// </summary>
+        /// <param name="UserId">用户编号</param>
+        /// <returns></returns>
+        public List<AssSOListOutputDto> GetIncompleteOrders(string UserId)
+        {
+            var area = _assSalesOrderRepository.GetAll();
 
+            if (!string.IsNullOrEmpty(UserId))
+            {
+                area = area.Where(a => a.SALESPERSON == UserId);
+            }
+            var list = from assSalesOrder in area
+                       join user in SMOWMSDbContext.coreUsers on assSalesOrder.SALESPERSON equals user.USER_ID
+                       where assSalesOrder.STATUS!=2
+                       orderby assSalesOrder.CREATEDATE descending
+                       select new AssSOListOutputDto()
+                       {
+                           SOID = assSalesOrder.SOID,
+                           NAME = assSalesOrder.NAME,
+                       };
+            var temTable = list.ToList();
+            return temTable;
+        }
+ 
         /// <summary>
         /// 得到销售单行项
         /// </summary>

SMOSEC.Application/Services/AssSalesOrderService.cs

@@ -59,7 +59,14 @@ public interface IAssetsRepository : IRepository<Assets>
         /// <param name="types">类型</param>
         /// <returns></returns>
         IQueryable<Assets> QueryAssets(string SNOrName, List<String> types);
-
+        /// <summary>
+        /// 根据SN或者名称和类别、仓库模糊查询资产
+        /// </summary>
+        /// <param name="SNOrName">SN或者名称</param>
+        /// <param name="types">类别</param>
+        /// <param name="wareid">仓库编号</param>
+        /// <returns></returns>
+        IQueryable<Assets> QueryAssets(string SNOrName, List<String> types,string wareid);
         /// <summary>
         /// 根据SN得到资产信息
         /// </summary>

SMOSEC.Application/Services/SettingService.cs

@@ -114,6 +114,30 @@ public AssetsRepository(IDbContext dbContext)
             }
             return result;
         }
+        /// <summary>
+        /// 根据SN或者名称和类别、仓库模糊查询资产
+        /// </summary>
+        /// <param name="SNOrName">SN或者名称</param>
+        /// <param name="types">类别</param>
+        /// <param name="wareid">仓库编号</param>
+        /// <returns></returns>
+        public IQueryable<SMOWMS.Domain.Entity.Assets> QueryAssets(string SNOrName, List<String> types,string wareid)
+        {
+            var result = _entities;
+            if (types.Count > 0)
+            {
+                result = result.Where(a => types.Contains(a.TYPEID));
+            }
+            if (!string.IsNullOrEmpty(SNOrName))
+            {
+                result = result.Where(a => a.SN.Contains(SNOrName) || a.NAME.Contains(SNOrName));
+            }
+            if(string.IsNullOrEmpty(wareid)==false)
+            {
+                result = result.Where(a => a.WAREID == wareid);
+            }
+            return result;
+        }
 
         /// <summary>
         /// 根据序列号得到资产