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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-12-08 15:36:40 +08:00
parent a14f802d22 bd4fcdb904
commit f183f015c9
8 changed files with 116 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/WMS.Web.Domain/Entitys/OutStock.cs
View File

@@ -140,7 +140,8 @@ namespace WMS.Web.Domain.Entitys
var erpd = this.Details.SelectMany(s => s.ErpDetails).Where(w => w.SourceBillNo.Equals(sourcBillNo)).ToList();
erpd.ForEach(f => f.SuccessSync = SyncStatus.Success);
//所有erp明细同步成功才是整个单据成功
if (this.Details.SelectMany(s => s.ErpDetails).Where(w => w.SuccessSync == SyncStatus.Success).Any())
var erpDetails = this.Details.SelectMany(s => s.ErpDetails);
if (erpDetails.Where(w => w.SuccessSync == SyncStatus.Success).Count()== erpDetails.Count())
{
this.SuccessSync = SyncStatus.Success;
this.Remark = "";

69
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -77,7 +77,7 @@ namespace WMS.Web.Domain.Services
{
_logger.LogInformation($"出库:{JsonConvert.SerializeObject(dto)} 操作人:{loginInfo.UserInfo.StaffId}");
var outStockTask = await _outStockTaskRepositories.Get(dto.TaskId);
if(outStockTask==null) return Result.ReFailure(ResultCodes.OutStockTaskNoData);
if (outStockTask == null) return Result.ReFailure(ResultCodes.OutStockTaskNoData);
if (outStockTask.Status == OutStockStatus.Already)
return Result.ReFailure(ResultCodes.OutStockTaskAlready);
if (outStockTask.Status == OutStockStatus.Repeal)
@@ -206,38 +206,47 @@ namespace WMS.Web.Domain.Services
var list = await _outStockRepositories.GetEntityList(dto.Ids);
foreach (var entity in list)
{
if (entity.SuccessSync != SyncStatus.Fail) continue;
List<string> failList = entity.Details.SelectMany(s => s.ErpDetails)
.Where(w => w.SuccessSync == SyncStatus.Fail).GroupBy(g => g.SourceBillNo)
.Select(s => s.Key).ToList();//同步失败的来源单号
//找到单据里需要同步的单据
var sourcNos = entity.Details.SelectMany(s => s.ErpDetails).GroupBy(s => s.SourceBillNo).Select(s => s.Key);
foreach (var s in failList)
{
var erp_details = entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.Erp_DetailId).ToList();
var erpDto = new ErpPushDto()
{
FormId = FormIdParam.SAL_DELIVERYNOTICE.ToString(),
Numbers = new List<string>() { s },
Type = "",
DetailsId = string.Join(",", erp_details)
};
//下推金蝶
var res = await this.Push(erpDto);
if (res.IsSuccess)
entity.SyncSuccess(s, loginInfo.UserInfo.StaffId);
else
entity.SyncFail(res.Message, loginInfo.UserInfo.StaffId, SyncStatus.Fail);
}
//entity.SuccessSync = entity.SuccessSyncFail.Count() > 0 ? false : true;
//最好一条一条执行,否则执行失败 但是金蝶那边又同步成功 就会造成数据比价乱
var isSuccess = await _outStockRepositories.Edit(entity, true);
if (entity == null) return Result.ReFailure(ResultCodes.DateWriteError);
await SalOutStock(entity, loginInfo);
}
return Result.ReSuccess();
}
/// <summary>
/// 同步金蝶销售出库
/// </summary>
/// <returns></returns>
private async Task<Result> SalOutStock(OutStock entity, LoginInDto loginInfo)
{
if (entity.Type != OutStockType.Sal) return Result.ReSuccess();
if (entity.SuccessSync != SyncStatus.Fail) return Result.ReSuccess();
List<string> failList = entity.Details.SelectMany(s => s.ErpDetails)
.Where(w => w.SuccessSync == SyncStatus.Fail).GroupBy(g => g.SourceBillNo)
.Select(s => s.Key).ToList();//同步失败的来源单号
//找到单据里需要同步的单据
var sourcNos = entity.Details.SelectMany(s => s.ErpDetails).GroupBy(s => s.SourceBillNo).Select(s => s.Key);
foreach (var s in failList)
{
var erp_details = entity.Details.SelectMany(s => s.ErpDetails).Select(s => s.Erp_DetailId).ToList();
var erpDto = new ErpPushDto()
{
FormId = FormIdParam.SAL_DELIVERYNOTICE.ToString(),
Numbers = new List<string>() { s },
TargetFormId = FormIdParam.SAL_OUTSTOCK.ToString(),
DetailsId = string.Join(",", erp_details)
};
//下推金蝶
var res = await this.Push(erpDto);
if (res.IsSuccess)
entity.SyncSuccess(s, loginInfo.UserInfo.StaffId);
else
entity.SyncFail(res.Message, loginInfo.UserInfo.StaffId, SyncStatus.Fail);
}
//entity.SuccessSync = entity.SuccessSyncFail.Count() > 0 ? false : true;
//最好一条一条执行,否则执行失败 但是金蝶那边又同步成功 就会造成数据比价乱
var isSuccess = await _outStockRepositories.Edit(entity, true);
if (entity == null) return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
/// <summary>
/// 下推
/// </summary>

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

@@ -1416,7 +1416,7 @@ namespace WMS.Web.Domain.Services.Public
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
return Result.ReSuccess();
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
var msg = jobject["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception ex)
@@ -1448,7 +1448,7 @@ namespace WMS.Web.Domain.Services.Public
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
return Result.ReSuccess();
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
var msg = jobject["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
catch (Exception ex)
@@ -1466,12 +1466,19 @@ namespace WMS.Web.Domain.Services.Public
var token_result = await this.Init();
if (!token_result.IsSuccess)
return token_result;
var query = new ErpBillQueryDto(token_result.Data);
var query = new ErpBillQueryDto(token_result.Data, dto.FormId);
query.Data = JsonConvert.SerializeObject(dto);
//下推
var result_json = await _client.PushAsync(JsonConvert.SerializeObject(query));
return Result.ReSuccess();
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"][0]["Message"].ToString();
return Result.ReFailure(msg, 10002);
}
#endregion

6
src/WMS.Web.Domain/Values/Erp/FormIdParam.cs
View File

@@ -72,6 +72,10 @@ namespace WMS.Web.Domain.Values.Erp
/// <summary>
/// 客户
/// </summary>
BD_Customer=16
BD_Customer=16,
/// <summary>
/// 销售出库单
/// </summary>
SAL_OUTSTOCK=17
}
}