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:
qianjiawei
2023-05-17 16:52:55 +08:00
parent 8971b48984
commit 3978cc9e3a
7 changed files with 412 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
EquipMgr/Tnb.EquipMgr.Entities/Dto/ProducttListOutput.cs → EquipMgr/Tnb.EquipMgr.Entities/Dto/MaterialListOutput.cs
View File

@@ -7,15 +7,14 @@ using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 产品列表输出类
/// 物料列表输出类
/// </summary>
public class ProductListOutput
public class MaterialListOutput
{
public string id { get; set; }
public string product_code { get; set; }
public string product_name { get; set; }
public string product_standard { get; set; }
public string product_group { get; set; }
public string code { get; set; }
public string name { get; set; }
public string material_group { get; set; }
public int real_cavity_qty { get; set; }
}
/// <summary>

4
EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolMoldInput.cs
View File

@@ -10,9 +10,9 @@ namespace Tnb.EquipMgr.Entities.Dto
{
public string mold { get; set; }
public string[] equipid { get; set; }
public string productid { get; set; }
public string materialid { get; set; }
public int real_cavity_qty { get; set; }
public string[] productids { get; set; }
public string[] materialids { get; set; }
public string[] molds { get; set; }
}

352
EquipMgr/Tnb.EquipMgr.Entities/Entity/BasMaterial.cs Normal file
View File

@@ -0,0 +1,352 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SqlSugar;
using Tnb.Common.Contracts;
namespace Tnb.EquipMgr.Entities.Entity
{
///<summary>
///物料信息
///</summary>
[SugarTable("bas_material")]
public partial class BasMaterial : BaseEntity<string>
{
public BasMaterial()
{
}
/// <summary>
/// Desc:是否包含入库数
/// Default:
/// Nullable:True
/// </summary>
public int? is_contain_into_num { get; set; }
/// <summary>
/// Desc:批次管理
/// Default:
/// Nullable:True
/// </summary>
public int? is_batch_enabled { get; set; }
/// <summary>
/// Desc:标签管理
/// Default:
/// Nullable:True
/// </summary>
public int? is_label_enabled { get; set; }
/// <summary>
/// Desc:附件
/// Default:NULL::character varying
/// Nullable:True
/// </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:
/// Nullable:False
/// </summary>
public string code { get; set; }
/// <summary>
/// Desc:物料名称
/// Default:
/// Nullable:False
/// </summary>
public string name { get; set; }
/// <summary>
/// Desc:物料分类ID
/// Default:
/// Nullable:False
/// </summary>
public string category_id { get; set; }
/// <summary>
/// Desc:单位ID
/// Default:
/// Nullable:False
/// </summary>
public string unit_id { get; set; }
/// <summary>
/// Desc:单价
/// Default:
/// Nullable:True
/// </summary>
public decimal? cost { get; set; }
/// <summary>
/// Desc:毛重
/// Default:
/// Nullable:True
/// </summary>
public decimal? grossweight { get; set; }
/// <summary>
/// Desc:净重
/// Default:
/// Nullable:True
/// </summary>
public decimal? netweight { get; set; }
/// <summary>
/// Desc:长
/// Default:
/// Nullable:True
/// </summary>
public decimal? length { get; set; }
/// <summary>
/// Desc:宽
/// Default:
/// Nullable:True
/// </summary>
public decimal? width { get; set; }
/// <summary>
/// Desc:高
/// Default:
/// Nullable:True
/// </summary>
public decimal? high { get; set; }
/// <summary>
/// Desc:体积
/// Default:
/// Nullable:True
/// </summary>
public decimal? volumn { get; set; }
/// <summary>
/// Desc:是否免检
/// Default:
/// Nullable:True
/// </summary>
public int? isexemption { get; set; }
/// <summary>
/// Desc:安全库存
/// Default:
/// Nullable:True
/// </summary>
public decimal? safeqty { get; set; }
/// <summary>
/// Desc:保质期
/// Default:
/// Nullable:True
/// </summary>
public int? qualityperiod { get; set; }
/// <summary>
/// Desc:最小包装
/// Default:
/// Nullable:True
/// </summary>
public decimal? minpacking { get; set; }
/// <summary>
/// Desc:先进先出间隔天数，批次间隔天数
/// Default:
/// Nullable:True
/// </summary>
public int? fifo_interval_days { get; set; }
/// <summary>
/// Desc:创建时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// Desc:修改时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? modify_time { get; set; }
/// <summary>
/// Desc:扩展字段
/// Default:
/// Nullable:True
/// </summary>
public string extras { get; set; }
/// <summary>
/// Desc:所属组织
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string org_id { get; set; }
/// <summary>
/// Desc:是否过期允许出库
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string expireout { get; set; }
/// <summary>
/// Desc:是否先进先出管控
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string fifo { get; set; }
/// <summary>
/// Desc:物料规格型号
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string material_standard { get; set; }
/// <summary>
/// Desc:海关编码
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string fhscode { get; set; }
/// <summary>
/// Desc:附属性
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string attribute { get; set; }
/// <summary>
/// Desc:管控类型： 批管控：Lot 单管控：KeyParts 非管控：NoControl
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string controltype { get; set; }
/// <summary>
/// Desc:备注
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string remark { get; set; }
/// <summary>
/// Desc:创建用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string create_id { get; set; }
/// <summary>
/// Desc:修改用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string modify_id { get; set; }
/// <summary>
/// Desc:状态
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string state { get; set; }
/// <summary>
/// Desc:物料属性
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string material_property { get; set; }
/// <summary>
/// Desc:标签
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string label { get; set; }
/// <summary>
/// Desc:描述
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string descrip { get; set; }
}
}

