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

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
EquipMgr/Tnb.EquipMgr/ToolMoldMaterialService.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Aspose.Cells.Drawing;
using JNPF.Common.Core.Manager;
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
@@ -33,13 +27,12 @@ namespace Tnb.EquipMgr
/// <summary>
/// 根据模具id获取物料集合
/// </summary>
/// <param name="mold"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<MaterialListOutput>> GetMaterialLists(ToolMoldInput ToolMoldInput)
{
var db = _repository.AsSugarClient();
var list = await db.Queryable<BasMaterial, ToolMoldsMaterial>((a, b) => new object[]
ISqlSugarClient db = _repository.AsSugarClient();
List<MaterialListOutput> list = await db.Queryable<BasMaterial, ToolMoldsMaterial>((a, b) => new object[]
{
JoinType.Inner, a.id == b.material_id,
})
@@ -49,7 +42,7 @@ namespace Tnb.EquipMgr
id = a.id,
code = a.code,
name = a.name,
material_group=b.material_group,
material_group = b.material_group,
real_cavity_qty = b.real_cavity_qty.HasValue ? b.real_cavity_qty.Value : 0
}).ToListAsync();
return list;
@@ -57,105 +50,93 @@ namespace Tnb.EquipMgr
/// <summary>
/// 增加模具物料绑定
/// </summary>
/// <param name="mold"></param>
/// <param name="productid"></param>
/// <param name="real_cavity_qty"></param>
/// <param name="ToolMoldInput"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> SaveData(ToolMoldInput ToolMoldInput)
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
var ToolMoldsProduct= await _repository.AsSugarClient().Queryable<ToolMoldsMaterial>().Where(p=>p.mold_id== ToolMoldInput.mold&&p.material_id== ToolMoldInput.materialid).FirstAsync();
ToolMoldsMaterial 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 ToolMoldsMaterial();
entity.id = SnowflakeIdHelper.NextId();
entity.mold_id = ToolMoldInput.mold;
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<ToolMoldsMaterial>(entity).ExecuteCommandAsync();
ToolMoldsMaterial entity = new()
{
id = SnowflakeIdHelper.NextId(),
mold_id = ToolMoldInput.mold,
material_id = ToolMoldInput.materialid,
real_cavity_qty = ToolMoldInput.real_cavity_qty,
create_time = DateTime.Now,
create_id = _userManager.UserId
};
_ = await _repository.AsSugarClient().Insertable<ToolMoldsMaterial>(entity).ExecuteCommandAsync();
}
else {
ToolMoldsProduct.real_cavity_qty= ToolMoldInput.real_cavity_qty;
await _repository.AsSugarClient().Updateable<ToolMoldsMaterial>(ToolMoldsProduct).ExecuteCommandAsync();
else
{
ToolMoldsProduct.real_cavity_qty = ToolMoldInput.real_cavity_qty;
_ = await _repository.AsSugarClient().Updateable<ToolMoldsMaterial>(ToolMoldsProduct).ExecuteCommandAsync();
}
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "保存成功" : result.ErrorMessage;
return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "保存成功" : result.ErrorMessage);
}
/// <summary>
/// 批量删除模具物料绑定
/// </summary>
/// <param name="mold"></param>
/// <param name="productids"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> DetachMoldData(ToolMoldInput ToolMoldInput)
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
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();
List<ToolMoldsMaterial> 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;
return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "操作成功" : result.ErrorMessage);
}
/// <summary>
/// 物料同组
/// </summary>
/// <param name="mold"></param>
/// <param name="productids"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> SaveMaterialGroup(ToolMoldInput ToolMoldInput)
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
var arr = _repository.AsSugarClient().Queryable<ToolMoldsMaterial>().Where(x => x.mold_id == ToolMoldInput.mold && ToolMoldInput.materialids.Contains(x.material_id)).ToList();
var sign = SnowflakeIdHelper.NextId();
List<ToolMoldsMaterial> arr = _repository.AsSugarClient().Queryable<ToolMoldsMaterial>().Where(x => x.mold_id == ToolMoldInput.mold && ToolMoldInput.materialids.Contains(x.material_id)).ToList();
string sign = SnowflakeIdHelper.NextId();
arr.ForEach(p => { p.material_group = sign; });
await _repository.AsSugarClient().Updateable<ToolMoldsMaterial>(arr).ExecuteCommandAsync();
_ = await _repository.AsSugarClient().Updateable<ToolMoldsMaterial>(arr).ExecuteCommandAsync();
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "操作成功" : result.ErrorMessage;
return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "操作成功" : result.ErrorMessage);
}
/// <summary>
/// 取消物料同组
/// </summary>
/// <param name="mold"></param>
/// <param name="productids"></param>
/// <returns></returns>
public async Task<dynamic> CancelMaterialGroup(ToolMoldInput ToolMoldInput)
public async Task<dynamic> CancelMaterialGroup(ToolMoldInput ToolMoldInput)
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
var arr = _repository.AsSugarClient().Queryable<ToolMoldsMaterial>().Where(x => x.mold_id == ToolMoldInput.mold && ToolMoldInput.materialids.Contains(x.material_id)).ToList();
List<ToolMoldsMaterial> 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();
_ = await _repository.AsSugarClient().Updateable<ToolMoldsMaterial>(arr).ExecuteCommandAsync();
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "操作成功" : result.ErrorMessage;
return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "操作成功" : result.ErrorMessage);
}
/// <summary>
/// 根据物料id获取模具集合
/// </summary>
/// <param name="productid"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<MoldListOutput>> GetMoldLists(ToolMoldInput ToolMoldInput)
{
var db = _repository.AsSugarClient();
var list = await db.Queryable<ToolMolds, ToolMoldsMaterial>((a, b) => new object[]
ISqlSugarClient db = _repository.AsSugarClient();
List<MoldListOutput> list = await db.Queryable<ToolMolds, ToolMoldsMaterial>((a, b) => new object[]
{
JoinType.Inner, a.id == b.mold_id,
})
@@ -173,19 +154,17 @@ namespace Tnb.EquipMgr
/// <summary>
/// 批量删除物料模具绑定
/// </summary>
/// <param name="molds"></param>
/// <param name="productid"></param>
/// <param name="ToolMoldInput"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> DetachMaterialData(ToolMoldInput ToolMoldInput)
{
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
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();
List<ToolMoldsMaterial> 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;
return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "操作成功" : result.ErrorMessage);
}
}
}