From a8fcfbb5e5ed9a07b1a30ef2d7ef9d407e9b04dd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 02 四月 2025 21:44:54 +0800
Subject: [PATCH] 更新ASN实体
---
Tiger.Business.WMS/ERP/WMS_U9C.cs | 112 +++++++++++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 57 deletions(-)
diff --git a/Tiger.Business.WMS/ERP/WMS_U9C.cs b/Tiger.Business.WMS/ERP/WMS_U9C.cs
index cb3b27d..09e150f 100644
--- a/Tiger.Business.WMS/ERP/WMS_U9C.cs
+++ b/Tiger.Business.WMS/ERP/WMS_U9C.cs
@@ -1,5 +1,4 @@
-锘縰sing Tiger.Model;
-using SqlSugar;
+锘縰sing SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
@@ -10,17 +9,7 @@
using System.Linq;
using Newtonsoft.Json;
using Tiger.IBusiness;
-using Microsoft.AspNetCore.Http;
-using Tiger.Model.Minsun;
-using Org.BouncyCastle.Asn1.Tsp;
-using Tiger.Model.Entitys.MES.Position;
-using Apache.NMS.ActiveMQ.Commands;
-using System.Security.Cryptography;
-using System.Diagnostics;
using Tiger.Model.Entitys.MES.U9C;
-using Newtonsoft.Json.Linq;
-using System.Security.Policy;
-using NetTaste;
namespace Tiger.Business.WMS
{
@@ -29,25 +18,45 @@
public static string U9CAuthLoginUrl { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["U9CAuthLoginUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["U9CAuthLoginUrl", "U9CUrl"].PARAM_VALUE; // "http://172.16.80.20/U9C/webapi/OAuth2/AuthLogin?"; 娴嬭瘯
//public static string U9CAuthLoginUrl { get; set; } = Cache.SysParam["U9CAuthLoginUrl", "U9CUrl"].PARAM_VALUE; //姝ｅ紡
public static string secret = "&entcode=02&orgcode=101&clientid=mes&clientsecret=12c8ee7e9bb74ad2a6a0fb3315c8af20";
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ public static string Reviewer = Cache.SysParam["Reviewer", "U9CUrl"].PARAM_VALUE;
public static string CreateRcvBySrcASNUrl
- { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["CreateRcvBySrcASNUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateRcvBySrcASNUrl", "U9CUrl"].PARAM_VALUE; //"http://172.16.80.20/U9C/webapi/Receivement/CreateRcvBySrcASN"; 娴嬭瘯
+ { get; set; } = "http://172.16.80.20/U9C/webapi/Receivement/CreateRcvBySrcASN"; //ApiConfig.IsTestServer ? Cache.SysParam["CreateRcvBySrcASNUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateRcvBySrcASNUrl", "U9CUrl"].PARAM_VALUE; //"http://172.16.80.20/U9C/webapi/Receivement/CreateRcvBySrcASN"; 娴嬭瘯
public static string CreateReceivementUrl
- { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["CreateReceivementUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateReceivementUrl", "U9CUrl"].PARAM_VALUE; //"http://172.16.80.20/U9C/webapi/Receivement/CreateReceivement"; 娴嬭瘯
+ { get; set; } = "http://172.16.80.20/U9C/webapi/Receivement/CreateReceivement"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateReceivementUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateReceivementUrl", "U9CUrl"].PARAM_VALUE; //"http://172.16.80.20/U9C/webapi/Receivement/CreateReceivement"; 娴嬭瘯
public static string SubmitLineUrl
- { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["SubmitLineUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["SubmitLineUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/Receivement/SubmitLine; 娴嬭瘯
+ { get; set; } = "http://172.16.80.20/u9c/webapi/Receivement/SubmitLine"; // ApiConfig.IsTestServer ? Cache.SysParam["SubmitLineUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["SubmitLineUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/Receivement/SubmitLine; 娴嬭瘯
public static string ApproveLineUrl
- { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["ApproveLineUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["ApproveLineUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/Receivement/ApproveLine; 娴嬭瘯
+ { get; set; } = "http://172.16.80.20/u9c/webapi/Receivement/ApproveLine"; // ApiConfig.IsTestServer ? Cache.SysParam["ApproveLineUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["ApproveLineUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/Receivement/ApproveLine; 娴嬭瘯
+ /// <summary>
+ /// 鍒涘缓鐢熶骇棰嗘枡鍗�
+ /// </summary>
public static string CreateProdMaterialReqUrl
- { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["CreateProdMaterialReqUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateProdMaterialReqUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/IssueDoc/Create
- public static string CreateProdReturnOrderUrl
- { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["CreateProdReturnOrderUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateProdReturnOrderUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/IssueDoc/CreateRecedeIssueDocNew
+ { get; set; } = "http://172.16.80.20/u9c/webapi/IssueDoc/Create"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateProdMaterialReqUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateProdMaterialReqUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/IssueDoc/Create
+ /// <summary>
+ /// 鍒涘缓鐢熶骇閫�鏂欏崟-鎸夎閫�鏂�
+ /// </summary>
+ public static string CreateProdReturnOrderNewUrl
+ { get; set; } = "http://172.16.80.20/u9c/webapi/IssueDoc/CreateRecedeIssueDocNew"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateProdReturnOrderUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateProdReturnOrderUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/IssueDoc/CreateRecedeIssueDocNew
+ /// <summary>
+ /// 鍒涘缓濮斿鐢熶骇棰嗘枡鍗�
+ /// </summary>
public static string CreateOutProdMaterialReqUrl
- { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["CreateOutProdMaterialReqUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateOutProdMaterialReqUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/PMIssueDoc/Create
+ { get; set; } = "http://172.16.80.20/u9c/webapi/PMIssueDoc/Create"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateOutProdMaterialReqUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateOutProdMaterialReqUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/PMIssueDoc/Create
+ /// <summary>
+ /// 鍒涘缓濮斿鐢熶骇閫�鏂欏崟
+ /// </summary>
public static string CreateOutProdReturnOrderUrl
- { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["CreateOutProdReturnOrderUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateOutProdReturnOrderUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/PMIssueDoc/CreateRecedeIssueDoc
+ { get; set; } = "http://172.16.80.20/u9c/webapi/PMIssueDoc/CreateRecedeIssueDoc"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateOutProdReturnOrderUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateOutProdReturnOrderUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/PMIssueDoc/CreateRecedeIssueDoc
+ /// <summary>
+ /// 鍒涘缓璋冨叆鍗�
+ /// </summary>
public static string CreateTransferInUrl
- { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["CreateTransferInUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateTransferInUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/TransferIn/Create
+ { get; set; } = "http://172.16.80.20/u9c/webapi/TransferIn/Create"; // ApiConfig.IsTestServer ? Cache.SysParam["CreateTransferInUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateTransferInUrl", "U9CUrl"].PARAM_VALUE; //http://172.16.80.20/u9c/webapi/TransferIn/Create
+
/// <summary>
/// 鏂板鏀惰揣鍗�-鏉ユ簮ASN鍗曟帴鍙�
/// </summary>
@@ -69,35 +78,18 @@
Logger.Interface.Info($"U9C鐧诲綍token: {input.token}");
}
}
- //List<CreateRcvBySrcASNParam> param = new() {
- // new() {
- // aSNToRcvTransDTOs = new(){
- // new(){
- // TransQty=new() {
- // m_amount1= input.CurRevQty,
- // m_uOM1 = new() {
- // UOMMain = "1002212260110007",
- // UOMMain_SKey=new(){
- // ID="1002212260110007",
- // },
- // UOMSub_SKey = new(){
- // ID="1002212260110007",
- // }
- // },
- // },
- // ASNLineKey=input.ASNLineKey,
- // }
- // }
- // }
- //};
- var response = await HttpHelper.PostAsync(CreateRcvBySrcASNUrl, JsonConvert.SerializeObject(input.CreateRcvBySrcASNParam), new Dictionary<string, string>() { { "token", input.token } });
+ List<CreateRcvBySrcASNParam> param = new();
+ param.Add(input.CreateRcvBySrcASNParam);
+ var response = await HttpHelper.PostAsync(CreateRcvBySrcASNUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", input.token } });
+ //var response = new ApiAction("{\"ResCode\":0,\"Success\":true,\"ResMsg\":null,\"Data\":[{\"IsSucess\":true,\"U9CVersion\":null,\"OtherID\":\"WMS\",\"ID\":1002503210000100,\"Code\":\"YDRC250300003\",\"ErrorMsg\":null}]}");
+
var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
if (result != null)
{
if (result.Success && result.Data[0].IsSucess)
{
action.Data = result.Data;
- Logger.Interface.Info($"鏂板鏀惰揣鍗�-鏉ユ簮ASN鍗曟帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(input.CreateRcvBySrcASNParam)}锛岃繑鍥濲son: {response.Message}");
+ Logger.Interface.Info($"鏂板鏀惰揣鍗�-鏉ユ簮ASN鍗曟帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(param)}锛岃繑鍥濲son: {response.Message}");
}
else
{
@@ -142,7 +134,7 @@
{
BusinessDate = DateTime.Now,
Supplier = new() { m_code = input.Supplier },
- RcvDocType = new() { m_code = "RCV01" },
+ RcvDocType = new() { m_code = input.RcvDocType },
RcvLines= input.RcvLines,
},
OtherID = "WMS"
@@ -182,10 +174,12 @@
var action = new ApiAction<List<U9CReturnData2>>();
try
{
- action = await SubmitLine(input);
- if (action.IsSuccessed) {
- action = await ApproveLine(input);
- }
+ //action = await SubmitLine(input);
+ //if (action.IsSuccessed) {
+ // input.IsLogin = false;
+ // action = await ApproveLine(input);
+ //}
+ action = await ApproveLine(input);
}
catch (System.Exception ex)
{
@@ -216,19 +210,21 @@
Logger.Interface.Info($"U9C鐧诲綍token: {input.token}");
}
}
- var response = await HttpHelper.PostAsync(SubmitLineUrl, JsonConvert.SerializeObject(input.param), new Dictionary<string, string>() { { "token", input.token } });
+ var _params = new List<SubmitLineInputParam>();
+ _params.Add(input.param);
+ var response = await HttpHelper.PostAsync(SubmitLineUrl, JsonConvert.SerializeObject(_params), new Dictionary<string, string>() { { "token", input.token } });
var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
if (result != null)
{
if (result.Success && result.Data[0].IsSucess)
{
action.Data = result.Data;
- Logger.Interface.Info($"鏀惰揣鍗�-琛屾彁浜ゆ帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(input.param)}锛岃繑鍥濲son: {response.Message}");
+ Logger.Interface.Info($"鏀惰揣鍗�-琛屾彁浜ゆ帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(_params)}锛岃繑鍥濲son: {response.Message}");
}
else
{
action.IsSuccessed = false;
- action.LocaleMsg = new($"{action.Message}; {result.Data[0].ErrorMsg}");
+ action.LocaleMsg = new($"鏀惰揣鍗�-琛屾彁浜ゆ帴鍙ｅけ璐�: {result.Data[0].ErrorMsg}");
Logger.Interface.Info($"鏀惰揣鍗�-琛屾彁浜ゆ帴鍙ｅけ璐�:{result.Data[0].ErrorMsg}");
}
}
@@ -255,26 +251,28 @@
//濡傛灉宸茬粡鐧诲綍鍒欎笉闇�瑕佸啀娆＄櫥褰曪紝鐩存帴浣跨敤浼犲叆鐨則oken
if (input.IsLogin)
{
- var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
+ var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={Reviewer}{secret}");
if (u9CLoginResult.Success)
{
input.token = u9CLoginResult.Data;
Logger.Interface.Info($"U9C鐧诲綍token: {input.token}");
}
}
- var response = await HttpHelper.PostAsync(ApproveLineUrl, JsonConvert.SerializeObject(input.param), new Dictionary<string, string>() { { "token", input.token } });
+ var _params = new List<SubmitLineInputParam>();
+ _params.Add(input.param);
+ var response = await HttpHelper.PostAsync(ApproveLineUrl, JsonConvert.SerializeObject(_params), new Dictionary<string, string>() { { "token", input.token } });
var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
if (result != null)
{
if (result.Success && result.Data[0].IsSucess)
{
action.Data = result.Data;
- Logger.Interface.Info($"鏀惰揣鍗�-琛屽鏍告帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(input.param)}锛岃繑鍥濲son: {response.Message}");
+ Logger.Interface.Info($"鏀惰揣鍗�-琛屽鏍告帴鍙ｆ彁浜son: {JsonConvert.SerializeObject(_params)}锛岃繑鍥濲son: {response.Message}");
}
else
{
action.IsSuccessed = false;
- action.LocaleMsg = new($"{action.Message}; {result.Data[0].ErrorMsg}");
+ action.LocaleMsg = new($"鏀惰揣鍗� - 琛屽鏍告帴鍙ｅけ璐�:{result.Data[0].ErrorMsg}");
Logger.Interface.Info($"鏀惰揣鍗�-琛屽鏍告帴鍙ｅけ璐�:{result.Data[0].ErrorMsg}");
}
}
--
Gitblit v1.9.3