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-05-17 14:43:46 +08:00
parent 949c5a0184
commit fd3982b375
26 changed files with 443 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomDataOutput.cs
View File

@@ -52,7 +52,7 @@ namespace Tnb.BasicData.Entities.Dto
/// <summary> /// <summary>
/// 物料均再首道工序投产 /// 物料均再首道工序投产
/// </summary> /// </summary>
public int is_first { get; set; } public int? is_first { get; set; }
/// <summary> /// <summary>
/// 备注 /// 备注

2
BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.BasicData.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public long id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

23
EquipMgr/Tnb.EquipMgr.Entities/Dto/RelevanceMoldInput.cs Normal file
View File

@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 模具规则定义，关键模具输入参数
/// </summary>
public class RelevanceMoldInput
{
/// <summary>
/// 规则Id
/// </summary>
public string? rule_id { get; set; }
/// <summary>
/// 模具Id
/// </summary>
public string? mold_id { get; set;}
}
}

140
EquipMgr/Tnb.EquipMgr.Entities/Entity/MoldMaintenance.cs
View File

@@ -8,90 +8,86 @@ namespace Tnb.EquipMgr.Entities
///<summary> ///<summary>
///模具保养 ///模具保养
///</summary> ///</summary>
[SugarTable("mold_maintenance")] [SugarTable("tool_mold_maintenance")]
public partial class MoldMaintenance public partial class MoldMaintenance
{ {
public MoldMaintenance(){ /// <summary>
/// Desc:编号
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public string id { get; set; }
/// <summary>
/// Desc:所属组织
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? org_id { get; set; }
} /// <summary>
/// <summary> /// Desc:项目
/// Desc:编号 /// Default:NULL::character varying
/// Default: /// Nullable:True
/// Nullable:False /// </summary>
/// </summary> public string? name { get; set; }
[SugarColumn(IsPrimaryKey=true)]
public string id {get;set;}
/// <summary> /// <summary>
/// Desc:所属组织 /// Desc:描述
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? org_id {get;set;} public string? descrip { get; set; }
/// <summary> /// <summary>
/// Desc:项目 /// Desc:备注
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? name {get;set;} public string? remark { get; set; }
/// <summary> /// <summary>
/// Desc:描述 /// Desc:查看照片
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? descrip {get;set;} public string? image { get; set; }
/// <summary> /// <summary>
/// Desc:备注 /// Desc:扩展
/// Default:NULL::character varying /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? remark {get;set;} public string? extras { get; set; }
/// <summary> /// <summary>
/// Desc:查看照片 /// Desc:创建用户
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? image {get;set;} public string? create_id { get; set; }
/// <summary> /// <summary>
/// Desc:扩展 /// Desc:创建时间
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? extras {get;set;} public DateTime? create_time { get; set; }
/// <summary> /// <summary>
/// Desc:创建用户 /// Desc:修改用户
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? create_id {get;set;} public string? modify_id { get; set; }
/// <summary> /// <summary>
/// Desc:创建时间 /// Desc:修改时间
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public DateTime? create_time {get;set;} public DateTime? modify_time { get; set; }
/// <summary>
/// Desc:修改用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? modify_id {get;set;}
/// <summary>
/// Desc:修改时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? modify_time {get;set;}
} }
} }

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckItem.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public long id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckPeriod.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public long id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResult.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public char id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultDetail.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public char id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolCheckResultIcon.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public long id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckItem.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public long id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckPeriod.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public long id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

25
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupItem.cs
View File

@@ -11,33 +11,22 @@ namespace Tnb.EquipMgr.Entities
///模具保养项目组与保养项关系 ///模具保养项目组与保养项关系
///</summary> ///</summary>
[SugarTable("tool_mold_maintain_group_item")] [SugarTable("tool_mold_maintain_group_item")]
public partial class ToolMoldMaintainGroupItem public partial class ToolMoldMaintainGroupItem : BaseEntity<string>
{ {
public ToolMoldMaintainGroupItem(){
}
/// <summary> /// <summary>
/// Desc:主键 /// Desc:项目组id
/// Default: /// Default:NULL::character varying
/// Nullable:False /// Nullable:True
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] public string? item_group_id { get; set; }
public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary>
/// Desc:项目组id
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string? item_group_id {get;set;}
/// <summary> /// <summary>
/// Desc:保养项id /// Desc:保养项id
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? item_id {get;set;} public string? item_id { get; set; }
} }
} }

