feat(工单管理): 新增批量删除工单和批量领料功能
- 在工单DTO中增加领料数和成品在库数字段 - 实现批量删除工单功能并进行前置校验 - 实现根据工单ID批量领料功能 - 优化原材料领料外联查询显示炉号 - 修复领料查询条件忽略备注为null的记录问题
This commit is contained in:
@@ -11,6 +11,7 @@ using DOAN.Service.BZFM;
|
||||
using DOAN.Service.Mobile.IService;
|
||||
using Infrastructure.Attribute;
|
||||
using Mapster;
|
||||
using System;
|
||||
|
||||
namespace DOAN.Service.Mobile;
|
||||
|
||||
@@ -175,7 +176,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
|
||||
.Queryable<MmRecordOutbound>()
|
||||
.Where(it => it.Workorder == workorder)
|
||||
.Where(it => it.TransactionType == "领料出库")
|
||||
.Where(it => it.Remarks != "已撤销")
|
||||
.Where(it => it.Remarks != "已撤销" || it.Remarks == null)
|
||||
.First();
|
||||
//1.检查领料是否超出限额
|
||||
|
||||
@@ -198,7 +199,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
|
||||
.Queryable<MmRecordInbound>()
|
||||
.Where(it => it.Workorder == workorderRaw)
|
||||
.Where(it => it.TransactionType == "生产入库")
|
||||
.Where(it => it.Remarks != "已撤销")
|
||||
.Where(it => it.Remarks != "已撤销"|| it.Remarks == null)
|
||||
.First();
|
||||
if (inboundRecord == null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user