修复bug

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -225,16 +225,16 @@
             仓位
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.MaterialName">
-            <summary>
-            物料名称
-            </summary>
-        </member>
         <member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Specifications">
             <summary>
             物料规格型号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.MaterialNumber">
             <summary>
             物料编码
@@ -410,6 +410,11 @@
             单据编号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.Specifications">
+            <summary>
+            物料规格型号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.MaterialName">
             <summary>
             物料名称
@@ -420,11 +425,6 @@
             物料编码
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.Specifications">
-            <summary>
-            物料规格型号
-            </summary>
-        </member>
         <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.SerialNumbers">
             <summary>
             序列号  
@@ -435,31 +435,31 @@
             原箱子
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.DestBox">
-            <summary>
-            目标箱子
-            </summary>
-        </member>
         <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.SrcSubStock">
             <summary>
             原仓位
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.DestBox">
+            <summary>
+            目标箱子
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.DestSubStock">
             <summary>
             目标仓位
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.Creator">
-            <summary>
-            操作人
-            </summary>
-        </member>
         <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.CreateTime">
             <summary>
             操作时间
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.Creator">
+            <summary>
+            操作人
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest">
             <summary>
             保存改箱
@@ -3767,11 +3767,21 @@
             单据编号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Type">
+            <summary>
+            类型：整箱移货上级，整箱移货下级
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Box">
             <summary>
             箱号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Qty">
+            <summary>
+            数量
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.SrcSubStock">
             <summary>
             原仓位
@@ -3782,14 +3792,9 @@
             目标仓位
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Qty">
+        <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.CreateTime">
             <summary>
-            数量
+            操作时间
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Type">
-            <summary>
-            类型：整箱移货上级，整箱移货下级
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Creator">
@@ -3797,11 +3802,6 @@
             操作人
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.CreateTime">
-            <summary>
-            操作时间
-            </summary>
-        </member>
         <member name="T:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryRequest">
             <summary>
             移箱列表请求

src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs

@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using WMS.Web.Core.Dto;
 using WMS.Web.Core.Dto.ChangeBoxRecord;
+using WMS.Web.Core.Dto.Erp;
 using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
@@ -130,7 +131,9 @@ namespace WMS.Web.Repositories
             }
 
             var materials_result = await _erpService.BillQueryForMaterial();
-            var materials = materials_result.Data.ToList();
+            List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
+            if (materials_result.IsSuccess)
+                materials = materials_result.Data.ToList();
 
             var query = _context.ChangeBoxRecord
                  .GroupJoin(_context.Box, changeBox => changeBox.SrcBoxId, srcBox => srcBox.Id, (changeBox, srcBox) => new { changeBox, srcBox })

src/WMS.Web.Repositories/OutStockRepositories.cs

@@ -9,6 +9,8 @@ using System.Threading.Tasks;
 using WMS.Web.Core;
 using WMS.Web.Core.Dto;
 using WMS.Web.Core.Dto.Erp;
+using WMS.Web.Core.Dto.Erp.Customer;
+using WMS.Web.Core.Dto.Erp.Org;
 using WMS.Web.Core.Dto.OutStock;
 using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
@@ -97,7 +99,9 @@ namespace WMS.Web.Repositories
             #region erp基础资料
             List<int> mIds = new List<int>();
             var materials_result = await _erpService.BillQueryForMaterial();
-            var materials = materials_result.Data.ToList();
+            List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
+            if (materials_result.IsSuccess)
+                materials = materials_result.Data.ToList();
             //物料集合；模糊查询后的物料集合
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
             {
@@ -107,11 +111,15 @@ namespace WMS.Web.Repositories
 
             //取组织
             var org_result = await _erpService.BillQueryForOrg();
-            var orgs = org_result.Data.ToList();
+            List<ErpOrgDto> orgs = new List<ErpOrgDto>();
+            if (org_result.IsSuccess)
+                orgs = org_result.Data.ToList();
 
             //取客户
             var customer_result = await _erpService.BillQueryForCustomer();
-            var customers = customer_result.Data.ToList();
+            List<ErpCustomerDto> customers = new List<ErpCustomerDto>();
+            if (customer_result.IsSuccess)
+                customers = customer_result.Data.ToList();
 
             #endregion
 

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -8,6 +8,8 @@ using System.Text;
 using System.Threading.Tasks;
 using WMS.Web.Core;
 using WMS.Web.Core.Dto.Erp;
+using WMS.Web.Core.Dto.Erp.Customer;
+using WMS.Web.Core.Dto.Erp.Org;
 using WMS.Web.Core.Dto.OutStockTask;
 using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
@@ -222,8 +224,9 @@ namespace WMS.Web.Repositories
             #region erp基础资料
             List<int> mIds = new List<int>();
             var materials_result = await _erpService.BillQueryForMaterial();
-            var materials = materials_result.Data.ToList();
+            List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
-            //var materials =new List<ErpMaterialDto>();
+            if (materials_result.IsSuccess)
+                materials = materials_result.Data.ToList();
             //物料集合；模糊查询后的物料集合
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
             {
@@ -233,11 +236,15 @@ namespace WMS.Web.Repositories
 
             //取组织
             var org_result = await _erpService.BillQueryForOrg();
-            var orgs = org_result.Data.ToList();
+            List<ErpOrgDto> orgs = new List<ErpOrgDto>();
+            if (org_result.IsSuccess)
+                orgs = org_result.Data.ToList();
 
             //取客户
             var customer_result = await _erpService.BillQueryForCustomer();
-            var customers = customer_result.Data.ToList();
+            List<ErpCustomerDto> customers = new List<ErpCustomerDto>();
+            if (customer_result.IsSuccess)
+                customers = customer_result.Data.ToList();
 
             #endregion
 

src/WMS.Web.Repositories/TakeStockRepositories.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using WMS.Web.Core;
+using WMS.Web.Core.Dto.Erp;
 using WMS.Web.Core.Dto.TakeStock;
 using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
@@ -196,10 +197,14 @@ namespace WMS.Web.Repositories
                 companyId = _loginRepositories.CompanyId;
             //1.获取物料集合
             var materials_result = await _erpService.BillQueryForMaterial();
-            var materials = materials_result.Data.ToList();
+            List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
+            if (materials_result.IsSuccess)
+                materials = materials_result.Data.ToList();
             //金蝶子仓库
             var subStock_result = await _erpService.BillQueryForSubStock();
-            var subStocks = subStock_result.Data.ToList();
+            List<Erp_SubStockDto> subStocks = new List<Erp_SubStockDto>();
+            if (subStock_result.IsSuccess)
+                subStocks = subStock_result.Data.ToList();
 
             var query = _context.TakeStockDetails
                .GroupJoin(_context.TakeStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })