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

Dto变动

Browse Source
This commit is contained in:
git_rabbit
2026-01-09 11:22:45 +08:00
parent fdcb5b5200
commit 4507288026
4 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,6 +87,14 @@ 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)
)
.AndIF(!string.IsNullOrEmpty(parm.BatchNo), m => m.BatchNo.Contains(parm.BatchNo));
return predicate;
@@ -105,6 +113,9 @@ namespace DOAN.Service.BZFM
MaterialName = it.MaterialName,
CategoryCode = it.CategoryCode,
Specification = it.Specification,
SupplierCode = it.SupplierCode,
SupplierName = it.SupplierName,
Type = it.Type,
})
.ToList();
}
@@ -170,6 +181,10 @@ namespace DOAN.Service.BZFM
var mmMaterial = Context
.Queryable<MmMaterial>()
.Where(it => it.MaterialCode == parm.MaterialCode)
.WhereIF(
!string.IsNullOrEmpty(parm.SupplierCode),
it => it.SupplierCode == parm.SupplierCode
)
.First();
if (mmMaterial == null)
return "物料不存在!";
@@ -185,13 +200,14 @@ namespace DOAN.Service.BZFM
// 启用事务
Context.Ado.BeginTran();
// 获取现有库存（同物料、批次、库位）
// 获取现有库存（同物料、批次、库位、供应商）
var mmInventory = Context
.Queryable<MmInventory>()
.Where(it => it.MaterialCode == parm.MaterialCode)
.Where(it => it.BatchNo == parm.BatchNo)
.Where(it => it.WarehouseCode == parm.WarehouseCode)
.Where(it => it.LocationCode == parm.LocationCode)
.Where(it => it.SupplierCode == parm.SupplierCode)
.First();
// 若不存在则新增；存在则更新
@@ -201,10 +217,13 @@ namespace DOAN.Service.BZFM
{
MaterialCode = mmMaterial.MaterialCode,
MaterialName = mmMaterial.MaterialName,
SupplierCode = mmMaterial.SupplierCode,
SupplierName = mmMaterial.SupplierName,
LocationCode = mmLocation.LocationCode,
LocationName = mmLocation.LocationName,
WarehouseCode = mmLocation.WarehouseCode,
WarehouseName = mmLocation.WarehouseName,
BatchNo = parm.BatchNo,
CurrentQty = delta,
Unit = parm.Unit,
@@ -232,14 +251,14 @@ namespace DOAN.Service.BZFM
Operator = parm.Operator,
MaterialCode = mmMaterial.MaterialCode,
MaterialName = mmMaterial.MaterialName,
SupplierCode = mmMaterial.SupplierCode,
SupplierName = mmMaterial.SupplierName,
LocationCode = mmLocation.LocationCode,
LocationName = mmLocation.LocationName,
WarehouseCode = mmLocation.WarehouseCode,
WarehouseName = mmLocation.WarehouseName,
Quantity = parm.Quantity,
Unit = parm.Unit,
SupplierCode = parm.SupplierCode,
SupplierName = parm.SupplierName,
ProductionDate = parm.ProductionDate,
ExpiryDate = parm.ExpiryDate,
CreatedTime = nowDate,