From bdd84cc48ba7b2527584c44d174da8e7d20c5375 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 18 九月 2024 16:37:13 +0800
Subject: [PATCH] 增加对申请入库时对平库库位的校验
---
Wms/Wms/Controllers/JobController.cs | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/Wms/Wms/Controllers/JobController.cs b/Wms/Wms/Controllers/JobController.cs
index e7f8e2e..f35990d 100644
--- a/Wms/Wms/Controllers/JobController.cs
+++ b/Wms/Wms/Controllers/JobController.cs
@@ -2,19 +2,22 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Quartz;
+using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Utility.Entity;
using Utility;
using Model.ModelVm;
+using Microsoft.AspNetCore.Authorization;
namespace Wms.Controllers
{
/// <summary>
/// 浠诲姟璋冨害
/// </summary>
- [Route("api/[controller]/[Action]")]
- [EnableCors("AllowSameDomain")] //鍏佽璺ㄥ煙
+ [Route("api/[controller]/[action]")]
+ [ApiController]
+ [Authorize]
[ServiceFilter(typeof(ApiResponseActionFilter))]
public class JobController : ControllerBase
{
@@ -35,14 +38,14 @@
/// <param name="entity"></param>
/// <returns></returns>
[HttpPost]
- public async Task<string> AddJob([FromBody] ScheduleEntity entity)
+ public async Task<string> AddJob(ScheduleEntity entity)
{
if (entity.TriggerType == TriggerTypeEnum.Cron &&
entity.Cron == "* * * * * ?")
{
return "涓嶅厑璁歌繃棰戠箒鎵ц浠诲姟锛�";
}
-
+ throw Oops.Bah("娴嬭瘯寮傚父");
return await scheduler.AddScheduleJobAsync(entity);
}
@@ -92,10 +95,18 @@
/// <param name="entity"></param>
/// <returns></returns>
[HttpPost]
- public async Task<string> ModifyJob([FromBody] ModifyJobInput entity)
+ public async Task<string> ModifyJob(ModifyJobInput entity)
{
var jobKey = new JobKey(entity.OldScheduleEntity.JobName, entity.OldScheduleEntity.JobGroup);
- var runNumber = await scheduler.GetRunNumberAsync(jobKey);
+ long runNumber = 0;
+ try
+ {
+ runNumber = await scheduler.GetRunNumberAsync(jobKey);
+ }
+ catch (Exception)
+ {
+
+ }
await scheduler.StopOrDelScheduleJobAsync(entity.OldScheduleEntity.JobGroup, entity.OldScheduleEntity.JobName, true);
await scheduler.AddScheduleJobAsync(entity.NewScheduleEntity, runNumber);
return "淇敼璁″垝浠诲姟鎴愬姛锛�";
@@ -153,9 +164,16 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public async Task<List<JobInfoEntity>> GetAllJob()
+ public async Task<List<JobInfo>> GetAllJob()
{
- return await scheduler.GetAllJobAsync();
+ var list = await scheduler.GetAllJobAsync();
+ var listJob = new List<JobInfo>();
+ foreach (var mod in list)
+ {
+ mod.JobInfoList.ForEach(s => s.GroupName = mod.GroupName);
+ listJob.AddRange(mod.JobInfoList);
+ }
+ return listJob;
}
/// <summary>
--
Gitblit v1.8.0