diff --git a/BasicData/Tnb.BasicData.Entitys/Entity/EqpEquipment.cs b/BasicData/Tnb.BasicData.Entitys/Entity/EqpEquipment.cs
index 4c2de0dd..be0d8815 100644
--- a/BasicData/Tnb.BasicData.Entitys/Entity/EqpEquipment.cs
+++ b/BasicData/Tnb.BasicData.Entitys/Entity/EqpEquipment.cs
@@ -11,213 +11,218 @@ namespace Tnb.BasicData.Entitys.Entity
[SugarTable("eqp_equipment")]
public partial class EqpEquipment
{
- public EqpEquipment(){
+ public EqpEquipment()
+ {
- }
- ///
- /// Desc:自增ID
- /// Default:
- /// Nullable:False
- ///
- [SugarColumn(IsPrimaryKey=true)]
- public string id {get;set;}
+ }
+ ///
+ /// Desc:自增ID
+ /// Default:
+ /// Nullable:False
+ ///
+ [SugarColumn(IsPrimaryKey = true)]
+ public string id { get; set; }
- ///
- /// Desc:设备代码
- /// Default:
- /// Nullable:False
- ///
- public string eqp_code {get;set;}
+ ///
+ /// Desc:设备代码
+ /// Default:
+ /// Nullable:False
+ ///
+ public string eqp_code { get; set; }
- ///
- /// Desc:设备名称
- /// Default:
- /// Nullable:False
- ///
- public string eqp_name {get;set;}
+ ///
+ /// Desc:设备名称
+ /// Default:
+ /// Nullable:False
+ ///
+ public string eqp_name { get; set; }
- ///
- /// Desc:设备类型代码
- /// Default:
- /// Nullable:False
- ///
- public string eqp_type_code {get;set;}
+ ///
+ /// Desc:设备类型代码
+ /// Default:
+ /// Nullable:False
+ ///
+ public string eqp_type_code { get; set; }
- ///
- /// Desc:验收状态(合格:Qualified/不合格:Unqualified)
- /// Default:
- /// Nullable:False
- ///
- public string accept_status {get;set;}
+ ///
+ /// Desc:验收状态(合格:Qualified/不合格:Unqualified)
+ /// Default:
+ /// Nullable:False
+ ///
+ public string accept_status { get; set; }
- ///
- /// Desc:使用部门代码
- /// Default:
- /// Nullable:False
- ///
- public string use_department_code {get;set;}
+ ///
+ /// Desc:使用部门代码
+ /// Default:
+ /// Nullable:False
+ ///
+ public string use_department_code { get; set; }
- ///
- /// Desc:安装日期
- /// Default:
- /// Nullable:False
- ///
- public string install_date {get;set;}
+ ///
+ /// Desc:安装日期
+ /// Default:
+ /// Nullable:False
+ ///
+ public string install_date { get; set; }
- ///
- /// Desc:创建时间
- /// Default:
- /// Nullable:True
- ///
- public DateTime? create_time {get;set;}
+ ///
+ /// Desc:创建时间
+ /// Default:
+ /// Nullable:True
+ ///
+ public DateTime? create_time { get; set; }
- ///
- /// Desc:修改时间
- /// Default:
- /// Nullable:True
- ///
- public DateTime? modify_time {get;set;}
+ ///
+ /// Desc:修改时间
+ /// Default:
+ /// Nullable:True
+ ///
+ public DateTime? modify_time { get; set; }
- ///
- /// Desc:扩展字段
- /// Default:
- /// Nullable:True
- ///
- public string extras {get;set;}
+ ///
+ /// Desc:扩展字段
+ /// Default:
+ /// Nullable:True
+ ///
+ public string extras { get; set; }
- ///
- /// Desc:模具Id
- /// Default:
- /// Nullable:True
- ///
- public string mold_id {get;set;}
+ ///
+ /// Desc:模具Id
+ /// Default:
+ /// Nullable:True
+ ///
+ public string mold_id { get; set; }
- ///
- /// Desc:所属组织ID
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string org_id {get;set;}
+ ///
+ /// Desc:所属组织ID
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string org_id { get; set; }
- ///
- /// Desc:设备类型ID,EQP_EQUIPMENTTYPE.ID
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string eqp_type_id {get;set;}
+ ///
+ /// Desc:设备类型ID,EQP_EQUIPMENTTYPE.ID
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string eqp_type_id { get; set; }
- ///
- /// Desc:设备生产日期
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string product_date {get;set;}
+ ///
+ /// Desc:设备生产日期
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string product_date { get; set; }
- ///
- /// Desc:设备生产厂家
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string supplier_code {get;set;}
+ ///
+ /// Desc:设备生产厂家
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string supplier_code { get; set; }
- ///
- /// Desc:正式使用日期
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string use_date {get;set;}
+ ///
+ /// Desc:正式使用日期
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string use_date { get; set; }
- ///
- /// Desc:验收日期
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string accept_date {get;set;}
+ ///
+ /// Desc:验收日期
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string accept_date { get; set; }
- ///
- /// Desc:管理部门
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string manage_department_code {get;set;}
+ ///
+ /// Desc:管理部门
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string manage_department_code { get; set; }
- ///
- /// Desc:工段(车间)代码
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string segment_code {get;set;}
+ ///
+ /// Desc:工段(车间)代码
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string segment_code { get; set; }
- ///
- /// Desc:工位代码
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string station_code {get;set;}
+ ///
+ /// Desc:工位代码
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string station_code { get; set; }
- ///
- /// Desc:质检代码,良率计算
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string quality_station_code {get;set;}
+ ///
+ /// Desc:质检代码,良率计算
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string quality_station_code { get; set; }
- ///
- /// Desc:生产节拍
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string process_time {get;set;}
+ ///
+ /// Desc:生产节拍
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string process_time { get; set; }
- ///
- /// Desc:时间单位: 秒:s 分钟:m 小时:h
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string time_unit {get;set;}
+ ///
+ /// Desc:时间单位: 秒:s 分钟:m 小时:h
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string time_unit { get; set; }
- ///
- /// Desc:设备当前状态,状态代码
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string current_status {get;set;}
+ ///
+ /// Desc:设备当前状态,状态代码
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string current_status { get; set; }
- ///
- /// Desc:技术性能
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string techno_logy {get;set;}
+ ///
+ /// Desc:技术性能
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string techno_logy { get; set; }
- ///
- /// Desc:备注
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string remark {get;set;}
+ ///
+ /// Desc:备注
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string remark { get; set; }
- ///
- /// Desc:时间戳
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string timestamp {get;set;}
+ ///
+ /// Desc:时间戳
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string timestamp { get; set; }
- ///
- /// Desc:创建用户
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string create_id {get;set;}
+ ///
+ /// Desc:创建用户
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string create_id { get; set; }
- ///
- /// Desc:修改用户
- /// Default:NULL::character varying
- /// Nullable:True
- ///
- public string modify_id {get;set;}
+ ///
+ /// Desc:修改用户
+ /// Default:NULL::character varying
+ /// Nullable:True
+ ///
+ public string modify_id { get; set; }
+ ///
+ /// 吨位
+ ///
+ public double tonnage { get; set; }
}
}
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs
index ddda31cc..648b7b9a 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entitys/Dto/PrdManage/EquipmentListOutput.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using Tnb.ProductionMgr.Entitys.Entity;
+using Tnb.BasicData.Entitys.Entity;
namespace Tnb.ProductionMgr.Entitys.Dto
{
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
index 6fbfd651..2bdb8cf8 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
@@ -438,6 +438,16 @@ namespace Tnb.ProductionMgr
.ExecuteCommandAsync();
return (row > 0);
}
+ ///
+ /// 生产任务单修改
+ ///
+ ///
+ [HttpPost]
+ public async Task ICMOModify()
+ {
+ return null;
+ }
+
///
/// 工单调整-转移机台
diff --git a/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj b/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj
index 5295a18b..dc0d6697 100644
--- a/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj
+++ b/ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj
@@ -9,8 +9,8 @@
-
-
+
+