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:
DEVICE8\12494
2023-06-02 17:39:17 +08:00
parent aed23fac08
commit 863d9cf470
8 changed files with 254 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs
View File

@@ -135,7 +135,6 @@ namespace Tnb.EquipMgr
item_name = e.name,
})
.ToListAsync();
//items.ForEach(it => it.status = 0);
var checkItems = await _db.Queryable<ToolMoldMaintainItemRecord>().Where(it => it.plan_id == input.plan_id && it.mold_id == input.mold_id).Select(it => new
{
plan_id = it.plan_id,
@@ -143,16 +142,15 @@ namespace Tnb.EquipMgr
item_group_id = it.item_group_id,
mold_id = it.mold_id,
}).ToListAsync();
var dicCheckItems = checkItems.GroupBy(g => $"{g.plan_id}{g.mold_id}{g.item_group_id}{g.item_id}").ToDictionary(x => x.Key, x => x.FirstOrDefault());
if (items?.Count > 0 && checkItems?.Count > 0)
{
foreach (var item in items)
{
foreach (var checkItem in checkItems)
var key = $"{item.plan_id}{item.mold_id}{item.item_group_id}{item.item_id}";
if (dicCheckItems.ContainsKey(key) && dicCheckItems[key] != null)
{
if (item.plan_id == checkItem.plan_id && item.mold_id == checkItem.mold_id && item.item_group_id == checkItem.item_group_id && item.item_id == checkItem.item_id)
{
item.status = 1;
}
item.status = 1;
}
}
}
@@ -269,33 +267,49 @@ namespace Tnb.EquipMgr
[HttpPost]
public async Task MaintainFinish(MoldMaintainRunUpInput input)
{
if (input == null) throw new ArgumentNullException("input");
var grpIds = await _db.Queryable<ToolMoldMaintainGroupRelation>()
.LeftJoin<ToolMolds>((a, b) => a.mold_id == b.id)
.Where(a => a.mold_id == input.mold_id)
.Select((a, b) => a.item_group_id)
.Distinct()
.ToListAsync();
var itemIds = await _db.Queryable<ToolMoldMaintainGroupItem>().Where(it => grpIds.Contains(it.item_group_id)).Select(it => it.item_id).ToListAsync();
if (itemIds?.Count > 0)
var items = await _db.Queryable<ToolMoldMaintainPlanRelation>()
.InnerJoin<ToolMoldMaintainGroupRelation>((a, b) => a.mold_id == b.mold_id)
.InnerJoin<ToolMoldMaintainGroupItem>((a, b, c) => b.item_group_id == c.item_group_id)
.InnerJoin<ToolMoldMaintainGroup>((a, b, c, d) => c.item_group_id == d.id)
.InnerJoin<ToolMoldMaintainItem>((a, b, c, d, e) => c.item_id == e.id)
.Where((a) => a.maintain_plan_id == input.plan_id && a.mold_id == input.mold_id)
.Select((a, b, c, d, e) => new CheckItemOutput
{
plan_id = a.maintain_plan_id,
mold_id = a.mold_id,
item_group_id = d.id,
item_group_name = d.name,
item_id = e.id,
item_name = e.name,
})
.ToListAsync();
var checkItems = await _db.Queryable<ToolMoldMaintainItemRecord>().Where(it => it.plan_id == input.plan_id && it.mold_id == input.mold_id).Select(it => new
{
var items = await _db.Queryable<ToolMoldMaintainItemRecord>().Where(it => it.mold_id == input.mold_id && it.status == 1).ToListAsync();
if (items?.Count < itemIds.Count)
plan_id = it.plan_id,
item_id = it.item_id,
item_group_id = it.item_group_id,
mold_id = it.mold_id,
}).ToListAsync();
var dicCheckItems = checkItems.GroupBy(g => $"{g.plan_id}{g.mold_id}{g.item_group_id}{g.item_id}").ToDictionary(x => x.Key, x => x.FirstOrDefault());
var maintainedItems = items.Where(it => dicCheckItems.ContainsKey($"{it.plan_id}{it.mold_id}{it.item_group_id}{it.item_id}") && dicCheckItems[$"{it.plan_id}{it.mold_id}{it.item_group_id}{it.item_id}"] != null).ToList();
if ((items?.Count > 0 && maintainedItems?.Count > 0 )|| (maintainedItems == null || maintainedItems.Count < 1))
{
if (maintainedItems.Count < items.Count || (maintainedItems == null || maintainedItems.Count < 1))
{
throw new AppFriendlyException("当前模具有未完成的保养项目", 500);
}
var row = await _db.Updateable<ToolMolds>().SetColumns(it => new ToolMolds { mold_status = MoldUseStatus.MOLD_USE_STATUS_ZK_ID }).Where(it => it.id == input.mold_id).ExecuteCommandAsync();
if (row < 1) throw Oops.Oh(ErrorCode.COM1001);
var allMoldStatus = await _db.Queryable<ToolMoldMaintainPlanRelation>().InnerJoin<ToolMolds>((a, b) => a.mold_id == b.id)
.Where((a, b) => a.maintain_plan_id == input.plan_id)
.Select((a, b) => b.mold_status)
.ToListAsync();
if (allMoldStatus?.Count > 0 && allMoldStatus.All(x => x == MoldUseStatus.MOLD_USE_STATUS_ZK_ID))
{
row = await _db.Updateable<ToolMoldMaintainPlan>().SetColumns(it => new ToolMoldMaintainPlan { status = MoldPlanMaintainStatus.MOLDPLAN_MAINTAIN_STATUS_COMPLETED_CODE }).Where(it => it.id == input.plan_id).ExecuteCommandAsync();
}
if (row < 1) throw Oops.Oh(ErrorCode.COM1001);
}
var row = await _db.Updateable<ToolMolds>().SetColumns(it => new ToolMolds { mold_status = MoldUseStatus.MOLD_USE_STATUS_ZK_ID }).Where(it => it.id == input.mold_id).ExecuteCommandAsync();
var allMoldStatus = await _db.Queryable<ToolMoldMaintainPlanRelation>().InnerJoin<ToolMolds>((a, b) => a.mold_id == b.id)
.Where((a, b) => a.maintain_plan_id == input.plan_id)
.Select((a, b) => b.mold_status)
.ToListAsync();
if (allMoldStatus?.Count > 0 && allMoldStatus.All(x => x == MoldUseStatus.MOLD_USE_STATUS_ZK_ID))
{
row = await _db.Updateable<ToolMoldMaintainPlan>().SetColumns(it => new ToolMoldMaintainPlan { status = MoldPlanMaintainStatus.MOLDPLAN_MAINTAIN_STATUS_COMPLETED_CODE }).Where(it => it.id == input.plan_id).ExecuteCommandAsync();
}
if (row < 1) throw Oops.Oh(ErrorCode.COM1001);
}
}

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/CarryCodeDetailOutput.cs
View File

