erp调整

This commit is contained in:
18942506660
2023-12-08 17:53:55 +08:00
parent b47eaa5dc4
commit c0026a3717
7 changed files with 124 additions and 44 deletions

View File

@@ -1461,24 +1461,36 @@ namespace WMS.Web.Domain.Services.Public
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public async Task<Result> Push(ErpPushDto dto)
public async Task<Result<string>> Push(ErpPushDto dto)
{
var token_result = await this.Init();
if (!token_result.IsSuccess)
return token_result;
var query = new ErpBillQueryDto(token_result.Data, dto.FormId);
query.Data = JsonConvert.SerializeObject(dto);
//下推
var result_json = await _client.PushAsync(JsonConvert.SerializeObject(query));
try
{
var token_result = await this.Init();
if (!token_result.IsSuccess)
return token_result;
var query = new ErpBillQueryDto(token_result.Data, dto.FormId);
query.Data = JsonConvert.SerializeObject(dto);
//下推
string json = JsonConvert.SerializeObject(query);
var result_json = await _client.PushAsync(json);
JObject jobject = (JObject)JsonConvert.DeserializeObject(result_json);
var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
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();
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
{
//保存成功后返回Id 后续操作根据Id操作
string id = jobject["Result"]["ResponseStatus"]["SuccessEntitys"][0]["Id"].ToString();
return Result<string>.ReSuccess(id);
}
var msg = jobject["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString();
return Result.ReFailure(msg, 10002);
var msg = jobject["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString();
return Result<string>.ReFailure(msg, 10002);
}
catch (Exception ex)
{
return Result<string>.ReFailure(ex.ToString(), 10002);
}
}
#endregion
@@ -2038,6 +2050,62 @@ namespace WMS.Web.Domain.Services.Public
}
}
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForSalOutStock(string id)
{
try
{
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
//1.先登录金蝶-拿到token
var token_result = await this.Init();
if (!token_result.IsSuccess)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(token_result);
//3.获取金蝶采购订单:拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.SAL_OUTSTOCK.ToString());
param.FieldKeys = "FID,FEntity_FENTRYID,FMaterialID,FMustQty,FRealQty,FStockID.FNumber";
param.Limit = 10000;
param.FilterString = $"FID={id}";
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
var erp_list = new List<ErpDeliveryNoticeOutStockResultDto>();
//foreach (var item in result)
//{
// var lis = new ErpDeliveryNoticeOutStockResultDto();
// lis.SourceBillNo = item[0];
// lis.SaleBillNo = item[1];
// lis.DeliveryOrgId = Convert.ToInt32(item[2]);
// lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
// lis.MaterialId = Convert.ToInt32(item[4]);
// lis.StockCode = item[5];
// lis.SubStockId = Convert.ToInt32(item[6]);
// lis.AccruedQty = Convert.ToDecimal(item[7]);
// lis.Remark = item[8];
// lis.CreateTime = Convert.ToDateTime(item[9]);
// lis.Type = (int)OutStockType.Miscellaneous;
// lis.Erp_DetailId = Convert.ToInt32(item[10]);
// lis.OrgCode = item[11];
// erp_list.Add(lis);
//}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
}
catch (Exception ex)
{
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
#endregion
}
}