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

erp-其他入库单

Browse Source
This commit is contained in:
tongfei
2023-11-10 16:43:09 +08:00
parent df787cd6dd de10b40d2e
commit 7ce070de67
10 changed files with 225 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
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;
@@ -758,13 +759,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
{
@@ -776,15 +779,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)
{
@@ -808,6 +939,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)
@@ -833,7 +965,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.SAL_DELIVERYNOTICE.ToString());
param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID,FStockID,FStockLocID,FQty,FNoteEntry,FCreateDate";
param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID,FStockID,FStockLocID,FQty,FNoteEntry,FCreateDate,FEntryID";
param.Limit = 10;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -874,6 +1006,7 @@ namespace WMS.Web.Domain.Services.Public
lis.Remark = item[8];
lis.CreateTime = Convert.ToDateTime(item[9]);
lis.Type = (int)OutStockType.Sal;
lis.Erp_DetailId = Convert.ToInt32(item[10]);
erp_list.Add(lis);
}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
@@ -1269,8 +1402,6 @@ namespace WMS.Web.Domain.Services.Public
}
}
#endregion
}
}