配置测试数据

src/WMS.Web.Api/appsettings.json

@@ -39,7 +39,7 @@
     "UserName": "mes",
     "Password": "A1B2C3Dh.",
     "ErpId": "ce20210909",
-    "PurchaseInstockFieldKeys": "FBillNo,FUOM"
+    "PurchaseInstockFieldKeys": "FBillNo,FUOM,FSupplierId.FName,FPurchaseOrgId.FName,FMaterialName,FMaterialId.FNumber"
   },
   "Qiniu": {
     "AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms",

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

@@ -205,6 +205,111 @@
             物料规格信号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.SupplierName">
+            <summary>
+            供应商名称
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.OrgName">
+            <summary>
+            组织名称
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.MaterialNumber">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.InStockQueryRequest">
+            <summary>
+            入库单查询请求对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryRequest.SourceBillNo">
+            <summary>
+            来源单号
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.InStockQueryResponse">
+            <summary>
+            入库单查询响应对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Id">
+            <summary>
+            单据ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.BillNo">
+            <summary>
+            单据编号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Type">
+            <summary>
+            入库类型
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.SourceBillNo">
+            <summary>
+            来源单号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Supplier">
+            <summary>
+            供应商
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Org">
+            <summary>
+            组织
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.MaterialName">
+            <summary>
+            物料名称
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.MaterialNumber">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Specifications">
+            <summary>
+            物料规格型号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Stock">
+            <summary>
+            仓库
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Qty">
+            <summary>
+            数量
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.Creator">
+            <summary>
+            创建人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.CreateTime">
+            <summary>
+            创建时间（入库时间）
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryResponse.SuccessSync">
+            <summary>
+            同步成功或者失败
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.Login.AccessTokenDto.Token">
             <summary>
             授权token -- 给前端用的验证token

src/WMS.Web.Core/Dto/Erp/ErpBillQueryParamDto.cs

@@ -45,7 +45,7 @@ namespace WMS.Web.Core.Dto.Erp
         /// <summary>
         /// 最大行数，整型，不能超过10000（非必录）
         /// </summary>
-        public int Limit { get; set; } = 10;
+        public int Limit { get; set; } = 2;
 
         /// <summary>
         /// 表单所在的子系统内码，字符串类型（非必录）

src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs

@@ -20,5 +20,25 @@ namespace WMS.Web.Core.Dto.Erp.Purchase
         /// 物料规格信号
         /// </summary>
         public string Specifications { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
+
+        /// <summary>
+        /// 组织名称
+        /// </summary>
+        public string OrgName { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MaterialName { get; set; }
+
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string MaterialNumber { get; set; }
     }
 }

src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto
+{
+    /// <summary>
+    /// 入库单查询请求对象
+    /// </summary>
+    public class InStockQueryRequest: PaginationBaseRequestDto
+    {
+        /// <summary>
+        /// 来源单号
+        /// </summary>
+        public string SourceBillNo { get; set; }
+    }
+}

src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto
+{
+    /// <summary>
+    /// 入库单查询响应对象
+    /// </summary>
+    public class InStockQueryResponse
+    {
+        /// <summary>
+        /// 单据ID
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 单据编号
+        /// </summary>
+        public string BillNo { get; set; }
+
+        /// <summary>
+        /// 入库类型
+        /// </summary>
+        public string Type { get; set; }
+
+        /// <summary>
+        /// 来源单号
+        /// </summary>
+        public string SourceBillNo { get; set; }
+        /// <summary>
+        /// 供应商
+        /// </summary>
+        public string Supplier { get; set; }
+        /// <summary>
+        /// 组织
+        /// </summary>
+        public string Org { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MaterialName { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string MaterialNumber { get; set; }
+        /// <summary>
+        /// 物料规格型号
+        /// </summary>
+        public string Specifications { get; set; }
+        /// <summary>
+        /// 仓库
+        /// </summary>
+        public string Stock { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string Creator { get; set; }
+        /// <summary>
+        /// 创建时间（入库时间）
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+        /// <summary>
+        /// 同步成功或者失败
+        /// </summary>
+        public bool SuccessSync { get; set; }
+    }
+}

src/WMS.Web.Domain/Services/Public/ErpService.cs

@@ -64,27 +64,43 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock()
         {
-            BasicHttpBinding binding = new BasicHttpBinding();
+            try
-            EndpointAddress address = new EndpointAddress(this._erpOptions.EndpointAddress);
-            ERPGWSoapClient client = new ERPGWSoapClient(binding, address);
-            var token_result = await client.ValidateSystemAsync(this._erpOptions.UserName, this._erpOptions.Password, this._erpOptions.ErpId, "");
-            var query = new ErpBillQueryDto(token_result.AccessToken);
-            var param = new ErpBillQueryParamDto(FormIdParam.STK_InStock.ToString());
-            query.Data = JsonConvert.SerializeObject(param);
-            var json = JsonConvert.SerializeObject(query);
-            var result_json = await client.ExecuteBillQueryAsync(json);
-            var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
-
-            var list = new List<ErpPurchaseInStockResultDto>();
-            foreach (var item in result)
             {
-                var lis = new ErpPurchaseInStockResultDto();
+                BasicHttpBinding binding = new BasicHttpBinding();
-                lis.BillNo = item[0];
+                EndpointAddress address = new EndpointAddress(this._erpOptions.EndpointAddress);
-                lis.Specifications = item[1];
+                ERPGWSoapClient client = new ERPGWSoapClient(binding, address);
-                list.Add(lis);
+                var token_result = await client.ValidateSystemAsync(this._erpOptions.UserName, this._erpOptions.Password, this._erpOptions.ErpId, "");
+                var query = new ErpBillQueryDto(token_result.AccessToken);
+                var param = new ErpBillQueryParamDto(FormIdParam.STK_InStock.ToString());
+                param.FieldKeys = this._erpOptions.PurchaseInstockFieldKeys;
+                query.Data = JsonConvert.SerializeObject(param);
+                var json = JsonConvert.SerializeObject(query);
+
+                var result_json = await client.ExecuteBillQueryAsync(json);
+                var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
+
+                var list = new List<ErpPurchaseInStockResultDto>();
+                foreach (var item in result)
+                {
+                    var lis = new ErpPurchaseInStockResultDto();
+                    lis.BillNo = item[0];
+                    lis.Specifications = item[1];
+                    lis.SupplierName = item[2];
+                    lis.OrgName = item[3];
+                    lis.MaterialName = item[4];
+                    lis.MaterialNumber = item[5];
+                    list.Add(lis);
+
+                }
+                return ResultList<ErpPurchaseInStockResultDto>.ReSuccess(list);
 
             }
-            return ResultList<ErpPurchaseInStockResultDto>.ReSuccess(list);
+            catch (Exception)
+            {
+
+                return ResultList<ErpPurchaseInStockResultDto>.ReFailure("错误",10001);
+            }
+
         }
     }
 }

src/WMS.Web.Repositories/InStockRepositories.cs

@@ -2,6 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
 using WMS.Web.Domain.Infrastructure;
 using WMS.Web.Repositories.Configuration;
 
@@ -23,5 +25,10 @@ namespace WMS.Web.Repositories
             _mapper = mapper;
             _serviceProvider = serviceProvider;
         }
+
+        public async Task<InStockQueryResponse> GetPagedListAsync(InStockQueryRequest dto) 
+        {
+            return null;
+        }
     }
 }