feat(工单管理): 新增批量删除工单和批量领料功能

- 在工单DTO中增加领料数和成品在库数字段
- 实现批量删除工单功能并进行前置校验
- 实现根据工单ID批量领料功能
- 优化原材料领料外联查询显示炉号
- 修复领料查询条件忽略备注为null的记录问题
This commit is contained in:
2026-03-07 17:16:31 +08:00
parent 5ed1458431
commit cd03b4d5dc
13 changed files with 353 additions and 21 deletions

View File

@@ -1,3 +1,4 @@
using DOAN.Model.BZFM;
using DOAN.Model.MES.product;
using DOAN.Model.MES.product.Dto;
using DOAN.Repository;
@@ -131,9 +132,25 @@ namespace DOAN.Service.MES.product
var response = Context
.Queryable<ProWorkorder>()
.Where(predicate)
.Select(
it => new ProWorkorderDto
{
Id = it.Id,
MaterialNum = (int)
SqlFunc.Abs(
SqlFunc
.Subqueryable<MmRecordOutbound>()
.Where(sub => sub.Workorder == it.Workorder)
.Where(sub => sub.TransactionType == "领料出库")
.Where(sub => sub.Remarks != "已撤销" || sub.Remarks == null)
.Select(sub => sub.Quantity)
),
InInventoryNum = it.ProductNum - it.ShipmentNum,
},
true
)
.OrderBy(it => it.Sort)
.ToPage<ProWorkorder, ProWorkorderDto>(parm);
.ToPage(parm);
return response;
}