Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

测试 SortSchedule

Browse Source
This commit is contained in:
xiaowei.song
2023-11-16 16:13:30 +08:00
parent cac6397feb
commit 77980f8c24
4 changed files with 121 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs
View File

@@ -1,5 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using JinianNet.JNTemplate;
using Microsoft.AspNetCore.Mvc;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Text.Json;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Model.mes.pro;
@@ -21,7 +25,15 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
this.proWorkorderService = proWorkorderService;
}
/// <summary>
/// 获取所有非排产工单
/// </summary>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="year"></param>
/// <param name="week"></param>
/// <param name="date"></param>
/// <returns></returns>
[HttpGet("getworkorderListwithoutschedule")]
public IActionResult GetWorkorderListWithoutSchedule(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
@@ -30,6 +42,15 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 获取所有排产工单
/// </summary>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="year"></param>
/// <param name="week"></param>
/// <param name="date"></param>
/// <returns></returns>
[HttpGet("getworkorderListwithschedule")]
public IActionResult GetWorkorderListWithSchedule(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
@@ -37,5 +58,75 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 根据工单ID，设置为排产状态
/// </summary>
/// <param name="id">工单ID</param>
/// <param name="arrange_starttime">预计开始时间</param>
/// <param name="arrange_endtime">预计结束时间</param>
/// <returns></returns>
[HttpGet("setschedule")]
public IActionResult SetSchedule(string id, string arrange_starttime,string arrange_endtime)
{
DateTime bgDateTime = DateTime.Now;
DateTime edDateTime = DateTime.Now;
try
{
bgDateTime = Convert.ToDateTime(arrange_starttime);
edDateTime = Convert.ToDateTime(arrange_endtime);
}
catch { }
int data = proWorkorderService.SetWorkorderSechedule(id, bgDateTime, edDateTime);
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 根据工单ID，设置为非排产状态
/// </summary>
/// <param name="id">工单ID</param>
/// <returns></returns>
[HttpGet("resetschedule")]
public IActionResult ResetSchedule(string id)
{
int data = proWorkorderService.ResetWorkorderSechedule(id);
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
///
/// </summary>
/// <param name="parameter"></param>
/// <returns></returns>
[HttpPost("sortschedule")]
public IActionResult SortSchedule([FromBody] List<t> parameter)
{
//JsonElement t = (JsonElement)parameter;
//JsonElement.
//parameter.Adapt(t);
//string t = parameter["listKeyValue"];
//Dictionary<string, string> KV_ID_Sort = new Dictionary<string, string>();
//JArray ja = (JArray)JsonConvert.DeserializeObject(t);
//foreach (JToken item in ja.ToList())
//{
// KV_ID_Sort.Add(item["id"].ToString(), item["value"].ToString());
//}
return ToResponse(new ApiResult(200, "success", 1));
}
}
public class t
{
public string id { get; set; }
public string order { get; set; }
}
}

7
ZR.Model/mes/pro/ProWorkorder.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.MES.pro;
namespace ZR.Model.mes.pro
{
@@ -57,6 +58,12 @@ namespace ZR.Model.mes.pro
[SugarColumn(ColumnName = "priority")]
public int Priority { get; set; }
/// <summary>
/// 工单顺序
///</summary>
[SugarColumn(ColumnName = "order")]
public int Order { get; set; }
/// <summary>
/// 排产开始时间
///</summary>

4
ZR.Service/mes/pro/IService/IProWorkorderService.cs
View File

@@ -12,5 +12,9 @@ namespace ZR.Service.mes.pro.IService
public interface IProWorkorderService
{
public (List<ProWorkorder>, int) GetWorkorderList(int pageNum, int pageSize, int year, int week,int date,string isSchedule);
public int SetWorkorderSechedule(string id, DateTime arrange_starttime, DateTime arrange_endtime);
public int ResetWorkorderSechedule(string id);
}
}

17
ZR.Service/mes/pro/ProWorkorderService.cs
View File

@@ -32,5 +32,22 @@ namespace ZR.Service.mes.pro
return (proWorkorderList, totalCount);
}
public int SetWorkorderSechedule(string id, DateTime arrange_starttime, DateTime arrange_endtime)
{
return Context.Updateable<ProWorkorder>()
.SetColumns(it => new ProWorkorder() { ArrangeStarttime = arrange_starttime, ArrangeEndtime = arrange_endtime, Isarrange = "1" })
.Where(it => it.Id.Equals(id))
.ExecuteCommand();
}
public int ResetWorkorderSechedule(string id)
{
return Context.Updateable<ProWorkorder>()
.SetColumns(it => it.Isarrange == "0")
.Where(it => it.Id.Equals(id))
.ExecuteCommand();
}
}
}