18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整下登录退出接口

Browse Source
This commit is contained in:
tongfei
2023-11-01 16:49:49 +08:00
parent a2db8d62ed
commit 9148056f61
7 changed files with 76 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -909,9 +909,54 @@
同步成功或者失败 null 就是未同步
</summary>
</member>
<member name="F:WMS.Web.Domain.Entitys.TakeStock.Details">
<member name="P:WMS.Web.Domain.Entitys.TakeStock.BoxId">
<summary>
明细
箱Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.UnitId">
<summary>
单位ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.StockId">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.SubStockId">
<summary>
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.BeforeQty">
<summary>
盘点前数量（wms系统数量）
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.AfterQty">
<summary>
盘点实际数量（实际仓库数量）
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.FinalQty">
<summary>
盘点后数量
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.ResultType">
<summary>
盘点结果类型：1为盘盈，2位盘亏
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.Remark">
<summary>
备注
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.TakeStock.Create(System.Int32)">

5
src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs
View File

@@ -52,5 +52,10 @@ namespace WMS.Web.Core.Dto.Erp.Purchase
/// 创建时间
/// </summary>
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; }
}
}

4
src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryResponse.cs
View File

@@ -90,7 +90,7 @@ namespace WMS.Web.Core.Dto
/// <summary>
/// 收货时间
/// </summary>
public DateTime ReceiveTime { get; set; }
public string ReceiveTime { get; set; }
/// <summary>
/// 上架人
/// </summary>
@@ -98,7 +98,7 @@ namespace WMS.Web.Core.Dto
/// <summary>
/// 入库时间
/// </summary>
public DateTime ShelfTime { get; set; }
public string ShelfTime { get; set; }
/// <summary>
/// 明细备注
/// </summary>

8
src/WMS.Web.Domain/Entitys/InstockTask.cs
View File

@@ -36,19 +36,19 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 收货人
/// </summary>
public int ReceiverId { get; set; }
public int? ReceiverId { get; set; }
/// <summary>
/// 收货时间
/// </summary>
public DateTime ReceiveTime { get; set; }
public DateTime? ReceiveTime { get; set; }
/// <summary>
/// 上架人
/// </summary>
public int ShelferId { get; set; }
public int? ShelferId { get; set; }
/// <summary>
/// 入库时间(上架时间)
/// </summary>
public DateTime ShelfTime { get; set; }
public DateTime? ShelfTime { get; set; }
/// <summary>
/// 明细

16
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -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<ErpPurchaseInStockResultDto>.ReSuccess(erp_list);

2
src/WMS.Web.Domain/Services/Public/LoginService.cs
View File

@@ -382,7 +382,7 @@ namespace WMS.Web.Domain.Services.Public
}
else
{
return Result.ReFailure(jObject["errmsg"], jObject["errno"]);
return Result.ReFailure(BaseResultCodes.UnAuthorized);
}
}

6
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -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();