feat(库存报表): 新增出入库报表功能及变动箱数字段

添加成品库出入库报表功能,包括入库报表和出库报表的查询接口
在WmGoodsRecord模型中新增ChangePackage字段记录变动箱数
修复Job_Blank.cs中多余的return null语句
This commit is contained in:
2025-08-15 14:58:32 +08:00
parent 1be5945f2f
commit 20c7855995
14 changed files with 608 additions and 3 deletions

View File

@@ -0,0 +1,43 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.MES.mm;
using ZR.Model.MES.mm.Dto;
using ZR.Service.mes.mm.IService;
namespace ZR.Admin.WebApi.Controllers.mes.mm
{
/// <summary>
/// 生产投料
/// </summary>
[Route("mes/mm/mmInventoryReport")]
public class MmInventoryReportController : BaseController
{
readonly IMmInventoryReportService mmInventoryReportService;
public MmInventoryReportController(IMmInventoryReportService mmInventoryReportService)
{
this.mmInventoryReportService = mmInventoryReportService;
}
/// <summary>
/// 成品库,入库清单
/// </summary>
/// <returns></returns>
[HttpPost("GetInventoryReportByPage")]
public IActionResult GetInventoryReportByPage([FromBody] WmGoodsRecordReportQueryDto query)
{
try
{
var response = mmInventoryReportService.GetInventoryReportByPage(query);
return SUCCESS(response);
}
catch (Exception)
{
throw;
}
}
}
}

View File

@@ -0,0 +1,43 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.MES.mm;
using ZR.Model.MES.mm.Dto;
using ZR.Service.mes.mm.IService;
namespace ZR.Admin.WebApi.Controllers.mes.mm
{
/// <summary>
/// 生产投料
/// </summary>
[Route("mes/mm/mmOutboundReport")]
public class MmOutboundReportController : BaseController
{
readonly IMmOutboundReportService mmOutboundReportService;
public MmOutboundReportController(IMmOutboundReportService mmOutboundReportService)
{
this.mmOutboundReportService = mmOutboundReportService;
}
/// <summary>
/// 成品库,入库清单
/// </summary>
/// <returns></returns>
[HttpPost("GetOutboundReportByPage")]
public IActionResult GetOutboundReportByPage([FromBody] WmGoodsRecordReportQueryDto query)
{
try
{
var response = mmOutboundReportService.GetOutboundReportByPage(query);
return SUCCESS(response);
}
catch (Exception)
{
throw;
}
}
}
}

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<key id="ab5766eb-3e33-4d3f-9868-b1dbae6dbefb" version="1">
<creationDate>2025-08-13T05:44:14.9326709Z</creationDate>
<activationDate>2025-08-13T05:44:14.877032Z</activationDate>
<expirationDate>2025-11-11T05:44:14.877032Z</expirationDate>
<descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
<descriptor>
<encryption algorithm="AES_256_CBC" />
<validation algorithm="HMACSHA256" />
<masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
<!-- Warning: the key below is in an unencrypted form. -->
<value>XS+y3HmCKGimKj5oZV6Oq/747D2R8k7rQtVfVswIGOhbE6OHFfJo3mLhKICIDrk5ACcTP4ea5z+Uo5qMAGqp+Q==</value>
</masterKey>
</descriptor>
</descriptor>
</key>