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

6
ZR.Admin.WebApi/Controllers/mes/qc/FQC/CommonFQCController.cs
View File

@@ -1,8 +1,4 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
using Microsoft.IdentityModel.Tokens;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Hubs;
using ZR.Model.MES.qc.DTO;
using ZR.Service.mes.qc.IService;
@@ -104,7 +100,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.IQC
{
return ToResponse(new ApiResult(500, "获取看板数据异常-02" + ex.Message, ex.Message));
}
}
/// <summary>
/// 获取质量检测工单，生产线数据列表

4
ZR.Admin.WebApi/Controllers/mes/qc/FQC/QCStatisticsController.cs
View File

@@ -25,7 +25,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.FQC
/// </summary>
/// <returns></returns>
[HttpGet("queryQualityStatisticsTable_first")]
public IActionResult GetQualityStatisticsTable_first(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize,int sortType)
public IActionResult GetQualityStatisticsTable_first(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize, int sortType)
{
(List<QcQualityStatisticsFirst>, int) list = qcStatistics.GetQualityStatisticsTable_first(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize, sortType);
@@ -103,7 +103,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.FQC
/// <param name="isShowDetail">是否展示细节，展示细节则根据三行,两行合并规则</param>
/// <returns></returns>
[HttpGet("downloadStatisticsTableExcel")]
public IActionResult DownloadStatisticsTableExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize, int type, bool isShowDetail,int sortType)
public IActionResult DownloadStatisticsTableExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize, int type, bool isShowDetail, int sortType)
{
try
{