12
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainGroupRelation.cs
View File

@@ -11,19 +11,9 @@ namespace Tnb.EquipMgr.Entities
///模具保养组与磨具关联 ///模具保养组与磨具关联
///</summary> ///</summary>
[SugarTable("tool_mold_maintain_group_relation")] [SugarTable("tool_mold_maintain_group_relation")]
public partial class ToolMoldMaintainGroupRelation public partial class ToolMoldMaintainGroupRelation :BaseEntity<string>
{ {
public ToolMoldMaintainGroupRelation(){
}
/// <summary>
/// Desc:主键
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey=true)]
public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:项目组Id /// Desc:项目组Id

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeCheckPeriod.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public long id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolToolTypeChekItem.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.EquipMgr.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public long id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

15
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldMaintainRuleService.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.EquipMgr.Interfaces
{
/// <summary>
/// 设备保养规则定义
/// </summary>
public interface IToolMoldMaintainRuleService
{
}
}

12
EquipMgr/Tnb.EquipMgr/MoldMaintainBaseService.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr
{
public class MoldMaintainBaseService
{
}
}

52
EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRuleService.cs Normal file
View File

@@ -0,0 +1,52 @@
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.Enums;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Interfaces;
namespace Tnb.EquipMgr
{
/// <summary>
/// 模具保养规则定义服务
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
public class ToolMoldMaintainRuleService : IToolMoldMaintainRuleService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<ToolMoldMaintainRule> _repository;
private readonly IUserManager _userManager;
private readonly ISqlSugarClient _db;
public ToolMoldMaintainRuleService(ISqlSugarRepository<ToolMoldMaintainRule> repository, IUserManager userManager)
{
_repository = repository;
_userManager = userManager;
_db = repository.AsSugarClient();
}
/// <summary>
/// 关联模具
/// </summary>
/// <param name="input">关联模具输入参数</param>
/// <returns></returns>
/// <exception cref="ArgumentNullException"></exception>
[HttpPost]
public async Task RelevanceMold(RelevanceMoldInput input)
{
if (input is null) throw new ArgumentNullException(nameof(input));
var entity = input.Adapt<ToolMoldMaintainRuleRelation>();
var row = await _db.Insertable(entity).ExecuteCommandAsync();
if (row < 1) throw Oops.Oh(ErrorCode.COM1000);
}
}
}

6
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs
View File

@@ -43,15 +43,15 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary> /// <summary>
/// 生产任务数量 /// 生产任务数量
/// </summary> /// </summary>
public int scheduled_qty { get; set; } public int? scheduled_qty { get; set; }
/// <summary> /// <summary>
/// 计划数量 /// 计划数量
/// </summary> /// </summary>
public int plan_qty { get; set; } public int? plan_qty { get; set; }
/// <summary> /// <summary>
/// 工序任务量 /// 工序任务量
/// </summary> /// </summary>
public int process_task_qty { get; set; } public int? process_task_qty { get; set; }
} }
} }

22
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskDefectOutput.cs
View File

