From c01d2854dd3b585ab6f661517837272da71eda24 Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Mon, 23 Oct 2023 14:33:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E8=AE=BE=E5=A4=87=E7=BB=B4?=
=?UTF-8?q?=E4=BF=AE=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Consts/CodeTemplateConst.cs | 7 +++
.../Tnb.EquipMgr/EqpRepairApplyService.cs | 52 ++++++++++++++++++-
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/BasicData/Tnb.BasicData.Entities/Consts/CodeTemplateConst.cs b/BasicData/Tnb.BasicData.Entities/Consts/CodeTemplateConst.cs
index 39390136..494db034 100644
--- a/BasicData/Tnb.BasicData.Entities/Consts/CodeTemplateConst.cs
+++ b/BasicData/Tnb.BasicData.Entities/Consts/CodeTemplateConst.cs
@@ -29,5 +29,12 @@ namespace Tnb.BasicData
/// 生产齐套领料
///
public const string PRDKITTINGOUTSTOCK_CODE = "PrdKittingOutStocK";
+
+ ///
+ /// 设备维修单
+ ///
+ public const string EQPREPAIR_CODE = "EqpRepair";
+
+
}
}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
index 01d77186..98d122ea 100644
--- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager;
+using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Filter;
using JNPF.Common.Security;
@@ -7,6 +8,10 @@ using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
@@ -22,16 +27,61 @@ namespace Tnb.EquipMgr
///
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
- public class EqpRepairApplyService : IEqpRepairApplyService, IDynamicApiController, ITransient
+ [OverideVisualDev(ModuleId)]
+ public class EqpRepairApplyService : IEqpRepairApplyService, IOverideVisualDevService, IDynamicApiController, ITransient
{
+ private const string ModuleId = "26165698078741";
private readonly ISqlSugarRepository _repository;
+ private readonly IVisualDevService _visualDevService;
+ private readonly IRunService _runService;
+ private readonly IBillRullService _billRuleService;
private readonly IUserManager _userManager;
+
+ public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public EqpRepairApplyService(ISqlSugarRepository repository,
+ IVisualDevService visualDevService,
+ IRunService runService,
+ IBillRullService billRullService,
IUserManager userManager)
{
_repository = repository;
+ _visualDevService = visualDevService;
+ _runService = runService;
_userManager = userManager;
+ _billRuleService = billRullService;
+ OverideFuncs.CreateAsync = Create;
+ }
+
+ private async Task Create(VisualDevModelDataCrInput input)
+ {
+ if (!input.data.ContainsKey("create_time"))
+ {
+ input.data.Add("create_time",DateTime.Now);
+ }
+
+ if (!input.data.ContainsKey("create_id"))
+ {
+ input.data.Add("create_id",_userManager.UserId);
+ }
+
+ if (!input.data.ContainsKey("apply_user_id"))
+ {
+ input.data.Add("apply_user_id",_userManager.UserId);
+ }
+
+ if (!input.data.ContainsKey("org_id"))
+ {
+ input.data.Add("org_id",_userManager.GetUserInfo().Result.organizeId);
+ }
+
+ if (!input.data.ContainsKey("code"))
+ {
+ input.data.Add("code",await _billRuleService.GetBillNumber(CodeTemplateConst.EQPREPAIR_CODE));
+ }
+ VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
+ await _runService.Create(templateEntity, input);
+ return await Task.FromResult(true);
}
[HttpPost]