253 lines
10 KiB
C#
253 lines
10 KiB
C#
using System;
|
|
using SqlSugar;
|
|
using Infrastructure.Attribute;
|
|
using Infrastructure.Extensions;
|
|
using ZR.Model;
|
|
using ZR.Repository;
|
|
|
|
using System.Linq;
|
|
using ZR.Model.MES.wms;
|
|
using ZR.Model.MES.wms.Dto;
|
|
using ZR.Service.mes.wms.IService;
|
|
using System.Collections.Generic;
|
|
using Mapster;
|
|
|
|
namespace ZR.Service.mes.wms
|
|
{
|
|
/// <summary>
|
|
/// 成品库当前货物表Service业务层处理
|
|
/// </summary>
|
|
[AppService(ServiceType = typeof(IWmGoodsNowProductionService), ServiceLifetime = LifeTime.Transient)]
|
|
public class WmGoodsNowProductionService : BaseService<WmGoodsNowProduction>, IWmGoodsNowProductionService
|
|
{
|
|
/// <summary>
|
|
/// 查询成品库当前货物表列表
|
|
/// </summary>
|
|
/// <param name="parm"></param>
|
|
/// <returns></returns>
|
|
public PagedInfo<WmGoodsNowProductionDto> GetList(WmGoodsNowProductionQueryDto parm)
|
|
{
|
|
var predicate = Expressionable.Create<WmGoodsNowProduction>()
|
|
.AndIF(!string.IsNullOrEmpty(parm.Partnumber), it => it.Partnumber.Contains(parm.Partnumber))
|
|
.AndIF(!string.IsNullOrEmpty(parm.PackageCodeClient), it => it.PackageCodeClient.Contains(parm.PackageCodeClient))
|
|
.AndIF(!string.IsNullOrEmpty(parm.LocationCode), it => it.LocationCode.Contains(parm.LocationCode))
|
|
;
|
|
|
|
var response = Queryable()
|
|
.Where(predicate.ToExpression())
|
|
.ToPage<WmGoodsNowProduction, WmGoodsNowProductionDto>(parm);
|
|
|
|
return response;
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// 批量查看
|
|
/// </summary>
|
|
/// <param name="parm"></param>
|
|
/// <returns></returns>
|
|
/// <exception cref="NotImplementedException"></exception>
|
|
public (List<WmGoods_nodeDto>, int) QuerypatchsearchList(WmGoodsNowProductionQueryDto parm)
|
|
{
|
|
List<WmGoods_nodeDto> list = null;
|
|
int total = 0;
|
|
var predicate = Expressionable.Create<WmGoodsNowProduction>()
|
|
.AndIF(!string.IsNullOrEmpty(parm.Partnumber), it => it.Partnumber.Contains(parm.Partnumber))
|
|
.AndIF(!string.IsNullOrEmpty(parm.PackageCodeClient), it => it.PackageCodeClient.Contains(parm.PackageCodeClient));
|
|
|
|
List<WmGoodsNowProduction> rawdatas = Queryable().Where(predicate.ToExpression()).ToPageList(parm.PageNum, parm.PageSize, ref total);
|
|
if (rawdatas != null && rawdatas.Count > 0)
|
|
{
|
|
//todo 对字段进行拆分
|
|
|
|
List<WmGoods_nodeDto> WmGoods_nodeDto_list = rawdatas.Select(p => new WmGoods_nodeDto()
|
|
{
|
|
Id = p.Id,
|
|
PackageCode = p.PackageCode,
|
|
PackageCodeClient_short_parent = p.PackageCodeClient.Split("_")[0],
|
|
PackageCodeClient_son = p.PackageCodeClient,
|
|
PackageCodeOriginal = p.PackageCodeClient,
|
|
LocationCode = p.LocationCode,
|
|
Partnumber = p.Partnumber,
|
|
GoodsNumLogic = p.GoodsNumLogic,
|
|
GoodsNumAction = p.GoodsNumAction,
|
|
EntryWarehouseTime = p.EntryWarehouseTime,
|
|
Remark = p.Remark,
|
|
|
|
}).ToList();
|
|
//todo 分组 聚合 生成父节点
|
|
|
|
List<WmGoods_nodeDto> WmGoods_nodeDto_list_parent = WmGoods_nodeDto_list.GroupBy(p => p.PackageCodeClient_short_parent)
|
|
.Select(group => new WmGoods_nodeDto()
|
|
{
|
|
PackageCodeClient_short_parent = "",
|
|
PackageCodeClient_son = group.Key,
|
|
GoodsNumLogic = group.Sum(group => group.GoodsNumLogic),
|
|
GoodsNumAction = group.Sum(group => group.GoodsNumAction),
|
|
Partnumber = group.Max(group => group.Partnumber),
|
|
Pack_num = group.Count()
|
|
}).ToList();
|
|
|
|
//todo 合并
|
|
|
|
list = WmGoods_nodeDto_list.Concat(WmGoods_nodeDto_list_parent).ToList();
|
|
|
|
|
|
}
|
|
return (list, total);
|
|
}
|
|
/// <summary>
|
|
/// 移动端 短批次号查询
|
|
/// </summary>
|
|
/// <param name="parm"></param>
|
|
/// <returns></returns>
|
|
public List<WmGoods_nodeDto> QueryshortPatch(WmGoodsNowProductionQueryDto parm)
|
|
{
|
|
|
|
List<WmGoods_nodeDto> list = null;
|
|
int total = 0;
|
|
var predicate = Expressionable.Create<WmGoodsNowProduction>()
|
|
.AndIF(!string.IsNullOrEmpty(parm.Partnumber), it => it.Partnumber.Contains(parm.Partnumber))
|
|
.AndIF(!string.IsNullOrEmpty(parm.PackageCodeClient), it => it.PackageCodeClient.Contains(parm.PackageCodeClient));
|
|
|
|
List<WmGoodsNowProduction> rawdatas = Queryable().Where(predicate.ToExpression()).ToList();
|
|
if (rawdatas != null && rawdatas.Count > 0)
|
|
{
|
|
//todo 对字段进行拆分
|
|
|
|
List<WmGoods_nodeDto> WmGoods_nodeDto_list = rawdatas.Select(p => new WmGoods_nodeDto()
|
|
{
|
|
Id = p.Id,
|
|
PackageCode = p.PackageCode,
|
|
PackageCodeClient_short_parent = p.PackageCodeClient.Split("_")[0],
|
|
PackageCodeClient_son = p.PackageCodeClient,
|
|
PackageCodeOriginal = p.PackageCodeClient,
|
|
LocationCode = p.LocationCode,
|
|
Partnumber = p.Partnumber,
|
|
GoodsNumLogic = p.GoodsNumLogic,
|
|
GoodsNumAction = p.GoodsNumAction,
|
|
EntryWarehouseTime = p.EntryWarehouseTime,
|
|
Remark = p.Remark,
|
|
|
|
}).ToList();
|
|
//todo 分组 聚合 生成父节点
|
|
|
|
List<WmGoods_nodeDto> WmGoods_nodeDto_list_parent = WmGoods_nodeDto_list.GroupBy(p => p.PackageCodeClient_short_parent)
|
|
.Select(group => new WmGoods_nodeDto()
|
|
{
|
|
PackageCodeClient_short_parent = "",
|
|
PackageCodeClient_son = group.Key,
|
|
GoodsNumLogic = group.Sum(group => group.GoodsNumLogic),
|
|
GoodsNumAction = group.Sum(group => group.GoodsNumAction),
|
|
Partnumber = group.Max(group => group.Partnumber),
|
|
Pack_num = group.Count()
|
|
}).ToList();
|
|
|
|
//todo 合并
|
|
|
|
return WmGoods_nodeDto_list_parent.OrderByDescending(it => it.PackageCodeClient_son).ToList();
|
|
|
|
}
|
|
return null;
|
|
}
|
|
/// <summary>
|
|
/// 移动端 短批次号详情
|
|
/// </summary>
|
|
/// <param name="parm"></param>
|
|
/// <returns></returns>
|
|
public List<WmGoodsNowProductionDto> Patchsearchdetail(WmGoodsNowProductionQueryDto parm)
|
|
{
|
|
var predicate = Expressionable.Create<WmGoodsNowProduction>()
|
|
.AndIF(!string.IsNullOrEmpty(parm.PackageCodeClient), it => it.PackageCodeClient.Contains(parm.PackageCodeClient));
|
|
|
|
var response = Queryable()
|
|
.Where(predicate.ToExpression())
|
|
.OrderBy(it=>it.PackageCodeClient)
|
|
.ToList();
|
|
|
|
|
|
return response.Adapt<List<WmGoodsNowProductionDto>>();
|
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// 获取详情
|
|
/// </summary>
|
|
/// <param name="Id"></param>
|
|
/// <returns></returns>
|
|
public WmGoodsNowProduction GetInfo(string Id)
|
|
{
|
|
var response = Queryable()
|
|
.Where(x => x.Id == Id)
|
|
.First();
|
|
|
|
return response;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 添加成品库当前货物表
|
|
/// </summary>
|
|
/// <param name="model"></param>
|
|
/// <returns></returns>
|
|
public WmGoodsNowProduction AddWmGoodsNowProduction(WmGoodsNowProduction model)
|
|
{
|
|
if (string.IsNullOrEmpty(model.Id))
|
|
{
|
|
model.Id = SnowFlakeSingle.Instance.NextId().ToString();//也可以在程序中直接获取ID
|
|
}
|
|
if(string.IsNullOrEmpty(model.PackageCode))
|
|
{
|
|
model.PackageCode=model.PackageCodeClient;
|
|
}
|
|
if (string.IsNullOrEmpty(model.PackageCodeOriginal))
|
|
{
|
|
model.PackageCodeOriginal = model.PackageCodeClient;
|
|
}
|
|
return Context.Insertable(model).ExecuteReturnEntity();
|
|
}
|
|
|
|
/// <summary>
|
|
/// 修改成品库当前货物表
|
|
/// </summary>
|
|
/// <param name="model"></param>
|
|
/// <returns></returns>
|
|
public int UpdateWmGoodsNowProduction(WmGoodsNowProduction model)
|
|
{
|
|
//var response = Update(w => w.Id == model.Id, it => new WmGoodsNowProduction()
|
|
//{
|
|
// PackageCode = model.PackageCode,
|
|
// PackageCodeClient = model.PackageCodeClient,
|
|
// PackageCodeOriginal = model.PackageCodeOriginal,
|
|
// LocationCode = model.LocationCode,
|
|
// Partnumber = model.Partnumber,
|
|
// GoodsNumLogic = model.GoodsNumLogic,
|
|
// GoodsNumAction = model.GoodsNumAction,
|
|
// EntryWarehouseTime = model.EntryWarehouseTime,
|
|
// Remark = model.Remark,
|
|
// UpdatedBy = model.UpdatedBy,
|
|
// UpdatedTime = model.UpdatedTime,
|
|
// CreatedBy = model.CreatedBy,
|
|
// CreatedTime = model.CreatedTime,
|
|
//});
|
|
//return response;
|
|
return Update(model, true);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 修改实际库存
|
|
/// </summary>
|
|
/// <param name="id"></param>
|
|
/// <param name="stack_num"></param>
|
|
/// <returns></returns>
|
|
public int ModifyInventoryQuantity(string id, int stack_num)
|
|
{
|
|
return Context.Updateable<WmGoodsNowProduction>()
|
|
.SetColumns(it => it.GoodsNumAction == stack_num)
|
|
.Where(it => it.Id == id).ExecuteCommand();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
} |