From f747c5151051c12a1c44eaf5ef49f0a3805702b0 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期日, 09 十一月 2025 10:22:53 +0800
Subject: [PATCH] 1
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs"
index fec512a..0b48c40 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
@@ -18,35 +19,36 @@
public class InvokeMESService : IInvokeMESService
{
private readonly IHttpClientFactory _httpClientFactory;
-
+ private readonly ILogger<InvokeMESService> _logger;
private string UserName = "12312";
private string Password = "1";
- public InvokeMESService(IHttpClientFactory httpClientFactory)
+ public InvokeMESService(IHttpClientFactory httpClientFactory, ILogger<InvokeMESService> logger)
{
_httpClientFactory = httpClientFactory;
+ _logger = logger;
}
- public async Task FeedbackInbound(string url, FeedbackInboundRequestModel model)
+ public async Task<ResponseModel> FeedbackInbound( FeedbackInboundRequestModel model)
{
string json = JsonConvert.SerializeObject(model);
var content = new StringContent(json, Encoding.UTF8, "application/json");
var _client = _httpClientFactory.CreateClient("MESUrl");
_client.DefaultRequestHeaders.Clear();
_client.DefaultRequestHeaders.Add("Accept", "application/json");
-
- var response = await _client.PostAsync(url, content);
+ _logger.LogInformation("InvokeMESService FeedbackInbound : " + json);
+ var response = await _client.PostAsync("AldMaterialWarehousing/MaterialWarehousing", content);
string body = await response.Content.ReadAsStringAsync();
-
+ _logger.LogInformation("InvokeMESService FeedbackInbound body: " + body);
if (!response.IsSuccessStatusCode)
{
throw new HttpRequestException(body);
}
- // JsonConvert.DeserializeObject<ResponseModel>(body);
+ return JsonConvert.DeserializeObject<ResponseModel>(body);
}
- public async Task FeedbackOutbound(string url, FeedbackOutboundRequestModel model)
+ public async Task FeedbackOutbound( FeedbackOutboundRequestModel model)
{
string json = JsonConvert.SerializeObject(model);
var content = new StringContent(json, Encoding.UTF8, "application/json");
@@ -54,7 +56,7 @@
_client.DefaultRequestHeaders.Clear();
_client.DefaultRequestHeaders.Add("Accept", "application/json");
- var response = await _client.PostAsync(url, content);
+ var response = await _client.PostAsync("AldMaterialOutbound/MaterialOutbound", content);
string body = await response.Content.ReadAsStringAsync();
if (!response.IsSuccessStatusCode)
@@ -71,15 +73,15 @@
string json = JsonConvert.SerializeObject(model);
- string userDataEncoded = Uri.EscapeDataString(json);
- //string baseUrl = "http://mestest.ald.com//OrBitWCFServiceR15/orbitwebapi.ashx?";
- string userTicket = await GetToken(UserName, Password);
- string api = "WMS_BarcodeInformation";
+ //string userDataEncoded = Uri.EscapeDataString(json);
+ ////string baseUrl = "http://mestest.ald.com//OrBitWCFServiceR15/orbitwebapi.ashx?";
+ //string userTicket = await GetToken(UserName, Password);
+ //string api = "WMS_BarcodeInformation";
var client = _httpClientFactory.CreateClient("MESUrl");
// 鎷兼帴 URL 鍙傛暟
- string url = $"{client.BaseAddress}UserTicket={userTicket}&API={api}&UserData={userDataEncoded}";
+ // string url = $"{client.BaseAddress}UserTicket={userTicket}&API={api}&UserData={userDataEncoded}";
client.DefaultRequestHeaders.Clear();
@@ -89,7 +91,7 @@
var content = new StringContent(json, Encoding.UTF8, "application/json");
- using var response = await client.PostAsync(url, content);
+ using var response = await client.PostAsync("", content);
var responseText = await response.Content.ReadAsStringAsync();
if (!response.IsSuccessStatusCode)
{
--
Gitblit v1.9.3