@@ -11,6 +11,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// </summary>
public class CarryCodeDetailOutput
{
/// <summary>
/// 物料单位
/// </summary>
public string unit_id { get; set; }
/// <summary>
/// 条码编号
/// </summary>

15
WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IBasRegionUserService.cs Normal file
View File

@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Interfaces
{
/// <summary>
/// 区域人员设定服务接口
/// </summary>
public interface IBasRegionUserService
{
}
}

15
WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsCarryLedgerService.cs Normal file
View File

@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Interfaces
{
/// <summary>
/// 载具台账服务接口
/// </summary>
public interface IWmsCarryLedgerService
{
}
}

62
WarehouseMgr/Tnb.WarehouseMgr/BasRegionUserService.cs Normal file
View File

@@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Aspose.Cells.Drawing;
using JNPF.Common.Dtos.VisualDev;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr
{
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModuleId)]
public class BasRegionUserService : IOverideVisualDevService, IBasRegionUserService, IDynamicApiController, ITransient
{
private const string ModuleId = "26169876750629";
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private static Dictionary<string, object> _dicRegion = new Dictionary<string, object>();
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public BasRegionUserService(ISqlSugarRepository<BasRegionUser> repository, IRunService runService, IVisualDevService visualDevService)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
OverideFuncs.CreateAsync = Create;
}
private async Task<dynamic> Create(VisualDevModelDataCrInput input)
{
if (_dicRegion.Count < 1)
{
_dicRegion = await _db.Queryable<BasRegion>().ToDictionaryAsync(x => x.id, x => x.region_name);
}
if (input.data.ContainsKey(nameof(BasRegionUser.region_id)) && input.data.ContainsKey(nameof(BasRegionUser.user_id)))
{
var regionId = input.data[nameof(BasRegionUser.region_id)].ToString();
var userId = input.data[nameof(BasRegionUser.user_id)].ToString();
var user = await _db.Queryable<BasRegionUser>().Where(it => it.region_id == regionId && it.user_id == userId).FirstAsync();
if (user != null)
{
throw new AppFriendlyException($"区域【{_dicRegion[regionId]}】,已存在用户【{user.user_name}】", 500);
}
}
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
await _runService.Create(templateEntity, input);
return await Task.FromResult(true);
}
}
}

106
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs Normal file
View File

