From 2779947fe07c41250237437365f367b5a78a03b6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 10 六月 2025 23:57:58 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9d223ae2-4a90-4efd-ae67-f1131a379c2f.vsidx | 0
/dev/null | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ef8b54ea-95e6-4615-a7de-9b16de52a1b0.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/QMSService/InvokeQMSService.cs | 2 +-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/QMS/QmsController.cs | 24 ++++++++++++++++++++----
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/QMS/ReceiveResultDto.cs | 2 +-
6 files changed, 22 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/230a97ab-d5f2-438a-bf5e-1936c1bef923.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/230a97ab-d5f2-438a-bf5e-1936c1bef923.vsidx"
deleted file mode 100644
index fee9b65..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/230a97ab-d5f2-438a-bf5e-1936c1bef923.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/79d237d9-ba7d-40e6-9942-e7f8f7728cb4.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/79d237d9-ba7d-40e6-9942-e7f8f7728cb4.vsidx"
deleted file mode 100644
index ae87e04..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/79d237d9-ba7d-40e6-9942-e7f8f7728cb4.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9d223ae2-4a90-4efd-ae67-f1131a379c2f.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9d223ae2-4a90-4efd-ae67-f1131a379c2f.vsidx"
new file mode 100644
index 0000000..a6f2c49
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9d223ae2-4a90-4efd-ae67-f1131a379c2f.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ef8b54ea-95e6-4615-a7de-9b16de52a1b0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ef8b54ea-95e6-4615-a7de-9b16de52a1b0.vsidx"
new file mode 100644
index 0000000..26e693a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ef8b54ea-95e6-4615-a7de-9b16de52a1b0.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/QMS/ReceiveResultDto.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/QMS/ReceiveResultDto.cs"
index 46fbbf0..69372b8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/QMS/ReceiveResultDto.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/QMS/ReceiveResultDto.cs"
@@ -18,6 +18,6 @@
/// <summary>
/// ID
/// </summary>
- public int Id { get; set; }
+ public string Id { get; set; }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/QMSService/InvokeQMSService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/QMSService/InvokeQMSService.cs"
index de8dbe8..f8c8fb5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/QMSService/InvokeQMSService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/QMSService/InvokeQMSService.cs"
@@ -36,7 +36,7 @@
Content = model
};
- string request = JsonConvert.SerializeObject(model,settings);
+ string request = JsonConvert.SerializeObject(requestModel, settings);
string response = HttpQmsHelper.Post(apiInfo.ApiAddress, request);
return response;
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/QMS/QmsController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/QMS/QmsController.cs"
index 4d4ba43..08263c7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/QMS/QmsController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/QMS/QmsController.cs"
@@ -29,7 +29,7 @@
/// <summary>
/// ERP鎺ュ彛
/// </summary>
- [Route("api/Erp")]
+ [Route("api/Qms")]
[ApiController]
public class QmsController : ControllerBase
{
@@ -64,15 +64,31 @@
// else return Instance.Error(content.Message);
//}
/// <summary>
+ /// 鏀惰揣鍗曟潵鏂欐楠屾帹閫�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ReceiveCheck"), AllowAnonymous, MethodParamsValidate]
+ public string ReceivePurchaseOrder([FromBody] QMSReceiveCheckModel model)
+ {
+ string content = _invokeQMSService.InvokeReceiveCheckApi(model);
+ return content;
+ }
+ /// <summary>
/// 妫�楠屽崟鍥炰紶鏇存柊
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost, Route("CheckResultReturn"), AllowAnonymous, MethodParamsValidate]
- public string ReceivePurchaseOrder([FromBody] QMSReceiveCheckModel model)
+ public MesResponseContent CheckResultReturn([FromBody] ERPCheckModel model)
{
- string content = _invokeQMSService.InvokeReceiveCheckApi(model);
- return content;
+ string content = _invokeERPService.InvokeCheckOrderApi(model);
+ ErpRequestContent requestContent = content.DeserializeObject<ErpRequestContent>();
+ if (requestContent.res != 1)
+ {
+ return MesResponseContent.Instance.Error(requestContent.Data);
+ }
+ return MesResponseContent.Instance.OK("鎴愬姛");
}
}
}
--
Gitblit v1.9.3