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

调整金蝶操作

Browse Source
This commit is contained in:
18942506660
2023-11-10 16:17:03 +08:00
parent 074b649faf
commit f35dd85d29
6 changed files with 200 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -550,6 +550,21 @@
表单所在的子系统内码，字符串类型（非必录）
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpOperateDto">
<summary>
erp 提交和审核
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpOperateDto.FormId">
<summary>
业务对象表单Id（必录）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpOperateDto.Ids">
<summary>
单据Id
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpPushDto">
<summary>
下推
@@ -590,21 +605,6 @@
单据体
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpSubmitDto">
<summary>
erp 提交和审核
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpSubmitDto.FormId">
<summary>
业务对象表单Id（必录）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpSubmitDto.Ids">
<summary>
单据Id
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpMaterialDto">
<summary>
对应金蝶，物料信息

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

@@ -2743,7 +2743,7 @@
<param name="code"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.Sync``1(``0,System.String)">
<member name="M:WMS.Web.Domain.Services.Public.ErpService.Save``1(``0,System.String)">
<summary>
同步数据(保存提交审核)
</summary>
@@ -2751,6 +2751,38 @@
<param name="formId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.Submit(WMS.Web.Core.Dto.Erp.ErpOperateDto,System.String)">
<summary>
提交
</summary>
<param name="dto"></param>
<param name="formId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.Audit(WMS.Web.Core.Dto.Erp.ErpOperateDto,System.String)">
<summary>
审核
</summary>
<param name="dto"></param>
<param name="formId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.NoAudit(WMS.Web.Core.Dto.Erp.ErpOperateDto,System.String)">
<summary>
反审核
</summary>
<param name="dto"></param>
<param name="formId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.Delete(WMS.Web.Core.Dto.Erp.ErpOperateDto,System.String)">
<summary>
删除
</summary>
<param name="dto"></param>
<param name="formId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.Push(WMS.Web.Core.Dto.Erp.ErpPushDto)">
<summary>
下推

4
src/WMS.Web.Core/Dto/Erp/ErpSubmitDto.cs → src/WMS.Web.Core/Dto/Erp/ErpOperateDto.cs
View File

@@ -8,9 +8,9 @@ namespace WMS.Web.Core.Dto.Erp
/// <summary>
/// erp 提交和审核
/// </summary>
public class ErpSubmitDto
public class ErpOperateDto
{
public ErpSubmitDto(string formId, string id)
public ErpOperateDto(string formId, string id)
{
this.FormId = formId;
this.Ids = id;

11
src/WMS.Web.Domain/IService/Public/IErpService.cs
View File

@@ -83,9 +83,16 @@ namespace WMS.Web.Domain.IService.Public
/// <returns></returns>
Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code=null);
//同步数据(保存提交审核)
Task<Result> Sync<T>(T dto, string formId);
Task<Result> Save<T>(T dto, string formId);
//提交
Task<Result> Submit(ErpOperateDto dto, string formId);
//审核
Task<Result> Audit(ErpOperateDto dto, string formId);
//反审核
Task<Result> NoAudit(ErpOperateDto dto, string formId);
//删除
Task<Result> Delete(ErpOperateDto dto, string formId);
//下推
Task<Result> Push(ErpPushDto dto);
}
}

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

