From 9148056f613a97fee70f57e35d7ac14a6a51134b Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Wed, 1 Nov 2023 16:49:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8B=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=80=80=E5=87=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 49 ++++++++++++++++++- .../Purchase/ErpPurchaseInStockResultDto.cs | 5 ++ .../TaskInStock/InStockTaskQueryResponse.cs | 4 +- src/WMS.Web.Domain/Entitys/InstockTask.cs | 8 +-- .../Services/Public/ErpService.cs | 16 ++++-- .../Services/Public/LoginService.cs | 2 +- .../InStockTaskRepositories.cs | 6 ++- 7 files changed, 76 insertions(+), 14 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index d7f4a7f1..556722be 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -909,9 +909,54 @@ 同步成功或者失败 null 就是未同步 - + - 明细 + 箱Id + + + + + 物料ID + + + + + 单位ID + + + + + 仓库ID + + + + + 仓位ID + + + + + 盘点前数量（wms系统数量） + + + + + 盘点实际数量（实际仓库数量） + + + + + 盘点后数量 + + + + + 盘点结果类型：1为盘盈，2位盘亏 + + + + + 备注 diff --git a/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs b/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs index c0acb45f..867a1a78 100644 --- a/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs @@ -52,5 +52,10 @@ namespace WMS.Web.Core.Dto.Erp.Purchase /// 创建时间 /// public DateTime FCreateDate { get; set; } + + public string FDocumentStatus { get; set; } + public string FBillTypeID { get; set; } + public string FMRPCloseStatus { get; set; } + public string FBillTypeFName { get; set; } } } diff --git a/src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryResponse.cs b/src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryResponse.cs index 499100e8..ac9d98ce 100644 --- a/src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryResponse.cs @@ -90,7 +90,7 @@ namespace WMS.Web.Core.Dto /// /// 收货时间 /// - public DateTime ReceiveTime { get; set; } + public string ReceiveTime { get; set; } /// /// 上架人 /// @@ -98,7 +98,7 @@ namespace WMS.Web.Core.Dto /// /// 入库时间 /// - public DateTime ShelfTime { get; set; } + public string ShelfTime { get; set; } /// /// 明细备注 /// diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs index 07ed3926..706eb927 100644 --- a/src/WMS.Web.Domain/Entitys/InstockTask.cs +++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs @@ -36,19 +36,19 @@ namespace WMS.Web.Domain.Entitys /// /// 收货人 /// - public int ReceiverId { get; set; } + public int? ReceiverId { get; set; } /// /// 收货时间 /// - public DateTime ReceiveTime { get; set; } + public DateTime? ReceiveTime { get; set; } /// /// 上架人 /// - public int ShelferId { get; set; } + public int? ShelferId { get; set; } /// /// 入库时间(上架时间) /// - public DateTime ShelfTime { get; set; } + public DateTime? ShelfTime { get; set; } /// /// 明细 diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index aedc3979..7334b330 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -93,9 +93,15 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.PUR_PurchaseOrder.ToString()); - param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FModel,FMaterialName,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate"; + param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FModel,FMaterialName,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FDocumentStatus,FBillTypeID,FMRPCloseStatus,FBillTypeID.FName"; param.Limit = 10; - param.FilterString = "FCreateDate>='"+beginTime+"' and FCreateDate<='"+endTime+"'"; + //查询条件：备注其中的条件值以金蝶的值为准！！！ + //1.创建时间在两天前和当天时间之间 + //2.审核状态：已审核 + //3.单据类型：标准采购订单和标准委外订单 + //4.明细关闭状态：正常 + //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 + param.FilterString = "FCreateDate>='"+beginTime+"' and FCreateDate<='"+endTime+ "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -118,7 +124,11 @@ namespace WMS.Web.Domain.Services.Public lis.FQty = Convert.ToDecimal(item[7]); lis.FEntryNote = item[8]; lis.FCreateDate =Convert.ToDateTime(item[9]); - //list.FCHUCHANGPRICE=[10]FCHUCHANGPRICE;//这个是出厂价，但是金蝶测试没有这个字段，正式有的 + lis.FDocumentStatus = item[10]; + lis.FBillTypeID = item[11]; + lis.FMRPCloseStatus = item[12]; + lis.FBillTypeFName = item[13]; + //list.FCHUCHANGPRICE=FCHUCHANGPRICE[?];//这个是出厂价，但是金蝶测试没有这个字段，正式有的 erp_list.Add(lis); } return ResultList.ReSuccess(erp_list); diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs index 0cd19eda..e888017f 100644 --- a/src/WMS.Web.Domain/Services/Public/LoginService.cs +++ b/src/WMS.Web.Domain/Services/Public/LoginService.cs @@ -382,7 +382,7 @@ namespace WMS.Web.Domain.Services.Public } else { - return Result.ReFailure(jObject["errmsg"], jObject["errno"]); + return Result.ReFailure(BaseResultCodes.UnAuthorized); } } diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index f2f8ed66..26645ea7 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -93,9 +93,11 @@ namespace WMS.Web.Repositories ReceiveQty = s.detail.ReceiveQty, RealityQty = s.detail.RealityQty, Receiver = "", - ReceiveTime = s.order.ReceiveTime, + //ReceiveTime= s.order.ReceiveTime.ToString("yyyy-MM-dd HH:mm:ss.fff"), + ReceiveTime = s.order.ReceiveTime.HasValue? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss.fff") : "", Shelfer = "", - ShelfTime = s.order.ShelfTime, + //ShelfTime= s.order.ShelfTime.ToString("yyyy-MM-dd HH:mm:ss.fff"), + ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss.fff") : "", CreateTime = s.detail.CreateTime, }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();