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-04-21 16:54:16 +08:00
parent e915a1949c
commit a1bf240ff2
17 changed files with 750 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/WorkOrder/WorkOrderIssueCrInput.cs → ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/MoCrInput.cs
View File

@@ -9,7 +9,7 @@ namespace Tnb.ProductionPlanMgr.Entitys.Dto.WorkOrder
/// <summary>
/// 生产工单下发输入参数
/// </summary>
public class WorkOrderIssueCrInput
public class MoCrInput
{
/// <summary>
/// 生产工单Id列表

20
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/MoldListOutput.cs Normal file
View File

@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tnb.ProductionMgr.Entitys.Entity;
namespace Tnb.ProductionMgr.Entitys.Dto.WorkOrder
{
/// <summary>
/// 模具列表输出参数
/// </summary>
public class MoldListOutput : Molds
{
/// <summary>
/// 产品 名称
/// </summary>
public string item_name { get; set; }
}
}

19
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/PrdTaskReleaseUpInput.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entitys.Dto.PrdManage
{
/// <summary>
/// 生产任务单下发输入参数
/// </summary>
public class PrdTaskReleaseUpInput
{
/// <summary>
/// 生产任务ID列表
/// </summary>
public List<string> TaskIds { get; set; }
}
}

211
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/ProductionSchedulingCrInput.cs Normal file
View File

@@ -0,0 +1,211 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entitys.Dto.WorkOrder
{
/// <summary>
/// 生产工单排产输入参数
/// </summary>
public class ProductionSchedulingCrInput
{
/// <summary>
/// Desc:工单类型 1、注塑/挤出工单 2、组装/包装工单
/// Default:
/// Nullable:True
/// </summary>
public int? mo_type { get; set; }
/// <summary>
/// Desc:计划开始时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? plan_start_date { get; set; }
/// <summary>
/// Desc:计划结束时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? plan_end_date { get; set; }
/// <summary>
/// Desc:预计开始时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? estimated_start_date { get; set; }
/// <summary>
/// Desc:预计结束时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? estimated_end_date { get; set; }
/// <summary>
/// Desc:实际开工时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? start_date { get; set; }
/// <summary>
/// Desc:实际完工时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? end_date { 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:
/// Nullable:True
/// </summary>
public string status { get; set; }
/// <summary>
/// Desc:工单Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mo_id { get; set; }
/// <summary>
/// Desc:工单代码
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mo_code { get; set; }
/// <summary>
/// Desc:模具Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mold_id { get; set; }
/// <summary>
/// Desc:模具名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mold_name { get; set; }
/// <summary>
/// Desc:设备Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string eqp_id { get; set; }
/// <summary>
/// Desc:设备名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string eqp_name { get; set; }
/// <summary>
/// Desc:产线编号
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string line_id { get; set; }
/// <summary>
/// Desc:产线名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string line_name { get; set; }
/// <summary>
/// Desc:产品Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string item_id { get; set; }
/// <summary>
/// Desc:产品名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string item_name { 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 workshop { get; set; }
/// <summary>
/// Desc:模穴数
/// Default:
/// Nullable:True
/// </summary>
public int? mold_cavity_num { get; set; }
/// <summary>
/// Desc:计划生产数量
/// Default:
/// Nullable:True
/// </summary>
public int? plan_num { get; set; }
/// <summary>
/// Desc:吨位
/// Default:
/// Nullable:True
/// </summary>
public decimal? tonnage { get; set; }
/// <summary>
/// 已排产数量
/// </summary>
public int scheduled_num { get; set; }
}
}

68
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/WorkOrder/ProductionSchedulingCrInput.cs
View File

@@ -1,68 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.ProductionMgr.Entitys.Dto.WorkOrder
{
/// <summary>
/// 生产工单排产输入参数
/// </summary>
public class ProductionSchedulingCrInput
{
/// <summary>
/// 生产任务主键Id
/// </summary>
public string? Id { get; set; }
/// <summary>
/// 工单类型 1、注塑/挤出 2、组装/包装
/// </summary>
public int MoType { get; set; }
/// <summary>
/// 工单Id
/// </summary>
public int MoId { get; set; }
/// <summary>
/// 产品编号
/// </summary>
public string ItemId { get; set; }
/// <summary>
/// 产品名称
/// </summary>
public string ItemName { get; set; }
#region 注塑工单
/// <summary>
/// 模具Id
/// </summary>
public string MoldId { get; set; }
/// <summary>
/// 模具名称
/// </summary>
public string MoldName { get; set; }
/// <summary>
/// 设备Id
/// </summary>
public string EqpId { get; set; }
/// <summary>
/// 设备名称
/// </summary>
public string EqpName { get; set; }
#endregion
#region 组装包装工单
/// <summary>
/// 产线编号
/// </summary>
public string LineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
public string LineName { get; set; }
#endregion
}
}

181
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/Molds.cs Normal file
View File

@@ -0,0 +1,181 @@
using System;
using System.Linq;
using System.Text;
using SqlSugar;
namespace Tnb.ProductionMgr.Entitys.Entity
{
///<summary>
///模具信息表
///</summary>
[SugarTable("tool_molds")]
public partial class Molds
{
public Molds(){
}
/// <summary>
/// Desc:主键
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey=true)]
public string id {get;set;}
/// <summary>
/// Desc:生产模数
/// Default:
/// Nullable:True
/// </summary>
public int? production_modulus {get;set;}
/// <summary>
/// Desc:保养模次
/// Default:
/// Nullable:True
/// </summary>
public int? maintain_num {get;set;}
/// <summary>
/// Desc:日定额
/// Default:
/// Nullable:True
/// </summary>
public decimal? daily_rate {get;set;}
/// <summary>
/// Desc:工时定额（H/PCS）
/// Default:
/// Nullable:True
/// </summary>
public decimal? hour_norm {get;set;}
/// <summary>
/// Desc:成长周期
/// Default:
/// Nullable:True
/// </summary>
public int? growth_cycle {get;set;}
/// <summary>
/// Desc:型腔数
/// Default:
/// Nullable:True
/// </summary>
public int? cavity_num {get;set;}
/// <summary>
/// Desc:模具寿命
/// Default:
/// Nullable:True
/// </summary>
public int? mold_life {get;set;}
/// <summary>
/// Desc:备注
/// Default:
/// Nullable:True
/// </summary>
public string remark {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 mold_code {get;set;}
/// <summary>
/// Desc:模具名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mold_name {get;set;}
/// <summary>
/// Desc:产品Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string item_id {get;set;}
/// <summary>
/// Desc:设备Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string eqp_id {get;set;}
/// <summary>
/// Desc:设备代码
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string eqp_code {get;set;}
/// <summary>
/// Desc:磨具使用状态
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mold_status {get;set;}
/// <summary>
/// Desc:模具剩余寿命
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mold_remaining_life {get;set;}
/// <summary>
/// Desc:库房编号
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string warehosue_id {get;set;}
/// <summary>
/// Desc:库位编号
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string location_id {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;}
}
}

