入库任务数据调用

src/WMS.Web.Api/Controllers/TestController.cs

@@ -26,8 +26,8 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-            //var result= await this._erpService.BillQueryForPurchaseInStock();
+            var result= await this._erpService.BillQueryForPurchaseInStock();
-            var result = await this._erpService.BillQueryForOrg();
+            //var result = await this._erpService.BillQueryForOrg();
             if (!result.IsSuccess)
                 return "";
             return JsonConvert.SerializeObject(result.Data);

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

@@ -325,34 +325,64 @@
             erp-采购入库-返回数据源
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.BillNo">
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FPOOrderNo">
             <summary>
-            单据编号
+            采购订单号
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.Specifications">
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FSupplierId">
             <summary>
-            物料规格信号
+            供应商
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.SupplierName">
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FPurchaseOrgId">
             <summary>
-            供应商名称
+            采购组织
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.OrgName">
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FUOM">
             <summary>
-            组织名称
+            规则型号
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.MaterialName">
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FNumber">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FMaterialName">
             <summary>
             物料名称
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.MaterialNumber">
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FMaterialId">
             <summary>
-            物料编码
+            物料ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FStockId">
+            <summary>
+            仓库ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FStockLocId">
+            <summary>
+            子仓库
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FRemainInStockQty">
+            <summary>
+            采购数量
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FNote">
+            <summary>
+            明细备注
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FCreateDate">
+            <summary>
+            创建时间
             </summary>
         </member>
         <member name="T:WMS.Web.Core.Dto.InStockQueryRequest">

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

@@ -1365,6 +1365,18 @@
             私钥
             </summary>
         </member>
+        <member name="T:WMS.Web.Domain.QuartzJob.InStockOrderQuartzJob">
+            <summary>
+            erp入库单-获取定时任务
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Domain.QuartzJob.InStockOrderQuartzJob.Execute(Quartz.IJobExecutionContext)">
+            <summary>
+            执行方法
+            </summary>
+            <param name="context"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.ChangeMoveBoxService">
             改箱 移箱服务
         </member>

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