@@ -5,6 +5,7 @@ using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -607,13 +608,15 @@ namespace WMS.Web.Domain.Services.Public
return ResultList<ErpStockDto>.ReFailure("错误", 10002);
}
}
#region 金蝶操作交互
/// <summary>
/// 同步数据(保存提交审核)
/// </summary>
/// <param name="dto"></param>
/// <param name="formId"></param>
/// <returns></returns>
public async Task<Result> Sync<T>(T dto, string formId)
public async Task<Result> Save<T>(T dto, string formId)
{
try
{
@@ -625,15 +628,143 @@ namespace WMS.Web.Domain.Services.Public
query.Data = JsonConvert.SerializeObject(param);
//保存
var result_json = await _client.SaveAsync(JsonConvert.SerializeObject(query));
JObject jobject = (JObject)JsonConvert.DeserializeObject(result_json);
var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
return Result.ReSuccess();
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception)
{
return Result.ReFailure("错误", 10002);
}
}
/// <summary>
/// 提交
/// </summary>
/// <param name="dto"></param>
/// <param name="formId"></param>
/// <returns></returns>
public async Task<Result> Submit(ErpOperateDto dto, string formId)
{
try
{
var token_result = await this.Init();
if (!token_result.IsSuccess)
return token_result;
var query = new ErpBillQueryDto(token_result.Data);
//提交
var sparam = new ErpSubmitDto(formId, "");
query.Data = JsonConvert.SerializeObject(sparam);
result_json = await _client.SubmitAsync(JsonConvert.SerializeObject(query));
//审核
result_json = await _client.AuditAsync(JsonConvert.SerializeObject(query));
query.Data = JsonConvert.SerializeObject(dto);
var result_json = await _client.SubmitAsync(JsonConvert.SerializeObject(query));
JObject jobject = (JObject)JsonConvert.DeserializeObject(result_json);
var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
return Result.ReSuccess();
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
return Result.ReSuccess();
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception)
{
return Result.ReFailure("错误", 10002);
}
}
/// <summary>
/// 审核
/// </summary>
/// <param name="dto"></param>
/// <param name="formId"></param>
/// <returns></returns>
public async Task<Result> Audit(ErpOperateDto dto, string formId)
{
try
{
var token_result = await this.Init();
if (!token_result.IsSuccess)
return token_result;
var query = new ErpBillQueryDto(token_result.Data);
//提交
query.Data = JsonConvert.SerializeObject(dto);
var result_json = await _client.AuditAsync(JsonConvert.SerializeObject(query));
JObject jobject = (JObject)JsonConvert.DeserializeObject(result_json);
var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
return Result.ReSuccess();
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception)
{
return Result.ReFailure("错误", 10002);
}
}
/// <summary>
/// 反审核
/// </summary>
/// <param name="dto"></param>
/// <param name="formId"></param>
/// <returns></returns>
public async Task<Result> NoAudit(ErpOperateDto dto, string formId)
{
try
{
var token_result = await this.Init();
if (!token_result.IsSuccess)
return token_result;
var query = new ErpBillQueryDto(token_result.Data);
//提交
query.Data = JsonConvert.SerializeObject(dto);
var result_json = await _client.UnAuditAsync(JsonConvert.SerializeObject(query));
JObject jobject = (JObject)JsonConvert.DeserializeObject(result_json);
var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
return Result.ReSuccess();
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception)
{
return Result.ReFailure("错误", 10002);
}
}
/// <summary>
/// 删除
/// </summary>
/// <param name="dto"></param>
/// <param name="formId"></param>
/// <returns></returns>
public async Task<Result> Delete(ErpOperateDto dto, string formId)
{
try
{
var token_result = await this.Init();
if (!token_result.IsSuccess)
return token_result;
var query = new ErpBillQueryDto(token_result.Data);
//提交
query.Data = JsonConvert.SerializeObject(dto);
var result_json = await _client.DeleteAsync(JsonConvert.SerializeObject(query));
JObject jobject = (JObject)JsonConvert.DeserializeObject(result_json);
var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
return Result.ReSuccess();
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception)
{
@@ -657,6 +788,7 @@ namespace WMS.Web.Domain.Services.Public
return Result.ReSuccess();
}
#endregion
#region 出库
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForDeliveryNoticeOutStock(List<string> sourceBillNos = null, DateTime? beginTime = null)
@@ -1118,8 +1250,6 @@ namespace WMS.Web.Domain.Services.Public
}
}
#endregion
}
}

4
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -133,7 +133,7 @@ namespace WMS.Web.Domain.Services
};
#endregion
var resSync = await _erpService.Sync<ErpTakeStockSaveDto>(dto, FormIdParam.STK_StockCountGain.ToString());
var resSync = await _erpService.Save<ErpTakeStockSaveDto>(dto, FormIdParam.STK_StockCountGain.ToString());
entity.Sync(resSync.IsSuccess, resSync.Message);
await _takeStockRepositories.Edit(entity, true);
return res;
@@ -180,7 +180,7 @@ namespace WMS.Web.Domain.Services
#endregion
//判断盘盈盘亏
string formId = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss.ToString() : FormIdParam.STK_StockCountGain.ToString();
var resSync = await _erpService.Sync<ErpTakeStockSaveDto>(dto, formId);
var resSync = await _erpService.Save<ErpTakeStockSaveDto>(dto, formId);
entity.Sync(resSync.IsSuccess, resSync.Message);
await _takeStockRepositories.Edit(entity, true);
return res;