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/wms/WMentryWarehousing_productController.cs
View File

@@ -131,7 +131,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.wms
{
return ToResponse(new ApiResult(500, e.Message, e.Message));
}
}

2
ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsNowProductionController.cs
View File

@@ -70,7 +70,7 @@ namespace ZR.Admin.WebApi.Controllers
[HttpGet("shortPatchsearch")]
public IActionResult QueryshortPatch(CommonQueryDto parm)
{
(List<WmGoodShortPackageCodeDto>,int) response = _WmGoodsNowProductionService.QueryshortPatch(parm);
(List<WmGoodShortPackageCodeDto>, int) response = _WmGoodsNowProductionService.QueryshortPatch(parm);
var json = new
{
list = response.Item1,

2
ZR.Admin.WebApi/Controllers/mes/wms/WmGp12QualityStatisticsController.cs
View File

@@ -1,9 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Service.mes.wms;
using ZR.Service.mes.wms.IService;
//创建时间：2024-08-08

2
ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
View File

@@ -1,10 +1,8 @@
using Microsoft.AspNetCore.Mvc;
using MiniExcelLibs;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Service.mes.wms;
using ZR.Service.mes.wms.IService;
//创建时间：2024-08-08

25
ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeRecordController.cs
View File

@@ -1,6 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Service.mes.wms.IService;
@@ -103,17 +102,17 @@ namespace ZR.Admin.WebApi.Controllers
return ToResponse(response);
}
/// <summary>
///自动生成一次合格仓库记录日志
/// </summary>
/// <returns></returns>
[HttpPost("GenerateWmOneTimeRecord")]
/// <summary>
///自动生成一次合格仓库记录日志
/// </summary>
/// <returns></returns>
[HttpPost("GenerateWmOneTimeRecord")]
public IActionResult GenerateWmOneTimeRecord([FromBody] WmOneTimeRecordGenerateDto parm)
{
var response = _WmOneTimeRecordService.GenerateWmOneTimeRecord02(parm);
return SUCCESS(response);
}
}
public IActionResult GenerateWmOneTimeRecord([FromBody] WmOneTimeRecordGenerateDto parm)
{
var response = _WmOneTimeRecordService.GenerateWmOneTimeRecord02(parm);
return SUCCESS(response);
}
}
}

2
ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInspectionWorkorderController.cs
View File

@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetWmPolishInspectionWorkorder(string Id)
{
var response = _WmPolishInspectionWorkorderService.GetInfo(Id);
var info = response.Adapt<WmPolishInspectionWorkorder>();
return SUCCESS(info);
}

10
ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs
View File

@@ -1,16 +1,8 @@
using Microsoft.AspNetCore.Mvc;
using MiniExcelLibs;
using NPOI.HPSF;
using System.Text;
using System.Web;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Model.System;
using ZR.Model.System.Dto;
using ZR.Service.mes.wms;
using ZR.Service.mes.wms.IService;
//创建时间：2024-07-25
@@ -112,7 +104,7 @@ namespace ZR.Admin.WebApi.Controllers
return ToResponse(response);
}
/// <summary>
/// 物料下拉菜单查看

4
ZR.Admin.WebApi/Controllers/mes/wms/WmPolishQualityStatisticsController.cs
View File

@@ -1,9 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Service.mes.wms;
using ZR.Service.mes.wms.IService;
//创建时间：2024-08-07
@@ -34,7 +32,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
// [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:list")]
// [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:list")]
public IActionResult QueryWmPolishQualityStatistics(
[FromQuery] WmPolishQualityStatisticsQueryDto parm
)

14
ZR.Admin.WebApi/Controllers/mes/wms/WmPolishRecordController.cs
View File

@@ -109,11 +109,11 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPost("GetWmPolishRecordByDate")]
public IActionResult GetWmPolishRecordByDate([FromBody] WmPolishRecordGenerateDto parm)
{
var response = _WmPolishRecordService.GenerateWmPolishRecord02(parm);
return SUCCESS(response);
}
}
public IActionResult GetWmPolishRecordByDate([FromBody] WmPolishRecordGenerateDto parm)
{
var response = _WmPolishRecordService.GenerateWmPolishRecord02(parm);
return SUCCESS(response);
}
}
}

2
ZR.Admin.WebApi/Controllers/mes/wms/WmPolishWorkQualityStatisticsController.cs
View File

@@ -1,9 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Service.mes.wms;
using ZR.Service.mes.wms.IService;
//创建时间：2024-08-08

2
ZR.Admin.WebApi/Controllers/mes/wms/WmPolishWorkorderController.cs
View File

@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetWmPolishWorkorder(string Id)
{
var response = _WmPolishWorkorderService.GetInfo(Id);
var info = response.Adapt<WmPolishWorkorder>();
return SUCCESS(info);
}