5
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdMoEntity.cs
View File

@@ -30,6 +30,11 @@ namespace Tnb.ProductionMgr.Entitys.Entity
[SugarColumn(ColumnName = "mo_code")]
public string MoCode { get; set; }
/// <summary>
/// 产品Id
/// </summary>
[SugarColumn(ColumnName = "item_id")]
public string ItemId { get; set; }
/// <summary>
/// 产品代码， BAS_MATERIA.MATERIALCODE BAS_ITEM.ITEMCODE
///</summary>
[SugarColumn(ColumnName = "item_code")]

344
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/PrdTask.cs
View File

@@ -11,193 +11,211 @@ namespace Tnb.ProductionMgr.Entitys.Entity
[SugarTable("prd_task")]
public partial class PrdTask
{
public PrdTask(){
public PrdTask()
{
}
/// <summary>
/// Desc:主键
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey=true,ColumnName="id")]
public string Id {get;set;}
}
/// <summary>
/// Desc:主键
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public string id { get; set; }
/// <summary>
/// Desc:工单类型 1、注塑/挤出工单 2、组装/包装工单
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="mo_type")]
public int? MoType {get;set;}
/// <summary>
/// Desc:工单类型 1、注塑/挤出工单 2、组装/包装工单
/// Default:
/// Nullable:True
/// </summary>
public int? mo_type { get; set; }
/// <summary>
/// Desc:计划开始时间
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="plan_start_date")]
public DateTime? PlanStartDate {get;set;}
/// <summary>
/// Desc:计划开始时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? plan_start_date { get; set; }
/// <summary>
/// Desc:计划结束时间
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="plan_end_date")]
public DateTime? PlanEndDate {get;set;}
/// <summary>
/// Desc:计划结束时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? plan_end_date { get; set; }
/// <summary>
/// Desc:预计开始时间
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="estimated_start_date")]
public DateTime? EstimatedStartDate {get;set;}
/// <summary>
/// Desc:预计开始时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? estimated_start_date { get; set; }
/// <summary>
/// Desc:预计结束时间
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="estimated_end_date")]
public DateTime? EstimatedEndDate {get;set;}
/// <summary>
/// Desc:预计结束时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? estimated_end_date { get; set; }
/// <summary>
/// Desc:实际开工时间
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="start_date")]
public DateTime? StartDate {get;set;}
/// <summary>
/// Desc:实际开工时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? start_date { get; set; }
/// <summary>
/// Desc:实际完工时间
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="end_date")]
public DateTime? EndDate {get;set;}
/// <summary>
/// Desc:实际完工时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? end_date { get; set; }
/// <summary>
/// Desc:创建时间
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="create_time")]
public DateTime? CreateTime {get;set;}
/// <summary>
/// Desc:创建时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// Desc:修改时间
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="modify_time")]
public DateTime? ModifyTime {get;set;}
/// <summary>
/// Desc:修改时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? modify_time { get; set; }
/// <summary>
/// Desc:扩展字段
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="extras")]
public string Extras {get;set;}
/// <summary>
/// Desc:扩展字段
/// Default:
/// Nullable:True
/// </summary>
public string extras { get; set; }
/// <summary>
/// Desc:工单Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="mo_id")]
public string MoId {get;set;}
/// <summary>
/// Desc:生产任务单状态
/// Default:
/// Nullable:True
/// </summary>
public string status { get; set; }
/// <summary>
/// Desc:工单代码
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="mo_code")]
public string MoCode {get;set;}
/// <summary>
/// Desc:工单Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mo_id { get; set; }
/// <summary>
/// Desc:模具Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="mold_id")]
public string MoldId {get;set;}
/// <summary>
/// Desc:工单代码
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mo_code { get; set; }
/// <summary>
/// Desc:模具名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="mold_name")]
public string MoldName {get;set;}
/// <summary>
/// Desc:模具Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mold_id { get; set; }
/// <summary>
/// Desc:设备Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="eqp_id")]
public string EqpId {get;set;}
/// <summary>
/// Desc:模具名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string mold_name { get; set; }
/// <summary>
/// Desc:设备名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="eqp_name")]
public string EqpName {get;set;}
/// <summary>
/// Desc:设备Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string eqp_id { get; set; }
/// <summary>
/// Desc:产线编号
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="line_id")]
public string LineId {get;set;}
/// <summary>
/// Desc:设备名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string eqp_name { get; set; }
/// <summary>
/// Desc:产线名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="line_name")]
public string LineName {get;set;}
/// <summary>
/// Desc:产线编号
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string line_id { get; set; }
/// <summary>
/// Desc:产品Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="item_id")]
public string ItemId {get;set;}
/// <summary>
/// Desc:产线名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string line_name { get; set; }
/// <summary>
/// Desc:产品名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="item_name")]
public string ItemName {get;set;}
/// <summary>
/// Desc:产品Id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string item_id { get; set; }
/// <summary>
/// Desc:创建用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="create_id")]
public string CreateId {get;set;}
/// <summary>
/// Desc:产品名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string item_name { get; set; }
/// <summary>
/// Desc:修改用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName="modify_id")]
public string ModifyId {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 workshop { get; set; }
/// <summary>
/// Desc:模穴数
/// Default:
/// Nullable:True
/// </summary>
public int? mold_cavity_num { get; set; }
/// <summary>
/// Desc:计划生产数量
/// Default:
/// Nullable:True
/// </summary>
public int? plan_num { get; set; }
/// <summary>
/// Desc:吨位
/// Default:
/// Nullable:True
/// </summary>
public decimal? tonnage { get; set; }
/// <summary>
/// 已排产数量
/// </summary>
public int scheduled_num { get; set; }
}
}

