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

炉号可查看

Browse Source
This commit is contained in:
git_rabbit
2026-01-09 14:12:01 +08:00
parent c8ca658616
commit 8b206b257c
4 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DOAN.Model/MES/Material/Dto/MmInventoryDto.cs
View File

@@ -30,9 +30,10 @@ namespace DOAN.Model.BZFM.Dto
public string MaterialName { get; set; }
public string WarehouseCode { get; set; }
public string WarehouseCode { get; set; }
public string WarehouseName { get; set; }
[Required(ErrorMessage = "库位编码不能为空")]

4
DOAN.Model/MES/Material/Dto/MmRecordInboundDto.cs
View File

@@ -16,6 +16,8 @@ namespace DOAN.Model.BZFM.Dto
public string InboundNo { get; set; }
public string TransactionType { get; set; }
public string StoveCode { get; set; }
}
/// <summary>
@@ -31,6 +33,8 @@ namespace DOAN.Model.BZFM.Dto
public string Operator { get; set; }
public string StoveCode { get; set; }
public string SupplierName { get; set; }
public string SupplierCode { get; set; }

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

@@ -257,7 +257,6 @@ namespace DOAN.Service.BZFM
MaterialName = mmMaterial.MaterialName,
SupplierCode = mmMaterial.SupplierCode,
SupplierName = mmMaterial.SupplierName,
LocationCode = mmLocation.LocationCode,
LocationName = mmLocation.LocationName,
WarehouseCode = mmLocation.WarehouseCode,
@@ -564,7 +563,7 @@ namespace DOAN.Service.BZFM
message = $"库位名称不可为空，第{row + 1}行";
break;
}
//09 创建时间
NPOI.SS.UserModel.ICell currentCell_08 = currentRow.GetCell(8);
inventory.CreatedTime = currentCell_08?.DateCellValue ?? DateTime.Now;
@@ -579,8 +578,6 @@ namespace DOAN.Service.BZFM
{
return null;
}
}
// TODO 3.调用SplitInsert方法实现导入操作,注意主键列的配置(建议优化为，ID相同则修改，不同则新增)

50
DOAN.Service/MES/Material/MmRecordInboundService.cs
View File

@@ -15,7 +15,10 @@ namespace DOAN.Service.BZFM
/// <summary>
/// 入库记录表Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IMmRecordInboundService), ServiceLifetime = LifeTime.Transient)]
[AppService(
ServiceType = typeof(IMmRecordInboundService),
ServiceLifetime = LifeTime.Transient
)]
public class MmRecordInboundService : BaseService<MmRecordInbound>, IMmRecordInboundService
{
/// <summary>
@@ -25,7 +28,6 @@ namespace DOAN.Service.BZFM
/// <returns></returns>
public PagedInfo<MmRecordInboundDto> GetList(MmRecordInboundQueryDto parm)
{
var predicate = QueryExp(parm);
var response = Queryable()
@@ -35,7 +37,6 @@ namespace DOAN.Service.BZFM
return response;
}
/// <summary>
/// 获取详情
/// </summary>
@@ -43,9 +44,7 @@ namespace DOAN.Service.BZFM
/// <returns></returns>
public MmRecordInbound GetInfo(int Id)
{
var response = Queryable()
.Where(x => x.Id == Id)
.First();
var response = Queryable().Where(x => x.Id == Id).First();
return response;
}
@@ -84,12 +83,32 @@ namespace DOAN.Service.BZFM
parm.CreatedTime[0] = parm.CreatedTime[0].Date;
parm.CreatedTime[1] = parm.CreatedTime[1].Date;
}
var predicate = Expressionable.Create<MmRecordInbound>()
.AndIF(!string.IsNullOrEmpty(parm.SupplierCode), it => it.SupplierCode.Contains(parm.SupplierCode))
.AndIF(!string.IsNullOrEmpty(parm.Operator), it => it.Operator.Contains(parm.Operator))
.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode))
.AndIF(!string.IsNullOrEmpty(parm.InboundNo), it => it.InboundNo.Contains(parm.InboundNo))
.AndIF(!string.IsNullOrEmpty(parm.TransactionType), it => it.TransactionType.Contains(parm.TransactionType))
var predicate = Expressionable
.Create<MmRecordInbound>()
.AndIF(
!string.IsNullOrEmpty(parm.SupplierCode),
it => it.SupplierCode.Contains(parm.SupplierCode)
)
.AndIF(
!string.IsNullOrEmpty(parm.Operator),
it => it.Operator.Contains(parm.Operator)
)
.AndIF(
!string.IsNullOrEmpty(parm.MaterialCode),
it => it.MaterialCode.Contains(parm.MaterialCode)
)
.AndIF(
!string.IsNullOrEmpty(parm.StoveCode),
it => it.StoveCode.Contains(parm.StoveCode)
)
.AndIF(
!string.IsNullOrEmpty(parm.InboundNo),
it => it.InboundNo.Contains(parm.InboundNo)
)
.AndIF(
!string.IsNullOrEmpty(parm.TransactionType),
it => it.TransactionType.Contains(parm.TransactionType)
)
.AndIF(
parm.CreatedTime != null && parm.CreatedTime[0] > DateTime.MinValue,
it => it.CreatedTime >= parm.CreatedTime[0]
@@ -135,7 +154,8 @@ namespace DOAN.Service.BZFM
//01 创建时间
NPOI.SS.UserModel.ICell currentCell_01 = currentRow.GetCell(1);
recordinbound.CreatedTime = currentCell_01?.DateCellValue ?? DateTime.Now;
recordinbound.CreatedTime =
currentCell_01?.DateCellValue ?? DateTime.Now;
//02 入库单号
NPOI.SS.UserModel.ICell currentCell_02 = currentRow.GetCell(2);
@@ -272,8 +292,6 @@ namespace DOAN.Service.BZFM
{
return null;
}
}
// TODO 3.调用SplitInsert方法实现导入操作,注意主键列的配置(建议优化为，ID相同则修改，不同则新增)
@@ -357,4 +375,4 @@ namespace DOAN.Service.BZFM
return query.ToPage(pager);
}
}
}
}