工作流会签bug

dev
嵇文龙 5 months ago
parent 92648d429c
commit 30b9e036de

@ -10,6 +10,7 @@ using DS.WMS.Core.Fee.Interface;
using DS.WMS.Core.Flow.Dtos;
using DS.WMS.Core.Flow.Entity;
using DS.WMS.Core.Flow.Interface;
using DS.WMS.Core.Info.Entity;
using DS.WMS.Core.Op.Entity;
using DS.WMS.Core.Sys.Entity;
using LanguageExt;
@ -870,6 +871,37 @@ namespace DS.WMS.Core.Fee.Method
return rows > 0 ? DataResult.Successed("设置成功!", MultiLanguageConst.DataUpdateSuccess) : DataResult.Failed("设置失败!", MultiLanguageConst.Operation_Failed);
}
/// <summary>
/// 设置费用对象
/// </summary>
/// <param name="customerId">费用对象ID</param>
/// <param name="customerType">客户类别</param>
/// <param name="idArray">费用记录ID</param>
/// <returns></returns>
public DataResult SetCustomer(long customerId, string customerType, params long[] idArray)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
var model = tenantDb.Queryable<InfoClient>().Where(x => x.Id == customerId).Select(x => new
{
Id = customerId,
x.CodeName,
x.Name
}).First();
if (model == null)
return DataResult.Failed("未能找到费用对象信息,设置失败!", MultiLanguageConst.Operation_Failed);
var list = idArray.Select(x => new FeeRecord
{
Id = x,
CustomerId = customerId,
CustomerCode = model.CodeName,
CustomerName = model.Name,
CustomerType = customerType
}).ToList();
int rows = tenantDb.Updateable(list).UpdateColumns(x => new { x.CustomerId, x.CustomerCode, x.CustomerName, x.CustomerType }).ExecuteCommand();
return rows > 0 ? DataResult.Successed("设置成功!", MultiLanguageConst.DataUpdateSuccess) : DataResult.Failed("设置失败!", MultiLanguageConst.Operation_Failed);
}
/// <summary>
/// 获取费用核算单打印信息
/// </summary>

@ -905,6 +905,13 @@ public class FlowRuntime
{
res = nextNode.Id;
}
else
{
//同一节点的会签未达到所有审核人同意时节点类型设置为5
NextNodeType = 5;
res = nodeId;
return res;
}
}
else
{

@ -852,3 +852,17 @@
2024-05-31 15:50:31.1326 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.FeeApi\bin\Debug\net8.0\nlog.config
2024-05-31 15:50:31.1326 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-05-31 15:50:31.1326 Info Configuration initialized.
2024-05-31 17:47:24.0743 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-05-31 17:47:24.0908 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-05-31 17:47:24.0908 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-05-31 17:47:24.1082 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-05-31 17:47:24.1144 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.FeeApi\bin\Debug\net8.0\nlog.config
2024-05-31 17:47:24.1144 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-05-31 17:47:24.1144 Info Configuration initialized.
2024-05-31 17:50:06.2405 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-05-31 17:50:06.2598 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-05-31 17:50:06.2598 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-05-31 17:50:06.2901 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-05-31 17:50:06.2901 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.FeeApi\bin\Debug\net8.0\nlog.config
2024-05-31 17:50:06.3062 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-05-31 17:50:06.3062 Info Configuration initialized.

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\Publish\DS8\FeeApi</_PublishTargetUrl>
<History>True|2024-05-31T05:56:03.0734064Z||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;True|2024-05-21T17:13:36.4091775+08:00||;True|2024-05-21T14:41:18.8486299+08:00||;True|2024-05-21T11:04:27.3649637+08:00||;</History>
<History>True|2024-05-31T09:01:42.4717460Z||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;True|2024-05-21T17:13:36.4091775+08:00||;True|2024-05-21T14:41:18.8486299+08:00||;True|2024-05-21T11:04:27.3649637+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

@ -1660,3 +1660,17 @@
2024-05-30 17:18:51.5383 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-05-30 17:18:51.5383 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-05-30 17:18:51.5383 Info Configuration initialized.
2024-05-31 17:47:24.4767 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-05-31 17:47:24.4935 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-05-31 17:47:24.4935 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-05-31 17:47:24.5131 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-05-31 17:47:24.5212 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-05-31 17:47:24.5212 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-05-31 17:47:24.5212 Info Configuration initialized.
2024-05-31 17:50:06.8056 Info Registered target NLog.Targets.FileTarget(Name=allfile)
2024-05-31 17:50:06.8268 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
2024-05-31 17:50:06.8268 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
2024-05-31 17:50:06.8508 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
2024-05-31 17:50:06.8508 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
2024-05-31 17:50:06.8659 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2024-05-31 17:50:06.8659 Info Configuration initialized.

Loading…
Cancel
Save