RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

车间呆滞品

Browse Source
This commit is contained in:
qianhao.xu 2024-11-13 13:20:55 +08:00
parent 22a308c037
commit 61cb12747a
4 changed files with 376 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
DOAN.Admin.WebApi/Controllers/MES/mm/MmSlowMoveMaterialController.cs Normal file
View File

@ -0,0 +1,125 @@
using Microsoft.AspNetCore.Mvc;
using DOAN.Model.Dto;
using DOAN.Admin.WebApi.Filters;
using DOAN.Model.MES.mm;
using DOAN.Model.MES.mm.Dto;
using DOAN.Service.MES.mm.IService;
using Infrastructure.Converter;
//创建时间：2024-11-12
namespace DOAN.Admin.WebApi.Controllers
{
/// <summary>
/// 车间呆滞品盘点
/// </summary>
[Verify]
[Route("mes/materialManagement/SlowMoveMaterial")]
public class MmSlowMoveMaterialController : BaseController
{
/// <summary>
/// 车间呆滞品盘点接口
/// </summary>
private readonly IMmSlowMoveMaterialService _MmSlowMoveMaterialService;
public MmSlowMoveMaterialController(IMmSlowMoveMaterialService MmSlowMoveMaterialService)
{
_MmSlowMoveMaterialService = MmSlowMoveMaterialService;
}
//TODO 生成车间呆滞品
/// <summary>
/// 生成车间呆滞品
/// </summary>
/// <param name="selecDate"></param>
/// <returns></returns>
[HttpGet("generate_shop_moveSlow_material")]
public IActionResult GenerateShopFloorSluggishProducts(DateTime selecDate)
{
selecDate= DOANConvertDateTime.ConvertLocalDate(selecDate);
var response = _MmSlowMoveMaterialService.GenerateShopFloorSluggishProducts(selecDate,HttpContext.GetName());
return SUCCESS(response);
}
/// <summary>
/// 查询车间呆滞品盘点列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "materialManagement:mmslowmovematerial:list")]
public IActionResult QueryMmSlowMoveMaterial([FromQuery] MmSlowMoveMaterialQueryDto parm)
{
var response = _MmSlowMoveMaterialService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询车间呆滞品盘点详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "materialManagement:mmslowmovematerial:query")]
public IActionResult GetMmSlowMoveMaterial(string Id)
{
var response = _MmSlowMoveMaterialService.GetInfo(Id);
var info = response.Adapt<MmSlowMoveMaterial>();
return SUCCESS(info);
}
/// <summary>
/// 添加车间呆滞品盘点
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "materialManagement:mmslowmovematerial:add")]
[Log(Title = "车间呆滞品盘点", BusinessType = BusinessType.INSERT)]
public IActionResult AddMmSlowMoveMaterial([FromBody] MmSlowMoveMaterialDto parm)
{
var modal = parm.Adapt<MmSlowMoveMaterial>().ToCreate(HttpContext);
var response = _MmSlowMoveMaterialService.AddMmSlowMoveMaterial(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新车间呆滞品盘点
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "materialManagement:mmslowmovematerial:edit")]
[Log(Title = "车间呆滞品盘点", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateMmSlowMoveMaterial([FromBody] MmSlowMoveMaterialDto parm)
{
var modal = parm.Adapt<MmSlowMoveMaterial>().ToUpdate(HttpContext);
var response = _MmSlowMoveMaterialService.UpdateMmSlowMoveMaterial(modal);
return ToResponse(response);
}
/// <summary>
/// 删除车间呆滞品盘点
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "materialManagement:mmslowmovematerial:delete")]
[Log(Title = "车间呆滞品盘点", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteMmSlowMoveMaterial(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _MmSlowMoveMaterialService.Delete(idsArr);
return ToResponse(response);
}
}
}

43
DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs Normal file
View File

