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

重要：代码全局优化与添加一次合格，抛光仓库的截止日期数据查询功能

Browse Source
This commit is contained in:
赵正易
2025-07-28 15:40:59 +08:00
parent 89c113e5e1
commit 42de49629b
162 changed files with 3335 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/mes/ql/PainLab02Controller.cs
View File

@@ -26,7 +26,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
/// <param name="pageSize"></param>
/// <returns></returns>
[HttpGet("gettestlist")]
public IActionResult GetTestlist(DateTime starttime, DateTime endTime, string workorderid, string description, int pageNum, int pageSize,int dateType)
public IActionResult GetTestlist(DateTime starttime, DateTime endTime, string workorderid, string description, int pageNum, int pageSize, int dateType)
{
//starttime = starttime.AddHours(8);
//endTime = endTime.AddHours(8);

26
ZR.Admin.WebApi/Controllers/mes/ql/PainLab03Controller.cs
View File

@@ -15,18 +15,18 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
this.plBatchService = plbatchservice;
}
/// <summary>
/// 获取批处理数据
/// </summary>
/// <param name="starttime"></param>
/// <param name="endTime"></param>
/// <param name="workorderid">颜色代码</param>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="dateType"></param>
/// <returns></returns>
[HttpGet("getbatchlist")]
public IActionResult GetBatchlist(DateTime starttime, DateTime endTime, string workorderid, string description, int pageNum, int pageSize,int dateType, string workOrder)
/// <summary>
/// 获取批处理数据
/// </summary>
/// <param name="starttime"></param>
/// <param name="endTime"></param>
/// <param name="workorderid">颜色代码</param>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="dateType"></param>
/// <returns></returns>
[HttpGet("getbatchlist")]
public IActionResult GetBatchlist(DateTime starttime, DateTime endTime, string workorderid, string description, int pageNum, int pageSize, int dateType, string workOrder)
{
//starttime = starttime.AddHours(8);
@@ -70,7 +70,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
return ToResponse(new ApiResult(500, "error", e.Message));
throw;
}
}
/// <summary>

19
ZR.Admin.WebApi/Controllers/mes/ql/PainLabController.cs
View File

@@ -1,22 +1,7 @@
using Aliyun.OSS;
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.Admin.WebApi.Filters;
using ZR.Model.mes.pro;
using ZR.Model.MES.qc;
using ZR.Model.MES.ql.DTO;
using Microsoft.AspNetCore.Mvc;
using ZR.Model.MES.ql;
using ZR.Service.mes.pro;
using ZR.Service.mes.pro.IService;
using ZR.Model.MES.ql.DTO;
using ZR.Service.mes.ql.IService;
using ZR.Service.mes.qu.IService;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace ZR.Admin.WebApi.Controllers.mes.ql
{