From 8d85541058a46dfd396114f10acfad46e295846a Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 10 Nov 2023 17:06:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 15 ++++++++-------
src/WMS.Web.Domain/IService/Public/IErpService.cs | 2 +-
src/WMS.Web.Domain/Services/Public/ErpService.cs | 14 +++++++++-----
src/WMS.Web.Domain/Services/TakeStockService.cs | 10 +++++-----
4 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index c56bd986..69983bb8 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -3229,13 +3229,6 @@
-
-
- 作废
-
-
-
-
盘盈盘亏同步金蝶
@@ -3243,6 +3236,14 @@
+
+
+ 同步金蝶操作
+
+
+
+
+
出入库回退类型
diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs
index 654303c3..b409782e 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs
@@ -97,7 +97,7 @@ namespace WMS.Web.Domain.IService.Public
///
Task> BillQueryForSubStock(string code=null);
//同步数据(保存提交审核)
- Task Save(T dto, string formId);
+ Task> Save(T dto, string formId);
//提交
Task Submit(ErpOperateDto dto, string formId);
//审核
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 8a4601fb..2e775b33 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -767,13 +767,13 @@ namespace WMS.Web.Domain.Services.Public
///
///
///
- public async Task Save(T dto, string formId)
+ public async Task> Save(T dto, string formId)
{
try
{
var token_result = await this.Init();
if (!token_result.IsSuccess)
- return token_result;
+ return Result.ReFailure(token_result.Message,token_result.Status);
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpSave(formId, dto);
query.Data = JsonConvert.SerializeObject(param);
@@ -784,14 +784,18 @@ namespace WMS.Web.Domain.Services.Public
var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
- return Result.ReSuccess();
+ {
+ //保存成功后返回Id 后续操作根据Id操作
+ string id = jobject["Result"]["ResponseStatus"]["SuccessEntitys"]["Id"].ToString();
+ return Result.ReSuccess(id);
+ }
var msg = jobject["Result"]["ResponseStatus"]["Errors"]["Message"].ToString();
- return Result.ReFailure(msg, 10002);
+ return Result.ReFailure(msg, 10002);
}
catch (Exception)
{
- return Result.ReFailure("错误", 10002);
+ return Result.ReFailure("错误", 10002);
}
}
///
diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs
index bfeea34a..76d4eb32 100644
--- a/src/WMS.Web.Domain/Services/TakeStockService.cs
+++ b/src/WMS.Web.Domain/Services/TakeStockService.cs
@@ -152,12 +152,12 @@ namespace WMS.Web.Domain.Services
///
private async Task ErpOperate(ErpTakeStockSaveDto dto, string formId)
{
- var res = await _erpService.Save(dto, formId);
- if (!res.IsSuccess)
- return res;
+ var res_s = await _erpService.Save(dto, formId);
+ if (!res_s.IsSuccess)
+ return Result.ReFailure(res_s.Message,res_s.Status);
//提交
- ErpOperateDto o_dto = new ErpOperateDto(formId, "");
- res = await _erpService.Submit(o_dto, formId);
+ ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);
+ var res = await _erpService.Submit(o_dto, formId);
if (!res.IsSuccess)
{
//如果提交失败