wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

异常操作，取消 重新执行， 完成

Browse Source
This commit is contained in:
贺立波
2023-06-16 15:07:57 +08:00
parent 74e2726f8f
commit 62e7eec793
3 changed files with 170 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs
View File

@@ -1,2 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;

namespace Tnb.WarehouseMgr.Interfaces
{
 /// <summary>
 /// 库房业务(出入库)接口
 /// </summary>
 public interface IWareHouseService
 {
 /// <summary>
 /// 入库策略
 /// </summary>
 /// <param name="input"></param>
 /// <returns></returns>
 Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input);
 /// <summary>
 /// 出库策略
 /// </summary>
 /// <param name="input"></param>
 /// <returns></returns>
 //Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
 /// <summary>
 /// 路径算法
 /// </summary>
 /// <param name="pStartId"></param>
 /// <param name="pEndId"></param>
 /// <returns></returns>
 Task<List<WmsPointH>> PathAlgorithms(string pStartId, string pEndId);
 /// <summary>
 /// 生成预任务
 /// </summary>
 /// <param name="preTasks"></param>
 /// <returns></returns>
 Task<bool> GenPreTask(List<WmsPretaskH> preTasks,List<WmsPretaskCode> preTaskCodes);
 /// <summary>
 /// 生成预任务成功后操作
 /// </summary>
 /// <param name="input"></param>
 /// <returns></returns>
 Task GenInStockTaskHandleAfter(GenPreTaskUpInput input,Expression<Func<WmsCarryH,WmsCarryH>> setCarryColumnsExp,Expression<Func<BasLocation,BasLocation>> setLocaionColumbExp);
 }
}

using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
namespace Tnb.WarehouseMgr.Interfaces
{
/// <summary>
 /// 库房业务(出入库)接口
 /// </summary>
 public interface IWareHouseService
 {
 /// <summary>
 /// 入库策略
 /// </summary>
 /// <param name="input"></param>
 /// <returns></returns>
 Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input);
 /// <summary>
 /// 出库策略
 /// </summary>
 /// <param name="input"></param>
 /// <returns></returns>
 //Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
 /// <summary>
 /// 路径算法
 /// </summary>
 /// <param name="pStartId"></param>
 /// <param name="pEndId"></param>
 /// <returns></returns>
 Task<List<WmsPointH>> PathAlgorithms(string pStartId, string pEndId);
 /// <summary>
 /// 生成预任务
 /// </summary>
 /// <param name="preTasks"></param>
 /// <returns></returns>
 Task<bool> GenPreTask(List<WmsPretaskH> preTasks,List<WmsPretaskCode> preTaskCodes);
 /// <summary>
 /// 生成预任务成功后操作
 /// </summary>
 /// <param name="input"></param>
 /// <returns></returns>
 Task GenInStockTaskHandleAfter(GenPreTaskUpInput input,Expression<Func<WmsCarryH,WmsCarryH>> setCarryColumnsExp,Expression<Func<BasLocation,BasLocation>> setLocaionColumbExp);
 /// <summary>
 /// 任务完成
 /// </summary>
 /// <param name="input"></param>
 /// <returns></returns>
Task TaskComplate(TaskCompleUpInput input);
}
}


85
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAExceptionCompleteService.cs Normal file
View File

@@ -0,0 +1,85 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Security;
using JNPF.FriendlyException;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.CodeAnalysis;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Attributes;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr
{
/// <summary>
/// 异常取消
/// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSEXCPTIONCOMPLETEPDA_ID)]
public class WmsPDAExceptionCompleteService : BaseWareHouseService
{
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly IWareHouseService _wareHouseService;
private readonly IBillRullService _billRullService;
private readonly IUserManager _userManager;
public WmsPDAExceptionCompleteService(
ISqlSugarRepository<WmsCarryH> repository,
IRunService runService,
IVisualDevService visualDevService,
IWareHouseService wareHouseService,
IUserManager userManager,
IBillRullService billRullService)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
_wareHouseService = wareHouseService;
_userManager = userManager;
_billRullService = billRullService;
OverideFuncs.CreateAsync = ExceptionCancel;
}
private async Task<dynamic> ExceptionCancel(VisualDevModelDataCrInput input)
{
try
{
await _db.Ado.BeginTranAsync();
var taskCompleUpInput = new TaskCompleUpInput();
List<string> list = new();
if (input.data.ContainsKey(nameof(WmsDistaskH.id)))
{
list.Add(input.data[nameof(WmsDistaskH.id)].ToString());
taskCompleUpInput.disTaskIds = list;
await _wareHouseService.TaskComplate(taskCompleUpInput);
}
await _db.Ado.CommitTranAsync();
}
catch (Exception ex)
{
await _db.Ado.RollbackTranAsync();
throw;
}
return Task.FromResult(true);
}
}
}

78
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAExceptionReexcuteService.cs Normal file
View File

@@ -0,0 +1,78 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Security;
using JNPF.FriendlyException;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.CodeAnalysis;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Attributes;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr
{
/// <summary>
/// 异常取消
/// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSEXCPTIONREEXCUTEPDA_ID)]
public class WmsPDAExceptionReexcuteService : BaseWareHouseService
{
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly IWareHouseService _wareHouseService;
private readonly IBillRullService _billRullService;
private readonly IUserManager _userManager;
public WmsPDAExceptionReexcuteService(
ISqlSugarRepository<WmsCarryH> repository,
IRunService runService,
IVisualDevService visualDevService,
IWareHouseService wareHouseService,
IUserManager userManager,
IBillRullService billRullService)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
_wareHouseService = wareHouseService;
_userManager = userManager;
_billRullService = billRullService;
OverideFuncs.CreateAsync = ExceptionCancel;
}
private async Task<dynamic> ExceptionCancel(VisualDevModelDataCrInput input)
{
try
{
await _db.Ado.BeginTranAsync();
var items = await _db.Queryable<WmsDistaskH>().FirstAsync(it => it.id == input.data[nameof(WmsDistaskH.id)].ToString());
//items.agreement
//获取任务的协议，进行重新下发
await _db.Ado.CommitTranAsync();
}
catch (Exception ex)
{
await _db.Ado.RollbackTranAsync();
throw;
}
return Task.FromResult(true);
}
}
}