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
{

8
ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12BaseDefectController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcGp12BaseDefect(int Id)
{
var response = _QcGp12BaseDefectService.GetInfo(Id);
var info = response.Adapt<QcGp12BaseDefect>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12BaseGroupController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcGp12BaseGroup(int Id)
{
var response = _QcGp12BaseGroupService.GetInfo(Id);
var info = response.Adapt<QcGp12BaseGroup>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12BaseLabelAnalysisController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcGp12BaseLabelAnalysis(int Id)
{
var response = _QcGp12BaseLabelAnalysisService.GetInfo(Id);
var info = response.Adapt<QcGp12BaseLabelAnalysis>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12BaseSiteController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcGp12BaseSite(int Id)
{
var response = _QcGp12BaseSiteService.GetInfo(Id);
var info = response.Adapt<QcGp12BaseSite>();
return SUCCESS(info);
}

7
ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12Controller.cs
View File

@@ -1,7 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
@@ -144,11 +142,12 @@ namespace ZR.Admin.WebApi.Controllers
var response = _QcGp12Service.ScanInnerLabel(modal);
return SUCCESS(response);
}catch(Exception ex)
}
catch (Exception ex)
{
return SUCCESS("请刷新页面,错误代码:" + ex.Message);
}
}
/// <summary>

8
ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12LogWorkorderController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcGp12LogWorkorder(string Id)
{
var response = _QcGp12LogWorkorderService.GetInfo(Id);
var info = response.Adapt<QcGp12LogWorkorder>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12RecordLabelScanController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcGp12RecordLabelScan(string Id)
{
var response = _QcGp12RecordLabelScanService.GetInfo(Id);
var info = response.Adapt<QcGp12RecordLabelScan>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12RecordWorkorderDefectController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcGp12RecordWorkorderDefect(string Id)
{
var response = _QcGp12RecordWorkorderDefectService.GetInfo(Id);
var info = response.Adapt<QcGp12RecordWorkorderDefect>();
return SUCCESS(info);
}

2
ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12ServiceStatisticsController.cs
View File

@@ -123,7 +123,7 @@ namespace ZR.Admin.WebApi.Controllers
var pageList = resultWithDefects.Skip((parm.PageNum - 1) * parm.PageSize).Take(parm.PageSize).ToList();
// 返回包含数据和统计数据的对象
var result = new { statistics = statistics, pageList ,total = resultWithDefects.Count };
var result = new { statistics = statistics, pageList, total = resultWithDefects.Count };
return SUCCESS(result);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12ServiceWorkorderController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcGp12ServiceWorkorder(string Id)
{
var response = _QcGp12ServiceWorkorderService.GetInfo(Id);
var info = response.Adapt<QcGp12ServiceWorkorder>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndBaseDefectController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -47,7 +47,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcBackEndBaseDefect(int Id)
{
var response = _QcBackEndBaseDefectService.GetInfo(Id);
var info = response.Adapt<QcBackEndBaseDefect>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndBaseGroupController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -47,7 +47,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcBackEndBaseGroup(int Id)
{
var response = _QcBackEndBaseGroupService.GetInfo(Id);
var info = response.Adapt<QcBackEndBaseGroup>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndBaseLabelAnalysisController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -47,7 +47,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcBackEndBaseLabelAnalysis(int Id)
{
var response = _QcBackEndBaseLabelAnalysisService.GetInfo(Id);
var info = response.Adapt<QcBackEndBaseLabelAnalysis>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndBaseSiteController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -47,7 +47,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcBackEndBaseSite(int Id)
{
var response = _QcBackEndBaseSiteService.GetInfo(Id);
var info = response.Adapt<QcBackEndBaseSite>();
return SUCCESS(info);
}

7
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndController.cs
View File

@@ -1,7 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
@@ -152,11 +150,12 @@ namespace ZR.Admin.WebApi.Controllers
var response = _QcBackEndService.ScanInnerLabel(modal);
return SUCCESS(response);
}catch(Exception ex)
}
catch (Exception ex)
{
return SUCCESS("请刷新页面,错误代码:" + ex.Message);
}
}
/// <summary>

8
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndLogWorkorderController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -47,7 +47,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcBackEndLogWorkorder(string Id)
{
var response = _QcBackEndLogWorkorderService.GetInfo(Id);
var info = response.Adapt<QcBackEndLogWorkorder>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndRecordLabelScanController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -47,7 +47,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcBackEndRecordLabelScan(string Id)
{
var response = _QcBackEndRecordLabelScanService.GetInfo(Id);
var info = response.Adapt<QcBackEndRecordLabelScan>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndRecordWorkorderDefectController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -47,7 +47,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcBackEndRecordWorkorderDefect(string Id)
{
var response = _QcBackEndRecordWorkorderDefectService.GetInfo(Id);
var info = response.Adapt<QcBackEndRecordWorkorderDefect>();
return SUCCESS(info);
}

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndServiceStatisticsController.cs
View File

@@ -122,7 +122,7 @@ namespace ZR.Admin.WebApi.Controllers
var pageList = resultWithDefects.Skip((parm.PageNum - 1) * parm.PageSize).Take(parm.PageSize).ToList();
// 返回包含数据和统计数据的对象
var result = new { statistics = statistics, pageList ,total = resultWithDefects.Count };
var result = new { statistics = statistics, pageList, total = resultWithDefects.Count };
return SUCCESS(result);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndServiceWorkorderController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-01-02
namespace ZR.Admin.WebApi.Controllers
@@ -47,7 +47,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcBackEndServiceWorkorder(string Id)
{
var response = _QcBackEndServiceWorkorderService.GetInfo(Id);
var info = response.Adapt<QcBackEndServiceWorkorder>();
return SUCCESS(info);
}

8
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackendRecordLabelPrintController.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Model.Business;
using ZR.Service.Business.IBusinessService;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.Business;
using ZR.Model.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2025-05-22
namespace ZR.Admin.WebApi.Controllers
@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetQcBackendRecordLabelPrint(string Id)
{
var response = _QcBackendRecordLabelPrintService.GetInfo(Id);
var info = response.Adapt<QcBackendRecordLabelPrint>();
return SUCCESS(info);
}