Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(报废管理): 增强报废单功能并完善相关业务逻辑

Browse Source 
refactor(报废单): 重构报废单DTO和实体类结构
fix(报废单): 修复审批和撤销逻辑中的问题
feat(报废单): 添加工单关联和库存操作功能
style(报废单): 优化代码格式和注释
This commit is contained in:
git_rabbit
2026-02-10 19:00:54 +08:00
parent 9793fdd42f
commit 0885d26796
5 changed files with 631 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

337
DOAN.Service/MES/Quality/IPQC/QcScrapRecordsService.cs
View File

@@ -1,9 +1,11 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using DOAN.Model.BZFM.Dto;
using DOAN.Model.BZFM;
using DOAN.Model.BZFM.Dto;
using DOAN.Model.MES.product;
using DOAN.Repository;
using DOAN.Service.BZFM.IService;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using SqlSugar.DistributedSystem.Snowflake;
namespace DOAN.Service.BZFM
{
@@ -24,12 +26,12 @@ namespace DOAN.Service.BZFM
var response = Queryable()
.Where(predicate.ToExpression())
.OrderByDescending(it => it.CreatedTime)
.ToPage<QcScrapRecords, QcScrapRecordsDto>(parm);
return response;
}
/// <summary>
/// 获取详情
/// </summary>
@@ -37,9 +39,7 @@ namespace DOAN.Service.BZFM
/// <returns></returns>
public QcScrapRecords GetInfo(long Id)
{
var response = Queryable()
.Where(x => x.Id == Id)
.First();
var response = Queryable().Where(x => x.Id == Id).First();
return response;
}
@@ -82,14 +82,32 @@ namespace DOAN.Service.BZFM
var predicate = Expressionable
.Create<QcScrapRecords>()
// 模糊搜索字段
.AndIF(!string.IsNullOrEmpty(parm.ScrapOrderNo), it => it.ScrapOrderNo.Contains(parm.ScrapOrderNo))
.AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder))
.AndIF(!string.IsNullOrEmpty(parm.StoveCode), it => it.StoveCode.Contains(parm.StoveCode))
.AndIF(!string.IsNullOrEmpty(parm.ProductCode), it => it.ProductCode.Contains(parm.ProductCode))
.AndIF(
!string.IsNullOrEmpty(parm.ScrapOrderNo),
it => it.ScrapOrderNo.Contains(parm.ScrapOrderNo)
)
.AndIF(
!string.IsNullOrEmpty(parm.Workorder),
it => it.Workorder.Contains(parm.Workorder)
)
.AndIF(
!string.IsNullOrEmpty(parm.StoveCode),
it => it.StoveCode.Contains(parm.StoveCode)
)
.AndIF(
!string.IsNullOrEmpty(parm.ProductCode),
it => it.ProductCode.Contains(parm.ProductCode)
)
.AndIF(!string.IsNullOrEmpty(parm.BatchNo), it => it.BatchNo.Contains(parm.BatchNo))
// 精确搜索字段
.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode == parm.MaterialCode)
.AndIF(!string.IsNullOrEmpty(parm.SupplierCode), it => it.SupplierCode == parm.SupplierCode)
.AndIF(
!string.IsNullOrEmpty(parm.MaterialCode),
it => it.MaterialCode == parm.MaterialCode
)
.AndIF(
!string.IsNullOrEmpty(parm.SupplierCode),
it => it.SupplierCode == parm.SupplierCode
)
.AndIF(!string.IsNullOrEmpty(parm.ScrapType), it => it.ScrapType == parm.ScrapType)
.AndIF(!string.IsNullOrEmpty(parm.LineCode), it => it.LineCode == parm.LineCode)
.AndIF(!string.IsNullOrEmpty(parm.Status), it => it.Status == parm.Status);
@@ -143,20 +161,52 @@ namespace DOAN.Service.BZFM
/// <returns></returns>
public QcScrapRecords CreateScrapOrder(QcScrapRecords parm)
{
// 验证物料编码
if (string.IsNullOrEmpty(parm.MaterialCode))
try
{
throw new Exception("物料编码不能为空");
QcScrapRecords newQcScrapRecords = parm;
var workorderInfo = Context
.Queryable<ProWorkorder>()
.Where(x => x.Workorder == parm.Workorder)
.First();
// 工单号创建，根据工单信息填充报废单的相关字段
if (workorderInfo != null)
{
newQcScrapRecords.ProductCode = workorderInfo.productionCode;
newQcScrapRecords.ProductName = workorderInfo.productionName;
newQcScrapRecords.LineCode = workorderInfo.RouteCode;
newQcScrapRecords.StoveCode = workorderInfo.StoveCode;
newQcScrapRecords.BatchNo = workorderInfo.FeedOrder;
newQcScrapRecords.MaterialCode = workorderInfo.MaterialCode;
newQcScrapRecords.MaterialName = workorderInfo.MaterialName;
// 如有领料记录,则绑定采购记录
var purchaseInfo = Context
.Queryable<MmRecordInbound>()
.Where(it => it.BatchNo == workorderInfo.FeedOrder)
.Where(it => it.TransactionType == "采购入库")
.Where(it => it.Remarks != "已撤销")
.First();
if (purchaseInfo != null)
{
newQcScrapRecords.SupplierCode = purchaseInfo.SupplierCode;
newQcScrapRecords.SupplierName = purchaseInfo.SupplierName;
newQcScrapRecords.StoveCode = purchaseInfo.StoveCode;
newQcScrapRecords.Unit = purchaseInfo.Unit;
}
}
// 生成报废单号
newQcScrapRecords.ScrapOrderNo = GenerateScrapOrderNo();
// 设置状态为待审批
newQcScrapRecords.Status = "待审批";
newQcScrapRecords.ScrapType = "报废";
newQcScrapRecords.TenantId = 0;
newQcScrapRecords.Version = 1;
return Context.Insertable(newQcScrapRecords).ExecuteReturnEntity();
}
catch (Exception ex)
{
throw new Exception(ex.Message);
}
// 生成报废单号
parm.ScrapOrderNo = GenerateScrapOrderNo();
// 设置状态为待审批
parm.Status = "待审批";
parm.ScrapType = "报废";
return Context.Insertable(parm).ExecuteReturnEntity();
}
/// <summary>
@@ -166,26 +216,51 @@ namespace DOAN.Service.BZFM
/// <returns></returns>
public QcScrapRecords CreateTransferOrder(QcScrapRecords parm)
{
// 验证物料编码
if (string.IsNullOrEmpty(parm.MaterialCode))
{
throw new Exception("物料编码不能为空");
}
// 验证工单号
if (string.IsNullOrEmpty(parm.Workorder))
{
throw new Exception("工单号不能为空");
}
QcScrapRecords newQcScrapRecords = parm;
var workorderInfo = Context
.Queryable<ProWorkorder>()
.Where(x => x.Workorder == parm.Workorder)
.First();
// 工单号创建，根据工单信息填充报废单的相关字段
if (workorderInfo != null)
{
newQcScrapRecords.ProductCode = workorderInfo.productionCode;
newQcScrapRecords.ProductName = workorderInfo.productionName;
newQcScrapRecords.LineCode = workorderInfo.RouteCode;
newQcScrapRecords.StoveCode = workorderInfo.StoveCode;
newQcScrapRecords.BatchNo = workorderInfo.FeedOrder;
newQcScrapRecords.MaterialCode = workorderInfo.MaterialCode;
newQcScrapRecords.MaterialName = workorderInfo.MaterialName;
// 如有领料记录,则绑定采购记录
var purchaseInfo = Context
.Queryable<MmRecordInbound>()
.Where(it => it.BatchNo == workorderInfo.FeedOrder)
.Where(it => it.TransactionType == "采购入库")
.Where(it => it.Remarks != "已撤销")
.First();
if (purchaseInfo != null)
{
newQcScrapRecords.SupplierCode = purchaseInfo.SupplierCode;
newQcScrapRecords.SupplierName = purchaseInfo.SupplierName;
newQcScrapRecords.StoveCode = purchaseInfo.StoveCode;
newQcScrapRecords.Unit = purchaseInfo.Unit;
}
}
// 生成报废单号
parm.ScrapOrderNo = GenerateScrapOrderNo("ZY"); // ZY表示转用
// 生成单号
newQcScrapRecords.ScrapOrderNo = GenerateScrapOrderNo("ZY"); // ZY表示转用
// 设置状态为待审批，报废类型为转用
parm.Status = "待审批";
parm.ScrapType = "转用";
return Context.Insertable(parm).ExecuteReturnEntity();
// 设置状态为待审批，类型为转用
newQcScrapRecords.Status = "待审批";
newQcScrapRecords.ScrapType = "转用";
newQcScrapRecords.TenantId = 0;
newQcScrapRecords.Version = 1;
return Context.Insertable(newQcScrapRecords).ExecuteReturnEntity();
}
/// <summary>
@@ -222,10 +297,19 @@ namespace DOAN.Service.BZFM
Status = isApproved ? "已批准" : "已拒绝",
ApprovalDate = DateTime.Now,
SupervisorName = approver,
UpdatedTime = DateTime.Now
UpdatedTime = DateTime.Now,
};
result = Context.Updateable(updateObj).UpdateColumns(x => new { x.Status, x.ApprovalDate, x.SupervisorName, x.UpdatedTime }).ExecuteCommand();
result = Context
.Updateable(updateObj)
.UpdateColumns(x => new
{
x.Status,
x.ApprovalDate,
x.SupervisorName,
x.UpdatedTime,
})
.ExecuteCommand();
if (isApproved)
{
@@ -235,11 +319,94 @@ namespace DOAN.Service.BZFM
// 转用单批准：生成新工单（这里需要根据实际业务调整工单生成逻辑）
// 注意：需要确保工单服务的命名空间和方法名正确
// 示例：_proWorkorderService.GenerateWorkorder(record);
// 如果有工单则工单报废数增加
if (!string.IsNullOrEmpty(record.Workorder))
{
var workorderInfo = Context
.Queryable<ProWorkorder>()
.Where(x => x.Workorder == record.Workorder)
.First();
if (workorderInfo != null)
{
workorderInfo.DefectNum += (int)record.ScrapQuantity;
Context
.Updateable(workorderInfo)
.UpdateColumns(x => new { x.DefectNum })
.ExecuteCommand();
}
}
// 入报废库
InboundReceiptDto revokeRecepitDto = new()
{
ReceiptType = 1,
MaterialCode = record.ProductCode,
BatchNo = "000",
LocationCode = "ZYK001",
WarehouseCode = "WH005",
SupplierCode = record.SupplierCode,
StoveCode = record.StoveCode,
Workorder = record.Workorder,
WorkorderRaw = record.ScrapOrderNo,
Operator = approver,
Quantity = record.ScrapQuantity,
TransactionType = "转用入库",
Remarks = $"转用入库,转用单号:{record.ScrapOrderNo}",
};
MmInventoryService mmInventoryService = new();
string createReceiptresult = mmInventoryService.CreateInboundReceipt(
revokeRecepitDto
);
if (createReceiptresult != "ok")
{
throw new Exception(createReceiptresult);
}
}
else
else if (record.ScrapType == "报废")
{
// 报废单批准：生成入库单到报废库（这里需要根据实际业务调整入库逻辑）
// 示例：调用入库单服务添加到报废库
// 如果有工单则工单报废数增加
if (!string.IsNullOrEmpty(record.Workorder))
{
var workorderInfo = Context
.Queryable<ProWorkorder>()
.Where(x => x.Workorder == record.Workorder)
.First();
if (workorderInfo != null)
{
workorderInfo.DefectNum += (int)record.ScrapQuantity;
Context
.Updateable(workorderInfo)
.UpdateColumns(x => new { x.DefectNum })
.ExecuteCommand();
}
}
// 调用入库单服务添加到报废库
InboundReceiptDto revokeRecepitDto = new()
{
ReceiptType = 1,
MaterialCode = record.ProductCode,
BatchNo = "000",
LocationCode = "BFK001",
WarehouseCode = "WH006",
SupplierCode = record.SupplierCode,
StoveCode = record.StoveCode,
Workorder = record.Workorder,
WorkorderRaw = record.ScrapOrderNo,
Operator = approver,
Quantity = record.ScrapQuantity,
TransactionType = "报废入库",
Remarks = $"报废入库,报废单号:{record.ScrapOrderNo}",
};
MmInventoryService mmInventoryService = new();
string createReceiptresult = mmInventoryService.CreateInboundReceipt(
revokeRecepitDto
);
if (createReceiptresult != "ok")
{
throw new Exception(createReceiptresult);
}
}
}
});
@@ -254,29 +421,62 @@ namespace DOAN.Service.BZFM
/// <returns></returns>
public int RevokeScrapRecord(long id)
{
// 获取记录信息
var record = Context.Queryable<QcScrapRecords>().Where(x => x.Id == id).First();
if (record == null)
int result = 0;
UseTran2(() =>
{
throw new Exception("记录不存在");
}
// 获取记录信息
var record = Context.Queryable<QcScrapRecords>().Where(x => x.Id == id).First();
// 只有待审批状态的记录才能被撤销
if (record.Status != "已批准")
{
throw new Exception("只有已批准状态的记录才能被撤销");
}
if (record == null)
{
throw new Exception("记录不存在");
}
// 撤销：将状态改为待审批
var updateObj = new QcScrapRecords
{
Id = id,
Status = "待审批",
UpdatedTime = DateTime.Now
};
// 只有待审批状态的记录才能被撤销
if (record.Status != "已批准")
{
throw new Exception("只有已批准状态的记录才能被撤销");
}
// 撤销库存操作记录与工单不良数
var workorderInfo = Context
.Queryable<ProWorkorder>()
.Where(it => it.Workorder == record.Workorder)
.First();
if (workorderInfo != null)
{
workorderInfo.DefectNum -= (int)Math.Abs(record.ScrapQuantity);
Context
.Updateable(workorderInfo)
.UpdateColumns(it => new { it.DefectNum })
.ExecuteCommand();
}
return Context.Updateable(updateObj).UpdateColumns(x => new { x.Status, x.UpdatedTime }).ExecuteCommand();
MmInventoryService mmInventoryService = new();
int InBoundId = Context
.Queryable<MmRecordInbound>()
.Where(it => it.WorkorderRaw == record.ScrapOrderNo)
.Select(it => it.Id)
.First();
if (InBoundId > 0)
{
mmInventoryService.RevokeReceipt(
new MmInventoryRevokeDto { Id = InBoundId, Type = 1 }
);
}
// 撤销：将状态改为待审批
var updateObj = new QcScrapRecords
{
Id = id,
Status = "待审批",
UpdatedTime = DateTime.Now,
};
result = Context
.Updateable(updateObj)
.UpdateColumns(x => new { x.Status, x.UpdatedTime })
.ExecuteCommand();
});
return result;
}
/// <summary>
@@ -286,12 +486,12 @@ namespace DOAN.Service.BZFM
/// <returns></returns>
public PagedInfo<QcScrapRecordsDto> GetQcScrapRecordsByWorkorder(string workorder)
{
var queryDto = new QcScrapRecordsQueryDto
{
Workorder = workorder
};
return GetList(queryDto);
var queryDto = new QcScrapRecordsQueryDto { Workorder = workorder };
var result = Context
.Queryable<QcScrapRecords>()
.Where(x => x.Workorder == workorder)
.ToPage<QcScrapRecords, QcScrapRecordsDto>(queryDto);
return result;
}
/// <summary>
@@ -306,7 +506,6 @@ namespace DOAN.Service.BZFM
{
throw new Exception("工单号不能为空");
}
// 调用现有的创建报废单方法
return CreateScrapOrder(parm);
}
@@ -339,4 +538,4 @@ namespace DOAN.Service.BZFM
return RevokeScrapRecord(id);
}
}
}
}