@@ -18,24 +18,24 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string mo_task_code { get; set; } public string? mo_task_code { get; set; }
public List<BatchItem> batchItems { get; set; } public List<BatchItem>? batchItems { get; set; }
} }
public class BatchItem public class BatchItem
{ {
public string batch { get; set; } public string? batch { get; set; }
public string create_time { get; set; } public string? create_time { get; set; }
/// <summary> /// <summary>
/// 报废数量 /// 报废数量
/// </summary> /// </summary>
public int scrap_qty { get; set; } public int? scrap_qty { get; set; }
/// <summary> /// <summary>
///次品分类数组 ///次品分类数组
/// </summary> /// </summary>
public List<CategoryItem> categoryItems { get; set; } public List<CategoryItem>? categoryItems { get; set; }
} }
public class CategoryItem public class CategoryItem
@@ -43,16 +43,16 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary> /// <summary>
/// 次品分类名称 /// 次品分类名称
/// </summary> /// </summary>
public string name { get; set; } public string? name { get; set; }
/// <summary> /// <summary>
/// 次品分类数量 /// 次品分类数量
/// </summary> /// </summary>
public int qty { get; set; } public int? qty { get; set; }
/// <summary> /// <summary>
/// 次品项数组 /// 次品项数组
/// </summary> /// </summary>
public List<DefectItem> defectItems { get; set; } public List<DefectItem>? defectItems { get; set; }
} }
public class DefectItem public class DefectItem
@@ -60,10 +60,10 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary> /// <summary>
/// 次品分类名称 /// 次品分类名称
/// </summary> /// </summary>
public string name { get; set; } public string? name { get; set; }
/// <summary> /// <summary>
/// 次品分类数量 /// 次品分类数量
/// </summary> /// </summary>
public int qty { get; set; } public int? qty { get; set; }
} }
} }

10
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskOutput.cs
View File

@@ -61,20 +61,20 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary> /// <summary>
/// 完成数量 /// 完成数量
/// </summary> /// </summary>
public int complete_qty { get; set; } public int? complete_qty { get; set; }
/// <summary> /// <summary>
/// 计划生产数量 /// 计划生产数量
/// </summary> /// </summary>
public int plan_qty { get; set; } public int? plan_qty { get; set; }
public int scheduled_qty { get; set; } public int? scheduled_qty { get; set; }
/// <summary> /// <summary>
/// 预计开工时间 /// 预计开工时间
/// </summary> /// </summary>
public DateTime estimated_start_date { get; set; } public DateTime? estimated_start_date { get; set; }
/// <summary> /// <summary>
/// 预计完工时间 /// 预计完工时间
/// </summary> /// </summary>
public DateTime estimated_end_date { get; set; } public DateTime? estimated_end_date { get; set; }
} }

6
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskSortOutput.cs
View File

@@ -28,15 +28,15 @@ namespace Tnb.ProductionMgr.Entities.Dto
/// <summary> /// <summary>
/// 是否同组标识 /// 是否同组标识
/// </summary> /// </summary>
public int group_flag { get; set; } public int? group_flag { get; set; }
/// <summary> /// <summary>
/// 计划生产量 /// 计划生产量
/// </summary> /// </summary>
public int plan_qty { get; set; } public int? plan_qty { get; set; }
/// <summary> /// <summary>
/// 已完工数量 /// 已完工数量
/// </summary> /// </summary>
public int comple_qty { get; set; } public int? comple_qty { get; set; }
/// <summary> /// <summary>
/// 产品名称 /// 产品名称
/// </summary> /// </summary>

10
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMo.cs
View File

@@ -64,28 +64,28 @@ namespace Tnb.ProductionMgr.Entities
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? plan_qty {get;set;} public int? plan_qty {get;set;}
/// <summary> /// <summary>
/// Desc:已投入数量 /// Desc:已投入数量
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? input_qty {get;set;} public int? input_qty {get;set;}
/// <summary> /// <summary>
/// Desc:已完工数量 /// Desc:已完工数量
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? complete_qty {get;set;} public int? complete_qty {get;set;}
/// <summary> /// <summary>
/// Desc:报废数量 /// Desc:报废数量
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? scrap_qty {get;set;} public int? scrap_qty {get;set;}
/// <summary> /// <summary>
/// Desc:计划开始时间 /// Desc:计划开始时间
@@ -155,7 +155,7 @@ namespace Tnb.ProductionMgr.Entities
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? relation_ratio {get;set;} public int? relation_ratio {get;set;}
/// <summary> /// <summary>
/// Desc:下发人员ID /// Desc:下发人员ID

411
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs
View File