22
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsProduct.cs → EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldsMaterial.cs
View File

@@ -11,21 +11,15 @@ namespace Tnb.EquipMgr.Entities
///<summary>
///模具产品关联表
///</summary>
[SugarTable("tool_molds_product")]
public partial class ToolMoldsProduct
[SugarTable("tool_molds_material")]
public partial class ToolMoldsMaterial:BaseEntity<string>
{
public ToolMoldsProduct(){
public ToolMoldsMaterial(){
}
/// <summary>
/// Desc:编号
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey=true)]
public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary>
/// Desc:模具编号
@@ -35,11 +29,11 @@ namespace Tnb.EquipMgr.Entities
public string mold_id {get;set;} = string.Empty;
/// <summary>
/// Desc:产品编号
/// Desc:物料编号
/// Default:
/// Nullable:False
/// </summary>
public string product_id {get;set;} = string.Empty;
public string material_id { get;set;} = string.Empty;
/// <summary>
/// Desc:创建用户
@@ -77,11 +71,11 @@ namespace Tnb.EquipMgr.Entities
public int? real_cavity_qty {get;set;}
/// <summary>
/// Desc:产品同组标识
/// Desc:物料同组标识
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? product_group {get;set;}
public string? material_group { get;set;}
}
}

12
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldProductService.cs → EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldMaterialService.cs
View File

@@ -8,14 +8,14 @@ using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr.Interfaces
{
public interface IToolMoldProductService
public interface IToolMoldMaterialService
{
/// <summary>
/// 根据模具id获取设备集合
/// 根据模具id获取物料集合
/// </summary>
/// <param name="mold"></param>
/// <returns></returns>
public Task<List<ProductListOutput>> GetProductLists(ToolMoldInput ToolMoldInput);
public Task<List<MaterialListOutput>> GetMaterialLists(ToolMoldInput ToolMoldInput);
/// <summary>
/// 增加模具产品绑定
/// </summary>
@@ -37,14 +37,14 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="mold"></param>
/// <param name="productids"></param>
/// <returns></returns>
public Task<dynamic> SaveProductGroup(ToolMoldInput ToolMoldInput);
public Task<dynamic> SaveMaterialGroup(ToolMoldInput ToolMoldInput);
/// <summary>
/// 取消产品同组
/// </summary>
/// <param name="mold"></param>
/// <param name="productids"></param>
/// <returns></returns>
public Task<dynamic> CancelProductGroup(ToolMoldInput ToolMoldInput);
public Task<dynamic> CancelMaterialGroup(ToolMoldInput ToolMoldInput);
/// <summary>
/// 根据产品id获取模具集合
@@ -59,6 +59,6 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="productid"></param>
/// <returns></returns>
public Task<dynamic> DetachProductData(ToolMoldInput ToolMoldInput);
public Task<dynamic> DetachMaterialData(ToolMoldInput ToolMoldInput);
}
}

73
EquipMgr/Tnb.EquipMgr/ToolMoldProductService.cs → EquipMgr/Tnb.EquipMgr/ToolMoldMaterialService.cs
View File