@ -0,0 +1,43 @@
using System.ComponentModel.DataAnnotations;
namespace DOAN.Model.MES.mm.Dto
{
/// <summary>
/// 车间呆滞品盘点查询对象
/// </summary>
public class MmSlowMoveMaterialQueryDto : PagerInfo
{}
/// <summary>
/// 车间呆滞品盘点输入输出对象
/// </summary>
public class MmSlowMoveMaterialDto
{
[Required(ErrorMessage = "雪花不能为空")]
public string Id { get; set; }
public string LineCode { get; set; }
public DateTime? CheckDate { get; set; }
public string MaterialCode { get; set; }
public string MaterialName { get; set; }
public string Specification { get; set; }
public decimal LogicQuantity { get; set; }
public decimal ActualQuantity { get; set; }
public string Unit { get; set; }
public string CreatedBy { get; set; }
public DateTime? CreatedTime { get; set; }
public string UpdatedBy { get; set; }
public DateTime? UpdatedTime { get; set; }
}
}

25
DOAN.Service/MES/mm/IService/IMmSlowMoveMaterialService.cs Normal file
View File

@ -0,0 +1,25 @@
using System;
using DOAN.Model;
using DOAN.Model.Dto;
using System.Collections.Generic;
using DOAN.Model.MES.mm;
using DOAN.Model.MES.mm.Dto;
namespace DOAN.Service.MES.mm.IService
{
/// <summary>
/// 车间呆滞品盘点service接口
/// </summary>
public interface IMmSlowMoveMaterialService : IBaseService<MmSlowMoveMaterial>
{
bool GenerateShopFloorSluggishProducts(DateTime selecDate,string CreatedBy);
PagedInfo<MmSlowMoveMaterialDto> GetList(MmSlowMoveMaterialQueryDto parm);
MmSlowMoveMaterial GetInfo(string Id);
MmSlowMoveMaterial AddMmSlowMoveMaterial(MmSlowMoveMaterial parm);
int UpdateMmSlowMoveMaterial(MmSlowMoveMaterial parm);
}
}

183
DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs Normal file
View File