@@ -12,234 +12,255 @@ namespace Tnb.ProductionMgr.Entities
[SugarTable("prd_mo_task")] [SugarTable("prd_mo_task")]
public partial class PrdMoTask public partial class PrdMoTask
{ {
public PrdMoTask(){ public PrdMoTask()
{
} }
/// <summary> /// <summary>
/// Desc:编号 /// Desc:编号
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey = true)]
public string id {get;set;} = SnowflakeIdHelper.NextId(); public string id { get; set; } = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:生产任务编号 /// Desc:生产任务编号
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? mo_task_code {get;set;} public string? mo_task_code { get; set; }
/// <summary> /// <summary>
/// Desc:工单Id /// Desc:工单Id
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? mo_id {get;set;} public string? mo_id { get; set; }
/// <summary> /// <summary>
/// Desc:物料Id /// Desc:物料Id
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? material_id {get;set;} public string? material_id { get; set; }
/// <summary> /// <summary>
/// Desc:模具Id /// Desc:模具Id
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? mold_id {get;set;} public string? mold_id { get; set; }
/// <summary> /// <summary>
/// Desc:设备Id /// Desc:设备Id
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? eqp_id {get;set;} public string? eqp_id { get; set; }
/// <summary> /// <summary>
/// Desc:产线id /// Desc:产线id
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? workline_id {get;set;} public string? workline_id { get; set; }
/// <summary> /// <summary>
/// Desc:工位id /// Desc:工位id
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? workstation_id {get;set;} public string? workstation_id { get; set; }
/// <summary> /// <summary>
/// Desc:工艺路线id /// Desc:工艺路线id
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? workroute_id {get;set;} public string? workroute_id { get; set; }
/// <summary> /// <summary>
/// Desc:生产bom id /// Desc:生产bom id
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? bom_id {get;set;} public string? bom_id { get; set; }
/// <summary> /// <summary>
/// Desc:任务单状态 /// Desc:任务单状态
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? mo_task_status {get;set;} public string? mo_task_status { get; set; }
/// <summary> /// <summary>
/// Desc:计划数量 /// Desc:计划数量
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? plan_qty {get;set;} public int? plan_qty { get; set; }
/// <summary> /// <summary>
/// Desc:已投入数量 /// Desc:已投入数量
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? input_qty {get;set;} public int? input_qty { get; set; }
/// <summary> /// <summary>
/// Desc:已完工数量 /// Desc:已完工数量
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? complete_qty {get;set;} public int? complete_qty { get; set; }
/// <summary> /// <summary>
/// Desc:报废数量 /// Desc:报废数量
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? scrap_qty {get;set;} public int? scrap_qty { get; set; }
/// <summary> /// <summary>
/// Desc:已排产数量 /// Desc:已排产数量
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? scheduled_qty {get;set;} public int? scheduled_qty { get; set; }
/// <summary> /// <summary>
/// Desc:排产类型:1、注塑、挤出2、组装、包装 /// Desc:排产类型:1、注塑、挤出2、组装、包装
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public int? schedule_type {get;set;} public int? schedule_type { get; set; }
/// <summary> /// <summary>
/// Desc:计划开始时间 /// Desc:计划开始时间
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public DateTime? plan_start_date {get;set;} public DateTime? plan_start_date { get; set; }
/// <summary> /// <summary>
/// Desc:计划结束时间 /// Desc:计划结束时间
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public DateTime? plan_end_date {get;set;} public DateTime? plan_end_date { get; set; }
/// <summary> /// <summary>
/// Desc:实际开工日期 /// Desc:实际开工日期
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public DateTime? act_start_date {get;set;} public DateTime? act_start_date { get; set; }
/// <summary> /// <summary>
/// Desc:实际完工日期 /// Desc:实际完工日期
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public DateTime? act_end_date {get;set;} public DateTime? act_end_date { get; set; }
/// <summary> /// <summary>
/// Desc:创建人 /// Desc:创建人
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? create_id {get;set;} public string? create_id { get; set; }
/// <summary> /// <summary>
/// Desc:创建时间 /// Desc:创建时间
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public DateTime? create_time {get;set;} public DateTime? create_time { get; set; }
/// <summary> /// <summary>
/// Desc:修改人 /// Desc:修改人
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? modify_id {get;set;} public string? modify_id { get; set; }
/// <summary> /// <summary>
/// Desc:修改时间 /// Desc:修改时间
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public DateTime? modify_time {get;set;} public DateTime? modify_time { get; set; }
/// <summary> /// <summary>
/// Desc:扩展字段 /// Desc:扩展字段
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? extras {get;set;} public string? extras { get; set; }
/// <summary> /// <summary>
/// Desc:生产顺序 /// Desc:生产顺序
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public int? prd_order {get;set;} public int? prd_order { get; set; }
/// <summary> /// <summary>
/// Desc:预计开始时间 /// Desc:预计开始时间
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public DateTime? estimated_start_date {get;set;} public DateTime? estimated_start_date { get; set; }
/// <summary> /// <summary>
/// Desc:预计结束时间 /// Desc:预计结束时间
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public DateTime? estimated_end_date {get;set;} public DateTime? estimated_end_date { get; set; }
/// <summary> /// <summary>
/// Desc:同组标识 /// Desc:同组标识
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public int? group_flag {get;set;} public int? group_flag { get; set; }
/// <summary> /// <summary>
/// Desc:父任务Id /// Desc:父任务Id
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string? parent_id {get;set;} public string? parent_id { get; set; }
/// <summary> /// <summary>
/// Desc:工序任务量 /// Desc:工序任务量
/// Default: /// Default:
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public int? process_task_qty {get;set;} public int? process_task_qty { get; set; }
/// <summary>
/// 设备类型编码
/// </summary>
[SugarColumn(IsIgnore = true)]
public string eqp_type_code { get; set; }
/// <summary>
/// 模具编号
/// </summary>
[SugarColumn(IsIgnore = true)]
public string mold_code { get; set; }
/// <summary>
/// 模具名称
/// </summary>
[SugarColumn(IsIgnore = true)]
public string mold_name { get; set; }
/// <summary>
/// 模具型腔数
/// </summary>
[SugarColumn(IsIgnore = true)]
public int mold_cavity_qty { get; set; }
} }
} }

