新增以U8登录人为基础的制单功能(ST)
This commit is contained in:
Binary file not shown.
@@ -636,11 +636,19 @@
|
||||
日志组件
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.DPController.Login(UFIDA.U8.Framework.Api.ControlObject.Entity.LoginParamter)">
|
||||
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.DPController.Login(System.String,UFIDA.U8.Framework.Api.Entity.LoginInput)">
|
||||
<summary>
|
||||
U8登录接口
|
||||
</summary>
|
||||
<param name="input"></param>
|
||||
<param name="cAccId">系统号</param>
|
||||
<param name="input">登录参数</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.DPController.Login(UFIDA.U8.Framework.Api.Entity.UserTokenInput)">
|
||||
<summary>
|
||||
U8登录接口
|
||||
</summary>
|
||||
<param name="input">用户令牌</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.DPController.GetPassword(System.String)">
|
||||
@@ -673,21 +681,21 @@
|
||||
</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>
|
||||
@@ -1015,6 +1023,19 @@
|
||||
<param name="bReMote">是否远程</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.STController.Insert2(System.String,System.Collections.Generic.Dictionary{System.String,System.Object},System.Boolean,System.Boolean,System.Boolean,System.String,System.Boolean)">
|
||||
<summary>
|
||||
新增单据
|
||||
</summary>
|
||||
<param name="cCardNum">单据类型编码</param>
|
||||
<param name="input">报文</param>
|
||||
<param name="bCheck">是否控制可用量</param>
|
||||
<param name="bBeforCheckStock">是否检查可用量</param>
|
||||
<param name="bIsRedVouch">是否红字单据</param>
|
||||
<param name="sAddedState">传空字符串</param>
|
||||
<param name="bReMote">是否远程</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.STController.Verify(System.String,System.String,System.String,System.Boolean,System.Boolean,System.Boolean)">
|
||||
<summary>
|
||||
审核单据(单号)
|
||||
@@ -1139,6 +1160,51 @@
|
||||
日志组件
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:UFIDA.U8.Framework.Api.Entity.LoginInput">
|
||||
<summary>
|
||||
登录参数
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:UFIDA.U8.Framework.Api.Entity.LoginInput.pUserId">
|
||||
<summary>
|
||||
用户名
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:UFIDA.U8.Framework.Api.Entity.LoginInput.pPassword">
|
||||
<summary>
|
||||
密码
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:UFIDA.U8.Framework.Api.Entity.LoginInput.pDate">
|
||||
<summary>
|
||||
登录日期,影响各接口制单的默认日期
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:UFIDA.U8.Framework.Api.Entity.UserTokenInput">
|
||||
<summary>
|
||||
用户令牌参数
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:UFIDA.U8.Framework.Api.Entity.UserTokenInput.userToken">
|
||||
<summary>
|
||||
用户令牌
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:UFIDA.U8.Framework.Api.Entity.LoginOutput">
|
||||
<summary>
|
||||
登录输出参数
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:UFIDA.U8.Framework.Api.Entity.LoginOutput.cAccId">
|
||||
<summary>
|
||||
系统号
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:UFIDA.U8.Framework.Api.Entity.LoginOutput.userToken">
|
||||
<summary>
|
||||
用户令牌
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:UFIDA.U8.Framework.Api.WebApiApplication.CurrentDomain_AssemblyResolve(System.Object,System.ResolveEventArgs)">
|
||||
<summary>
|
||||
缺少程序集全局处理事件
|
||||
@@ -1224,6 +1290,13 @@
|
||||
<param name="pDate"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:UFIDA.U8.Framework.Api.Unit.CommUnit.GetUserToken(System.String)">
|
||||
<summary>
|
||||
获取用户令牌
|
||||
</summary>
|
||||
<param name="userToken">用户令牌</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:UFIDA.U8.Framework.Api.Unit.RemoteLoader">
|
||||
<summary>
|
||||
跨域加载
|
||||
|
||||
@@ -39,8 +39,8 @@ namespace UFIDA.U8.Framework.Api
|
||||
c.CustomProvider((defaultProvider) => new SwaggerCacheProvider(defaultProvider, $@"{AppDomain.CurrentDomain.BaseDirectory}\App_Data\U8API.xml"));
|
||||
c.SingleApiVersion("v1", "U8API");
|
||||
c.IncludeXmlComments($@"{AppDomain.CurrentDomain.BaseDirectory}\App_Data\U8API.xml");
|
||||
TokenRequiredHeaderParameter.HeaderKey = "account_token";
|
||||
TokenRequiredHeaderParameter.Description = "ÁîÅÆ";
|
||||
TokenRequiredHeaderParameter.HeaderKey = "userToken";
|
||||
TokenRequiredHeaderParameter.Description = "Óû§ÁîÅÆ";
|
||||
c.OperationFilter<TokenRequiredHeaderParameter>();
|
||||
|
||||
// If you want the output Swagger docs to be indented properly, enable the "PrettyPrint" option.
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web.Http;
|
||||
using System.Web.Http.Description;
|
||||
using System.Web.UI.WebControls;
|
||||
using log4net;
|
||||
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.U8M;
|
||||
using UFIDA.U8.Framework.Api.Entity;
|
||||
using UFIDA.U8.Framework.Api.Models;
|
||||
using UFIDA.U8.Framework.Api.Unit;
|
||||
|
||||
@@ -23,26 +27,53 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
/// <summary>
|
||||
/// U8登录接口
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <param name="cAccId">系统号</param>
|
||||
/// <param name="input">登录参数</param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Route("api/U8/DP/Login")]
|
||||
public async Task<BaseResult<string>> Login( [FromBody] LoginParamter input)
|
||||
public async Task<BaseResult<string>> Login(string cAccId, [FromBody] LoginInput input)
|
||||
{
|
||||
try
|
||||
{
|
||||
var logn = new BaseLogin();
|
||||
logInfo.Debug($"当前接口:api/U8/DP/Login,参数:{input.ToJson()}");
|
||||
|
||||
logn.Init(input, false);
|
||||
var db = CommUnit.GetDbClient();
|
||||
|
||||
var userToken = logn.userToken;
|
||||
var account = await db.Queryable<SysU8AccountConfig>().FirstAsync(a => a.Status == StatusEnum.Enable && a.cAccountNo == cAccId);
|
||||
|
||||
if (account == null)
|
||||
{
|
||||
throw new Exception($"未能找到[{cAccId}]的配置信息");
|
||||
}
|
||||
|
||||
var param = new LoginParamter()
|
||||
{
|
||||
cSrv = account.cSrv,
|
||||
pAccId = account.cAcc_DataSource,
|
||||
pDate = string.IsNullOrWhiteSpace(input.pDate) ? $"{DateTime.Today:yyyy-MM-dd}" : input.pDate,
|
||||
pPassword = string.IsNullOrWhiteSpace(input.pPassword) ? "" : CommUnit.GetDecrypt(input.pPassword),
|
||||
pYearId = string.IsNullOrWhiteSpace(input.pDate) ? $"{DateTime.Today.Year}" : $"{DateTime.Parse(input.pDate).Year}",
|
||||
pSubId = "DP",
|
||||
pUserId = input.pUserId
|
||||
};
|
||||
|
||||
var login = new BaseLogin();
|
||||
|
||||
login.Init(param, false);
|
||||
|
||||
var userToken = login.userToken;
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(userToken))
|
||||
{
|
||||
return new BaseResult<string>() { bSuccess = true, message = "登录成功", result = userToken };
|
||||
}
|
||||
var output = new LoginOutput
|
||||
{
|
||||
cAccId = cAccId,
|
||||
userToken = CommUnit.GetEncrypt(userToken)
|
||||
};
|
||||
|
||||
await Task.Delay(1);
|
||||
return new BaseResult<string>() { bSuccess = true, message = "登录成功", result = CommUnit.GetEncrypt(output.ToJson()) };
|
||||
}
|
||||
|
||||
throw new Exception("未知错误,请检查系统日志");
|
||||
|
||||
@@ -51,9 +82,52 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
{
|
||||
logInfo.Error(ex.Message, ex);
|
||||
|
||||
await Task.Delay(1);
|
||||
|
||||
return new BaseResult<string> { bSuccess = false, message = "登录失败", result = ex.Message };
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// U8登录接口
|
||||
/// </summary>
|
||||
/// <param name="input">用户令牌</param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Route("api/U8/DP/Login/Token")]
|
||||
public async Task<BaseResult<string>> Login([FromBody] UserTokenInput input)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
logInfo.Debug($"当前接口:api/U8/DP/Login/Token,参数:{input.ToJson()}");
|
||||
|
||||
var token = CommUnit.GetUserToken(input.userToken);
|
||||
|
||||
var login = new BaseLogin();
|
||||
|
||||
login.Init(token, false);
|
||||
|
||||
var userToken = login.userToken;
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(userToken))
|
||||
{
|
||||
return new BaseResult<string>() { bSuccess = true, message = "登录成功", result = "登录成功" };
|
||||
}
|
||||
|
||||
throw new Exception("未知错误,请检查系统日志");
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logInfo.Error(ex.Message, ex);
|
||||
|
||||
await Task.Delay(1);
|
||||
|
||||
return new BaseResult<string> { bSuccess = false, message = "登录失败", result = ex.Message };
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -138,6 +212,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[Route("api/U8/DP/GetDecryptString")]
|
||||
[ApiExplorerSettings(IgnoreApi = true)]
|
||||
public async Task<BaseResult<string>> GetDecryptString(string input)
|
||||
{
|
||||
try
|
||||
@@ -155,7 +230,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 新增对接账套设置
|
||||
/// 注册对接系统
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
@@ -202,7 +277,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新对接账套设置
|
||||
/// 更新对接系统
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
@@ -248,7 +323,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取对接账套设置列表
|
||||
/// 获取对接系统列表
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
|
||||
@@ -4,7 +4,9 @@ using SqlSugar;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net.Http;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
using System.Web.Http;
|
||||
using UFIDA.U8.Framework.Api.Common.Entity;
|
||||
using UFIDA.U8.Framework.Api.ControlObject.Common;
|
||||
@@ -12,6 +14,7 @@ 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.Entity;
|
||||
using UFIDA.U8.Framework.Api.Models;
|
||||
using UFIDA.U8.Framework.Api.Unit;
|
||||
// ReSharper disable StringLiteralTypo
|
||||
@@ -46,7 +49,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[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)
|
||||
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
|
||||
{
|
||||
@@ -254,6 +257,227 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 新增单据
|
||||
/// </summary>
|
||||
/// <param name="cCardNum">单据类型编码</param>
|
||||
/// <param name="input">报文</param>
|
||||
/// <param name="bCheck">是否控制可用量</param>
|
||||
/// <param name="bBeforCheckStock">是否检查可用量</param>
|
||||
/// <param name="bIsRedVouch">是否红字单据</param>
|
||||
/// <param name="sAddedState">传空字符串</param>
|
||||
/// <param name="bReMote">是否远程</param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Route("api/U8/ST/{cCardNum}/Insert/Token")]
|
||||
public async Task<BaseResult<string>> Insert2(string cCardNum, [FromBody] Dictionary<string, object> input, bool bCheck = true, bool bBeforCheckStock = true, bool bIsRedVouch = false, string sAddedState = "", bool bReMote = false)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userToken = Request.Headers.GetValues("userToken").First();
|
||||
|
||||
logInfo.Debug($"当前接口:api/U8/ST/{cCardNum}/Insert/{userToken},参数:{input.ToJson()}");
|
||||
|
||||
var output = CommUnit.GetDecrypt(userToken).ToObject<LoginOutput>();
|
||||
|
||||
var token = CommUnit.GetDecrypt(output.userToken);
|
||||
|
||||
var db = CommUnit.GetDbClient();
|
||||
|
||||
var workId = SnowFlakeSingle.Instance.NextId();
|
||||
|
||||
logInfo.Debug($"作业Id:{workId}-----单据:{cCardNum},操作:新增,对接账套:{output.cAccId},数据:{input.ToJson()}");
|
||||
|
||||
//LoginParamter param;
|
||||
|
||||
if (!_cache.TryGetValue($"U8_{userToken}_{output.cAccId}", out BaseLogin baseLogin))
|
||||
{
|
||||
logInfo.Debug($"作业Id:{workId}-----未获取到缓存的登录信息,正在重新构建");
|
||||
|
||||
baseLogin = new BaseLogin();
|
||||
|
||||
baseLogin.Init(token, false, 5);
|
||||
|
||||
_cache.Clear();
|
||||
|
||||
_cache.Set($"U8_{userToken}_{output.cAccId}", baseLogin);
|
||||
}
|
||||
//else
|
||||
//{
|
||||
// param = await CommUnit.GetLoginParamter(cAccId);
|
||||
//}
|
||||
|
||||
logInfo.Debug($"作业Id:{workId}-----登录信息获取完成,缓存设置完成,开始加载单据配置信息");
|
||||
|
||||
var voucherInfo = await db.Queryable<SysU8VoucherDefine>().FirstAsync(s => s.CardNumber == cCardNum);
|
||||
|
||||
var defs = await db.Queryable<SysU8FieldDefine>().Where(s => s.CardNumber == cCardNum && s.cPosition == "H" && s.bEnable == true).ToListAsync(); //查询表头字段配置,供后续设置字段值
|
||||
|
||||
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.TryGetValue(exchKey, out var value))
|
||||
{
|
||||
exch = CommonHelper.GetExch(dDate, output.cAccId, $"{value}", baseLogin.Connection);
|
||||
}
|
||||
else
|
||||
{
|
||||
exch = null;
|
||||
}
|
||||
|
||||
|
||||
var newNumber = "";
|
||||
var bGetCode = false;
|
||||
var codeKey = "";
|
||||
|
||||
if (defs.Any(a => a.bDefault == true && a.cPosition == "H" && a.DefaultValue == "单号" && a.bEnable == true))
|
||||
{
|
||||
bGetCode = true;
|
||||
codeKey = defs
|
||||
.Where(a => a.bDefault == true && a.cPosition == "H" && a.DefaultValue == "单号" &&
|
||||
a.bEnable == true).Select(a => a.FieldName).First();
|
||||
|
||||
logInfo.Debug($"作业Id:{workId}-----配置获取单号");
|
||||
}
|
||||
else
|
||||
{
|
||||
logInfo.Debug($"作业Id:{workId}-----没有单号需要自动指定");
|
||||
}
|
||||
|
||||
#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 = await db.Queryable<SysU8FieldDefine>().Where(s => s.CardNumber == cCardNum && s.cPosition == "B" && s.bEnable == true).ToListAsync(); //获取表体的字段配置
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
input[voucherInfo.BodyName] = bodyData;
|
||||
|
||||
var co = new USERPCO();
|
||||
|
||||
var res = await co.Insert(baseLogin, input, cCardNum, voucherInfo.VoucherType, bGetCode, codeKey, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote, voucherInfo.bVerify, voucherInfo.bPrintDom);
|
||||
|
||||
return res;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logInfo.Error(ex.Message, ex);
|
||||
|
||||
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
|
||||
}
|
||||
}
|
||||
|
||||
///// <summary>
|
||||
///// 修改单据
|
||||
///// </summary>
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
|
||||
namespace UFIDA.U8.Framework.Api.Entity
|
||||
{
|
||||
/// <summary>
|
||||
/// 登录参数
|
||||
/// </summary>
|
||||
public class LoginInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 用户名
|
||||
/// </summary>
|
||||
public string pUserId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 密码
|
||||
/// </summary>
|
||||
public string pPassword { get; set; } = "";
|
||||
|
||||
/// <summary>
|
||||
/// 登录日期,影响各接口制单的默认日期
|
||||
/// </summary>
|
||||
public string pDate { get; set; } = $"{DateTime.Today:yyyy-MM-dd}";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 用户令牌参数
|
||||
/// </summary>
|
||||
public class UserTokenInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 用户令牌
|
||||
/// </summary>
|
||||
public string userToken { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 登录输出参数
|
||||
/// </summary>
|
||||
public class LoginOutput
|
||||
{
|
||||
/// <summary>
|
||||
/// 系统号
|
||||
/// </summary>
|
||||
public string cAccId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 用户令牌
|
||||
/// </summary>
|
||||
public string userToken { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -419,12 +419,13 @@
|
||||
<Compile Include="Controllers\U8\SFCController.cs" />
|
||||
<Compile Include="Controllers\U8\STController.cs" />
|
||||
<Compile Include="Controllers\U8\WorkflowController.cs" />
|
||||
<Compile Include="Entity\LoginInput.cs" />
|
||||
<Compile Include="Global.asax.cs">
|
||||
<DependentUpon>Global.asax</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Models\SFCInput.cs" />
|
||||
<Compile Include="Models\STInput.cs" />
|
||||
<Compile Include="Models\U8AccountConfigInput.cs" />
|
||||
<Compile Include="Entity\SFCInput.cs" />
|
||||
<Compile Include="Entity\STInput.cs" />
|
||||
<Compile Include="Entity\U8AccountConfigInput.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Unit\AssemblyDynamicLoader.cs" />
|
||||
<Compile Include="Unit\CommUnit.cs" />
|
||||
|
||||
@@ -5,10 +5,14 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
using System.Web.UI.WebControls;
|
||||
using Microsoft.Data.Sqlite;
|
||||
using SqlSugar;
|
||||
using UFIDA.U8.Framework.Api.Common.Unit.GM;
|
||||
using UFIDA.U8.Framework.Api.ControlObject.Entity;
|
||||
using UFIDA.U8.Framework.Api.ControlObject.Json;
|
||||
using UFIDA.U8.Framework.Api.Entity;
|
||||
using UFIDA.U8.Framework.Api.Models;
|
||||
|
||||
namespace UFIDA.U8.Framework.Api.Unit
|
||||
{
|
||||
@@ -126,9 +130,21 @@ namespace UFIDA.U8.Framework.Api.Unit
|
||||
|
||||
return param;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取用户令牌
|
||||
/// </summary>
|
||||
/// <param name="userToken">用户令牌</param>
|
||||
/// <returns></returns>
|
||||
public static string GetUserToken(string userToken)
|
||||
{
|
||||
var output = CommUnit.GetDecrypt(userToken).ToObject<LoginOutput>();
|
||||
|
||||
var token = CommUnit.GetDecrypt(output.userToken);
|
||||
|
||||
return token;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user