From 3450a98119bdc166417ef94734239aed7f3a2785 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 9 Nov 2023 15:30:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=87=91=E8=9D=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/OutStockController.cs | 2 +-
.../Dto/OutStock/OutStockQueryInfoResponse.cs | 4 +++
src/WMS.Web.Domain/Entitys/OutStock.cs | 27 ++++++++++++++++++-
.../IService/IOutStockService.cs | 2 +-
.../Services/OutStockService.cs | 19 ++++++++++---
.../OutStockRepositories.cs | 3 ++-
6 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/src/WMS.Web.Api/Controllers/OutStockController.cs b/src/WMS.Web.Api/Controllers/OutStockController.cs
index b9a86961..6133f004 100644
--- a/src/WMS.Web.Api/Controllers/OutStockController.cs
+++ b/src/WMS.Web.Api/Controllers/OutStockController.cs
@@ -80,7 +80,7 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null)
return Result.ReFailure(ResultCodes.Token_Invalid_Error);
- return await _outStockService.Sync(dto);
+ return await _outStockService.Sync(dto, loginInfo);
}
}
}
diff --git a/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs
index 31bb7f9f..db89a365 100644
--- a/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs
+++ b/src/WMS.Web.Core/Dto/OutStock/OutStockQueryInfoResponse.cs
@@ -70,5 +70,9 @@ namespace WMS.Web.Core.Dto.OutStock
/// 出库数量
///
public decimal Qty { get; set; }
+ ///
+ /// 备注
+ ///
+ public string Remark { get; set; }
}
}
diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs
index e9a7d6ef..a13afe31 100644
--- a/src/WMS.Web.Domain/Entitys/OutStock.cs
+++ b/src/WMS.Web.Domain/Entitys/OutStock.cs
@@ -56,6 +56,11 @@ namespace WMS.Web.Domain.Entitys
[Column("CreatorId")]
public int CreatorId { get; set; }
///
+ /// 操作人
+ ///
+ [Column("OperateId")]
+ public int OperateId { get; set; }
+ ///
/// 创建时间（出库时间）
///
[Column("CreateTime")]
@@ -66,6 +71,16 @@ namespace WMS.Web.Domain.Entitys
[Column("SuccessSync")]
public bool? SuccessSync { get; set; }
///
+ /// 同步时间
+ ///
+ [Column("SyncTime")]
+ public DateTime? SyncTime { get; set; }
+ ///
+ /// 备注
+ ///
+ [Column("Remark")]
+ public string Remark { get; set; }
+ ///
/// 明细
///
public List Details = new List();
@@ -82,7 +97,17 @@ namespace WMS.Web.Domain.Entitys
this.CreatorId = creatorId;
this.CreateTime = DateTime.Now;
}
-
+ ///
+ /// 同步金蝶
+ ///
+ ///
+ public void Sync(bool isSuccess, int operateId,string remark)
+ {
+ this.SuccessSync = isSuccess;
+ this.Remark = remark;
+ this.OperateId = operateId;
+ this.SyncTime = DateTime.Now;
+ }
///
/// 生成单据号
diff --git a/src/WMS.Web.Domain/IService/IOutStockService.cs b/src/WMS.Web.Domain/IService/IOutStockService.cs
index f051c911..872409c8 100644
--- a/src/WMS.Web.Domain/IService/IOutStockService.cs
+++ b/src/WMS.Web.Domain/IService/IOutStockService.cs
@@ -18,7 +18,7 @@ namespace WMS.Web.Domain.IService
//出库单保存
Task Save(SaveOutStockRequest dto, LoginInDto loginInfo);
// 同步金蝶
- Task Sync(OperateRequest dto);
+ Task Sync(OperateRequest dto, LoginInDto loginInfo);
}
}
diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs
index 18ac6157..db05fb70 100644
--- a/src/WMS.Web.Domain/Services/OutStockService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockService.cs
@@ -29,9 +29,11 @@ namespace WMS.Web.Domain.Services
private readonly IOutStockRepositories _outStockRepositories;
private readonly IOutStockTaskRepositories _outStockTaskRepositories;
private readonly IOutStockTaskService _outStockTaskService;
+ private readonly IErpService _erpService;
public OutStockService(IMapper mapper, ILoginService loginService,
IBasicsRepositories transactionRepositories,
- IOutStockRepositories outStockRepositories, IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService)
+ IOutStockRepositories outStockRepositories, IOutStockTaskRepositories outStockTaskRepositories,
+ IOutStockTaskService outStockTaskService, IErpService erpService)
{
_mapper = mapper;
_loginService = loginService;
@@ -39,6 +41,7 @@ namespace WMS.Web.Domain.Services
_outStockRepositories = outStockRepositories;
_outStockTaskRepositories = outStockTaskRepositories;
_outStockTaskService = outStockTaskService;
+ _erpService = erpService;
}
///
/// 出库单
@@ -95,9 +98,19 @@ namespace WMS.Web.Domain.Services
///
///
///
- public Task Sync(OperateRequest dto)
+ public async Task Sync(OperateRequest dto, LoginInDto loginInfo)
{
- return Task.FromResult(Result.ReSuccess());
+ var list = await _outStockRepositories.GetEntityList(dto.Ids);
+ foreach (var entity in list)
+ {
+ //下推金蝶
+ var res = await _erpService.Push(new Core.Dto.Erp.ErpPushDto() { });
+ entity.Sync(res.IsSuccess, loginInfo.UserInfo.StaffId, res.Message);
+ }
+ var isSuccess = await _outStockRepositories.EditEntityList(list, true);
+ if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
+
+ return Result.ReSuccess();
}
}
}
diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs
index 132463ab..3fbd9b8c 100644
--- a/src/WMS.Web.Repositories/OutStockRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockRepositories.cs
@@ -169,7 +169,8 @@ namespace WMS.Web.Repositories
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
- Qty = s.detail.Qty
+ Qty = s.detail.Qty,
+ Remark = s.order.Remark
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();