@@ -21,42 +21,41 @@ namespace Tnb.EquipMgr
{
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
public class ToolMoldProductService : IToolMoldProductService, IDynamicApiController, ITransient
public class ToolMoldMaterialService : IToolMoldMaterialService, IDynamicApiController, ITransient
{
private readonly IUserManager _userManager;
private readonly ISqlSugarRepository<ToolMolds> _repository;
public ToolMoldProductService(IUserManager userManager, ISqlSugarRepository<ToolMolds> repository)
public ToolMoldMaterialService(IUserManager userManager, ISqlSugarRepository<ToolMolds> repository)
{
_userManager = userManager;
_repository = repository;
}
/// <summary>
/// 根据模具id获取产品集合
/// 根据模具id获取物料集合
/// </summary>
/// <param name="mold"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<ProductListOutput>> GetProductLists(ToolMoldInput ToolMoldInput)
public async Task<List<MaterialListOutput>> GetMaterialLists(ToolMoldInput ToolMoldInput)
{
var db = _repository.AsSugarClient();
var list = await db.Queryable<BasProduct, ToolMoldsProduct>((a, b) => new object[]
var list = await db.Queryable<BasMaterial, ToolMoldsMaterial>((a, b) => new object[]
{
JoinType.Inner, a.id == b.product_id,
JoinType.Inner, a.id == b.material_id,
})
.Where((a, b) => b.mold_id == ToolMoldInput.mold)
.Select((a, b) => new ProductListOutput
.Select((a, b) => new MaterialListOutput
{
id = a.id,
product_code = a.product_code,
product_name = a.product_name,
product_standard = a.product_standard,
product_group=b.product_group,
code = a.code,
name = a.name,
material_group=b.material_group,
real_cavity_qty = b.real_cavity_qty.HasValue ? b.real_cavity_qty.Value : 0
}).ToListAsync();
return list;
}
/// <summary>
/// 增加模具产品绑定
/// 增加模具物料绑定
/// </summary>
/// <param name="mold"></param>
/// <param name="productid"></param>
@@ -67,21 +66,21 @@ namespace Tnb.EquipMgr
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
var ToolMoldsProduct= await _repository.AsSugarClient().Queryable<ToolMoldsProduct>().Where(p=>p.mold_id== ToolMoldInput.mold&&p.product_id== ToolMoldInput.productid).FirstAsync();
var ToolMoldsProduct= await _repository.AsSugarClient().Queryable<ToolMoldsMaterial>().Where(p=>p.mold_id== ToolMoldInput.mold&&p.material_id== ToolMoldInput.materialid).FirstAsync();
if (ToolMoldsProduct == null)
{
var entity = new ToolMoldsProduct();
var entity = new ToolMoldsMaterial();
entity.id = SnowflakeIdHelper.NextId();
entity.mold_id = ToolMoldInput.mold;
entity.product_id = ToolMoldInput.productid;
entity.material_id = ToolMoldInput.materialid;
entity.real_cavity_qty = ToolMoldInput.real_cavity_qty;
entity.create_time = DateTime.Now;
entity.create_id = _userManager.UserId;
await _repository.AsSugarClient().Insertable<ToolMoldsProduct>(entity).ExecuteCommandAsync();
await _repository.AsSugarClient().Insertable<ToolMoldsMaterial>(entity).ExecuteCommandAsync();
}
else {
ToolMoldsProduct.real_cavity_qty= ToolMoldInput.real_cavity_qty;
await _repository.AsSugarClient().Updateable<ToolMoldsProduct>(ToolMoldsProduct).ExecuteCommandAsync();
await _repository.AsSugarClient().Updateable<ToolMoldsMaterial>(ToolMoldsProduct).ExecuteCommandAsync();
}
@@ -92,7 +91,7 @@ namespace Tnb.EquipMgr
}
/// <summary>
/// 批量删除模具产品绑定
/// 批量删除模具物料绑定
/// </summary>
/// <param name="mold"></param>
/// <param name="productids"></param>
@@ -102,53 +101,53 @@ namespace Tnb.EquipMgr
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
var arr = _repository.AsSugarClient().Queryable<ToolMoldsProduct>().Where(x => x.mold_id == ToolMoldInput.mold && ToolMoldInput.productids.Contains(x.product_id)).ToList();
await _repository.AsSugarClient().Deleteable<ToolMoldsProduct>(arr).ExecuteCommandAsync();
var arr = _repository.AsSugarClient().Queryable<ToolMoldsMaterial>().Where(x => x.mold_id == ToolMoldInput.mold && ToolMoldInput.materialids.Contains(x.material_id)).ToList();
await _repository.AsSugarClient().Deleteable<ToolMoldsMaterial>(arr).ExecuteCommandAsync();
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "操作成功" : result.ErrorMessage;
}
/// <summary>
/// 产品同组
/// 物料同组
/// </summary>
/// <param name="mold"></param>
/// <param name="productids"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> SaveProductGroup(ToolMoldInput ToolMoldInput)
public async Task<dynamic> SaveMaterialGroup(ToolMoldInput ToolMoldInput)
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
var arr = _repository.AsSugarClient().Queryable<ToolMoldsProduct>().Where(x => x.mold_id == ToolMoldInput.mold && ToolMoldInput.productids.Contains(x.product_id)).ToList();
var arr = _repository.AsSugarClient().Queryable<ToolMoldsMaterial>().Where(x => x.mold_id == ToolMoldInput.mold && ToolMoldInput.materialids.Contains(x.material_id)).ToList();
var sign = SnowflakeIdHelper.NextId();
arr.ForEach(p => { p.product_group = sign; });
await _repository.AsSugarClient().Updateable<ToolMoldsProduct>(arr).ExecuteCommandAsync();
arr.ForEach(p => { p.material_group = sign; });
await _repository.AsSugarClient().Updateable<ToolMoldsMaterial>(arr).ExecuteCommandAsync();
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "操作成功" : result.ErrorMessage;
}
/// <summary>
/// 取消产品同组
/// 取消物料同组
/// </summary>
/// <param name="mold"></param>
/// <param name="productids"></param>
/// <returns></returns>
public async Task<dynamic> CancelProductGroup(ToolMoldInput ToolMoldInput)
public async Task<dynamic> CancelMaterialGroup(ToolMoldInput ToolMoldInput)
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
var arr = _repository.AsSugarClient().Queryable<ToolMoldsProduct>().Where(x => x.mold_id == ToolMoldInput.mold && ToolMoldInput.productids.Contains(x.product_id)).ToList();
arr.ForEach(p => { p.product_group = string.Empty; });
await _repository.AsSugarClient().Updateable<ToolMoldsProduct>(arr).ExecuteCommandAsync();
var arr = _repository.AsSugarClient().Queryable<ToolMoldsMaterial>().Where(x => x.mold_id == ToolMoldInput.mold && ToolMoldInput.materialids.Contains(x.material_id)).ToList();
arr.ForEach(p => { p.material_group = string.Empty; });
await _repository.AsSugarClient().Updateable<ToolMoldsMaterial>(arr).ExecuteCommandAsync();
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "操作成功" : result.ErrorMessage;
}
/// <summary>
/// 根据产品id获取模具集合
/// 根据物料id获取模具集合
/// </summary>
/// <param name="productid"></param>
/// <returns></returns>
@@ -156,11 +155,11 @@ namespace Tnb.EquipMgr
public async Task<List<MoldListOutput>> GetMoldLists(ToolMoldInput ToolMoldInput)
{
var db = _repository.AsSugarClient();
var list = await db.Queryable<ToolMolds, ToolMoldsProduct>((a, b) => new object[]
var list = await db.Queryable<ToolMolds, ToolMoldsMaterial>((a, b) => new object[]
{
JoinType.Inner, a.id == b.mold_id,
})
.Where((a, b) => b.product_id == ToolMoldInput.productid)
.Where((a, b) => b.material_id == ToolMoldInput.materialid)
.Select((a, b) => new MoldListOutput
{
id = a.id,
@@ -172,18 +171,18 @@ namespace Tnb.EquipMgr
return list;
}
/// <summary>
/// 批量删除产品模具绑定
/// 批量删除物料模具绑定
/// </summary>
/// <param name="molds"></param>
/// <param name="productid"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> DetachProductData(ToolMoldInput ToolMoldInput)
public async Task<dynamic> DetachMaterialData(ToolMoldInput ToolMoldInput)
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
var arr = _repository.AsSugarClient().Queryable<ToolMoldsProduct>().Where(x => ToolMoldInput.molds.Contains(x.mold_id) && x.product_id == ToolMoldInput.productid).ToList();
await _repository.AsSugarClient().Deleteable<ToolMoldsProduct>(arr).ExecuteCommandAsync();
var arr = _repository.AsSugarClient().Queryable<ToolMoldsMaterial>().Where(x => ToolMoldInput.molds.Contains(x.mold_id) && x.material_id == ToolMoldInput.materialid).ToList();
await _repository.AsSugarClient().Deleteable<ToolMoldsMaterial>(arr).ExecuteCommandAsync();
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "操作成功" : result.ErrorMessage;

5
EquipMgr/Tnb.EquipMgr/ToolMoldsService.cs
View File

@@ -68,9 +68,12 @@ namespace Tnb.EquipMgr
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
var his= await _repository.AsSugarClient().Queryable<ToolMoldsEquipment>().ToListAsync();
var list = new List<ToolMoldsEquipment>();
foreach (var equip in ToolMoldInput.equipid)
{
if (his.Where(p => p.mold_id == ToolMoldInput.mold && p.equipment_id == equip).ToList().Count > 0)
continue;
var entity = new ToolMoldsEquipment();
entity.id = SnowflakeIdHelper.NextId();
entity.mold_id = ToolMoldInput.mold;
@@ -83,8 +86,6 @@ namespace Tnb.EquipMgr
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "保存成功" : result.ErrorMessage;
}
/// <summary>
/// 批量删除模具设备绑定