165 lines
5.8 KiB
C#
165 lines
5.8 KiB
C#
using DOAN.Model.MES.base_;
|
|
using DOAN.Model;
|
|
using DOAN.Model.MES.product;
|
|
using DOAN.Model.MES.product.Dto;
|
|
using DOAN.Service.MES.product.IService;
|
|
using Infrastructure.Attribute;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using System.Threading.Tasks;
|
|
using DOAN.Repository;
|
|
using DOAN.Model.MES.base_.Dto;
|
|
using Mapster;
|
|
using Microsoft.AspNetCore.Authentication;
|
|
|
|
|
|
|
|
namespace DOAN.Service.MES.product
|
|
{
|
|
/// <summary>
|
|
/// 报工表Service业务层处理
|
|
/// </summary>
|
|
[AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)]
|
|
public class ProReportworkService : BaseService<ProReportwork>, IProReportworkService
|
|
{
|
|
/// <summary>
|
|
/// 查询报工表列表
|
|
/// </summary>
|
|
/// <param name="parm"></param>
|
|
/// <returns></returns>
|
|
public PagedInfo<ProReportworkDto> GetList(ProReportworkQueryDto parm)
|
|
{
|
|
if (parm.TimeRange != null && parm.TimeRange.Length == 2)
|
|
{
|
|
parm.TimeRange[0] = parm.TimeRange[0].Date;
|
|
parm.TimeRange[1] = parm.TimeRange[1].Date.AddDays(1);
|
|
|
|
}
|
|
var predicate = Expressionable.Create<ProWorkorder, ProReportwork>()
|
|
.AndIF(!string.IsNullOrEmpty(parm.FkWorkorder), (w, r) => w.Workorder.Contains(parm.FkWorkorder))
|
|
.AndIF(!string.IsNullOrEmpty(parm.GroupCode), (w, r) => w.GroupCode == parm.GroupCode)
|
|
.AndIF(!string.IsNullOrEmpty(parm.LineCode), (w, r) => w.LineCode == parm.LineCode)
|
|
.AndIF(parm.TimeRange != null && parm.TimeRange.Length == 2 && parm.TimeRange[0] > DateTime.MinValue, (w, r) => w.WorkorderDate >= parm.TimeRange[0])
|
|
.AndIF(parm.TimeRange != null && parm.TimeRange.Length == 2 && parm.TimeRange[1] > DateTime.MinValue, (w, r) => w.WorkorderDate <= parm.TimeRange[1])
|
|
;
|
|
|
|
|
|
|
|
var response = Context.Queryable<ProWorkorder>().LeftJoin<ProReportwork>((w, r) => w.Workorder == r.FkWorkorder)
|
|
.Where(predicate.ToExpression())
|
|
.Select((w, r) => new ProReportworkDto
|
|
{
|
|
Id = r.Id,
|
|
ProductionCode=w.ProductionCode,
|
|
ProductionName=w.ProductionName,
|
|
Specification=w.Specification,
|
|
FkWorkorder =w.Workorder,
|
|
GroupCode = w.GroupCode,
|
|
LineCode = w.LineCode,
|
|
DispatchNum=w.DeliveryNum,
|
|
|
|
}, true).ToPage_NO_Convert<ProReportworkDto>(parm);
|
|
|
|
return response;
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// 获取详情
|
|
/// </summary>
|
|
/// <param name="Id"></param>
|
|
/// <returns></returns>
|
|
public ProReportwork GetInfo(string Id)
|
|
{
|
|
var response = Queryable()
|
|
.Where(x => x.Id == Id)
|
|
.First();
|
|
|
|
return response;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 添加报工表
|
|
/// </summary>
|
|
/// <param name="model"></param>
|
|
/// <returns></returns>
|
|
public ProReportwork AddProReportwork(ProReportwork model)
|
|
{
|
|
model.Id = XueHua;
|
|
return Context.Insertable(model).ExecuteReturnEntity();
|
|
}
|
|
|
|
/// <summary>
|
|
/// 修改报工表
|
|
/// </summary>
|
|
/// <param name="model"></param>
|
|
/// <returns></returns>
|
|
public int UpdateProReportwork(ProReportwork model)
|
|
{
|
|
//var response = Update(w => w.Id == model.Id, it => new ProReportwork()
|
|
//{
|
|
// FkWorkorder = model.FkWorkorder,
|
|
// DispatchNum = model.DispatchNum,
|
|
// FinishedNum = model.FinishedNum,
|
|
// GroupCode = model.GroupCode,
|
|
// LineCode = model.LineCode,
|
|
// CreatedBy = model.CreatedBy,
|
|
// CreatedTime = model.CreatedTime,
|
|
// UpdatedBy = model.UpdatedBy,
|
|
// UpdatedTime = model.UpdatedTime,
|
|
//});
|
|
//return response;
|
|
return Update(model, true);
|
|
}
|
|
|
|
public List<ProReportworkDto> UserExport(DateTime handleDate)
|
|
{
|
|
// DateTime AddhandleDate = handleDate.AddDays(1);
|
|
|
|
return Context.Queryable<ProWorkorder>()
|
|
.LeftJoin<ProReportwork>((w, r) => w.Workorder == r.FkWorkorder)
|
|
.Where((w, r) => w.WorkorderDate == handleDate)
|
|
.Select((w, r) => r)
|
|
.ToList()
|
|
.Adapt<List<ProReportworkDto>>();
|
|
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
/// 如果没有id 传入工单 手动生成报工记录
|
|
/// </summary>
|
|
/// <param name="workorder"></param>
|
|
/// <returns></returns>
|
|
public string ManualGenerationOfReportWork(string workorder, string CreatedBy)
|
|
{
|
|
bool isEXsit = Context.Queryable<ProReportwork>().Where(it => it.FkWorkorder == workorder).Any();
|
|
|
|
if (isEXsit)
|
|
{
|
|
return "-1";
|
|
|
|
}
|
|
ProWorkorder handleWorkorder = Context.Queryable<ProWorkorder>().Where(it => it.Workorder == workorder).First();
|
|
ProReportwork proReportwork = new
|
|
ProReportwork();
|
|
proReportwork.Id = XueHua;
|
|
proReportwork.FkWorkorder = workorder;
|
|
proReportwork.DispatchNum = handleWorkorder.DeliveryNum;
|
|
proReportwork.FinishedNum = null;
|
|
proReportwork.GroupCode = handleWorkorder.GroupCode;
|
|
proReportwork.LineCode = handleWorkorder.LineCode;
|
|
proReportwork.CreatedBy = CreatedBy;
|
|
proReportwork.CreatedTime = DateTime.Now;
|
|
|
|
ProReportwork proReportwork1= Context.Insertable(proReportwork).ExecuteReturnEntity();
|
|
|
|
return proReportwork1.Id;
|
|
|
|
|
|
}
|
|
|
|
}
|
|
} |