2023-11-16 16:13:30 +08:00
|
|
|
|
using JinianNet.JNTemplate;
|
|
|
|
|
|
using Microsoft.AspNetCore.Mvc;
|
2023-11-16 13:35:43 +08:00
|
|
|
|
using Microsoft.IdentityModel.Tokens;
|
2023-11-16 16:13:30 +08:00
|
|
|
|
using Newtonsoft.Json;
|
|
|
|
|
|
using Newtonsoft.Json.Linq;
|
|
|
|
|
|
using System.Text.Json;
|
2023-11-16 13:35:43 +08:00
|
|
|
|
using ZR.Admin.WebApi.Extensions;
|
|
|
|
|
|
using ZR.Model.mes.md;
|
|
|
|
|
|
using ZR.Model.mes.pro;
|
|
|
|
|
|
using ZR.Service.mes.pro;
|
|
|
|
|
|
using ZR.Service.mes.pro.IService;
|
|
|
|
|
|
using ZR.Service.MES.md;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
namespace ZR.Admin.WebApi.Controllers.MES.pro
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
[Route("mes/pro/workorder")]
|
|
|
|
|
|
public class ProWorkorderController : BaseController
|
|
|
|
|
|
{
|
|
|
|
|
|
private readonly IProWorkorderService proWorkorderService;
|
|
|
|
|
|
|
|
|
|
|
|
public ProWorkorderController(IProWorkorderService proWorkorderService)
|
|
|
|
|
|
{
|
|
|
|
|
|
this.proWorkorderService = proWorkorderService;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2023-11-16 16:13:30 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 获取所有非排产工单
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="pageNum"></param>
|
|
|
|
|
|
/// <param name="pageSize"></param>
|
|
|
|
|
|
/// <param name="year"></param>
|
|
|
|
|
|
/// <param name="week"></param>
|
|
|
|
|
|
/// <param name="date"></param>
|
|
|
|
|
|
/// <returns></returns>
|
2023-11-16 13:35:43 +08:00
|
|
|
|
[HttpGet("getworkorderListwithoutschedule")]
|
|
|
|
|
|
public IActionResult GetWorkorderListWithoutSchedule(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
|
|
|
|
|
|
{
|
|
|
|
|
|
(List<ProWorkorder>, int) data = proWorkorderService.GetWorkorderList(pageNum, pageSize, year, week, date, "0");
|
|
|
|
|
|
|
|
|
|
|
|
return ToResponse(new ApiResult(200, "success", data));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2023-11-16 16:13:30 +08:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// 获取所有排产工单
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
/// <param name="pageNum"></param>
|
|
|
|
|
|
/// <param name="pageSize"></param>
|
|
|
|
|
|
/// <param name="year"></param>
|
|
|
|
|
|
/// <param name="week"></param>
|
|
|
|
|
|
/// <param name="date"></param>
|
|
|
|
|
|
/// <returns></returns>
|
2023-11-16 13:35:43 +08:00
|
|
|
|
[HttpGet("getworkorderListwithschedule")]
|
|
|
|
|
|
public IActionResult GetWorkorderListWithSchedule(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
|
|
|
|
|
|
{
|
|
|
|
|
|
(List<ProWorkorder>, int) data = proWorkorderService.GetWorkorderList(pageNum, pageSize, year, week, date, "1");
|
|
|
|
|
|
|
|
|
|
|
|
return ToResponse(new ApiResult(200, "success", data));
|
|
|
|
|
|
}
|
2023-11-16 16:13:30 +08:00
|
|
|
|
|
|
|
|
|
|
/// <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; }
|
2023-11-16 13:35:43 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|