Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改001

Browse Source
This commit is contained in:
赵正易
2025-03-24 15:19:20 +08:00
parent dff3b009e5
commit 0a4b9f60ab
1 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
ZR.Service/mes/wms/WmOneTimeRecordService.cs
View File

@@ -12,114 +12,114 @@ using ZR.Service.mes.wms.IService;
namespace ZR.Service.mes.wms
{
/// <summary>
/// 一次合格品仓库记录表Service业务层处理
/// </summary>
[AppService(
ServiceType = typeof(IWmOneTimeRecordService),
ServiceLifetime = LifeTime.Transient
)]
public class WmOneTimeRecordService : BaseService<WmOneTimeRecord>, IWmOneTimeRecordService
{
/// <summary>
/// 查询一次合格品仓库记录表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmOneTimeRecordDto> GetList(WmOneTimeRecordQueryDto parm)
{
var predicate = Expressionable
.Create<WmOneTimeRecord>()
.AndIF(
!string.IsNullOrEmpty(parm.Partnumber),
it => it.Partnumber.Contains(parm.Partnumber)
)
.AndIF(
!string.IsNullOrEmpty(parm.BlankNum),
it => it.BlankNum.Contains(parm.BlankNum)
)
.AndIF(!string.IsNullOrEmpty(parm.Remark), it => it.Remark.Contains(parm.Remark))
.AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code))
.AndIF(
!string.IsNullOrEmpty(parm.FkInventoryId),
it => it.FkInventoryId == parm.FkInventoryId
)
.AndIF(!string.IsNullOrEmpty(parm.Id), it => it.Id == parm.Id)
.AndIF(parm.ChangeType > -1, it => it.ChangeType == parm.ChangeType)
.AndIF(
parm.StartActionTime != null,
it => parm.StartActionTime.Value.ToLocalTime() <= it.ActionTime
)
.AndIF(
parm.EndActionTime != null,
it => parm.EndActionTime.Value.ToLocalTime() >= it.ActionTime
);
/// <summary>
/// 一次合格品仓库记录表Service业务层处理
/// </summary>
[AppService(
ServiceType = typeof(IWmOneTimeRecordService),
ServiceLifetime = LifeTime.Transient
)]
public class WmOneTimeRecordService : BaseService<WmOneTimeRecord>, IWmOneTimeRecordService
{
/// <summary>
/// 查询一次合格品仓库记录表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmOneTimeRecordDto> GetList(WmOneTimeRecordQueryDto parm)
{
var predicate = Expressionable
.Create<WmOneTimeRecord>()
.AndIF(
!string.IsNullOrEmpty(parm.Partnumber),
it => it.Partnumber.Contains(parm.Partnumber)
)
.AndIF(
!string.IsNullOrEmpty(parm.BlankNum),
it => it.BlankNum.Contains(parm.BlankNum)
)
.AndIF(!string.IsNullOrEmpty(parm.Remark), it => it.Remark.Contains(parm.Remark))
.AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code))
.AndIF(
!string.IsNullOrEmpty(parm.FkInventoryId),
it => it.FkInventoryId == parm.FkInventoryId
)
.AndIF(!string.IsNullOrEmpty(parm.Id), it => it.Id == parm.Id)
.AndIF(parm.ChangeType > -1, it => it.ChangeType == parm.ChangeType)
.AndIF(
parm.StartActionTime != null,
it => parm.StartActionTime.Value.ToLocalTime() <= it.ActionTime
)
.AndIF(
parm.EndActionTime != null,
it => parm.EndActionTime.Value.ToLocalTime() >= it.ActionTime
);
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<WmOneTimeRecord, WmOneTimeRecordDto>(parm);
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<WmOneTimeRecord, WmOneTimeRecordDto>(parm);
return response;
}
return response;
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public WmOneTimeRecord GetInfo(string Id)
{
var response = Queryable().Where(x => x.Id == Id).First();
/// <summary>
/// 获取详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public WmOneTimeRecord GetInfo(string Id)
{
var response = Queryable().Where(x => x.Id == Id).First();
return response;
}
return response;
}
/// <summary>
/// 添加一次合格品仓库记录表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WmOneTimeRecord AddWmOneTimeRecord(WmOneTimeRecord model)
{
return Context.Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 添加一次合格品仓库记录表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WmOneTimeRecord AddWmOneTimeRecord(WmOneTimeRecord model)
{
return Context.Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 修改一次合格品仓库记录表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWmOneTimeRecord(WmOneTimeRecord model)
{
//var response = Update(w => w.Id == model.Id, it => new WmOneTimeRecord()
//{
// Code = model.Code,
// Partnumber = model.Partnumber,
// BlankNum = model.BlankNum,
// ChangeType = model.ChangeType,
// ChangeQuantity = model.ChangeQuantity,
// ActionTime = model.ActionTime,
// Status = model.Status,
// Remark = model.Remark,
// CreatedBy = model.CreatedBy,
// CreatedTime = model.CreatedTime,
// UpdatedBy = model.UpdatedBy,
// UpdatedTime = model.UpdatedTime,
//});
//return response;
return Update(model, true);
}
/// <summary>
/// 修改一次合格品仓库记录表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWmOneTimeRecord(WmOneTimeRecord model)
{
//var response = Update(w => w.Id == model.Id, it => new WmOneTimeRecord()
//{
// Code = model.Code,
// Partnumber = model.Partnumber,
// BlankNum = model.BlankNum,
// ChangeType = model.ChangeType,
// ChangeQuantity = model.ChangeQuantity,
// ActionTime = model.ActionTime,
// Status = model.Status,
// Remark = model.Remark,
// CreatedBy = model.CreatedBy,
// CreatedTime = model.CreatedTime,
// UpdatedBy = model.UpdatedBy,
// UpdatedTime = model.UpdatedTime,
//});
//return response;
return Update(model, true);
}
/// <summary>
/// 自动生成一次合格仓库记录日志
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
/// <exception cref="global::System.NotImplementedException"></exception>
public int GenerateWmOneTimeRecord(WmOneTimeRecordGenerateDto parm)
{
/// <summary>
/// 自动生成一次合格仓库记录日志
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
/// <exception cref="global::System.NotImplementedException"></exception>
public int GenerateWmOneTimeRecord(WmOneTimeRecordGenerateDto parm)
{
if (parm == null || parm.StartTime == null || parm.StartTime.Value == DateTime.MinValue)
{
return -1;
@@ -136,7 +136,7 @@ namespace ZR.Service.mes.wms
)
.Where(it => !it.ProductDescription.Contains("倒车雷达"))
.Where(it => it.StartTime >= parm.StartTime)
.Where(it => it.PaoguangTotal > 0)
.Where(it => it.QualifiedNumber > 0)
.ToList();
//TODO 入库条件2 抛光合格品 wm_polish_work_quality_statistics 合格数
@@ -158,7 +158,6 @@ namespace ZR.Service.mes.wms
)
.Where(it => it.StartTime >= parm.StartTime)
.Where(it => it.GroupSort == 1)
.Where(it => it.PolishNumber > 0)
.ToList();
//TODO 出库条件2 后道 wm_polish_quality_statistics 投入数
@@ -174,7 +173,7 @@ namespace ZR.Service.mes.wms
#endregion
#region 组装 WmOneTimeRecord 实体
List<WmOneTimeRecord> wmOneTimeRecords = new List<WmOneTimeRecord>();
foreach (var item in qcQualityStatisticsFirsts)
@@ -187,7 +186,7 @@ namespace ZR.Service.mes.wms
Code = "自动",
Partnumber = item.FinishedPartNumber,
ChangeType = 1,
ChangeQuantity = item.PaoguangTotal,
ChangeQuantity = item.QualifiedNumber,
ActionTime = item.StartTime,
Status = 1,
Remark = "产线合格品 合格数"
@@ -205,7 +204,7 @@ namespace ZR.Service.mes.wms
Code = "自动",
Partnumber = item.Partnumber,
ChangeType = 1,
ChangeQuantity = item.,
ChangeQuantity = item.QualifiedNumber,
ActionTime = item.StartTime,
Status = 1,
Remark = "抛光合格品 合格数"
@@ -223,7 +222,7 @@ namespace ZR.Service.mes.wms
Code = "自动",
Partnumber = item.PartNumber,
ChangeType = 2,
ChangeQuantity = item.PolishNumber,
ChangeQuantity = item.RequireNumber,
ActionTime = item.StartTime,
Status = 1,
Remark = "触摸屏投入数"
@@ -241,7 +240,7 @@ namespace ZR.Service.mes.wms
Code = "自动",
Partnumber = item.Partnumber,
ChangeType = 2,
ChangeQuantity = item.PaoguangTotal,
ChangeQuantity = item.RequireNumber,
ActionTime = item.StartTime,
Status = 1,
Remark = "后道投入数"
@@ -249,7 +248,7 @@ namespace ZR.Service.mes.wms
);
}
#endregion
//如果有这个时间段的数据，要删除
@@ -266,5 +265,6 @@ namespace ZR.Service.mes.wms
return wmOneTimeRecords.Count; // 返回插入的记录数
}
}
}
}
}