1

BasicData/Tnb.BasicData.Entitys/Entity/EqpEquipment.cs

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

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
 {

ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs

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

ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj

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