diff --git a/ZR.Admin.WebApi/Extensions/InitTable.cs b/ZR.Admin.WebApi/Extensions/InitTable.cs index 2997b824..2a6ad3ce 100644 --- a/ZR.Admin.WebApi/Extensions/InitTable.cs +++ b/ZR.Admin.WebApi/Extensions/InitTable.cs @@ -1,4 +1,7 @@ using SqlSugar.IOC; +using ZR.Model.mes.md; +using ZR.Model.mes.pro; +using ZR.Model.MES.op.ZR.Model.mes.md; using ZR.Model.Models; using ZR.Model.System; using ZR.Model.System.Generate; @@ -48,6 +51,28 @@ namespace ZR.Admin.WebApi.Extensions db.CodeFirst.InitTables(typeof(SysDictData)); db.CodeFirst.InitTables(typeof(SysDictType)); db.CodeFirst.InitTables(typeof(SqlDiffLog)); + + // MES 初始化表 + db.CodeFirst.InitTables(typeof(MdBom)); + db.CodeFirst.InitTables(typeof(MdDevice)); + db.CodeFirst.InitTables(typeof(MdPallet)); + db.CodeFirst.InitTables(typeof(MdProductDefine)); + db.CodeFirst.InitTables(typeof(MdProrouteSort)); + db.CodeFirst.InitTables(typeof(MdTechnologicalProroute)); + db.CodeFirst.InitTables(typeof(MdUnit)); + db.CodeFirst.InitTables(typeof(MdWorkline)); + db.CodeFirst.InitTables(typeof(MdWorkshop)); + db.CodeFirst.InitTables(typeof(MdWorkline)); + db.CodeFirst.InitTables(typeof(MdWorksort)); + db.CodeFirst.InitTables(typeof(MdWorkstation)); + db.CodeFirst.InitTables(typeof(OpStatistics)); + db.CodeFirst.InitTables(typeof(ProWorkorder)); + db.CodeFirst.InitTables(typeof(ProWorkplan)); + + + + + } } diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj index 7b6e1fba..5caac064 100644 --- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj +++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj @@ -30,6 +30,7 @@ + diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index e2388d13..112bd893 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -9,8 +9,8 @@ "urls": "http://localhost:8888", //项目启动url,如果改动端口前端对应devServer也需要进行修改 "dbConfigs": [ { - "Conn": "Data Source=127.0.0.1;User ID=sa;Password=123456;Initial Catalog=ZrAdmin;", - "DbType": 1, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3,PgSql = 4 + "Conn": "Data Source=192.168.0.36;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3,PgSql = 4 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true } @@ -19,8 +19,8 @@ //代码生成数据库配置 "CodeGenDbConfig": { //代码生成连接字符串,注意{dbName}为固定格式,不要填写数据库名 - "Conn": "Data Source=127.0.0.1;User ID=sa;Password=123456;Initial Catalog={dbName};", - "DbType": 1, + "Conn": "Data Source=192.168.0.36;User ID=root;Password=123456;Initial Catalog={dbName};", + "DbType": 0, "IsAutoCloseConnection": true, "DbName": "ZrAdmin" //代码生成默认连接数据库 }, diff --git a/ZR.Admin.WebApi/wwwroot/data.xlsx b/ZR.Admin.WebApi/wwwroot/data.xlsx index a35adecc..5194772c 100644 Binary files a/ZR.Admin.WebApi/wwwroot/data.xlsx and b/ZR.Admin.WebApi/wwwroot/data.xlsx differ diff --git a/ZR.Model/MES/pro/ProWorkplan.cs b/ZR.Model/MES/pro/ProWorkplan.cs new file mode 100644 index 00000000..e93147e8 --- /dev/null +++ b/ZR.Model/MES/pro/ProWorkplan.cs @@ -0,0 +1,146 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZR.Model.mes.pro +{ + /// + /// 生产计划 + /// + [SugarTable("pro_workplan")] + public class ProWorkplan + { + /// + /// 流水号 + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] + public string Id { get; set; } + /// + /// 年 + /// + [SugarColumn(ColumnName = "year")] + public int? Year { get; set; } + /// + /// 周 + /// + [SugarColumn(ColumnName = "week")] + public int? Week { get; set; } + /// + /// 来源 + /// + [SugarColumn(ColumnName = "source")] + public int? Source { get; set; } + /// + /// 零件号 + /// + [SugarColumn(ColumnName = "partnumber")] + public string Partnumber { get; set; } + /// + /// 版本 + /// + [SugarColumn(ColumnName = "version")] + public string Version { get; set; } + /// + /// 颜色 + /// + [SugarColumn(ColumnName = "color")] + public string Color { get; set; } + /// + /// 颜色代码 + /// + [SugarColumn(ColumnName = "colorcode")] + public string Colorcode { get; set; } + /// + /// 本周要货数量 + /// + [SugarColumn(ColumnName = "neednumber")] + public string Neednumber { get; set; } + /// + /// 产品合格率 + /// + [SugarColumn(ColumnName = "passpercent")] + public string Passpercent { get; set; } + /// + /// 每挂数量 + /// + [SugarColumn(ColumnName = "batchNumber")] + public int? BatchNumber { get; set; } + /// + /// 生产节拍 + /// + [SugarColumn(ColumnName = "productionRhythm")] + public decimal? ProductionRhythm { get; set; } + /// + /// 总挂具数 + /// + [SugarColumn(ColumnName = "hangerNumber")] + public int? HangerNumber { get; set; } + /// + /// 订单需生产挂具数量 + /// + [SugarColumn(ColumnName = "needhangerNumber")] + public string NeedhangerNumber { get; set; } + /// + /// 实际计划数量 + /// + [SugarColumn(ColumnName = "actualplanNumber")] + public string ActualplanNumber { get; set; } + /// + /// 车数 + /// + [SugarColumn(ColumnName = "carNumber")] + public string CarNumber { get; set; } + /// + /// 圈数 + /// + [SugarColumn(ColumnName = "circleNumber")] + public string CircleNumber { get; set; } + /// + /// 订单生产时间(分钟) + /// + [SugarColumn(ColumnName = "producttime")] + public int? Producttime { get; set; } + /// + /// 计划需求定性 + /// + [SugarColumn(ColumnName = "needcertainty")] + public string Needcertainty { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + /// + /// 租户号 + /// + [SugarColumn(ColumnName = "TENANT_ID")] + public string TenantId { get; set; } + /// + /// 乐观锁 + /// + [SugarColumn(ColumnName = "REVISION")] + public int? Revision { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "CREATED_BY")] + public string CreatedBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATED_TIME")] + public DateTime? CreatedTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "UPDATED_BY")] + public string UpdatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "UPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/ZR.Model/mes/pro/ProCallmaterial.cs b/ZR.Model/mes/pro/ProCallmaterial.cs deleted file mode 100644 index 47323b66..00000000 --- a/ZR.Model/mes/pro/ProCallmaterial.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; -namespace ZR.Model.mes.pro -{ - /// - /// 产线叫料 - /// - [SugarTable("pro_callmaterial")] - public class ProCallmaterial - { - /// - /// 编号 - /// - [SugarColumn(ColumnName="id" ,IsPrimaryKey = true )] - public int Id { get; set; } - /// - /// fk_生产任务id - /// - [SugarColumn(ColumnName="fk_task_id" )] - public int? FkTaskId { get; set; } - /// - /// 物料id - /// - [SugarColumn(ColumnName="material_id" )] - public string MaterialId { get; set; } - /// - /// 物料code - /// - [SugarColumn(ColumnName="material_code" )] - public string MaterialCode { get; set; } - /// - /// 物料名称 - /// - [SugarColumn(ColumnName="material_name" )] - public string MaterialName { get; set; } - /// - /// 叫料数量 - /// - [SugarColumn(ColumnName="call_num" )] - public decimal? CallNum { get; set; } - /// - /// 叫料时间 - /// - [SugarColumn(ColumnName="call_time" )] - public DateTime? CallTime { get; set; } - /// - /// 得到数量 - /// - [SugarColumn(ColumnName="arrive_num" )] - public decimal? ArriveNum { get; set; } - /// - /// 叫料是否成功(0,1) - /// - [SugarColumn(ColumnName="status" )] - public string Status { get; set; } - /// - /// 备用字段1 - /// - [SugarColumn(ColumnName="attr1" )] - public string Attr1 { get; set; } - /// - /// 备用字段2 - /// - [SugarColumn(ColumnName="attr2" )] - public string Attr2 { get; set; } - /// - /// 备用字段3 - /// - [SugarColumn(ColumnName="attr3" )] - public string Attr3 { get; set; } - /// - /// 租户号 - /// - [SugarColumn(ColumnName="TENANT_ID" )] - public string TenantId { get; set; } - /// - /// 乐观锁 - /// - [SugarColumn(ColumnName="REVISION" )] - public int? Revision { get; set; } - /// - /// 创建人 - /// - [SugarColumn(ColumnName="CREATED_BY" )] - public string CreatedBy { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CREATED_TIME" )] - public DateTime? CreatedTime { get; set; } - /// - /// 更新人 - /// - [SugarColumn(ColumnName="UPDATED_BY" )] - public string UpdatedBy { get; set; } - /// - /// 更新时间 - /// - [SugarColumn(ColumnName="UPDATED_TIME" )] - public DateTime? UpdatedTime { get; set; } - } -} diff --git a/ZR.Model/mes/pro/ProFeedback.cs b/ZR.Model/mes/pro/ProFeedback.cs deleted file mode 100644 index 98284ed6..00000000 --- a/ZR.Model/mes/pro/ProFeedback.cs +++ /dev/null @@ -1,214 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; -namespace ZR.Model.mes.pro -{ - /// - /// 生产报工 - /// - [SugarTable("pro_feedback")] - public class ProFeedback - { - /// - /// 主键 - /// - [SugarColumn(ColumnName="record_id" ,IsPrimaryKey = true )] - public int RecordId { get; set; } - /// - /// 报工类型(统一报工,自行报工) - /// - [SugarColumn(ColumnName="feedback_type" )] - public string FeedbackType { get; set; } - /// - /// 报工单编号 - /// - [SugarColumn(ColumnName="feedback_code" )] - public string FeedbackCode { get; set; } - /// - /// 工单id - /// - [SugarColumn(ColumnName="workorder_id" )] - public int? WorkorderId { get; set; } - /// - /// 工单code - /// - [SugarColumn(ColumnName="workorder_code" )] - public string WorkorderCode { get; set; } - /// - /// 工单name - /// - [SugarColumn(ColumnName="workorder_name" )] - public string WorkorderName { get; set; } - /// - /// 工序id - /// - [SugarColumn(ColumnName="process_id" )] - public int? ProcessId { get; set; } - /// - /// 工序code - /// - [SugarColumn(ColumnName="process_code" )] - public string ProcessCode { get; set; } - /// - /// 工序name - /// - [SugarColumn(ColumnName="process_name" )] - public string ProcessName { get; set; } - /// - /// 工作站id - /// - [SugarColumn(ColumnName="workstation_id" )] - public int? WorkstationId { get; set; } - /// - /// 工作站code - /// - [SugarColumn(ColumnName="workstation_code" )] - public string WorkstationCode { get; set; } - /// - /// 工作站name - /// - [SugarColumn(ColumnName="workstation_name" )] - public string WorkstationName { get; set; } - /// - /// 生产任务ID - /// - [SugarColumn(ColumnName="task_id" )] - public string TaskId { get; set; } - /// - /// 生产任务code - /// - [SugarColumn(ColumnName="task_code" )] - public string TaskCode { get; set; } - /// - /// 产品物料ID - /// - [SugarColumn(ColumnName="item_id" )] - public string ItemId { get; set; } - /// - /// 产品物料code - /// - [SugarColumn(ColumnName="item_code" )] - public string ItemCode { get; set; } - /// - /// 产品物料name - /// - [SugarColumn(ColumnName="item_name" )] - public string ItemName { get; set; } - /// - /// 单位 - /// - [SugarColumn(ColumnName="unit" )] - public string Unit { get; set; } - /// - /// 排产数量 - /// - [SugarColumn(ColumnName="quantity" )] - public string Quantity { get; set; } - /// - /// 本次报工数量 - /// - [SugarColumn(ColumnName="quantity_feedback" )] - public string QuantityFeedback { get; set; } - /// - /// 合格数量 - /// - [SugarColumn(ColumnName="quantity_qualified" )] - public string QuantityQualified { get; set; } - /// - /// 不合格数量 - /// - [SugarColumn(ColumnName="quantity_unquanlified" )] - public string QuantityUnquanlified { get; set; } - /// - /// 报工人姓名 - /// - [SugarColumn(ColumnName="user_name" )] - public string UserName { get; set; } - /// - /// 昵称 - /// - [SugarColumn(ColumnName="nick_name" )] - public string NickName { get; set; } - /// - /// 报工途径 - /// - [SugarColumn(ColumnName="feedback_channel" )] - public string FeedbackChannel { get; set; } - /// - /// 报工时间 - /// - [SugarColumn(ColumnName="feedback_time" )] - public string FeedbackTime { get; set; } - /// - /// 记录人名称 - /// - [SugarColumn(ColumnName="record_user" )] - public string RecordUser { get; set; } - /// - /// 昵称 - /// - [SugarColumn(ColumnName="record_nick" )] - public string RecordNick { get; set; } - /// - /// 状态 - /// - [SugarColumn(ColumnName="status" )] - public string Status { get; set; } - /// - /// 备注 - /// - [SugarColumn(ColumnName="remark" )] - public string Remark { get; set; } - /// - /// 预留字段1 - /// - [SugarColumn(ColumnName="attr1" )] - public string Attr1 { get; set; } - /// - /// 预留字段2 - /// - [SugarColumn(ColumnName="attr2" )] - public string Attr2 { get; set; } - /// - /// 预留字段3 - /// - [SugarColumn(ColumnName="attr3" )] - public string Attr3 { get; set; } - /// - /// 预留字段4 - /// - [SugarColumn(ColumnName="attr4" )] - public string Attr4 { get; set; } - /// - /// 租户号 - /// - [SugarColumn(ColumnName="TENANT_ID" )] - public string TenantId { get; set; } - /// - /// 乐观锁 - /// - [SugarColumn(ColumnName="REVISION" )] - public int? Revision { get; set; } - /// - /// 创建人 - /// - [SugarColumn(ColumnName="CREATED_BY" )] - public string CreatedBy { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CREATED_TIME" )] - public DateTime? CreatedTime { get; set; } - /// - /// 更新人 - /// - [SugarColumn(ColumnName="UPDATED_BY" )] - public string UpdatedBy { get; set; } - /// - /// 更新时间 - /// - [SugarColumn(ColumnName="UPDATED_TIME" )] - public DateTime? UpdatedTime { get; set; } - } -} diff --git a/ZR.Model/mes/pro/ProWorkorder.cs b/ZR.Model/mes/pro/ProWorkorder.cs index 77c86bd0..03270119 100644 --- a/ZR.Model/mes/pro/ProWorkorder.cs +++ b/ZR.Model/mes/pro/ProWorkorder.cs @@ -1,184 +1,127 @@ using System; using System.Collections.Generic; using System.Linq; -using SqlSugar; +using System.Text; +using System.Threading.Tasks; + namespace ZR.Model.mes.pro { /// - /// 生产计划 + /// 生产工单 /// [SugarTable("pro_workorder")] public class ProWorkorder { /// - /// 计划年 + /// 流水号 /// - [SugarColumn(ColumnName="workorder_year" ,IsPrimaryKey = true )] - public int WorkorderYear { get; set; } + [SugarColumn(ColumnName = "id", IsPrimaryKey = true)] + public string Id { get; set; } /// - /// 计划月 + /// 生产计划id /// - [SugarColumn(ColumnName="workorder_month" ,IsPrimaryKey = true )] - public int WorkorderMonth { get; set; } + [SugarColumn(ColumnName = "fk_pro_plan_id")] + public string FkProPlanId { get; set; } /// - /// 计划周 + /// 年份 /// - [SugarColumn(ColumnName="workorder_week" ,IsPrimaryKey = true )] - public int WorkorderWeek { get; set; } + [SugarColumn(ColumnName = "year")] + public int? Year { get; set; } /// - /// 工单编码/产品编码 + /// 周 /// - [SugarColumn(ColumnName="workorder_code" ,IsPrimaryKey = true )] - public string WorkorderCode { get; set; } + [SugarColumn(ColumnName = "week")] + public int? Week { get; set; } /// - /// 工单名称/第(30)周生产计划 + /// 周几 /// - [SugarColumn(ColumnName="workorder_name" )] - public string WorkorderName { get; set; } + [SugarColumn(ColumnName = "date")] + public int? Date { get; set; } /// - /// 来源类型(1:客户订单(默认),2:生产备料) + /// 排产开始时间 /// - [SugarColumn(ColumnName="order_source" )] - public string OrderSource { get; set; } + [SugarColumn(ColumnName = "arrange_starttime")] + public DateTime? ArrangeStarttime { get; set; } /// - /// 来源单据code + /// 排产结束时间 /// - [SugarColumn(ColumnName="source_code" )] - public string SourceCode { get; set; } + [SugarColumn(ColumnName = "arrange_endtime")] + public DateTime? ArrangeEndtime { get; set; } /// - /// 班组 + /// 预计工时 /// - [SugarColumn(ColumnName="classgroup" )] - public string Classgroup { get; set; } + [SugarColumn(ColumnName = "production_time")] + public decimal? ProductionTime { get; set; } /// - /// 车型 + /// 产品名称 /// - [SugarColumn(ColumnName="vehicle" )] - public string Vehicle { get; set; } + [SugarColumn(ColumnName = "production_name")] + public string ProductionName { get; set; } /// - /// 生产产品零件号 + /// 颜色 /// - [SugarColumn(ColumnName="product_id" )] - public string ProductId { get; set; } + [SugarColumn(ColumnName = "color")] + public string Color { get; set; } /// - /// 生产产品编码 + /// 油漆缸号 /// - [SugarColumn(ColumnName="product_code" )] - public string ProductCode { get; set; } + [SugarColumn(ColumnName = "paint_cylinder_number")] + public int? PaintCylinderNumber { get; set; } /// - /// 生产产品名称 + /// 规格 /// - [SugarColumn(ColumnName="product_name" )] - public string ProductName { get; set; } + [SugarColumn(ColumnName = "specification")] + public string Specification { get; set; } /// - /// 标准班产 + /// 车数 /// - [SugarColumn(ColumnName="standard_shift_production" )] - public string StandardShiftProduction { get; set; } + [SugarColumn(ColumnName = "carnum")] + public int? Carnum { get; set; } /// - /// 生产耗时 + /// 挂具摆放 /// - [SugarColumn(ColumnName="time_consumption" )] - public string TimeConsumption { get; set; } + [SugarColumn(ColumnName = "rack")] + public int? Rack { get; set; } /// - /// 本周装配计划数量 + /// 上件数 /// - [SugarColumn(ColumnName="require_quantity" )] - public string RequireQuantity { get; set; } + [SugarColumn(ColumnName = "require_num")] + public int? RequireNum { get; set; } /// - /// 单位 + /// 毛坯零件号 /// - [SugarColumn(ColumnName="unit" )] - public string Unit { get; set; } + [SugarColumn(ColumnName = "workblankpartnumber")] + public string Workblankpartnumber { get; set; } /// - /// 本周实际生产数量 + /// 成品零件号 /// - [SugarColumn(ColumnName="quantity_produced" )] - public string QuantityProduced { get; set; } + [SugarColumn(ColumnName = "finishedpartnumber")] + public string Finishedpartnumber { get; set; } /// - /// 数量调整 + /// 实际上件数 /// - [SugarColumn(ColumnName="quantity_changed" )] - public string QuantityChanged { get; set; } - /// - /// 已排程数量 - /// - [SugarColumn(ColumnName="quantity_scheduled" )] - public string QuantityScheduled { get; set; } - /// - /// 客户id - /// - [SugarColumn(ColumnName="client_id" )] - public string ClientId { get; set; } - /// - /// 客户code - /// - [SugarColumn(ColumnName="client_code" )] - public string ClientCode { get; set; } - /// - /// 客户名称 - /// - [SugarColumn(ColumnName="client_name" )] - public string ClientName { get; set; } - /// - /// 父工单 - /// - [SugarColumn(ColumnName="parent_id" )] - public string ParentId { get; set; } - /// - /// 单据状态 - /// - [SugarColumn(ColumnName="status" )] - public string Status { get; set; } - /// - /// 备注 - /// - [SugarColumn(ColumnName="remark" )] - public string Remark { get; set; } - /// - /// 备用字段1 - /// - [SugarColumn(ColumnName="attr1" )] - public string Attr1 { get; set; } - /// - /// 备用字段2 - /// - [SugarColumn(ColumnName="attr2" )] - public string Attr2 { get; set; } - /// - /// 备用字段3 - /// - [SugarColumn(ColumnName="attr3" )] - public string Attr3 { get; set; } - /// - /// 租户号 - /// - [SugarColumn(ColumnName="TENANT_ID" )] - public string TenantId { get; set; } - /// - /// 乐观锁 - /// - [SugarColumn(ColumnName="REVISION" )] - public int? Revision { get; set; } + [SugarColumn(ColumnName = "actualnumber")] + public int? Actualnumber { get; set; } /// /// 创建人 /// - [SugarColumn(ColumnName="CREATED_BY" )] - public string CreatedBy { get; set; } + [SugarColumn(ColumnName = "CREATED_BY")] + public string CreatedBy { get; set; } /// /// 创建时间 /// - [SugarColumn(ColumnName="CREATED_TIME" )] - public DateTime? CreatedTime { get; set; } + [SugarColumn(ColumnName = "CREATED_TIME")] + public DateTime? CreatedTime { get; set; } /// /// 更新人 /// - [SugarColumn(ColumnName="UPDATED_BY" )] - public string UpdatedBy { get; set; } + [SugarColumn(ColumnName = "UPDATED_BY")] + public string UpdatedBy { get; set; } /// /// 更新时间 /// - [SugarColumn(ColumnName="UPDATED_TIME" )] - public DateTime? UpdatedTime { get; set; } + [SugarColumn(ColumnName = "UPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } } + } diff --git a/ZR.Model/mes/pro/ProWorktask.cs b/ZR.Model/mes/pro/ProWorktask.cs deleted file mode 100644 index 4802a80c..00000000 --- a/ZR.Model/mes/pro/ProWorktask.cs +++ /dev/null @@ -1,179 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; -namespace ZR.Model.mes.pro -{ - /// - /// 生产任务 - /// - [SugarTable("pro_worktask")] - public class ProWorktask - { - /// - /// 生产任务id - /// - [SugarColumn(ColumnName="task_id" ,IsPrimaryKey = true ,IsIdentity = true )] - public int TaskId { get; set; } - /// - /// 生产任务code - /// - [SugarColumn(ColumnName="task_code" )] - public string TaskCode { get; set; } - /// - /// 生产计划ID - /// - [SugarColumn(ColumnName="workorder_id" )] - public string WorkorderId { get; set; } - /// - /// 生产计划编号 - /// - [SugarColumn(ColumnName="workorder_code" )] - public string WorkorderCode { get; set; } - /// - /// 计划名称 - /// - [SugarColumn(ColumnName="workorder_name" )] - public string WorkorderName { get; set; } - /// - /// 工序id - /// - [SugarColumn(ColumnName="process_id" )] - public int? ProcessId { get; set; } - /// - /// 工序编码 - /// - [SugarColumn(ColumnName="process_code" )] - public string ProcessCode { get; set; } - /// - /// 工序名称 - /// - [SugarColumn(ColumnName="process_name" )] - public string ProcessName { get; set; } - /// - /// 物料id - /// - [SugarColumn(ColumnName="material_id" )] - public int? MaterialId { get; set; } - /// - /// 物料编码 - /// - [SugarColumn(ColumnName="material_code" )] - public string MaterialCode { get; set; } - /// - /// 物料名称 - /// - [SugarColumn(ColumnName="material_name" )] - public string MaterialName { get; set; } - /// - /// 单位 - /// - [SugarColumn(ColumnName="unit" )] - public string Unit { get; set; } - /// - /// 排产数量 - /// - [SugarColumn(ColumnName="quantity" )] - public decimal? Quantity { get; set; } - /// - /// 已经生产数量 - /// - [SugarColumn(ColumnName="quantity_produced" )] - public decimal? QuantityProduced { get; set; } - /// - /// 合格品数量 - /// - [SugarColumn(ColumnName="quantity_quanlify" )] - public decimal? QuantityQuanlify { get; set; } - /// - /// 不良品数量 - /// - [SugarColumn(ColumnName="quantity_unquanlify" )] - public decimal? QuantityUnquanlify { get; set; } - /// - /// 开始生产时间 - /// - [SugarColumn(ColumnName="start_time" )] - public DateTime? StartTime { get; set; } - /// - /// 生产时长 - /// - [SugarColumn(ColumnName="duration" )] - public decimal? Duration { get; set; } - /// - /// 完成生产时间 - /// - [SugarColumn(ColumnName="end_time" )] - public DateTime? EndTime { get; set; } - /// - /// 甘特图显示颜色 - /// - [SugarColumn(ColumnName="color_code" )] - public string ColorCode { get; set; } - /// - /// 需求日期 - /// - [SugarColumn(ColumnName="request_date" )] - public string RequestDate { get; set; } - /// - /// 生产状态 - /// - [SugarColumn(ColumnName="status" )] - public string Status { get; set; } - /// - /// 备注 - /// - [SugarColumn(ColumnName="remark" )] - public string Remark { get; set; } - /// - /// 预留字段1 - /// - [SugarColumn(ColumnName="attr1" )] - public string Attr1 { get; set; } - /// - /// 预留字段2 - /// - [SugarColumn(ColumnName="attr2" )] - public string Attr2 { get; set; } - /// - /// 预留字段3 - /// - [SugarColumn(ColumnName="attr3" )] - public string Attr3 { get; set; } - /// - /// 预留字段4 - /// - [SugarColumn(ColumnName="attr4" )] - public string Attr4 { get; set; } - /// - /// 租户号 - /// - [SugarColumn(ColumnName="TENANT_ID" )] - public string TenantId { get; set; } - /// - /// 乐观锁 - /// - [SugarColumn(ColumnName="REVISION" )] - public int? Revision { get; set; } - /// - /// 创建人 - /// - [SugarColumn(ColumnName="CREATED_BY" )] - public string CreatedBy { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName="CREATED_TIME" )] - public DateTime? CreatedTime { get; set; } - /// - /// 更新人 - /// - [SugarColumn(ColumnName="UPDATED_BY" )] - public string UpdatedBy { get; set; } - /// - /// 更新时间 - /// - [SugarColumn(ColumnName="UPDATED_TIME" )] - public DateTime? UpdatedTime { get; set; } - } -} diff --git a/ZR.Model/mes/pro/ProductDefine.cs b/ZR.Model/mes/pro/ProductDefine.cs deleted file mode 100644 index 16ec5030..00000000 --- a/ZR.Model/mes/pro/ProductDefine.cs +++ /dev/null @@ -1,91 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ZR.Model.mes.pro -{ - /// - /// 产品定义 - /// - [SugarTable("md_product_define")] - public class MdProductDefine - { - /// - /// 流水号 - /// - [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] - public int Id { get; set; } - /// - /// 产品编号 - /// - [SugarColumn(ColumnName = "product_code")] - public string ProductCode { get; set; } - /// - /// 产品名称 - /// - [SugarColumn(ColumnName = "product_name")] - public string ProductName { get; set; } - /// - /// 单位id - /// - [SugarColumn(ColumnName = "product_unit")] - public int? ProductUnit { get; set; } - /// - /// 工艺路线code - /// - [SugarColumn(ColumnName = "processRoute_code")] - public string ProcessrouteCode { get; set; } - /// - /// 工艺路线 - /// - [SugarColumn(ColumnName = "processRoute_name")] - public string ProcessrouteName { get; set; } - /// - /// 预留字段1 - /// - [SugarColumn(ColumnName = "attre1")] - public string Attre1 { get; set; } - /// - /// 预留字段2 - /// - [SugarColumn(ColumnName = "attre2")] - public string Attre2 { get; set; } - /// - /// 预留字段3 - /// - [SugarColumn(ColumnName = "attre3")] - public string Attre3 { get; set; } - /// - /// 租户号 - /// - [SugarColumn(ColumnName = "TENANT_ID")] - public string TenantId { get; set; } - /// - /// 乐观锁 - /// - [SugarColumn(ColumnName = "REVISION")] - public int? Revision { get; set; } - /// - /// 创建人 - /// - [SugarColumn(ColumnName = "CREATED_BY")] - public string CreatedBy { get; set; } - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "CREATED_TIME")] - public DateTime? CreatedTime { get; set; } - /// - /// 更新人 - /// - [SugarColumn(ColumnName = "UPDATED_BY")] - public string UpdatedBy { get; set; } - /// - /// 更新时间 - /// - [SugarColumn(ColumnName = "UPDATED_TIME")] - public DateTime? UpdatedTime { get; set; } - } -} diff --git a/ZR.Vue/src/views/OperationManagement/paintingWorkshop.vue b/ZR.Vue/src/views/OperationManagement/paintingWorkshop.vue index cebb6c55..11dd4791 100644 --- a/ZR.Vue/src/views/OperationManagement/paintingWorkshop.vue +++ b/ZR.Vue/src/views/OperationManagement/paintingWorkshop.vue @@ -1,5 +1,5 @@