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

1

Browse Source
This commit is contained in:
DEVICE8\12494
2023-04-26 10:56:00 +08:00
parent f13a3c2ac8
commit cb86df09e0
4 changed files with 195 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

359
BasicData/Tnb.BasicData.Entitys/Entity/EqpEquipment.cs
View File

@@ -11,213 +11,218 @@ namespace Tnb.BasicData.Entitys.Entity
[SugarTable("eqp_equipment")] [SugarTable("eqp_equipment")]
public partial class EqpEquipment public partial class EqpEquipment
{ {
public EqpEquipment(){ public EqpEquipment()
{
} }
/// <summary> /// <summary>
/// Desc:自增ID /// Desc:自增ID
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
[SugarColumn(IsPrimaryKey=true)] [SugarColumn(IsPrimaryKey = true)]
public string id {get;set;} public string id { get; set; }
/// <summary> /// <summary>
/// Desc:设备代码 /// Desc:设备代码
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string eqp_code {get;set;} public string eqp_code { get; set; }
/// <summary> /// <summary>
/// Desc:设备名称 /// Desc:设备名称
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string eqp_name {get;set;} public string eqp_name { get; set; }
/// <summary> /// <summary>
/// Desc:设备类型代码 /// Desc:设备类型代码
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string eqp_type_code {get;set;} public string eqp_type_code { get; set; }
/// <summary> /// <summary>
/// Desc:验收状态（合格：Qualified/不合格：Unqualified） /// Desc:验收状态（合格：Qualified/不合格：Unqualified）
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string accept_status {get;set;} public string accept_status { get; set; }
/// <summary> /// <summary>
/// Desc:使用部门代码 /// Desc:使用部门代码
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string use_department_code {get;set;} public string use_department_code { get; set; }
/// <summary> /// <summary>
/// Desc:安装日期 /// Desc:安装日期
/// Default: /// Default:
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string install_date {get;set;} public string install_date { 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 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:模具Id /// Desc:模具Id
/// Default: /// Default:
/// 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 org_id {get;set;} public string org_id { get; set; }
/// <summary> /// <summary>
/// Desc:设备类型ID，EQP_EQUIPMENTTYPE.ID /// Desc:设备类型ID，EQP_EQUIPMENTTYPE.ID
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string eqp_type_id {get;set;} public string eqp_type_id { get; set; }
/// <summary> /// <summary>
/// Desc:设备生产日期 /// Desc:设备生产日期
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string product_date {get;set;} public string product_date { get; set; }
/// <summary> /// <summary>
/// Desc:设备生产厂家 /// Desc:设备生产厂家
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string supplier_code {get;set;} public string supplier_code { get; set; }
/// <summary> /// <summary>
/// Desc:正式使用日期 /// Desc:正式使用日期
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string use_date {get;set;} public string use_date { get; set; }
/// <summary> /// <summary>
/// Desc:验收日期 /// Desc:验收日期
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string accept_date {get;set;} public string accept_date { get; set; }
/// <summary> /// <summary>
/// Desc:管理部门 /// Desc:管理部门
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string manage_department_code {get;set;} public string manage_department_code { get; set; }
/// <summary> /// <summary>
/// Desc:工段（车间）代码 /// Desc:工段（车间）代码
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string segment_code {get;set;} public string segment_code { get; set; }
/// <summary> /// <summary>
/// Desc:工位代码 /// Desc:工位代码
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string station_code {get;set;} public string station_code { get; set; }
/// <summary> /// <summary>
/// Desc:质检代码，良率计算 /// Desc:质检代码，良率计算
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string quality_station_code {get;set;} public string quality_station_code { get; set; }
/// <summary> /// <summary>
/// Desc:生产节拍 /// Desc:生产节拍
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string process_time {get;set;} public string process_time { get; set; }
/// <summary> /// <summary>
/// Desc:时间单位： 秒：s 分钟：m 小时：h /// Desc:时间单位： 秒：s 分钟：m 小时：h
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string time_unit {get;set;} public string time_unit { get; set; }
/// <summary> /// <summary>
/// Desc:设备当前状态，状态代码 /// Desc:设备当前状态，状态代码
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string current_status {get;set;} public string current_status { get; set; }
/// <summary> /// <summary>
/// Desc:技术性能 /// Desc:技术性能
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string techno_logy {get;set;} public string techno_logy { get; set; }
/// <summary> /// <summary>
/// Desc:备注 /// Desc:备注
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string remark {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 timestamp {get;set;} public string timestamp { 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 create_id { get; set; }
/// <summary> /// <summary>
/// Desc:修改用户 /// Desc:修改用户
/// Default:NULL::character varying /// Default:NULL::character varying
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string modify_id {get;set;} public string modify_id { get; set; }
/// <summary>
/// 吨位
/// </summary>
public double tonnage { get; set; }
} }
} }

2
ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Tnb.ProductionMgr.Entitys.Entity; using Tnb.BasicData.Entitys.Entity;
namespace Tnb.ProductionMgr.Entitys.Dto namespace Tnb.ProductionMgr.Entitys.Dto
{ {

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

@@ -438,6 +438,16 @@ namespace Tnb.ProductionMgr
.ExecuteCommandAsync(); .ExecuteCommandAsync();
return (row > 0); return (row > 0);
} }
/// <summary>
/// 生产任务单修改
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> ICMOModify()
{
return null;
}
/// <summary> /// <summary>
/// 工单调整-转移机台 /// 工单调整-转移机台

4
ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj
View File

@@ -9,8 +9,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\BasicData\Tnb.BasicData.Entitys\Tnb.BasicData.Entitys.csproj" /> <ProjectReference Include="..\..\BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" />
<ProjectReference Include="..\..\BasicData\Tnb.BasicData\Tnb.BasicData.csproj" /> <ProjectReference Include="..\..\EquipMgr\Tnb.EquipMgr.Interfaces\Tnb.EquipMgr.Interfaces.csproj" />
<ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" /> <ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
<ProjectReference Include="..\Tnb.ProductionMgr.Interfaces\Tnb.ProductionMgr.Interfaces.csproj" /> <ProjectReference Include="..\Tnb.ProductionMgr.Interfaces\Tnb.ProductionMgr.Interfaces.csproj" />
</ItemGroup> </ItemGroup>