@ -0,0 +1,183 @@
using System;
using SqlSugar;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using DOAN.Model;
using DOAN.Model.Dto;
using DOAN.Model.MES.mm.Dto;
using DOAN.Model.MES.mm;
using DOAN.Repository;
using DOAN.Model.MES.mm.Dto;
using System.Linq;
using DOAN.Model.MES.base_;
using DOAN.Model.MES.product;
using DOAN.Service.MES.mm.IService;
namespace DOAN.Service.MES.mm
{
/// <summary>
/// 车间呆滞品盘点Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IMmSlowMoveMaterialService), ServiceLifetime = LifeTime.Transient)]
public class MmSlowMoveMaterialService : BaseService<MmSlowMoveMaterial>, IMmSlowMoveMaterialService
{
/// <summary>
/// 生成车间呆滞品
/// </summary>
/// <param name="selecDate"></param>
/// <returns></returns>
public bool GenerateShopFloorSluggishProducts(DateTime selecDate,string CreatedBy)
{
List<MmSlowMoveMaterial> list = new List<MmSlowMoveMaterial>();
// 计算 仓库发料
var WarehouseSendMaterial= Context.Queryable<MmPreparationTaskLine>()
.LeftJoin<MmTaskMaterialInfoByLine>((task, info) => task.TaskCode == info.FkTaskCode)
.Where((task, info) => task.TaskDate == selecDate)
.GroupBy((task, info) => new {task.LineCode, info.MaterialCode, info.MaterialName, info.Specification,info.Unit })
.Select((task, info) => new
{
LineCode=task.LineCode,
MaterialCode = info.MaterialCode,
MaterialName = info.MaterialName,
Specification = info.Specification,
Unit = info.Unit,
Quantity =SqlFunc.AggregateSum(info.Quantity) ,
}).ToList();
// 计算 理论消耗
var logicConsumeMaterial= Context.Queryable<ProWorkorder>()
.LeftJoin<ProReportwork>((work, report) => work.Workorder == report.FkWorkorder)
.LeftJoin<BaseMaterialBom>((work, report, bom) => work.ProductionCode == bom.InvCode)
.LeftJoin<BaseMaterialList>((work, report, bom,list) =>bom.InvCode==list.Code)
.Where((work, report, bom,list) => work.WorkorderDate == selecDate)
.GroupBy((work, report, bom,list) => new { work.LineCode, bom.SubInvCode,bom.SubInvName,list.Specification,list.Unit })
.Select((work, report, bom,list) => new
{
LineCode = work.LineCode,
MaterialName=bom.SubInvName,
MaterialCode = bom.SubInvCode,
Specification=list.Specification,
unit=list.Unit,
Quantity = SqlFunc.AggregateSum(report.FinishedNum ?? 0) *
SqlFunc.AggregateSum(Convert.ToInt16(bom.Iusequantity)),
}).ToList();
for (int i = 0; i < logicConsumeMaterial.Count; i++)
{
MmSlowMoveMaterial mmSlowMoveMaterial = new MmSlowMoveMaterial();
mmSlowMoveMaterial.Id = XueHua;
mmSlowMoveMaterial.CheckDate = selecDate;
mmSlowMoveMaterial.LineCode = logicConsumeMaterial[i].LineCode;
mmSlowMoveMaterial.MaterialCode = logicConsumeMaterial[i].MaterialCode;
mmSlowMoveMaterial.MaterialName = logicConsumeMaterial[i].MaterialName;
mmSlowMoveMaterial.Specification = logicConsumeMaterial[i].Specification;
mmSlowMoveMaterial.LogicQuantity=logicConsumeMaterial[i].Quantity;
mmSlowMoveMaterial.Unit = logicConsumeMaterial[i].unit;
mmSlowMoveMaterial.CreatedBy = CreatedBy;
mmSlowMoveMaterial.CreatedTime = DateTime.Now;
for (int j = 0; j < WarehouseSendMaterial.Count; j++)
{
if (WarehouseSendMaterial[j].LineCode == logicConsumeMaterial[i].LineCode)
{
if (WarehouseSendMaterial[j].MaterialCode == logicConsumeMaterial[i].MaterialCode)
{
mmSlowMoveMaterial.LogicQuantity= WarehouseSendMaterial[j].Quantity - logicConsumeMaterial[j].Quantity;
}
}
}
list.Add(mmSlowMoveMaterial);
}
int result = 0;
if (list.Count > 0)
{
UseTran2(() =>
{
Context.Deleteable<MmSlowMoveMaterial>().Where(it => it.CheckDate == selecDate).ExecuteCommand();
result = Context.Insertable(list).ExecuteCommand();
});
}
return result > 0;
}
/// <summary>
/// 查询车间呆滞品盘点列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<MmSlowMoveMaterialDto> GetList(MmSlowMoveMaterialQueryDto parm)
{
var predicate = Expressionable.Create<MmSlowMoveMaterial>();
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<MmSlowMoveMaterial, MmSlowMoveMaterialDto>(parm);
return response;
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public MmSlowMoveMaterial GetInfo(string Id)
{
var response = Queryable()
.Where(x => x.Id == Id)
.First();
return response;
}
/// <summary>
/// 添加车间呆滞品盘点
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public MmSlowMoveMaterial AddMmSlowMoveMaterial(MmSlowMoveMaterial model)
{
return Context.Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 修改车间呆滞品盘点
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateMmSlowMoveMaterial(MmSlowMoveMaterial model)
{
//var response = Update(w => w.Id == model.Id, it => new MmSlowMoveMaterial()
//{
// LineCode = model.LineCode,
// CheckDate = model.CheckDate,
// MaterialCode = model.MaterialCode,
// MaterialName = model.MaterialName,
// Specification = model.Specification,
// LogicQuantity = model.LogicQuantity,
// ActualQuantity = model.ActualQuantity,
// Unit = model.Unit,
// CreatedBy = model.CreatedBy,
// CreatedTime = model.CreatedTime,
// UpdatedBy = model.UpdatedBy,
// UpdatedTime = model.UpdatedTime,
//});
//return response;
return Update(model, true);
}
}
}