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

修复bug

Browse Source
This commit is contained in:
18942506660
2023-12-01 16:55:34 +08:00
parent 64fb6e50af
commit 4e3926ff89
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -210,7 +210,7 @@ namespace WMS.Web.Api.Controllers
return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
List<UcStockResponse> list = new List<UcStockResponse>();
if (!number.Substring(0, 2).Equals("HD") && !number.Substring(0, 2).Equals("JD"))
if (!number.Substring(0, 2).Equals("HD") && !number.Substring(0, 2).Equals("GD"))
return Result<List<UcStockResponse>>.ReSuccess(list);
var subs = await _erpService.BillQueryForSubStock(number, orgCode);

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

@@ -1630,6 +1630,11 @@
备注
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.ErpSyncId">
<summary>
同步到金蝶后金蝶的单据Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.SerialNumbers">
<summary>
序列号
@@ -1641,7 +1646,7 @@
</summary>
<param name="creatorId"></param>
</member>
<member name="M:WMS.Web.Domain.Entitys.TakeStock.Sync(System.Boolean,System.String,WMS.Web.Domain.Values.SyncStatus)">
<member name="M:WMS.Web.Domain.Entitys.TakeStock.Sync(System.Boolean,System.String,WMS.Web.Domain.Values.SyncStatus,System.String)">
<summary>
同步金蝶结果
</summary>

8
src/WMS.Web.Domain/Entitys/TakeStock.cs
View File

@@ -97,6 +97,11 @@ namespace WMS.Web.Domain.Entitys
[Column("Remark")]
public string Remark { get; set; }
/// <summary>
/// 同步到金蝶后金蝶的单据Id
/// </summary>
[Column("ErpSyncId")]
public string ErpSyncId { get; set; }
/// <summary>
/// 序列号
/// </summary>
[Column("SerialNumbers")]
@@ -115,10 +120,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
/// <param name="isSuccess"></param>
/// <param name="remark"></param>
public void Sync(bool isSuccess, string remark, SyncStatus syncStatus)
public void Sync(bool isSuccess, string remark, SyncStatus syncStatus,string erpId)
{
this.SuccessSync = syncStatus;
this.Remark = "";
this.ErpSyncId = erpId;
}
/// <summary>
/// 生成单据号

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

@@ -161,7 +161,7 @@ namespace WMS.Web.Domain.Services
FormIdParam type = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss : FormIdParam.STK_StockCountGain;
//操作金蝶
var resSync = await ErpOperate(dto, type);
entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus);
entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus, resSync.erpId);
await _takeStockRepositories.Edit(entity, true);
return res;
}
@@ -171,7 +171,7 @@ namespace WMS.Web.Domain.Services
/// <param name="dto"></param>
/// <param name="type"></param>
/// <returns></returns>
private async Task<(Result result, SyncStatus syncStatus)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type)
private async Task<(Result result, SyncStatus syncStatus,string erpId)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type)
{
string formId = type.ToString();
_logger.LogInformation($"盘点单->开始同步金蝶 单号:{dto.BillNo} 数据: {JsonConvert.SerializeObject(dto)}");
@@ -179,7 +179,7 @@ namespace WMS.Web.Domain.Services
if (!res_s.IsSuccess)
{
_logger.LogInformation($"盘点单->保存失败 单号:{dto.BillNo} 错误:{res_s.Message}");
return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail);
return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail,"");
}
//提交
_logger.LogInformation($"盘点单->保存成功 开始提交 单号:{dto.BillNo}");
@@ -193,7 +193,7 @@ namespace WMS.Web.Domain.Services
//if (!del_res.IsSuccess)
// _logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 提交失败原因: {res.Message} 删单失败原因:{del_res.Message}");
_logger.LogInformation($"盘点单->提交失败 单号:{dto.BillNo} 错误:{res.Message}");
return (res, SyncStatus.SubmitFail);
return (res, SyncStatus.SubmitFail, o_dto.Ids);
}
//审核
_logger.LogInformation($"盘点单->提交成功 开始审核 单号:{dto.BillNo}");
@@ -214,10 +214,10 @@ namespace WMS.Web.Domain.Services
//if (!del_res.IsSuccess)
// _logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 审核失败原因: {res.Message} 删单失败原因:{del_res.Message}");
_logger.LogInformation($"盘点单->审核失败 单号:{dto.BillNo} 错误:{res.Message}");
return (res, SyncStatus.CheckFail);
return (res, SyncStatus.CheckFail, o_dto.Ids);
}
_logger.LogInformation($"同步金蝶成功");
return (Result.ReSuccess(), SyncStatus.Success);
return (Result.ReSuccess(), SyncStatus.Success, o_dto.Ids);
}
}
}