Open/U8API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测试

Browse Source
This commit is contained in:
邱敏健
2024-12-15 14:01:58 +08:00
parent 7d3133c79d
commit 7f138d24c2
16 changed files with 839 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UFIDA.U8.Framework.Api/App_Data/API_Meta.db
BIN
View File
Binary file not shown.
UFIDA.U8.Framework.Api/App_Data/U8API.xml
+35
View File
@@ -663,6 +663,41 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.DPController.GetEncryptString(System.String)">
<summary>
获取加密字符串
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.DPController.GetDecryptString(System.String)">
<summary>
获取解密字符串
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.DPController.AddAccountConfig(UFIDA.U8.Framework.Api.Models.AddU8AccountConfigInput)">
<summary>
新增对接账套设置
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.DPController.UpdateAccountConfig(UFIDA.U8.Framework.Api.Models.AddU8AccountConfigInput)">
<summary>
更新对接账套设置
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.DPController.ListAccountConfig(UFIDA.U8.Framework.Api.Models.ListU8AccountConfigInput)">
<summary>
获取对接账套设置列表
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="T:UFIDA.U8.Framework.Api.Controllers.U8.MOController">
<summary>
生产订单
UFIDA.U8.Framework.Api/Controllers/U8/DPController.cs
+168 -4
View File
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using System.Web.Http;
using log4net;
@@ -69,6 +65,8 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
{
try
{
await Task.Delay(1);
return new BaseResult<string>() { bSuccess = true, message = "加密成功", result = CommonHelper.U8Encrypt(cPwd) };
}
catch (Exception ex)
@@ -106,5 +104,171 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
}
}
/// <summary>
/// 获取加密字符串
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet]
[Route("api/U8/DP/GetEncryptString")]
public async Task<BaseResult<string>> GetEncryptString(string input)
{
try
{
await Task.Delay(1);
return new BaseResult<string> { bSuccess = true, message = "加密成功", result = CommUnit.GetEncrypt(input) };
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
return new BaseResult<string> { bSuccess = false, message = "加密失败", result = ex.Message };
}
}
/// <summary>
/// 获取解密字符串
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet]
[Route("api/U8/DP/GetDecryptString")]
public async Task<BaseResult<string>> GetDecryptString(string input)
{
try
{
await Task.Delay(1);
return new BaseResult<string> { bSuccess = true, message = "解密成功", result = CommUnit.GetDecrypt(input) };
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
return new BaseResult<string> { bSuccess = false, message = "解密失败", result = ex.Message };
}
}
/// <summary>
/// 新增对接账套设置
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/DP/AddAccountConfig")]
public async Task<BaseResult<dynamic>> AddAccountConfig([FromBody] AddU8AccountConfigInput input)
{
try
{
var db = CommUnit.GetDbClient();
var isExists = await db.Queryable<SysU8AccountConfig>().AnyAsync(a => a.cAccountNo == input.cAccountNo);
if (isExists)
{
throw new Exception($"已存在系统号为{input.cAccountNo}的数据");
}
try
{
if (!string.IsNullOrWhiteSpace(input.cPassword))
{
CommUnit.GetDecrypt(input.cPassword);
}
}
catch (Exception ex)
{
logInfo.Debug($"密码未加密:{ex.Message},将进行密码加密");
input.cPassword = CommUnit.GetEncrypt(input.cPassword);
}
var id = await db.Insertable(input).ExecuteReturnIdentityAsync();
return new BaseResult<dynamic> { bSuccess = true, message = "新增成功", result = id };
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
return new BaseResult<dynamic> { bSuccess = false, message = "新增失败", result = ex.Message };
}
}
/// <summary>
/// 更新对接账套设置
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/DP/UpdateAccountConfig")]
public async Task<BaseResult<dynamic>> UpdateAccountConfig([FromBody] AddU8AccountConfigInput input)
{
try
{
var db = CommUnit.GetDbClient();
var isExists = await db.Queryable<Common.Entity.SysU8AccountConfig>().AnyAsync(a => a.Id == input.Id);
if (!isExists)
{
throw new Exception($"不存在系统号为{input.cAccountNo}的数据");
}
try
{
if (!string.IsNullOrWhiteSpace(input.cPassword))
{
CommUnit.GetDecrypt(input.cPassword);
}
}
catch (Exception ex)
{
logInfo.Debug($"密码未加密:{ex.Message},将进行密码加密");
input.cPassword = CommUnit.GetEncrypt(input.cPassword);
}
var id = await db.Updateable(input).ExecuteCommandAsync();
return new BaseResult<dynamic> { bSuccess = true, message = "更新成功", result = id };
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
return new BaseResult<dynamic> { bSuccess = false, message = "更新失败", result = ex.Message };
}
}
/// <summary>
/// 获取对接账套设置列表
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/DP/ListAccountConfig")]
public async Task<BaseResult<dynamic>> ListAccountConfig([FromBody] ListU8AccountConfigInput input)
{
try
{
var db = CommUnit.GetDbClient();
var res = await db.Queryable<Common.Entity.SysU8AccountConfig>()
.WhereIF(!string.IsNullOrWhiteSpace(input.cAccId), a => a.cAccountNo == input.cAccId)
.ToListAsync();
return new BaseResult<dynamic> { bSuccess = true, message = "查询成功", result = res };
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
return new BaseResult<dynamic> { bSuccess = false, message = "查询失败", result = ex.Message };
}
}
}
}
UFIDA.U8.Framework.Api/Controllers/U8/STController.cs
+163 -6
View File
@@ -1,13 +1,18 @@
using log4net;
using log4net.Util;
using Microsoft.Extensions.Caching.Memory;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Web;
using System.Web.Http;
using UFIDA.U8.Framework.Api.Common.Entity;
using UFIDA.U8.Framework.Api.ControlObject.AP;
using UFIDA.U8.Framework.Api.ControlObject.Common;
using UFIDA.U8.Framework.Api.ControlObject.Entity;
using UFIDA.U8.Framework.Api.ControlObject.Json;
using UFIDA.U8.Framework.Api.ControlObject.ST;
using UFIDA.U8.Framework.Api.ControlObject.U8M;
using UFIDA.U8.Framework.Api.Unit;
@@ -36,16 +41,26 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
/// <param name="bReMote"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/ST/0411/Insert")]
[Route("api/U8/ST/{cCardNum}/Insert")]
public async Task<BaseResult<string>> Insert(string cAccId, string cCardNum,[FromBody] Dictionary<string, object> input, bool bCheck = true,bool bBeforCheckStock=true,bool bIsRedVouch=false,string sAddedState="",bool bReMote=false)
{
try
{
var db = CommUnit.GetDbClient();
var workId = SnowFlakeSingle.Instance.NextId();
logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{cAccId},数据:{input.ToJson()}");
LoginParamter param;
if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
{
logInfo.Debug($"作业Id:{workId}-----未获取到缓存的登录信息,正在重新构建");
baseLogin = new BaseLogin();
var param = await CommUnit.GetLoginParamter(cAccId);
param = await CommUnit.GetLoginParamter(cAccId);
if (param == null)
{
@@ -58,11 +73,153 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
_cache.Set($"U8_{cAccId}", baseLogin);
}
else
{
param = await CommUnit.GetLoginParamter(cAccId);
}
var bo = new USERPCO();
logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
var res =await bo.Insert(baseLogin, input, "11", bCheck, bBeforCheckStock, bIsRedVouch, sAddedState,
bReMote);
var voucherInfo = db.Queryable<SysU8VoucherDefine>().First(s => s.CardNumber == cCardNum);
var defs = db.Queryable<SysU8FieldDefine>().Where(s => s.CardNumber == cCardNum && s.cPosition == "H" && s.bEnable==true).ToList(); //查询表头字段配置,供后续设置字段值
var dateKey = "";
var exchKey = "";
if (defs.Any(a => a.bDate == true && a.cPosition == "H"))
dateKey = defs.Where(a => a.bDate == true && a.cPosition == "H").Select(a => a.FieldName).First();
if (defs.Any(a => a.bPrice == true && a.cPosition == "H"))
exchKey = defs.Where(a => a.bPrice == true && a.cPosition == "H").Select(a => a.FieldName).First();
var dDate = DateTime.Today;
if (!string.IsNullOrWhiteSpace(dateKey))
{
if (!DateTime.TryParse($"{input[dateKey]}", out dDate))
{
dDate = DateTime.Today;
}
}
Exch exch;
if (!string.IsNullOrWhiteSpace(exchKey) && input.ContainsKey(exchKey))
{
exch = CommonHelper.GetExch(dDate, param.cAccId, $"{input[exchKey]}", baseLogin.Connection);
}
else
{
exch = null;
}
var newNumber = "";
#region 调整日期,去掉时间部分
if (input.ContainsKey("ddate"))
{
logInfo.Debug($"作业Id:{workId}-----调整日期,去掉时间部分");
input["ddate"] = $"{Convert.ToDateTime(input["ddate"]):yyyy-MM-dd}";
}
if (input.ContainsKey("dtvdate"))
{
logInfo.Debug($"作业Id:{workId}-----调整日期,去掉时间部分");
input["dtvdate"] = $"{Convert.ToDateTime(input["dtvdate"]):yyyy-MM-dd}";
}
#endregion
logInfo.Debug($"作业Id:{workId}-----设置表头数据");
input.SetDictionaryData(defs, baseLogin.Connection, newNumber, 1, exch);
logInfo.Debug($"作业Id:{workId}-----读取表体数据");
var bodyData = input[voucherInfo.BodyName].ToJson().ToList<Dictionary<string, object>>(); //读取表体的数据
if (bodyData == null || bodyData.Count <= 0)
throw new Exception("无表体数据!");
logInfo.Debug($"作业Id:{workId}-----获取表体字段配置");
var defsBody = db.Queryable<SysU8FieldDefine>().Where(s => s.CardNumber == cCardNum && s.cPosition == "B" && s.bEnable==true).ToList(); //获取表体的字段配置
var rowNo = 1;
foreach (var body in bodyData)
{
logInfo.Debug($"作业Id:{workId}-----设置第{rowNo}行单据数据");
body.SetDictionaryData(defsBody, baseLogin.Connection, newNumber, rowNo, exch);
rowNo++;
// 根据存货档案是否批次管理调整批次号
if (body.ContainsKey("binvbatch") && body.ContainsKey("cbatch"))
{
logInfo.Debug($"作业Id:{workId}-----第{rowNo}行根据存货档案是否批次管理调整批次号");
if (body["binvbatch"] == null || body["binvbatch"] == DBNull.Value || !body["binvbatch"].ToBoolean())
{
body["cbatch"] = "";
}
}
// 根据存货档案是否批次管理调整批次号(调拨单)
if (body.ContainsKey("binvbatch") && body.ContainsKey("ctvbatch"))
{
logInfo.Debug($"作业Id:{workId}-----第{rowNo}行根据存货档案是否批次管理调整批次号(调拨单)");
if (body["binvbatch"] == null || body["binvbatch"] == DBNull.Value || !body["binvbatch"].ToBoolean())
{
body["ctvbatch"] = "";
}
}
// 根据存货档案是否保质期管理调整生产日期和失效日期
if (body.ContainsKey("binvquality") && body.ContainsKey("dmadedate"))
{
logInfo.Debug($"作业Id:{workId}-----第{rowNo}行根据存货档案是否保质期管理调整生产日期和失效日期");
if (body["binvquality"] == null || body["binvquality"] == DBNull.Value || !body["binvquality"].ToBoolean())
{
if (cCardNum == "0304")
{
body["dmadedate"] = "";
}
else
{
body["dmadedate"] = "";
}
}
else
{
if (body.ContainsKey("cmassunit") && body.ContainsKey("imassdate"))
{
switch ($"{body["cmassunit"]}")
{
case "1" when cCardNum != "0304":
body["dvdate"] = $"{Convert.ToDateTime(body["dmadedate"]).AddYears(Convert.ToInt32(body["imassdate"])):yyyy-MM-dd HH:MM:ss}";
break;
case "1" when cCardNum == "0304":
body["ddisdate"] = $"{Convert.ToDateTime(body["dmadedate"]).AddYears(Convert.ToInt32(body["imassdate"])):yyyy-MM-dd HH:MM:ss}";
break;
case "2" when cCardNum != "0304":
body["dvdate"] = $"{Convert.ToDateTime(body["dmadedate"]).AddMonths(Convert.ToInt32(body["imassdate"])):yyyy-MM-dd HH:MM:ss}";
break;
case "2" when cCardNum == "0304":
body["ddisdate"] = $"{Convert.ToDateTime(body["dmadedate"]).AddMonths(Convert.ToInt32(body["imassdate"])):yyyy-MM-dd HH:MM:ss}";
break;
case "3" when cCardNum != "0304":
body["dvdate"] = $"{Convert.ToDateTime(body["dmadedate"]).AddDays(Convert.ToInt32(body["imassdate"])):yyyy-MM-dd HH:MM:ss}";
break;
case "3" when cCardNum == "0304":
body["ddisdate"] = $"{Convert.ToDateTime(body["dmadedate"]).AddDays(Convert.ToInt32(body["imassdate"])):yyyy-MM-dd HH:MM:ss}";
break;
}
}
}
}
}
var co = new USERPCO();
var res =await co.Insert(baseLogin, input, voucherInfo.VoucherType, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState,bReMote);
return res;
}
@@ -87,7 +244,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
/// <param name="bUpdateNeedEas"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/ST/0411/Update")]
[Route("api/U8/ST/{cCardNum}/Update")]
public async Task<BaseResult<string>> Update(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input, bool bCheck = true, bool bBeforCheckStock = true, bool bIsRedVouch = false, string sAddedState = "", bool bUpdateNeedEas = true)
{
try
UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj
+5
View File
@@ -47,6 +47,11 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="ADODB, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>True</EmbedInteropTypes>
<HintPath>..\..\..\U8SOFT\Interop\ADODB.dll</HintPath>
</Reference>
<Reference Include="Autofac, Version=8.1.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.8.1.1\lib\netstandard2.0\Autofac.dll</HintPath>
</Reference>
UFIDA.U8.Framework.Api/Unit/CommUnit.cs
+8 -7
View File
@@ -92,7 +92,7 @@ namespace UFIDA.U8.Framework.Api.Unit
/// <returns></returns>
public static SqlSugarClient GetDbClient()
{
var db = new SqlSugarClient(CommUnit.GetConnectionConfig());
var db = new SqlSugarClient(GetConnectionConfig());
return db;
}
@@ -106,21 +106,22 @@ namespace UFIDA.U8.Framework.Api.Unit
/// <returns></returns>
public static async Task<LoginParamter> GetLoginParamter(string cAccId,bool bAP=false,string pDate="")
{
var db = new SqlSugarClient(CommUnit.GetConnectionConfig());
var db = new SqlSugarClient(GetConnectionConfig());
var account=await db.Queryable<SysU8AccountConfig>().FirstAsync(a => a.Status == StatusEnum.Enable && a.cAccountNo == cAccId);
if (account != null)
{
var param=new LoginParamter()
var param = new LoginParamter()
{
cSrv = account.cSrv,
pAccId = account.cAcc_DataSource,
pDate = string.IsNullOrWhiteSpace(pDate)?$"{DateTime.Today:yyyy-MM-dd}":pDate,
pPassword = string.IsNullOrWhiteSpace(account.cPassword)?"":GetDecrypt(account.cPassword),
pYearId = string.IsNullOrWhiteSpace(pDate) ? $"{DateTime.Today.Year}" :$"{DateTime.Parse(pDate).Year}",
pDate = string.IsNullOrWhiteSpace(pDate) ? $"{DateTime.Today:yyyy-MM-dd}" : pDate,
pPassword = string.IsNullOrWhiteSpace(account.cPassword) ? "" : GetDecrypt(account.cPassword),
pYearId = string.IsNullOrWhiteSpace(pDate) ? $"{DateTime.Today.Year}" : $"{DateTime.Parse(pDate).Year}",
pSubId = bAP ? "AP" : "DP",
pUserId = account.cUser_Id
pUserId = account.cUser_Id,
cAccId = account.cAcc_Id
};
return param;