@@ -12,33 +12,53 @@ namespace WMS.Web.Core.Dto.Erp.Purchase
     public class ErpPurchaseInStockResultDto
     {
         /// <summary>
-        /// 单据编号
+        /// 采购订单号
         /// </summary>
-        public string BillNo { get; set; }
+        public string FPOOrderNo { get; set; }
 
         /// <summary>
-        /// 物料规格信号
+        /// 供应商
         /// </summary>
-        public string Specifications { get; set; }
+        public int FSupplierId { get; set; }
-
         /// <summary>
-        /// 供应商名称
+        /// 采购组织
         /// </summary>
-        public string SupplierName { get; set; }
+        public int FPurchaseOrgId { get; set; }
-
         /// <summary>
-        /// 组织名称
+        /// 规则型号
         /// </summary>
-        public string OrgName { get; set; }
+        public string FUOM { get; set; }
-
-        /// <summary>
-        /// 物料名称
-        /// </summary>
-        public string MaterialName { get; set; }
-
         /// <summary>
         /// 物料编码
         /// </summary>
-        public string MaterialNumber { get; set; }
+        public string FNumber { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string FMaterialName { get; set; }
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+        public int FMaterialId { get; set; }
+        /// <summary>
+        /// 仓库ID
+        /// </summary>
+        public int FStockId { get; set; }
+        /// <summary>
+        /// 子仓库
+        /// </summary>
+        public int FStockLocId { get; set; }
+        /// <summary>
+        /// 采购数量
+        /// </summary>
+        public decimal FRemainInStockQty { get; set; }
+        /// <summary>
+        /// 明细备注
+        /// </summary>
+        public string FNote { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime FCreateDate { get; set; }
     }
 }

src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs

@@ -0,0 +1,73 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Quartz;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using WMS.Web.Domain.Infrastructure;
+using WMS.Web.Domain.IService.Public;
+using WMS.Web.Domain.Options;
+
+namespace WMS.Web.Domain.QuartzJob
+{
+    /// <summary>
+    /// erp入库单-获取定时任务
+    /// </summary>
+    public class InStockOrderQuartzJob : IJob
+    {
+        private readonly ILogger<InStockOrderQuartzJob> _logger;
+        private readonly IServiceScopeFactory _serviceScopeFactory;
+        private readonly AppOptions _options;
+        private readonly IInStockTaskRepositories _inStockTaskRepositories;
+        private readonly IErpService _erpService;
+
+        public InStockOrderQuartzJob(ILogger<InStockOrderQuartzJob> logger,
+            IServiceScopeFactory serviceScopeFactory,
+            IOptions<AppOptions> options,
+            IInStockTaskRepositories inStockTaskRepositories,
+            IErpService erpService)
+        {
+            this._erpService = erpService;
+            this._logger = logger;
+            _serviceScopeFactory = serviceScopeFactory;
+            this._options = options?.Value;
+            _inStockTaskRepositories = inStockTaskRepositories;
+        }
+
+        /// <summary>
+        /// 执行方法
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public async Task Execute(IJobExecutionContext context)
+        {
+            try
+            {
+
+
+                var begindatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
+
+
+                var purchaseInStockOrder = await _erpService.BillQueryForPurchaseInStock();
+
+
+
+                var enddatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
+                //_logger.LogInformation($"《获取金蝶数据》->执行开始时间：{begindatetime},\r\n" +
+                //$"执行条数：{result.Data?.ExecuteCount}条，\r\n" +
+                //$"新增数：{result.Data?.ExecuteCreateCount}条，\r\n" +
+                //$"更新数：{result.Data?.ExecuteUpdateCount}条，\r\n" +
+                //$"执行结果：{result.Data?.Message}，\r\n" +
+                //$"执行结束时间：{enddatetime}");
+
+            }
+            catch (Exception ex)
+            {
+                _logger.LogInformation($"首页库存金额统计：定时任务执行失败->{ex.Message}");
+            }
+
+        }
+    }
+}

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

@@ -76,9 +76,16 @@ namespace WMS.Web.Domain.Services.Public
                 if (!token_result.IsSuccess)
                     return ResultList<ErpPurchaseInStockResultDto>.ReFailure(token_result);
 
+                //var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00");
+                //var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                var beginTime = DateTime.Now.ToString("2023-07-06 00:00:00");
+                var endTime = DateTime.Now.ToString("2023-07-06 01:00:00");
+
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.STK_InStock.ToString());
-                param.FieldKeys = this._erpOptions.PurchaseInstockFieldKeys;
+                param.FieldKeys = "FPOOrderNo,FSupplierId,FPurchaseOrgId,FUOM,FMaterialId.FNumber,FMaterialName,FMaterialId,FStockId,FStockLocId,FRemainInStockQty,FNote,FCreateDate";
+                param.Limit = 10;
+                param.FilterString = "FCreateDate>='"+beginTime+"' and FCreateDate<='"+endTime+"'";
                 query.Data = JsonConvert.SerializeObject(param);
                 var json = JsonConvert.SerializeObject(query);
 
@@ -89,19 +96,25 @@ namespace WMS.Web.Domain.Services.Public
                 foreach (var item in result)
                 {
                     var lis = new ErpPurchaseInStockResultDto();
-                    lis.BillNo = item[0];
+                    lis.FPOOrderNo = item[0];
-                    lis.Specifications = item[1];
+                    lis.FSupplierId = Convert.ToInt32(item[1]);
-                    lis.SupplierName = item[2];
+                    lis.FPurchaseOrgId = Convert.ToInt32(item[2]);
-                    lis.OrgName = item[3];
+                    lis.FUOM = item[3];
-                    lis.MaterialName = item[4];
+                    lis.FNumber = item[4];
-                    lis.MaterialNumber = item[5];
+                    lis.FMaterialName = item[5];
+                    lis.FMaterialId = Convert.ToInt32(item[6]);
+                    lis.FStockId = Convert.ToInt32(item[7]);
+                    lis.FStockLocId = Convert.ToInt32(item[8]);
+                    lis.FRemainInStockQty =Convert.ToDecimal(item[9]);
+                    lis.FNote = item[10];
+                    lis.FCreateDate =Convert.ToDateTime(item[11]);
                     list.Add(lis);
 
                 }
                 return ResultList<ErpPurchaseInStockResultDto>.ReSuccess(list);
 
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 return ResultList<ErpPurchaseInStockResultDto>.ReFailure("错误", 10001);
             }

src/WMS.Web.Domain/WMS.Web.Domain.csproj

@@ -29,8 +29,4 @@
     <ProjectReference Include="..\WMS.Web.Core\WMS.Web.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="QuartzJob\" />
-  </ItemGroup>
-
 </Project>