@@ -0,0 +1,106 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Core.Manager;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Interfaces;
using SqlSugar;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.WarehouseMgr.Interfaces;
using JNPF.Common.Extension;
using JNPF.VisualDev.Entitys;
using Aspose.Cells.Drawing;
using Microsoft.AspNetCore.Mvc;
namespace Tnb.WarehouseMgr
{
/// <summary>
/// 载具台账服务
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
//[OverideVisualDev(ModuleId)]
public class WmsCarryLedgerService : IOverideVisualDevService, IWmsCarryLedgerService, IDynamicApiController, ITransient
{
private const string ModuleId = "26038721525029";
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private static Dictionary<int, string> _dicCarryStatus = new(); //载具状态
private static Dictionary<int, string> _dicOutStatus = new(); //出库类型
private static Dictionary<int, string> _dicIsCheck = new() //是否检验
{
[0] = "未检验",
[1] = "已检验",
};
private static Dictionary<int, string> _dicIsEnabled = new()
{
[0] = "启用",
[1] = "禁用",
};
private static Dictionary<int, string> _dicIsLock = new()
{
[0] = "未锁定",
[1] = "锁定",
};
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public WmsCarryLedgerService(ISqlSugarRepository<WmsCarryH> repository, IRunService runService, IVisualDevService visualDevService)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
//OverideFuncs.GetListAsync = GetList;
}
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
if (_dicCarryStatus.Count < 1)
{
_dicCarryStatus = typeof(EnumCarryStatus).GetEnumDictionary();
}
if (_dicOutStatus.Count < 1)
{
_dicOutStatus = typeof(EnumOutStatus).GetEnumDictionary();
}
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
var data = await _runService.GetListResult(templateEntity, input);
if (data?.list?.Count > 0)
{
//foreach (var item in data.list)
//{
// if (item.ContainsKey(nameof(WmsCarryH.carry_status)) && item[nameof(WmsCarryH.carry_status)].IsNotEmptyOrNull())
// {
// item[nameof(WmsCarryH.carry_status)] = _dicCarryStatus[item[nameof(WmsCarryH.carry_status)].ParseToInt()];
// }
// if (item.ContainsKey(nameof(WmsCarryH.out_status)) && item[nameof(WmsCarryH.out_status)].IsNotEmptyOrNull())
// {
// item[nameof(WmsCarryH.out_status)] = _dicOutStatus[item[nameof(WmsCarryH.out_status)].ParseToInt()];
// }
// if (item.ContainsKey(nameof(WmsCarryH.is_lock)) && item[nameof(WmsCarryH.is_lock)].IsNotEmptyOrNull())
// {
// item[nameof(WmsCarryH.is_lock)] = _dicIsLock[item[nameof(WmsCarryH.is_lock)].ParseToInt()];
// }
// if (item.ContainsKey(nameof(WmsCarryH.is_check)) && item[nameof(WmsCarryH.is_check)].IsNotEmptyOrNull())
// {
// item[nameof(WmsCarryH.is_check)] = _dicIsCheck[item[nameof(WmsCarryH.is_check)].ParseToInt()];
// }
// if (item.ContainsKey(nameof(WmsCarryH.status)) && item[nameof(WmsCarryH.status)].IsNotEmptyOrNull())
// {
// item[nameof(WmsCarryH.status)] = _dicIsEnabled[item[nameof(WmsCarryH.status)].ParseToInt()];
// }
//}
}
return data;
}
}
}

1
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
View File

@@ -88,6 +88,7 @@ namespace Tnb.WarehouseMgr
newCarry.create_time = DateTime.Now;
var row = await _db.Updateable(newCarry).ExecuteCommandAsync();
WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt<WmsCarryReplaceH>();
wmsCarryReplaceH.id = SnowflakeIdHelper.NextId();
wmsCarryReplaceH.org_id = oldCarry.org_id;
wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE);
wmsCarryReplaceH.carry_id = oldCarry.id;

17
WarehouseMgr/Tnb.WarehouseMgr/WmsFeedingService.cs
View File

@@ -41,16 +41,17 @@ namespace Tnb.WarehouseMgr
{
dicMaterial = await _db.Queryable<BasMaterial>().ToDictionaryAsync(x => x.id, x => x.name);
}
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId)
.Select(it => new CarryCodeDetailOutput
var items = await _db.Queryable<WmsCarryCode>().Where(a => a.carry_id == carryId)
.Select(a => new CarryCodeDetailOutput
{
barcode = it.barcode,
code_batch = it.code_batch,
codeqty = it.codeqty,
material_code = it.material_code,
material_id = it.material_id,
barcode = a.barcode,
code_batch = a.code_batch,
codeqty = a.codeqty,
material_code = a.material_code,
material_id = a.material_id,
unit_id = a.unit_id,
})
.Mapper(it => it.material_name = dicMaterial.ContainsKey(it.material_id) ? dicMaterial[it.material_id].ToString() : "")
.Mapper(it => it.material_name = dicMaterial.ContainsKey(it.material_id) ? dicMaterial[it.material_id].ToString()! : "")
.ToListAsync();
return items;
}