2
ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoService.cs
View File

@@ -7,6 +7,6 @@ namespace Tnb.ProductionPlanMgr.Interfaces
/// </summary>
public interface IPrdMoService
{
Task<dynamic> WorkOrderIssue(WorkOrderIssueCrInput input);
Task<dynamic> WorkOrderIssue(MoCrInput input);
}
}

96
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -1,5 +1,7 @@
using JNPF.Common.Core.Manager;
using System.Dynamic;
using JNPF.Common.Core.Manager;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
@@ -9,6 +11,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using NPOI.OpenXmlFormats.Shared;
using SqlSugar;
using Tnb.ProductionMgr.Entitys.Dto.PrdManage;
using Tnb.ProductionMgr.Entitys.Dto.WorkOrder;
using Tnb.ProductionMgr.Entitys.Entity;
using Tnb.ProductionPlanMgr.Entitys.Dto.WorkOrder;
@@ -25,10 +28,12 @@ namespace Tnb.ProductionPlanMgr
{
private readonly ISqlSugarRepository<PrdMoEntity> _repository;
private readonly IDataBaseManager _dataBaseManager;
public PrdMoService(ISqlSugarRepository<PrdMoEntity> repository, IDataBaseManager dataBaseManager)
private readonly IUserManager _userManager;
public PrdMoService(ISqlSugarRepository<PrdMoEntity> repository, IDataBaseManager dataBaseManager,IUserManager userManager)
{
_repository = repository;
_dataBaseManager = dataBaseManager;
_userManager = userManager;
}
/// <summary>
/// 生产工单创建-生产工单下发
@@ -36,7 +41,7 @@ namespace Tnb.ProductionPlanMgr
/// <param name="input">生产工单下发输入参数</param>
/// <returns></returns>
[HttpPut("workorder-issue")]
public async Task<dynamic> WorkOrderIssue(WorkOrderIssueCrInput input)
public async Task<dynamic> WorkOrderIssue(MoCrInput input)
{
if (input is null)
{
@@ -52,26 +57,97 @@ namespace Tnb.ProductionPlanMgr
/// <summary>
/// 生产工单-生产排产
/// </summary>
/// <param name="input"></param>
/// <param name="input">
///<br/>{
///<br/> Id:生产任务主键Id
///<br/> MoType:工单类型 1、注塑/挤出 2、组装/包装
///<br/> MoId:工单Id
///<br/> ItemId:产品编号
///<br/> ItemName:产品名称
///<br/> MoldId:模具Id
///<br/> MoldName:模具名称
///<br/> EqpId:设备Id
///<br/> EqpName:设备名称
///<br/> LineId:产线编号
///<br/> LineName:产线名称
///<br/>}
/// </param>
/// <returns></returns>
[HttpPost("scheduling")]
public async Task<dynamic> ProductionScheduling(ProductionSchedulingCrInput input)
{
var entity = input.Adapt<PrdTask>();
entity.Id = input.Id ?? SnowflakeIdHelper.NextId();
entity.id ??= SnowflakeIdHelper.NextId();
entity.status = "ToBeScheduled"; //任务单状态默认，待排产
entity.create_id = _userManager.UserId;
entity.create_time = DateTime.Now;
var db = await GetDbContext();
var row = await db.Storageable(entity).ExecuteCommandAsync();
if (row > 0)
{
//修改工单状态为已排产，同事修改已排产数量
row = await db.Updateable<PrdMoEntity>().SetColumns(it => new PrdMoEntity
{
MoStatus = "25019252113685",
InputQty = entity.scheduled_num
})
.Where(it => it.Id == entity.mo_id).ExecuteCommandAsync();
}
return row > 0;
}
/// <summary>
/// 生产任务下发
/// </summary>
/// <returns></returns>
[HttpPost("task-release")]
public async Task<dynamic> PrdTaskRelease(PrdTaskReleaseUpInput input)
{
if (input is null)
{
throw new ArgumentNullException(nameof(input));
}
var db = await GetDbContext();
var row = await db.Updateable<PrdTask>()
.SetColumns(it => new PrdTask { status = "ToBeStarted" })
.Where(it => input.TaskIds.Contains(it.id))
.ExecuteCommandAsync();
return (row > 0);
}
private async Task<ISqlSugarClient> GetDbContext()
/// <summary>
/// 根据产品ID获取模具列表
/// </summary>
/// <param name="itemId">产品ID</param>
/// <returns></returns>
[HttpGet("moldlist/{itemId}")]
public async Task<dynamic> GetMoldListByItemId(string itemId)
{
var link = await _repository.AsSugarClient().Queryable<DbLinkEntity>().FirstAsync(x => x.FullName == "tnb_mes");
var db = await GetDbContext("tnb_mom");
List<dynamic> items = await db.Queryable<object>().AS("bas_item").Select(new List<SelectModel>()
{
new SelectModel{ FiledName="id" },
new SelectModel{ FiledName="item_name" },
}).ToListAsync();
var itemDic = items.ToDictionary(x => x.id, x => x.item_name);
db = await GetDbContext("tnb_eqp");
var moldList = await db.Queryable<Molds>().Where(it => it.item_id == itemId).ToListAsync();
var list = moldList.Adapt<List<MoldListOutput>>();
db.ThenMapper(list, x => x.item_name = itemDic.ContainsKey(x.item_id) ? itemDic[x.item_id] : "");
return list;
}
private async Task<ISqlSugarClient> GetDbContext(string dbName = "tnb_mes")
{
var link = await _repository.AsSugarClient().Queryable<DbLinkEntity>().FirstAsync(x => x.FullName == dbName);
var db = _dataBaseManager.ChangeDataBase(link);
return db;
}
}
}

6
common/Tnb.Common.Core/Manager/DataBase/DataBaseManager.cs
View File

@@ -49,8 +49,8 @@ public class DataBaseManager : IDataBaseManager, ITransient
IUserManager userManager,
ISqlSugarClient context)
{
_sqlSugarClient = (SqlSugarScope)context;
_userManager = userManager;
_sqlSugarClient = ((SqlSugarScope)context);
_userManager = userManager;
_connectionStrings = connectionOptions.Value;
}
@@ -419,7 +419,7 @@ WHERE pcolumn.table_name='{0}' ORDER BY ordinal_position";
{
if (link != null && _sqlSugarClient.CurrentConnectionConfig.ConfigId != link.Id) _sqlSugarClient = ChangeDataBase(link);
return _sqlSugarClient.DbMaintenance.GetPrimaries(tableName);
return _sqlSugarClient.CopyNew().DbMaintenance.GetPrimaries(tableName);
}
/// <summary>

