wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物料增加信息 工艺路线弹窗增加过滤

Browse Source
This commit is contained in:
周科达
2023-05-08 17:42:07 +08:00
parent c9e0e2691b
commit b4ad3d26e2
8 changed files with 177 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BasicData/Tnb.BasicData.Entities/Dto/BasRoute/VaildRouteOutput.cs Normal file
View File

@@ -0,0 +1,15 @@
namespace Tnb.BasicData.Entities.Dto
{
public class VaildRouteOutput
{
public string id { get; set; }
public string code { get; set; }
public string name { get; set; }
public DateTime? start_time { get; set; }
public DateTime? end_time { get; set; }
}
}

8
BasicData/Tnb.BasicData.Entities/Entity/BasEbomD.cs
View File

@@ -101,6 +101,14 @@ namespace Tnb.BasicData.Entities
/// </summary>
[SugarColumn(ColumnName="route_id")]
public string route_id {get;set;}
/// <summary>
/// Desc:工艺路线名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="route_id")]
public string route_name {get;set;}
}
}

70
BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs
View File

@@ -34,6 +34,76 @@ namespace Tnb.BasicData.Entities
/// </summary>
public string attachment { get; set; }
/// <summary>
/// Desc:先进先出 0否 1是
/// Default:
/// Nullable:True
/// </summary>
public int? first_in_out { get; set; }
/// <summary>
/// Desc:存储有效期(天)
/// Default:
/// Nullable:True
/// </summary>
public int? storage_valid_day { get; set; }
/// <summary>
/// Desc:预警提前期(天)
/// Default:
/// Nullable:True
/// </summary>
public int? early_warn_day { get; set; }
/// <summary>
/// Desc:安全库存
/// Default:
/// Nullable:True
/// </summary>
public int? safe_stock { get; set; }
/// <summary>
/// Desc:发料仓库id
/// Default:
/// Nullable:True
/// </summary>
public string send_warehouse_id { get; set; }
/// <summary>
/// Desc:入厂单位id
/// Default:
/// Nullable:True
/// </summary>
public string into_factory_unit_id { get; set; }
/// <summary>
/// Desc:安全库存包含状态
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string safe_stock_stauts { get; set; }
/// <summary>
/// Desc:投料单位
/// Default:
/// Nullable:True
/// </summary>
public string material_in_unit_id { get; set; }
/// <summary>
/// Desc:产出单位
/// Default:
/// Nullable:True
/// </summary>
public string material_out_unit_id { get; set; }
/// <summary>
/// Desc:请料方式 1按计划排程请料 2自行管控
/// Default:
/// Nullable:True
/// </summary>
public string material_request_method { get; set; }
/// <summary>
/// Desc:物料代码
/// Default:

39
BasicData/Tnb.BasicData.Entities/Entity/BasMaterialIntoFactorySpecifications.cs Normal file
View File

@@ -0,0 +1,39 @@
using SqlSugar;
using Tnb.Common.Contracts;
namespace Tnb.BasicData.Entities
{
///<summary>
///物料入场规格
///</summary>
[SugarTable("bas_material_into_factory_specifications")]
public class BasMaterialIntoFactorySpecifications : BaseEntity<string>
{
public BasMaterialIntoFactorySpecifications(){
}
/// <summary>
/// Desc:物料id
/// Default:
/// Nullable:False
/// </summary>
public string material_id {get;set;}
/// <summary>
/// Desc:单位id
/// Default:
/// Nullable:False
/// </summary>
public string unit_id {get;set;}
/// <summary>
/// Desc:数量
/// Default:
/// Nullable:False
/// </summary>
public decimal num {get;set;}
}
}

8
BasicData/Tnb.BasicData.Interfaces/IBasRouteService.cs
View File

