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

9
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -33,10 +33,11 @@ namespace WMS.Web.Api.Controllers
private readonly IBoxInventoryRepositories _boxInventoryRepositories;
private readonly ITakeStockService _takeStockService;
private readonly ITakeStockRepositories _takeStockRepositories;
private readonly IOutStockService _outStockService;
public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBoxInventoryRepositories boxInventoryRepositories,
IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService,
IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService,
ITakeStockService takeStockService, ITakeStockRepositories takeStockRepositories)
ITakeStockService takeStockService, ITakeStockRepositories takeStockRepositories, IOutStockService outStockService)
{
_boxInventoryRepositories = boxInventoryRepositories;
this._erpService = erpService;
@@ -48,18 +49,22 @@ namespace WMS.Web.Api.Controllers
_outStockTaskService = outStockTaskService;
_takeStockService = takeStockService;
_takeStockRepositories = takeStockRepositories;
_outStockService = outStockService;
}
[HttpGet]
[Route("hj")]
public async Task<string> TestHJ()
{
OperateRequest dto = new OperateRequest();
dto.Ids.Add(65);
await _outStockService.Sync(dto, null);
// List<ErpCustomerDto> list = null;
//var b= list.FirstOrDefault(f => f.Id == 123);
//var entity=await _takeStockRepositories.GetEntityList(new List<int>() {2 });
//var r= await _takeStockService.Loss_Profit(entity.First());
//var list = await GetList();
var c = await _erpService.BillQueryForAssembledAppOutStock_Assembly(new List<string>() { "ZZCX003061" }, DateTime.Now.AddDays(-10));
//var c = await _erpService.BillQueryForAssembledAppOutStock_Assembly(new List<string>() { "ZZCX003061" }, DateTime.Now.AddDays(-10));
//var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List<string>() { "FHTZD8022232" }, DateTime.Now.AddDays(-10));
//var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10));
//var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1));

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

@@ -775,9 +775,15 @@
分录内码集合，逗号分隔（分录下推时必录） 注（按分录下推时，单据内码和编码不需要填,否则按整单下推）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpPushDto.Type">
<member name="P:WMS.Web.Core.Dto.Erp.ErpPushDto.TargetFormId">
<summary>
目标单据类型内码
目标单据类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpPushDto.IsEnableDefaultRule">
<summary>
是否启用默认转换规则，布尔类型，默认false（非必录）
开启后则不需要填 RuleId
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpSave`1">

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

@@ -3928,6 +3928,12 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.OutStockService.SalOutStock(WMS.Web.Domain.Entitys.OutStock,WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
同步金蝶销售出库
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.OutStockService.Push(WMS.Web.Core.Dto.Erp.ErpPushDto)">
<summary>
下推
@@ -4903,6 +4909,11 @@
客户
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.Erp.FormIdParam.SAL_OUTSTOCK">
<summary>
销售出库单
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.ExportStatus">
<summary>
文件导出状态

17
src/WMS.Web.Core/Dto/Erp/ErpPushDto.cs
View File

@@ -12,12 +12,12 @@ namespace WMS.Web.Core.Dto.Erp
{
public ErpPushDto() { }
public ErpPushDto(string formId,string number,List<int> detailIds,string type)
public ErpPushDto(string formId,string number,List<int> detailIds,string targetFormId)
{
this.FormId = formId;
this.Numbers.Add(number);
this.DetailsId = detailIds.ToString();
this.Type = type;
this.TargetFormId = targetFormId;
}
/// <summary>
@@ -36,9 +36,16 @@ namespace WMS.Web.Core.Dto.Erp
[JsonProperty("EntryIds")]
public string DetailsId { get; set; }
/// <summary>
/// 目标单据类型内码
/// 目标单据类型
/// </summary>
[JsonProperty("TargetBillTypeId")]
public string Type { get; set; }
[JsonProperty("TargetFormId")]
public string TargetFormId { get; set; }
/// <summary>
/// 是否启用默认转换规则，布尔类型，默认false（非必录）
/// 开启后则不需要填 RuleId
/// </summary>
[JsonProperty("IsEnableDefaultRule")]
public bool IsEnableDefaultRule { get; set; } = true;
}
}

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 = "";

21
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,7 +206,18 @@ namespace WMS.Web.Domain.Services
var list = await _outStockRepositories.GetEntityList(dto.Ids);
foreach (var entity in list)
{
if (entity.SuccessSync != SyncStatus.Fail) continue;
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();//同步失败的来源单号
@@ -219,7 +230,7 @@ namespace WMS.Web.Domain.Services
{
FormId = FormIdParam.SAL_DELIVERYNOTICE.ToString(),
Numbers = new List<string>() { s },
Type = "",
TargetFormId = FormIdParam.SAL_OUTSTOCK.ToString(),
DetailsId = string.Join(",", erp_details)
};
//下推金蝶
@@ -233,11 +244,9 @@ namespace WMS.Web.Domain.Services
//最好一条一条执行,否则执行失败 但是金蝶那边又同步成功 就会造成数据比价乱
var isSuccess = await _outStockRepositories.Edit(entity, true);
if (entity == null) return Result.ReFailure(ResultCodes.DateWriteError);
}
return Result.ReSuccess();
}
/// <summary>
/// 下推
/// </summary>

13
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));
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
}
}