5
system/Tnb.Systems.Entitys/Dto/Permission/Department/DepartmentCrInput.cs
View File

@@ -46,4 +46,9 @@ public class DepartmentCrInput
/// 组织类型
/// </summary>
public string category { get; set; }
/// <summary>
/// 组织类型名称
/// added by ly on 20230421
/// </summary>
public string typeName { get; set; }
}

4
system/Tnb.Systems.Entitys/Dto/Permission/Department/DepartmentInfoOutput.cs
View File

@@ -57,4 +57,8 @@ public class DepartmentInfoOutput
/// added by ly on 20230420
/// </summary>
public string category { get; set; }
/// <summary>
/// 组织类型名称
/// </summary>
public string categoryName { get; set; }
}

5
system/Tnb.Systems.Entitys/Dto/Permission/Organize/OrganizeListOutput.cs
View File

@@ -73,4 +73,9 @@ public class OrganizeListOutput : TreeModel
/// 集团名 (组织树最后一个).
/// </summary>
public string lastFullName { get; set; }
/// <summary>
/// 组织类型名称
/// added by ly on 20230421
/// </summary>
public string categoryName { get; set; }
}

6
system/Tnb.Systems/Permission/DepartmentService.cs
View File

@@ -9,6 +9,7 @@ using JNPF.Systems.Entitys.Dto.Department;
using JNPF.Systems.Entitys.Dto.Organize;
using JNPF.Systems.Entitys.Dto.SysConfig;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.Permission;
using JNPF.Systems.Interfaces.System;
using Mapster;
@@ -212,6 +213,9 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra
var res = entity.Adapt<DepartmentInfoOutput>();
if (entity.ParentId.Equals("-1")) res.organizeIdTree = new List<string>() { res.id };
else res.organizeIdTree = (await _repository.GetSingleAsync(p => p.Id == entity.ParentId)).OrganizeIdTree.Split(",").ToList();
//modified by ly on 20230421
var dic = await _repository.AsSugarClient().Queryable<DictionaryDataEntity>().Where(it => it.DictionaryTypeId == "24754619407381").ToDictionaryAsync(x => x.EnCode, x => x.FullName);
res.categoryName = dic.ContainsKey(res.category) ? dic[res.category].ToString() : "";
return res;
}
@@ -578,7 +582,7 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra
/// <returns></returns>
public async Task<List<OrganizeEntity>> GetCompanyAllDep(string id)
{
return await _repository.GetListAsync(x => x.OrganizeIdTree.Contains(id) && x.Category == "department" && x.EnabledMark == 1 && x.DeleteMark == null);
return await _repository.GetListAsync(x => x.OrganizeIdTree.Contains(id) && x.Category == "department" && x.EnabledMark == 1 && x.DeleteMark == null);
}
#endregion
}

