毛坯 获取工单

This commit is contained in:
xiaowei.song
2023-11-23 08:31:14 +08:00
parent 4e2ac51a86
commit 53380203f1
3 changed files with 65 additions and 1 deletions

View File

@@ -0,0 +1,43 @@
using Infrastructure.Extensions;
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.pro;
using ZR.Service.mes.pro;
using ZR.Service.mes.pro.IService;
using ZR.Service.mes.qu.IService;
namespace ZR.Admin.WebApi.Controllers.mes.qu
{
[Route("mes/qu/rough")]
public class QuRoughController : BaseController
{
private readonly IQuRoughService quRoughService;
public QuRoughController(IQuRoughService quRoughService)
{
this.quRoughService = quRoughService;
}
/// <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("getworkorderList")]
public IActionResult GetWorkorderList(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
(List<ProWorkorder>, int) data = quRoughService.GetWorkorderList(pageNum, pageSize, year, week, date, "1");
return ToResponse(new ApiResult(200, "success", data));
}
}
}

View File

@@ -3,6 +3,7 @@ using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.mes.pro;
using ZR.Model.MES.qu;
@@ -10,5 +11,6 @@ namespace ZR.Service.mes.qu.IService
{
public interface IQuRoughService
{
public (List<ProWorkorder>, int) GetWorkorderList(int pageNum, int pageSize, int year, int week, int date, string isSchedule);
}
}

View File

@@ -7,11 +7,30 @@ using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.mes.pro;
using ZR.Model.MES.qu;
using ZR.Service.mes.pro.IService;
using ZR.Service.mes.qu.IService;
namespace ZR.Service.mes.qu
{
public class QuRoughService
[AppService(ServiceType = typeof(IQuRoughService), ServiceLifetime = LifeTime.Transient)]
public class QuRoughService : BaseService<QuRough>, IQuRoughService
{
public (List<ProWorkorder>, int) GetWorkorderList(int pageNum, int pageSize, int year, int week, int date, string isSchedule)
{
var predicate = Expressionable.Create<ProWorkorder>()
.AndIF(year > 0, it => it.Year == year)
.AndIF(week > 0, it => it.Week == week)
.AndIF(date > 0, it => it.Date == date)
.AndIF(date > 0, it => it.Isarrange.Equals(isSchedule))
.ToExpression();
int totalCount = 0;
List<ProWorkorder> proWorkorderList = Context.Queryable<ProWorkorder>().Where(predicate).ToPageList(pageNum, pageSize, ref totalCount);
return (proWorkorderList, totalCount);
}
}
}