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

仓库-毛坯仓库添加，毛坯仓库日志添加

Browse Source
This commit is contained in:
赵正易
2024-05-13 17:32:20 +08:00
parent 47dd0c4930
commit b4039d0b49
14 changed files with 791 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using ZR.Model;
using ZR.Model.Dto;
using ZR.Model.MES.wms;
using System.Collections.Generic;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms.IService
{
/// <summary>
/// 毛坯库存表service接口
/// </summary>
public interface IWmBlankInventoryService : IBaseService<WmBlankInventory>
{
PagedInfo<WmBlankInventoryDto> GetList(WmBlankInventoryQueryDto parm);
WmBlankInventory GetInfo(string Id);
WmBlankInventory AddWmBlankInventory(WmBlankInventory parm);
int UpdateWmBlankInventory(WmBlankInventory parm);
}
}

24
ZR.Service/mes/wms/IService/IWmBlankRecordService.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using ZR.Model;
using ZR.Model.Dto;
using System.Collections.Generic;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms.IService
{
/// <summary>
/// 毛坯库存库存变动记录表service接口
/// </summary>
public interface IWmBlankRecordService : IBaseService<WmBlankRecord>
{
PagedInfo<WmBlankRecordDto> GetList(WmBlankRecordQueryDto parm);
WmBlankRecord GetInfo(string Id);
WmBlankRecord AddWmBlankRecord(WmBlankRecord parm);
int UpdateWmBlankRecord(WmBlankRecord parm);
}
}

121
ZR.Service/mes/wms/WmBlankInventoryService.cs Normal file
View File

@@ -0,0 +1,121 @@
using System;
using SqlSugar;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using ZR.Model;
using ZR.Model.Dto;
using ZR.Model.MES.wms;
using ZR.Repository;
using System.Linq;
using ZR.Service.mes.wms.IService;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms
{
/// <summary>
/// 毛坯库存表Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IWmBlankInventoryService), ServiceLifetime = LifeTime.Transient)]
public class WmBlankInventoryService : BaseService<WmBlankInventory>, IWmBlankInventoryService
{
/// <summary>
/// 查询毛坯库存表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmBlankInventoryDto> GetList(WmBlankInventoryQueryDto parm)
{
var predicate = Expressionable.Create<WmBlankInventory>()
.AndIF(!string.IsNullOrEmpty(parm.BlankNum), it => it.BlankNum.Contains(parm.BlankNum))
.AndIF(parm.Status > -1, it => it.Status == parm.Status)
.AndIF(parm.Type > 0, it => it.Type == parm.Type)
;
var response = Queryable()
.Where(predicate.ToExpression())
.OrderByDescending(it=>it.UpdatedTime)
.ToPage<WmBlankInventory, WmBlankInventoryDto>(parm);
if (response.Result.Count > 0)
{
foreach (WmBlankInventoryDto item in response.Result)
{
WmMaterial material = Context.Queryable<WmMaterial>()
.Where(it => it.BlankNum == item.BlankNum)
.Where(it => it.Remarks == "毛坯")
.First();
if (material == null)
{
item.Description = "此毛坯号不在物料清单内！";
continue;
}
item.Color = material.Color;
item.Unit = material.Unit;
item.Version = material.Version;
item.Specification = material.Specification;
item.Description = !string.IsNullOrEmpty(material.Description) ? material.Description : material.ProductName;
}
}
return response;
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public WmBlankInventory GetInfo(string Id)
{
var response = Queryable()
.Where(x => x.Id == Id)
.First();
return response;
}
/// <summary>
/// 添加毛坯库存表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WmBlankInventory AddWmBlankInventory(WmBlankInventory model)
{
bool hasRecord = Context.Queryable<WmBlankInventory>()
.Where(it => it.BlankNum == model.BlankNum)
.Any();
if(hasRecord)
{
throw new Exception("毛坯仓库已有相同毛坯号记录");
}
model.Id = SnowFlakeSingle.Instance.NextId().ToString();
return Context.Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 修改毛坯库存表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWmBlankInventory(WmBlankInventory model)
{
//var response = Update(w => w.Id == model.Id, it => new WmBlankInventory()
//{
// BlankNum = model.BlankNum,
// Quantity = model.Quantity,
// MaxNum = model.MaxNum,
// MinNum = model.MinNum,
// WarnNum = model.WarnNum,
// Type = model.Type,
// Status = model.Status,
// Remark = model.Remark,
// CreatedBy = model.CreatedBy,
// CreatedTime = model.CreatedTime,
// UpdatedBy = model.UpdatedBy,
// UpdatedTime = model.UpdatedTime,
//});
//return response;
return Update(model, true);
}
}
}

87
ZR.Service/mes/wms/WmBlankRecordService.cs Normal file
View File

@@ -0,0 +1,87 @@
using System;
using SqlSugar;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using ZR.Model;
using ZR.Model.Dto;
using ZR.Repository;
using ZR.Service.Business.IBusinessService;
using System.Linq;
using ZR.Service.mes.wms.IService;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms
{
/// <summary>
/// 毛坯库存库存变动记录表Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IWmBlankRecordService), ServiceLifetime = LifeTime.Transient)]
public class WmBlankRecordService : BaseService<WmBlankRecord>, IWmBlankRecordService
{
/// <summary>
/// 查询毛坯库存库存变动记录表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmBlankRecordDto> GetList(WmBlankRecordQueryDto parm)
{
var predicate = Expressionable.Create<WmBlankRecord>();
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<WmBlankRecord, WmBlankRecordDto>(parm);
return response;
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public WmBlankRecord GetInfo(string Id)
{
var response = Queryable()
.Where(x => x.Id == Id)
.First();
return response;
}
/// <summary>
/// 添加毛坯库存库存变动记录表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WmBlankRecord AddWmBlankRecord(WmBlankRecord model)
{
return Context.Insertable(model).ExecuteReturnEntity();
}
/// <summary>
/// 修改毛坯库存库存变动记录表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWmBlankRecord(WmBlankRecord model)
{
//var response = Update(w => w.Id == model.Id, it => new WmBlankRecord()
//{
// BlankNum = model.BlankNum,
// ChangeQuantity = model.ChangeQuantity,
// Type = model.Type,
// Status = model.Status,
// Remark = model.Remark,
// CreatedBy = model.CreatedBy,
// CreatedTime = model.CreatedTime,
// UpdatedBy = model.UpdatedBy,
// UpdatedTime = model.UpdatedTime,
//});
//return response;
return Update(model, true);
}
}
}

7
ZR.Service/mes/wms/WmGoodsNowProductionService.cs
View File

@@ -258,6 +258,13 @@ namespace ZR.Service.mes.wms
{
model.PackageCodeOriginal = model.PackageCodeClient;
}
bool hasRecord = Context.Queryable<WmGoodsNowProduction>()
.Where(it => it.PackageCodeClient == model.PackageCodeClient)
.Any();
if (hasRecord)
{
throw new Exception("成品仓库已有相同批次号记录");
}
return Context.Insertable(model).ExecuteReturnEntity();
}