37
system/Tnb.Systems/Permission/OrganizeService.cs
View File

@@ -12,6 +12,7 @@ using JNPF.LinqBuilder;
using JNPF.Systems.Entitys.Dto.Organize;
using JNPF.Systems.Entitys.Dto.SysConfig;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.Permission;
using JNPF.Systems.Interfaces.System;
using Mapster;
@@ -88,6 +89,8 @@ public class OrganizeService : IOrganizeService, IDynamicApiController, ITransie
// 获取分级管理组织
var dataScope = _userManager.DataScope.Where(x => x.Select).Select(x => x.organizeId).Distinct().ToList();
//modified by ly on 20230421 查询区域类型数据字典
var dic = await _repository.AsSugarClient().Queryable<DictionaryDataEntity>().Where(it => it.DictionaryTypeId == "24754619407381").ToDictionaryAsync(x => x.EnCode, x => x.FullName);
List<OrganizeListOutput>? data = await _repository.AsQueryable().Where(t => t.DeleteMark == null)
.WhereIF(!_userManager.IsAdministrator, a => dataScope.Contains(a.Id))
@@ -105,7 +108,9 @@ public class OrganizeService : IOrganizeService, IDynamicApiController, ITransie
sortCode = x.SortCode,
icon = SqlFunc.IIF(x.Category.Equals("company"), "icon-ym icon-ym-tree-organization3", "icon-ym icon-ym-tree-department1"),
type = x.Category
}).ToListAsync();
})
.Mapper(x => x.categoryName = dic.ContainsKey(x.category) ? dic[x.category].ToString() : "")
.ToListAsync();
if (!string.IsNullOrEmpty(input.keyword))
data = data.TreeWhere(t => t.fullName.Contains(input.keyword) || t.enCode.Contains(input.keyword), t => t.id, t => t.parentId);
@@ -290,19 +295,19 @@ public class OrganizeService : IOrganizeService, IDynamicApiController, ITransie
queryWhere = queryWhere.And(x => x.DeleteMark == null);
List<OrganizeListOutput>? data = await _repository.AsQueryable().Where(queryWhere)
.WhereIF(input.keyword.IsNotEmptyOrNull(), a => a.FullName.Contains(input.keyword) || a.EnCode.Contains(input.keyword)).Select(a => new OrganizeListOutput
{
id = a.Id,
organizeIdTree = a.OrganizeIdTree,
type = a.Category,
parentId = a.ParentId,
lastFullName = a.FullName,
fullName = a.FullName,
enabledMark = a.EnabledMark,
creatorTime = a.CreatorTime,
icon = a.Category.Equals("company") ? "icon-ym icon-ym-tree-organization3" : "icon-ym icon-ym-tree-department1",
sortCode = a.SortCode,
isLeaf = true
}).ToListAsync();
{
id = a.Id,
organizeIdTree = a.OrganizeIdTree,
type = a.Category,
parentId = a.ParentId,
lastFullName = a.FullName,
fullName = a.FullName,
enabledMark = a.EnabledMark,
creatorTime = a.CreatorTime,
icon = a.Category.Equals("company") ? "icon-ym icon-ym-tree-organization3" : "icon-ym icon-ym-tree-department1",
sortCode = a.SortCode,
isLeaf = true
}).ToListAsync();
// 获取所有组织
List<OrganizeEntity>? allOrgList = GetOrgListTreeName();
@@ -393,7 +398,7 @@ public class OrganizeService : IOrganizeService, IDynamicApiController, ITransie
});
});
if(adminlist.Any()) await _repository.AsSugarClient().Insertable(adminlist).CallEntityMethod(m => m.Create()).ExecuteReturnEntityAsync();
if (adminlist.Any()) await _repository.AsSugarClient().Insertable(adminlist).CallEntityMethod(m => m.Create()).ExecuteReturnEntityAsync();
#endregion
#region 第三方同步
@@ -629,7 +634,7 @@ public class OrganizeService : IOrganizeService, IDynamicApiController, ITransie
[NonAction]
public async Task<List<OrganizeEntity>> GetListAsync(Expression<Func<OrganizeEntity, bool>> expression = null)
{
var query = _repository.AsQueryable().Where(t => t.EnabledMark == 1 && t.DeleteMark == null).WhereIF(expression!=null, expression);
var query = _repository.AsQueryable().Where(t => t.EnabledMark == 1 && t.DeleteMark == null).WhereIF(expression != null, expression);
return await query.OrderBy(o => o.SortCode).OrderBy(a => a.CreatorTime, OrderByType.Desc).ToListAsync();
}

4
system/Tnb.Systems/System/DataBaseService.cs
View File

@@ -417,8 +417,8 @@ public class DataBaseService : IDynamicApiController, ITransient
sugarClient.MappingTables.Add(entityName, item.Name);
foreach (var col in sugarClient.DbMaintenance.GetColumnInfosByTableName(item.Name))
{
var colName = CustomFormatName(col.DbColumnName);
sugarClient.MappingColumns.Add(colName /*类的属性首字母大写*/, col.DbColumnName, entityName);
//var colName = CustomFormatName(col.DbColumnName);
sugarClient.MappingColumns.Add(col.DbColumnName /*类的属性首字母大写*/, col.DbColumnName, entityName);
}
}
sugarClient.DbFirst.Where(input.TableName)