@@ -1,3 +1,5 @@
using JNPF.Common.Filter;
namespace Tnb.BasicData.Interfaces
{
public interface IBasRouteService
@@ -13,5 +15,11 @@ namespace Tnb.BasicData.Interfaces
/// </summary>
/// <param name="parameters">工艺路线id id</param>
public Task<string> Copy(Dictionary<string, string> parameters);
/// <summary>
/// 获取有效的已发布的工艺路线
/// </summary>
/// <param name="parameters"></param>
public Task<dynamic> GetValidRouteList(PageInputBase pageInputBase);
}
}

10
BasicData/Tnb.BasicData/BasMaterialService.cs
View File

@@ -43,6 +43,7 @@ namespace Tnb.BasicData
BasMaterial basMaterial = await _repository.GetByIdAsync(id);
List<BasMaterialUnit> materialUnits = await _repository.AsSugarClient().Queryable<BasMaterialUnit>().Where(x => x.material_id == id).ToListAsync();
List<BasMaterialIntoFactorySpecifications> materialIntoFactorySpecifications = await _repository.AsSugarClient().Queryable<BasMaterialIntoFactorySpecifications>().Where(x => x.material_id == id).ToListAsync();
string newId = SnowflakeIdHelper.NextId();
basMaterial.id = newId;
@@ -57,15 +58,22 @@ namespace Tnb.BasicData
basMaterialUnit.id = SnowflakeIdHelper.NextId();
basMaterialUnit.material_id = newId;
}
foreach (BasMaterialIntoFactorySpecifications basMaterialIntoFactorySpecification in materialIntoFactorySpecifications)
{
basMaterialIntoFactorySpecification.id = SnowflakeIdHelper.NextId();
basMaterialIntoFactorySpecification.material_id = newId;
}
await _repository.AsSugarClient().Insertable<BasMaterialUnit>(materialUnits).ExecuteCommandAsync();
await _repository.AsSugarClient().Insertable<BasMaterialIntoFactorySpecifications>(materialIntoFactorySpecifications).ExecuteCommandAsync();
});
return result.IsSuccess ? "复制成功" : result.ErrorMessage;
}
/// <summary>
/// 获取物料清单所有自己物料信息
/// 获取物料清单所有子集物料信息
/// </summary>
/// <param name="queryInput"></param>
/// <returns></returns>

2
BasicData/Tnb.BasicData/BasProcessService.cs
View File

@@ -51,7 +51,7 @@ namespace Tnb.BasicData
_runService = runService;
_visualDevService = visualDevService;
OverideFuncs.CreateAsync = Create;
OverideFuncs.GetListAsync = GetList;
// OverideFuncs.GetListAsync = GetList;
}
/// <summary>

27
BasicData/Tnb.BasicData/BasRouteService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
@@ -6,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.BasicData.Interfaces;
using Tnb.BasicData.Entities.Dto;
namespace Tnb.BasicData
{
@@ -72,5 +74,30 @@ namespace Tnb.BasicData
return result.IsSuccess ? "复制成功" : result.ErrorMessage;
}
/// <summary>
/// 获取有效的已发布的工艺路线
/// </summary>
/// <param name="parameters"></param>
[HttpPost]
public async Task<dynamic> GetValidRouteList([FromBody]PageInputBase pageInputBase)
{
var db = _repository.AsSugarClient();
var result = await db.Queryable<BasRouteH>()
.Where(x => x.status == "1" && ((x.start_time != null && x.start_time.Value <= DateTime.Now && x.end_time != null && x.end_time.Value>=DateTime.Now)
|| (x.start_time==null && x.end_time>=DateTime.Now)
|| (x.end_time==null && x.start_time<=DateTime.Now)
|| (x.start_time == null && x.end_time == null)
))
.Select(x=>new VaildRouteOutput()
{
id = x.id,
code = x.code,
name = x.name,
start_time = x.start_time,
end_time = x.end_time,
}).ToPagedListAsync(pageInputBase.currentPage, pageInputBase.pageSize);
return PageResult<VaildRouteOutput>.SqlSugarPageResult(result);
}
}
}