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

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);
}