2
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOnwipTool.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.ProductionMgr.Entities
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey=true)]
public char id {get;set;} = SnowflakeIdHelper.NextId(); public string id {get;set;} = SnowflakeIdHelper.NextId();
/// <summary> /// <summary>
/// Desc:TODO /// Desc:TODO

20
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -402,7 +402,7 @@ namespace Tnb.ProductionMgr
}) })
.Mapper(it => .Mapper(it =>
{ {
it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString() : ""; it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString()! : "";
}) })
.ToListAsync(); .ToListAsync();
} }
@@ -434,7 +434,7 @@ namespace Tnb.ProductionMgr
scheduled_qty = a.scheduled_qty, scheduled_qty = a.scheduled_qty,
plan_qty = d.plan_qty plan_qty = d.plan_qty
}) })
.Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString() : "") .Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString()! : "")
.ToListAsync(); .ToListAsync();
return result; return result;
} }
@@ -465,7 +465,7 @@ namespace Tnb.ProductionMgr
plan_qty = d.plan_qty, plan_qty = d.plan_qty,
process_task_qty = a.process_task_qty, process_task_qty = a.process_task_qty,
}) })
.Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString() : "") .Mapper(it => it.mo_task_status = dic.ContainsKey(it.mo_task_status) ? dic[it.mo_task_status].ToString()! : "")
.ToListAsync(); .ToListAsync();
return result; return result;
} }
@@ -699,7 +699,7 @@ namespace Tnb.ProductionMgr
var mo = await _db.Queryable<PrdMo>().FirstAsync(it => it.id == input.mo_id); var mo = await _db.Queryable<PrdMo>().FirstAsync(it => it.id == input.mo_id);
var moCode = mo?.mo_code; var moCode = mo?.mo_code;
var taskCode = await _db.Queryable<PrdMoTask>().Where(it => !string.IsNullOrEmpty(it.mo_task_code) && it.mo_task_code.Contains(moCode)).OrderByDescending(it => it.mo_task_code).Select(it => it.mo_task_code).FirstAsync(); var taskCode = await _db.Queryable<PrdMoTask>().Where(it => !string.IsNullOrEmpty(it.mo_task_code) && it.mo_task_code.Contains(moCode)).OrderByDescending(it => it.mo_task_code).Select(it => it.mo_task_code).FirstAsync();
if (taskCode.IsNullOrEmpty()) if (taskCode!.IsNullOrEmpty())
{ {
moTask.mo_task_code = $"{moCode}-01"; moTask.mo_task_code = $"{moCode}-01";
} }
@@ -727,7 +727,7 @@ namespace Tnb.ProductionMgr
taskLog.create_id = _userManager.UserId; taskLog.create_id = _userManager.UserId;
taskLog.create_time = DateTime.Now; taskLog.create_time = DateTime.Now;
taskLog.mo_task_id = moTask.id; taskLog.mo_task_id = moTask.id;
taskLog.mo_task_code = moTask.mo_task_code; taskLog.mo_task_code = moTask.mo_task_code!;
row = await _db.Insertable(taskLog).ExecuteCommandAsync(); row = await _db.Insertable(taskLog).ExecuteCommandAsync();
//根据工单号获取当前工单包含的已排产数 //根据工单号获取当前工单包含的已排产数
var schedQty = _db.Queryable<PrdMoTask>().Where(it => it.mo_id == input.mo_id)?.Sum(d => d.scheduled_qty); var schedQty = _db.Queryable<PrdMoTask>().Where(it => it.mo_id == input.mo_id)?.Sum(d => d.scheduled_qty);
@@ -781,7 +781,7 @@ namespace Tnb.ProductionMgr
subMoTasks.Add(subMoTask); subMoTasks.Add(subMoTask);
} }
//根据生产任务编号生成子任务编号 //根据生产任务编号生成子任务编号
if (moTask.mo_task_code.IsNotEmptyOrNull()) if (moTask.mo_task_code!.IsNotEmptyOrNull())
{ {
for (int i = 1; i <= subMoTasks.Count; i++) for (int i = 1; i <= subMoTasks.Count; i++)
{ {
@@ -884,19 +884,19 @@ namespace Tnb.ProductionMgr
taskLog.id = SnowflakeIdHelper.NextId(); taskLog.id = SnowflakeIdHelper.NextId();
if (taskItem != null) if (taskItem != null)
{ {
if (taskItem.mo_id.IsNotEmptyOrNull()) if (taskItem.mo_id!.IsNotEmptyOrNull())
{ {
taskLog.mo_code = (await db.Queryable<PrdMo>().FirstAsync(it => it.id == taskItem.mo_id))?.mo_code!; taskLog.mo_code = (await db.Queryable<PrdMo>().FirstAsync(it => it.id == taskItem.mo_id))?.mo_code!;
} }
if (taskItem.eqp_id.IsNotEmptyOrNull()) if (taskItem.eqp_id!.IsNotEmptyOrNull())
{ {
taskLog.eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == taskItem.eqp_id))?.code!; taskLog.eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == taskItem.eqp_id))?.code!;
} }
if (taskItem.mold_id.IsNotEmptyOrNull()) if (taskItem.mold_id!.IsNotEmptyOrNull())
{ {
taskLog.mold_code = (await db.Queryable<Molds>().FirstAsync(it => it.id == taskItem.mold_id))?.mold_code!; taskLog.mold_code = (await db.Queryable<Molds>().FirstAsync(it => it.id == taskItem.mold_id))?.mold_code!;
} }
if (taskItem.material_id.IsNotEmptyOrNull()) if (taskItem.material_id!.IsNotEmptyOrNull())
{ {
var material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == taskItem.material_id); var material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == taskItem.material_id);
taskLog.item_code = material?.code!; taskLog.item_code = material?.code!;