diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs
index d88300a9..571409b8 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs
@@ -29,9 +29,7 @@ namespace WMS.Web.Domain.IService.Public
///
///
Task> BillQueryForStock();
- //盘盈
- Task TakeStock_Profit(TakeStock entity);
- //盘亏
- Task TakeStock_Loss(TakeStock entity);
+ //同步数据(保存提交审核)
+ Task Sync(T dto, string formId);
}
}
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 397eee6a..cee411dd 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -254,65 +254,30 @@ namespace WMS.Web.Domain.Services.Public
}
}
///
- /// 盘盈
+ /// 同步数据(保存提交审核)
///
- ///
+ ///
+ ///
///
- public async Task TakeStock_Profit(TakeStock entity)
+ public async Task Sync(T dto,string formId)
{
try
{
- //获取金蝶仓库仓位编码
- var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
- var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
-
- var res = await this.BillQueryForStock();
- var stock = res.Data.FirstOrDefault(f => f.Code == stockCode);//需要根据单点code搜索
- var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
- if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
- //组装dto
- #region 组装dto
- List detils = new List();
- detils.Add(new ErpTakeStockDetailsSaveDto()
- {
- FOwnerid = stock.OrgId.ToString(),
- FKeeperId = stock.OrgId.ToString(),
- MaterialId = entity.MaterialId.ToString(),
- UnitId = entity.UnitId.ToString(),
- StockId = stock.Id.ToString(),
- SubStockId = subStock.Id.ToString(),
- BeforeQty = entity.BeforeQty,
- AfterQty = entity.AfterQty,
- FinalQty = entity.FinalQty,
- Fnote = ""
- });
- ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()
- {
- BillNo = entity.BillNo,
- StockOrgId = stock.OrgId.ToString(),
- Type = "PY01_SYS",
- Date = entity.Date,
- Details = detils
- };
- #endregion
-
var token_result = await this.Init();
if (!token_result.IsSuccess)
return token_result;
var query = new ErpBillQueryDto(token_result.Data);
- var param = new ErpSave(FormIdParam.STK_StockCountGain.ToString(), dto);
+ var param = new ErpSave(formId, dto);
query.Data = JsonConvert.SerializeObject(param);
-
+ //保存
var result_json = await _client.SaveAsync(JsonConvert.SerializeObject(query));
//提交
- var sparam = new ErpSubmitDto(FormIdParam.STK_StockCountGain.ToString(), "");
+ 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));
-
return Result.ReSuccess();
}
@@ -321,14 +286,6 @@ namespace WMS.Web.Domain.Services.Public
return Result.ReFailure("错误", 10002);
}
}
- ///
- /// 盘亏
- ///
- ///
- ///
- public async Task TakeStock_Loss(TakeStock entity)
- {
- return Result.ReSuccess();
- }
+
}
}