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

feat(报废管理): 实现报废单和转用单的创建与审批流程

Browse Source 
添加报废审批DTO和供应商字段
实现创建报废单/转用单功能
新增审批和撤销报废记录接口
优化查询条件并生成唯一报废单号
This commit is contained in:
git_rabbit
2026-01-26 17:57:18 +08:00
parent 1e7d768489
commit 722ef40fd2
8 changed files with 355 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DOAN.Service/MES/Material/MmInventoryService.cs
View File

@@ -81,6 +81,10 @@ namespace DOAN.Service.BZFM
!string.IsNullOrEmpty(parm.MaterialCode),
m => m.MaterialCode.Contains(parm.MaterialCode)
)
.AndIF(
!string.IsNullOrEmpty(parm.SupplierCode),
m => m.SupplierCode.Contains(parm.SupplierCode)
)
.AndIF(
!string.IsNullOrEmpty(parm.WarehouseName),
m => m.WarehouseName.Contains(parm.WarehouseName)
@@ -93,10 +97,6 @@ namespace DOAN.Service.BZFM
!string.IsNullOrEmpty(parm.LocationCode),
m => m.LocationCode.Contains(parm.LocationCode)
)
.AndIF(
!string.IsNullOrEmpty(parm.SupplierCode),
m => m.SupplierCode.Contains(parm.SupplierCode)
)
.AndIF(
!string.IsNullOrEmpty(parm.SupplierName),
m => m.SupplierName.Contains(parm.SupplierName)
@@ -734,7 +734,7 @@ namespace DOAN.Service.BZFM
CreatedTime = it.CreatedTime,
Workorder = it.Workorder,
StoveCode = it.StoveCode,
Remarks = it.Remarks
Remarks = it.Remarks,
})
.OrderByDescending(it => it.CreatedTime)
.ToPage(parm);
@@ -777,7 +777,7 @@ namespace DOAN.Service.BZFM
CreatedTime = it.CreatedTime,
Workorder = it.Workorder,
OrderNo = it.OrderNo,
Remarks = it.Remarks
Remarks = it.Remarks,
})
.OrderByDescending(it => it.CreatedTime)
.ToPage(parm);