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 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<Folder Include="Controllers\MES\pro\" />
 		<Folder Include="Images\" />
 		<Folder Include="Properties\PublishProfiles\" />
 	</ItemGroup>
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
+{
+    /// <summary>
+    /// 生产计划
+    ///</summary>
+    [SugarTable("pro_workplan")]
+    public class ProWorkplan
+    {
+        /// <summary>
+        /// 流水号 
+        ///</summary>
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+        public string Id { get; set; }
+        /// <summary>
+        /// 年 
+        ///</summary>
+        [SugarColumn(ColumnName = "year")]
+        public int? Year { get; set; }
+        /// <summary>
+        /// 周 
+        ///</summary>
+        [SugarColumn(ColumnName = "week")]
+        public int? Week { get; set; }
+        /// <summary>
+        /// 来源 
+        ///</summary>
+        [SugarColumn(ColumnName = "source")]
+        public int? Source { get; set; }
+        /// <summary>
+        /// 零件号 
+        ///</summary>
+        [SugarColumn(ColumnName = "partnumber")]
+        public string Partnumber { get; set; }
+        /// <summary>
+        /// 版本 
+        ///</summary>
+        [SugarColumn(ColumnName = "version")]
+        public string Version { get; set; }
+        /// <summary>
+        /// 颜色 
+        ///</summary>
+        [SugarColumn(ColumnName = "color")]
+        public string Color { get; set; }
+        /// <summary>
+        /// 颜色代码 
+        ///</summary>
+        [SugarColumn(ColumnName = "colorcode")]
+        public string Colorcode { get; set; }
+        /// <summary>
+        /// 本周要货数量 
+        ///</summary>
+        [SugarColumn(ColumnName = "neednumber")]
+        public string Neednumber { get; set; }
+        /// <summary>
+        /// 产品合格率 
+        ///</summary>
+        [SugarColumn(ColumnName = "passpercent")]
+        public string Passpercent { get; set; }
+        /// <summary>
+        /// 每挂数量 
+        ///</summary>
+        [SugarColumn(ColumnName = "batchNumber")]
+        public int? BatchNumber { get; set; }
+        /// <summary>
+        /// 生产节拍 
+        ///</summary>
+        [SugarColumn(ColumnName = "productionRhythm")]
+        public decimal? ProductionRhythm { get; set; }
+        /// <summary>
+        /// 总挂具数 
+        ///</summary>
+        [SugarColumn(ColumnName = "hangerNumber")]
+        public int? HangerNumber { get; set; }
+        /// <summary>
+        /// 订单需生产挂具数量 
+        ///</summary>
+        [SugarColumn(ColumnName = "needhangerNumber")]
+        public string NeedhangerNumber { get; set; }
+        /// <summary>
+        /// 实际计划数量 
+        ///</summary>
+        [SugarColumn(ColumnName = "actualplanNumber")]
+        public string ActualplanNumber { get; set; }
+        /// <summary>
+        /// 车数 
+        ///</summary>
+        [SugarColumn(ColumnName = "carNumber")]
+        public string CarNumber { get; set; }
+        /// <summary>
+        /// 圈数 
+        ///</summary>
+        [SugarColumn(ColumnName = "circleNumber")]
+        public string CircleNumber { get; set; }
+        /// <summary>
+        /// 订单生产时间(分钟) 
+        ///</summary>
+        [SugarColumn(ColumnName = "producttime")]
+        public int? Producttime { get; set; }
+        /// <summary>
+        /// 计划需求定性 
+        ///</summary>
+        [SugarColumn(ColumnName = "needcertainty")]
+        public string Needcertainty { get; set; }
+        /// <summary>
+        /// 备注 
+        ///</summary>
+        [SugarColumn(ColumnName = "remark")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 租户号 
+        ///</summary>
+        [SugarColumn(ColumnName = "TENANT_ID")]
+        public string TenantId { get; set; }
+        /// <summary>
+        /// 乐观锁 
+        ///</summary>
+        [SugarColumn(ColumnName = "REVISION")]
+        public int? Revision { get; set; }
+        /// <summary>
+        /// 创建人 
+        ///</summary>
+        [SugarColumn(ColumnName = "CREATED_BY")]
+        public string CreatedBy { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+        [SugarColumn(ColumnName = "CREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+        /// <summary>
+        /// 更新人 
+        ///</summary>
+        [SugarColumn(ColumnName = "UPDATED_BY")]
+        public string UpdatedBy { get; set; }
+        /// <summary>
+        /// 更新时间 
+        ///</summary>
+        [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
-{
-    /// <summary>
-    /// 产线叫料
-    ///</summary>
-    [SugarTable("pro_callmaterial")]
-    public class ProCallmaterial
-    {
-        /// <summary>
-        /// 编号 
-        ///</summary>
-         [SugarColumn(ColumnName="id" ,IsPrimaryKey = true   )]
-         public int Id { get; set; }
-        /// <summary>
-        /// fk_生产任务id 
-        ///</summary>
-         [SugarColumn(ColumnName="fk_task_id"    )]
-         public int? FkTaskId { get; set; }
-        /// <summary>
-        /// 物料id 
-        ///</summary>
-         [SugarColumn(ColumnName="material_id"    )]
-         public string MaterialId { get; set; }
-        /// <summary>
-        /// 物料code 
-        ///</summary>
-         [SugarColumn(ColumnName="material_code"    )]
-         public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料名称 
-        ///</summary>
-         [SugarColumn(ColumnName="material_name"    )]
-         public string MaterialName { get; set; }
-        /// <summary>
-        /// 叫料数量 
-        ///</summary>
-         [SugarColumn(ColumnName="call_num"    )]
-         public decimal? CallNum { get; set; }
-        /// <summary>
-        /// 叫料时间 
-        ///</summary>
-         [SugarColumn(ColumnName="call_time"    )]
-         public DateTime? CallTime { get; set; }
-        /// <summary>
-        /// 得到数量 
-        ///</summary>
-         [SugarColumn(ColumnName="arrive_num"    )]
-         public decimal? ArriveNum { get; set; }
-        /// <summary>
-        /// 叫料是否成功(0，1) 
-        ///</summary>
-         [SugarColumn(ColumnName="status"    )]
-         public string Status { get; set; }
-        /// <summary>
-        /// 备用字段1 
-        ///</summary>
-         [SugarColumn(ColumnName="attr1"    )]
-         public string Attr1 { get; set; }
-        /// <summary>
-        /// 备用字段2 
-        ///</summary>
-         [SugarColumn(ColumnName="attr2"    )]
-         public string Attr2 { get; set; }
-        /// <summary>
-        /// 备用字段3 
-        ///</summary>
-         [SugarColumn(ColumnName="attr3"    )]
-         public string Attr3 { get; set; }
-        /// <summary>
-        /// 租户号 
-        ///</summary>
-         [SugarColumn(ColumnName="TENANT_ID"    )]
-         public string TenantId { get; set; }
-        /// <summary>
-        /// 乐观锁 
-        ///</summary>
-         [SugarColumn(ColumnName="REVISION"    )]
-         public int? Revision { get; set; }
-        /// <summary>
-        /// 创建人 
-        ///</summary>
-         [SugarColumn(ColumnName="CREATED_BY"    )]
-         public string CreatedBy { get; set; }
-        /// <summary>
-        /// 创建时间 
-        ///</summary>
-         [SugarColumn(ColumnName="CREATED_TIME"    )]
-         public DateTime? CreatedTime { get; set; }
-        /// <summary>
-        /// 更新人 
-        ///</summary>
-         [SugarColumn(ColumnName="UPDATED_BY"    )]
-         public string UpdatedBy { get; set; }
-        /// <summary>
-        /// 更新时间 
-        ///</summary>
-         [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
-{
-    /// <summary>
-    /// 生产报工
-    ///</summary>
-    [SugarTable("pro_feedback")]
-    public class ProFeedback
-    {
-        /// <summary>
-        /// 主键 
-        ///</summary>
-         [SugarColumn(ColumnName="record_id" ,IsPrimaryKey = true   )]
-         public int RecordId { get; set; }
-        /// <summary>
-        /// 报工类型（统一报工，自行报工） 
-        ///</summary>
-         [SugarColumn(ColumnName="feedback_type"    )]
-         public string FeedbackType { get; set; }
-        /// <summary>
-        /// 报工单编号 
-        ///</summary>
-         [SugarColumn(ColumnName="feedback_code"    )]
-         public string FeedbackCode { get; set; }
-        /// <summary>
-        /// 工单id 
-        ///</summary>
-         [SugarColumn(ColumnName="workorder_id"    )]
-         public int? WorkorderId { get; set; }
-        /// <summary>
-        /// 工单code 
-        ///</summary>
-         [SugarColumn(ColumnName="workorder_code"    )]
-         public string WorkorderCode { get; set; }
-        /// <summary>
-        /// 工单name 
-        ///</summary>
-         [SugarColumn(ColumnName="workorder_name"    )]
-         public string WorkorderName { get; set; }
-        /// <summary>
-        /// 工序id 
-        ///</summary>
-         [SugarColumn(ColumnName="process_id"    )]
-         public int? ProcessId { get; set; }
-        /// <summary>
-        /// 工序code 
-        ///</summary>
-         [SugarColumn(ColumnName="process_code"    )]
-         public string ProcessCode { get; set; }
-        /// <summary>
-        /// 工序name 
-        ///</summary>
-         [SugarColumn(ColumnName="process_name"    )]
-         public string ProcessName { get; set; }
-        /// <summary>
-        /// 工作站id 
-        ///</summary>
-         [SugarColumn(ColumnName="workstation_id"    )]
-         public int? WorkstationId { get; set; }
-        /// <summary>
-        /// 工作站code 
-        ///</summary>
-         [SugarColumn(ColumnName="workstation_code"    )]
-         public string WorkstationCode { get; set; }
-        /// <summary>
-        /// 工作站name 
-        ///</summary>
-         [SugarColumn(ColumnName="workstation_name"    )]
-         public string WorkstationName { get; set; }
-        /// <summary>
-        /// 生产任务ID 
-        ///</summary>
-         [SugarColumn(ColumnName="task_id"    )]
-         public string TaskId { get; set; }
-        /// <summary>
-        /// 生产任务code 
-        ///</summary>
-         [SugarColumn(ColumnName="task_code"    )]
-         public string TaskCode { get; set; }
-        /// <summary>
-        /// 产品物料ID 
-        ///</summary>
-         [SugarColumn(ColumnName="item_id"    )]
-         public string ItemId { get; set; }
-        /// <summary>
-        /// 产品物料code 
-        ///</summary>
-         [SugarColumn(ColumnName="item_code"    )]
-         public string ItemCode { get; set; }
-        /// <summary>
-        /// 产品物料name 
-        ///</summary>
-         [SugarColumn(ColumnName="item_name"    )]
-         public string ItemName { get; set; }
-        /// <summary>
-        /// 单位 
-        ///</summary>
-         [SugarColumn(ColumnName="unit"    )]
-         public string Unit { get; set; }
-        /// <summary>
-        /// 排产数量 
-        ///</summary>
-         [SugarColumn(ColumnName="quantity"    )]
-         public string Quantity { get; set; }
-        /// <summary>
-        /// 本次报工数量 
-        ///</summary>
-         [SugarColumn(ColumnName="quantity_feedback"    )]
-         public string QuantityFeedback { get; set; }
-        /// <summary>
-        /// 合格数量 
-        ///</summary>
-         [SugarColumn(ColumnName="quantity_qualified"    )]
-         public string QuantityQualified { get; set; }
-        /// <summary>
-        /// 不合格数量 
-        ///</summary>
-         [SugarColumn(ColumnName="quantity_unquanlified"    )]
-         public string QuantityUnquanlified { get; set; }
-        /// <summary>
-        /// 报工人姓名 
-        ///</summary>
-         [SugarColumn(ColumnName="user_name"    )]
-         public string UserName { get; set; }
-        /// <summary>
-        /// 昵称 
-        ///</summary>
-         [SugarColumn(ColumnName="nick_name"    )]
-         public string NickName { get; set; }
-        /// <summary>
-        /// 报工途径 
-        ///</summary>
-         [SugarColumn(ColumnName="feedback_channel"    )]
-         public string FeedbackChannel { get; set; }
-        /// <summary>
-        /// 报工时间 
-        ///</summary>
-         [SugarColumn(ColumnName="feedback_time"    )]
-         public string FeedbackTime { get; set; }
-        /// <summary>
-        /// 记录人名称 
-        ///</summary>
-         [SugarColumn(ColumnName="record_user"    )]
-         public string RecordUser { get; set; }
-        /// <summary>
-        /// 昵称 
-        ///</summary>
-         [SugarColumn(ColumnName="record_nick"    )]
-         public string RecordNick { get; set; }
-        /// <summary>
-        /// 状态 
-        ///</summary>
-         [SugarColumn(ColumnName="status"    )]
-         public string Status { get; set; }
-        /// <summary>
-        /// 备注 
-        ///</summary>
-         [SugarColumn(ColumnName="remark"    )]
-         public string Remark { get; set; }
-        /// <summary>
-        /// 预留字段1 
-        ///</summary>
-         [SugarColumn(ColumnName="attr1"    )]
-         public string Attr1 { get; set; }
-        /// <summary>
-        /// 预留字段2 
-        ///</summary>
-         [SugarColumn(ColumnName="attr2"    )]
-         public string Attr2 { get; set; }
-        /// <summary>
-        /// 预留字段3 
-        ///</summary>
-         [SugarColumn(ColumnName="attr3"    )]
-         public string Attr3 { get; set; }
-        /// <summary>
-        /// 预留字段4 
-        ///</summary>
-         [SugarColumn(ColumnName="attr4"    )]
-         public string Attr4 { get; set; }
-        /// <summary>
-        /// 租户号 
-        ///</summary>
-         [SugarColumn(ColumnName="TENANT_ID"    )]
-         public string TenantId { get; set; }
-        /// <summary>
-        /// 乐观锁 
-        ///</summary>
-         [SugarColumn(ColumnName="REVISION"    )]
-         public int? Revision { get; set; }
-        /// <summary>
-        /// 创建人 
-        ///</summary>
-         [SugarColumn(ColumnName="CREATED_BY"    )]
-         public string CreatedBy { get; set; }
-        /// <summary>
-        /// 创建时间 
-        ///</summary>
-         [SugarColumn(ColumnName="CREATED_TIME"    )]
-         public DateTime? CreatedTime { get; set; }
-        /// <summary>
-        /// 更新人 
-        ///</summary>
-         [SugarColumn(ColumnName="UPDATED_BY"    )]
-         public string UpdatedBy { get; set; }
-        /// <summary>
-        /// 更新时间 
-        ///</summary>
-         [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
 {
     /// <summary>
-    /// 生产计划
+    /// 生产工单
     ///</summary>
     [SugarTable("pro_workorder")]
     public class ProWorkorder
     {
         /// <summary>
-        /// 计划年 
+        /// 流水号 
         ///</summary>
-         [SugarColumn(ColumnName="workorder_year" ,IsPrimaryKey = true   )]
-         public int WorkorderYear { get; set; }
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+        public string Id { get; set; }
         /// <summary>
-        /// 计划月 
+        /// 生产计划id 
         ///</summary>
-         [SugarColumn(ColumnName="workorder_month" ,IsPrimaryKey = true   )]
-         public int WorkorderMonth { get; set; }
+        [SugarColumn(ColumnName = "fk_pro_plan_id")]
+        public string FkProPlanId { get; set; }
         /// <summary>
-        /// 计划周 
+        /// 年份 
         ///</summary>
-         [SugarColumn(ColumnName="workorder_week" ,IsPrimaryKey = true   )]
-         public int WorkorderWeek { get; set; }
+        [SugarColumn(ColumnName = "year")]
+        public int? Year { get; set; }
         /// <summary>
-        /// 工单编码/产品编码 
+        /// 周 
         ///</summary>
-         [SugarColumn(ColumnName="workorder_code" ,IsPrimaryKey = true   )]
-         public string WorkorderCode { get; set; }
+        [SugarColumn(ColumnName = "week")]
+        public int? Week { get; set; }
         /// <summary>
-        /// 工单名称/第（30)周生产计划 
+        /// 周几 
         ///</summary>
-         [SugarColumn(ColumnName="workorder_name"    )]
-         public string WorkorderName { get; set; }
+        [SugarColumn(ColumnName = "date")]
+        public int? Date { get; set; }
         /// <summary>
-        /// 来源类型（1：客户订单（默认），2：生产备料） 
+        /// 排产开始时间 
         ///</summary>
-         [SugarColumn(ColumnName="order_source"    )]
-         public string OrderSource { get; set; }
+        [SugarColumn(ColumnName = "arrange_starttime")]
+        public DateTime? ArrangeStarttime { get; set; }
         /// <summary>
-        /// 来源单据code 
+        /// 排产结束时间 
         ///</summary>
-         [SugarColumn(ColumnName="source_code"    )]
-         public string SourceCode { get; set; }
+        [SugarColumn(ColumnName = "arrange_endtime")]
+        public DateTime? ArrangeEndtime { get; set; }
         /// <summary>
-        /// 班组 
+        /// 预计工时 
         ///</summary>
-         [SugarColumn(ColumnName="classgroup"    )]
-         public string Classgroup { get; set; }
+        [SugarColumn(ColumnName = "production_time")]
+        public decimal? ProductionTime { get; set; }
         /// <summary>
-        /// 车型 
+        /// 产品名称 
         ///</summary>
-         [SugarColumn(ColumnName="vehicle"    )]
-         public string Vehicle { get; set; }
+        [SugarColumn(ColumnName = "production_name")]
+        public string ProductionName { get; set; }
         /// <summary>
-        /// 生产产品零件号 
+        /// 颜色 
         ///</summary>
-         [SugarColumn(ColumnName="product_id"    )]
-         public string ProductId { get; set; }
+        [SugarColumn(ColumnName = "color")]
+        public string Color { get; set; }
         /// <summary>
-        /// 生产产品编码 
+        /// 油漆缸号 
         ///</summary>
-         [SugarColumn(ColumnName="product_code"    )]
-         public string ProductCode { get; set; }
+        [SugarColumn(ColumnName = "paint_cylinder_number")]
+        public int? PaintCylinderNumber { get; set; }
         /// <summary>
-        /// 生产产品名称 
+        /// 规格 
         ///</summary>
-         [SugarColumn(ColumnName="product_name"    )]
-         public string ProductName { get; set; }
+        [SugarColumn(ColumnName = "specification")]
+        public string Specification { get; set; }
         /// <summary>
-        /// 标准班产 
+        /// 车数 
         ///</summary>
-         [SugarColumn(ColumnName="standard_shift_production"    )]
-         public string StandardShiftProduction { get; set; }
+        [SugarColumn(ColumnName = "carnum")]
+        public int? Carnum { get; set; }
         /// <summary>
-        /// 生产耗时 
+        /// 挂具摆放 
         ///</summary>
-         [SugarColumn(ColumnName="time_consumption"    )]
-         public string TimeConsumption { get; set; }
+        [SugarColumn(ColumnName = "rack")]
+        public int? Rack { get; set; }
         /// <summary>
-        /// 本周装配计划数量 
+        /// 上件数 
         ///</summary>
-         [SugarColumn(ColumnName="require_quantity"    )]
-         public string RequireQuantity { get; set; }
+        [SugarColumn(ColumnName = "require_num")]
+        public int? RequireNum { get; set; }
         /// <summary>
-        /// 单位 
+        /// 毛坯零件号 
         ///</summary>
-         [SugarColumn(ColumnName="unit"    )]
-         public string Unit { get; set; }
+        [SugarColumn(ColumnName = "workblankpartnumber")]
+        public string Workblankpartnumber { get; set; }
         /// <summary>
-        /// 本周实际生产数量 
+        /// 成品零件号 
         ///</summary>
-         [SugarColumn(ColumnName="quantity_produced"    )]
-         public string QuantityProduced { get; set; }
+        [SugarColumn(ColumnName = "finishedpartnumber")]
+        public string Finishedpartnumber { get; set; }
         /// <summary>
-        /// 数量调整 
+        /// 实际上件数 
         ///</summary>
-         [SugarColumn(ColumnName="quantity_changed"    )]
-         public string QuantityChanged { get; set; }
-        /// <summary>
-        /// 已排程数量 
-        ///</summary>
-         [SugarColumn(ColumnName="quantity_scheduled"    )]
-         public string QuantityScheduled { get; set; }
-        /// <summary>
-        /// 客户id 
-        ///</summary>
-         [SugarColumn(ColumnName="client_id"    )]
-         public string ClientId { get; set; }
-        /// <summary>
-        /// 客户code 
-        ///</summary>
-         [SugarColumn(ColumnName="client_code"    )]
-         public string ClientCode { get; set; }
-        /// <summary>
-        /// 客户名称 
-        ///</summary>
-         [SugarColumn(ColumnName="client_name"    )]
-         public string ClientName { get; set; }
-        /// <summary>
-        /// 父工单 
-        ///</summary>
-         [SugarColumn(ColumnName="parent_id"    )]
-         public string ParentId { get; set; }
-        /// <summary>
-        /// 单据状态 
-        ///</summary>
-         [SugarColumn(ColumnName="status"    )]
-         public string Status { get; set; }
-        /// <summary>
-        /// 备注 
-        ///</summary>
-         [SugarColumn(ColumnName="remark"    )]
-         public string Remark { get; set; }
-        /// <summary>
-        /// 备用字段1 
-        ///</summary>
-         [SugarColumn(ColumnName="attr1"    )]
-         public string Attr1 { get; set; }
-        /// <summary>
-        /// 备用字段2 
-        ///</summary>
-         [SugarColumn(ColumnName="attr2"    )]
-         public string Attr2 { get; set; }
-        /// <summary>
-        /// 备用字段3 
-        ///</summary>
-         [SugarColumn(ColumnName="attr3"    )]
-         public string Attr3 { get; set; }
-        /// <summary>
-        /// 租户号 
-        ///</summary>
-         [SugarColumn(ColumnName="TENANT_ID"    )]
-         public string TenantId { get; set; }
-        /// <summary>
-        /// 乐观锁 
-        ///</summary>
-         [SugarColumn(ColumnName="REVISION"    )]
-         public int? Revision { get; set; }
+        [SugarColumn(ColumnName = "actualnumber")]
+        public int? Actualnumber { get; set; }
         /// <summary>
         /// 创建人 
         ///</summary>
-         [SugarColumn(ColumnName="CREATED_BY"    )]
-         public string CreatedBy { get; set; }
+        [SugarColumn(ColumnName = "CREATED_BY")]
+        public string CreatedBy { get; set; }
         /// <summary>
         /// 创建时间 
         ///</summary>
-         [SugarColumn(ColumnName="CREATED_TIME"    )]
-         public DateTime? CreatedTime { get; set; }
+        [SugarColumn(ColumnName = "CREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
         /// <summary>
         /// 更新人 
         ///</summary>
-         [SugarColumn(ColumnName="UPDATED_BY"    )]
-         public string UpdatedBy { get; set; }
+        [SugarColumn(ColumnName = "UPDATED_BY")]
+        public string UpdatedBy { get; set; }
         /// <summary>
         /// 更新时间 
         ///</summary>
-         [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
-{
-    /// <summary>
-    /// 生产任务
-    ///</summary>
-    [SugarTable("pro_worktask")]
-    public class ProWorktask
-    {
-        /// <summary>
-        /// 生产任务id 
-        ///</summary>
-         [SugarColumn(ColumnName="task_id" ,IsPrimaryKey = true ,IsIdentity = true  )]
-         public int TaskId { get; set; }
-        /// <summary>
-        /// 生产任务code 
-        ///</summary>
-         [SugarColumn(ColumnName="task_code"    )]
-         public string TaskCode { get; set; }
-        /// <summary>
-        /// 生产计划ID 
-        ///</summary>
-         [SugarColumn(ColumnName="workorder_id"    )]
-         public string WorkorderId { get; set; }
-        /// <summary>
-        /// 生产计划编号 
-        ///</summary>
-         [SugarColumn(ColumnName="workorder_code"    )]
-         public string WorkorderCode { get; set; }
-        /// <summary>
-        /// 计划名称 
-        ///</summary>
-         [SugarColumn(ColumnName="workorder_name"    )]
-         public string WorkorderName { get; set; }
-        /// <summary>
-        /// 工序id 
-        ///</summary>
-         [SugarColumn(ColumnName="process_id"    )]
-         public int? ProcessId { get; set; }
-        /// <summary>
-        /// 工序编码 
-        ///</summary>
-         [SugarColumn(ColumnName="process_code"    )]
-         public string ProcessCode { get; set; }
-        /// <summary>
-        /// 工序名称 
-        ///</summary>
-         [SugarColumn(ColumnName="process_name"    )]
-         public string ProcessName { get; set; }
-        /// <summary>
-        /// 物料id 
-        ///</summary>
-         [SugarColumn(ColumnName="material_id"    )]
-         public int? MaterialId { get; set; }
-        /// <summary>
-        /// 物料编码 
-        ///</summary>
-         [SugarColumn(ColumnName="material_code"    )]
-         public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料名称 
-        ///</summary>
-         [SugarColumn(ColumnName="material_name"    )]
-         public string MaterialName { get; set; }
-        /// <summary>
-        /// 单位 
-        ///</summary>
-         [SugarColumn(ColumnName="unit"    )]
-         public string Unit { get; set; }
-        /// <summary>
-        /// 排产数量 
-        ///</summary>
-         [SugarColumn(ColumnName="quantity"    )]
-         public decimal? Quantity { get; set; }
-        /// <summary>
-        /// 已经生产数量 
-        ///</summary>
-         [SugarColumn(ColumnName="quantity_produced"    )]
-         public decimal? QuantityProduced { get; set; }
-        /// <summary>
-        /// 合格品数量 
-        ///</summary>
-         [SugarColumn(ColumnName="quantity_quanlify"    )]
-         public decimal? QuantityQuanlify { get; set; }
-        /// <summary>
-        /// 不良品数量 
-        ///</summary>
-         [SugarColumn(ColumnName="quantity_unquanlify"    )]
-         public decimal? QuantityUnquanlify { get; set; }
-        /// <summary>
-        /// 开始生产时间 
-        ///</summary>
-         [SugarColumn(ColumnName="start_time"    )]
-         public DateTime? StartTime { get; set; }
-        /// <summary>
-        /// 生产时长 
-        ///</summary>
-         [SugarColumn(ColumnName="duration"    )]
-         public decimal? Duration { get; set; }
-        /// <summary>
-        /// 完成生产时间 
-        ///</summary>
-         [SugarColumn(ColumnName="end_time"    )]
-         public DateTime? EndTime { get; set; }
-        /// <summary>
-        /// 甘特图显示颜色 
-        ///</summary>
-         [SugarColumn(ColumnName="color_code"    )]
-         public string ColorCode { get; set; }
-        /// <summary>
-        /// 需求日期 
-        ///</summary>
-         [SugarColumn(ColumnName="request_date"    )]
-         public string RequestDate { get; set; }
-        /// <summary>
-        /// 生产状态 
-        ///</summary>
-         [SugarColumn(ColumnName="status"    )]
-         public string Status { get; set; }
-        /// <summary>
-        /// 备注 
-        ///</summary>
-         [SugarColumn(ColumnName="remark"    )]
-         public string Remark { get; set; }
-        /// <summary>
-        /// 预留字段1 
-        ///</summary>
-         [SugarColumn(ColumnName="attr1"    )]
-         public string Attr1 { get; set; }
-        /// <summary>
-        /// 预留字段2 
-        ///</summary>
-         [SugarColumn(ColumnName="attr2"    )]
-         public string Attr2 { get; set; }
-        /// <summary>
-        /// 预留字段3 
-        ///</summary>
-         [SugarColumn(ColumnName="attr3"    )]
-         public string Attr3 { get; set; }
-        /// <summary>
-        /// 预留字段4 
-        ///</summary>
-         [SugarColumn(ColumnName="attr4"    )]
-         public string Attr4 { get; set; }
-        /// <summary>
-        /// 租户号 
-        ///</summary>
-         [SugarColumn(ColumnName="TENANT_ID"    )]
-         public string TenantId { get; set; }
-        /// <summary>
-        /// 乐观锁 
-        ///</summary>
-         [SugarColumn(ColumnName="REVISION"    )]
-         public int? Revision { get; set; }
-        /// <summary>
-        /// 创建人 
-        ///</summary>
-         [SugarColumn(ColumnName="CREATED_BY"    )]
-         public string CreatedBy { get; set; }
-        /// <summary>
-        /// 创建时间 
-        ///</summary>
-         [SugarColumn(ColumnName="CREATED_TIME"    )]
-         public DateTime? CreatedTime { get; set; }
-        /// <summary>
-        /// 更新人 
-        ///</summary>
-         [SugarColumn(ColumnName="UPDATED_BY"    )]
-         public string UpdatedBy { get; set; }
-        /// <summary>
-        /// 更新时间 
-        ///</summary>
-         [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
-{
-    /// <summary>
-    /// 产品定义
-    ///</summary>
-    [SugarTable("md_product_define")]
-    public class MdProductDefine
-    {
-        /// <summary>
-        /// 流水号 
-        ///</summary>
-        [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
-        public int Id { get; set; }
-        /// <summary>
-        /// 产品编号 
-        ///</summary>
-        [SugarColumn(ColumnName = "product_code")]
-        public string ProductCode { get; set; }
-        /// <summary>
-        /// 产品名称 
-        ///</summary>
-        [SugarColumn(ColumnName = "product_name")]
-        public string ProductName { get; set; }
-        /// <summary>
-        /// 单位id 
-        ///</summary>
-        [SugarColumn(ColumnName = "product_unit")]
-        public int? ProductUnit { get; set; }
-        /// <summary>
-        /// 工艺路线code 
-        ///</summary>
-        [SugarColumn(ColumnName = "processRoute_code")]
-        public string ProcessrouteCode { get; set; }
-        /// <summary>
-        /// 工艺路线 
-        ///</summary>
-        [SugarColumn(ColumnName = "processRoute_name")]
-        public string ProcessrouteName { get; set; }
-        /// <summary>
-        /// 预留字段1 
-        ///</summary>
-        [SugarColumn(ColumnName = "attre1")]
-        public string Attre1 { get; set; }
-        /// <summary>
-        /// 预留字段2 
-        ///</summary>
-        [SugarColumn(ColumnName = "attre2")]
-        public string Attre2 { get; set; }
-        /// <summary>
-        /// 预留字段3 
-        ///</summary>
-        [SugarColumn(ColumnName = "attre3")]
-        public string Attre3 { get; set; }
-        /// <summary>
-        /// 租户号 
-        ///</summary>
-        [SugarColumn(ColumnName = "TENANT_ID")]
-        public string TenantId { get; set; }
-        /// <summary>
-        /// 乐观锁 
-        ///</summary>
-        [SugarColumn(ColumnName = "REVISION")]
-        public int? Revision { get; set; }
-        /// <summary>
-        /// 创建人 
-        ///</summary>
-        [SugarColumn(ColumnName = "CREATED_BY")]
-        public string CreatedBy { get; set; }
-        /// <summary>
-        /// 创建时间 
-        ///</summary>
-        [SugarColumn(ColumnName = "CREATED_TIME")]
-        public DateTime? CreatedTime { get; set; }
-        /// <summary>
-        /// 更新人 
-        ///</summary>
-        [SugarColumn(ColumnName = "UPDATED_BY")]
-        public string UpdatedBy { get; set; }
-        /// <summary>
-        /// 更新时间 
-        ///</summary>
-        [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 @@
 <template>
-  <div>
+  <div class="dark_theme">
     <vxe-table
       border
       resizable
@@ -28,8 +28,6 @@
         </template>
       </vxe-column>
 
-
-      
       <vxe-column field="name" title="app.body.label.name" sortable>
         <template #default="{ row }">
           <a href="https://github.com/x-extends/vxe-table" target="_black">我是超链接：{{ row.name }}</a>
@@ -261,7 +259,11 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
+.dark_theme {
+  background: black;
+}
+
 .first-col {
   position: relative;
   height: 20px;
diff --git a/ZR.Vue/src/views/index.vue b/ZR.Vue/src/views/index.vue
index 4810cbc2..eaf6490f 100644
--- a/ZR.Vue/src/views/index.vue
+++ b/ZR.Vue/src/views/index.vue
@@ -26,9 +26,9 @@
           <div class="card-wrap">
             <el-image :src="imagesArray[0]" class="image"></el-image>
             <div>
-              <p class="title">传统面授</p>
+              <p class="title">我们的产品</p>
               <p class="card-context">
-                学生在教室里与老师进行面对面的授课和互动。老师通过讲解、演示和示范等方式向学生传授知识，学生则通过听讲、做笔记和提问等方式进行学习。
+                上海干巷车镜实业有限公司是上海市高新技术企业、上海市文明单位、上海市优秀企业形象单位、国家汽车零部件出口基地企业。
               </p>
             </div>
           </div>
@@ -37,9 +37,9 @@
           <div class="card-wrap">
             <el-image :src="imagesArray[0]" class="image"></el-image>
             <div>
-              <p class="title">传统面授</p>
+              <p class="title">我们的产品</p>
               <p class="card-context">
-                学生在教室里与老师进行面对面的授课和互动。老师通过讲解、演示和示范等方式向学生传授知识，学生则通过听讲、做笔记和提问等方式进行学习。
+                上海干巷车镜实业有限公司是上海市高新技术企业、上海市文明单位、上海市优秀企业形象单位、国家汽车零部件出口基地企业。
               </p>
             </div>
           </div>
@@ -48,9 +48,9 @@
           <div class="card-wrap">
             <el-image :src="imagesArray[0]" class="image"></el-image>
             <div>
-              <p class="title">传统面授</p>
+              <p class="title">我们的产品</p>
               <p class="card-context">
-                学生在教室里与老师进行面对面的授课和互动。老师通过讲解、演示和示范等方式向学生传授知识，学生则通过听讲、做笔记和提问等方式进行学习。
+                上海干巷车镜实业有限公司是上海市高新技术企业、上海市文明单位、上海市优秀企业形象单位、国家汽车零部件出口基地企业。
               </p>
             </div>
           </div>
@@ -59,9 +59,9 @@
           <div class="card-wrap">
             <el-image :src="imagesArray[0]" class="image"></el-image>
             <div>
-              <p class="title">传统面授</p>
+              <p class="title">我们的产品</p>
               <p class="card-context">
-                学生在教室里与老师进行面对面的授课和互动。老师通过讲解、演示和示范等方式向学生传授知识，学生则通过听讲、做笔记和提问等方式进行学习。
+                上海干巷车镜实业有限公司是上海市高新技术企业、上海市文明单位、上海市优秀企业形象单位、国家汽车零部件出口基地企业。
               </p>
             </div>
           </div>
diff --git a/ZR.Vue/src/views/kanbanManagement/tuzhuangcanku.vue b/ZR.Vue/src/views/kanbanManagement/tuzhuangcanku.vue
index cc5d44b5..c70a71fb 100644
--- a/ZR.Vue/src/views/kanbanManagement/tuzhuangcanku.vue
+++ b/ZR.Vue/src/views/kanbanManagement/tuzhuangcanku.vue
@@ -1,41 +1,34 @@
 <template>
-  <div class="app-container">
-    <h1>涂装车间物料实时看板</h1>
-
-    <el-row :gutter="10" style="margin-left: 120px">
-      <el-col :span="4">
-        <div class="producting"><h2>1</h2></div>
-        <jihe style="margin: 0 auto"></jihe>
-      </el-col>
-      <el-col :span="4">
-        <div class="producting"><h2>2</h2></div>
-        <jihe style="margin: 0 auto"></jihe
-      ></el-col>
-      <el-col :span="4">
-        <div class="producting"><h2>3</h2></div>
-        <jihe style="margin: 0 auto"></jihe
-      ></el-col>
-      <el-col :span="4">
-        <div class="productstop"><h2>4</h2></div>
-        <jihe1 style="margin: 0 auto"></jihe1
-      ></el-col>
-      <el-col :span="4">
-        <div class="producting"><h2>5</h2></div>
-        <jihe style="margin: 0 auto"></jihe
-      ></el-col>
-      <el-col :span="4"><el-tag type="success">未满</el-tag><el-tag type="info">已满</el-tag></el-col>
+  <div class="app-container" style="background: black">
+    <el-row>
+      <el-col :span="8"><dv-decoration-8 style="width: 300px; height: 50px" /></el-col>
+      <el-col :span="8"
+        ><dv-decoration-7 style="height: 50px; color: white"> <h1>涂装车间物料实时看板</h1></dv-decoration-7></el-col
+      >
+      <el-col :span="8"><dv-decoration-8 :reverse="true" style="width: 300px; height: 50px; float: right" /></el-col>
     </el-row>
-    <vxe-table border resizable align="center" ref="xTable" :data="tableData" :row-style="rowClassName" :cell-style="cellStyle">
-      <vxe-column type="seq" width="60"></vxe-column>
-      <vxe-column field="NOProductionQuantity" title="未备料数量"></vxe-column>
-      <vxe-column field="num" title="库位号"></vxe-column>
-      <vxe-column field="ProductionQuantity" title="计划数量"></vxe-column>
-      <vxe-column field="online_time" title="上线时间"></vxe-column>
-      <vxe-column field="work_order" title="工单" :formatter="formatworkOrder" type="html"></vxe-column>
-      <vxe-column field="part_NO" title="零件号" :formatter="formatPartNo" type="html"></vxe-column>
-      <vxe-column field="part_name" title="零件名称" :formatter="formatPartName" type="html"> </vxe-column>
-      <vxe-column field="QuantityPerRack" title="每车件数"></vxe-column>
-    </vxe-table>
+
+    <el-row>
+      <el-col :span="8">
+        <h2>当前零件已配百分比</h2>
+        <dv-decoration-9 style="width: 150px; height: 150px; margin: 0 auto"><h1>66%</h1></dv-decoration-9>
+      </el-col>
+    </el-row>
+
+    <div>
+      <vxe-table border resizable align="center" ref="xTable" :data="tableData" :row-style="rowClassName" :cell-style="cellStyle">
+        <vxe-column type="seq" width="60"></vxe-column>
+        <vxe-column field="online_time" title="时间段"></vxe-column>
+        <vxe-column field="num" title="库位号"></vxe-column>
+        <vxe-column field="part_NO" title="零件号"></vxe-column>
+        <vxe-column field="part_name" title="零件名称" type="html"> </vxe-column>
+        <vxe-column field="online_time" title="已配站点1数量"></vxe-column>
+        <vxe-column field="online_time" title="已配站点2数量"></vxe-column>
+        <vxe-column field="online_time" title="已配站点3数量"></vxe-column>
+        <vxe-column field="online_time" title="已配站点4数量"></vxe-column>
+        <vxe-column field="online_time" title="已配站点5数量"></vxe-column>
+      </vxe-table>
+    </div>
   </div>
 </template>
 
@@ -176,9 +169,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-h1,
+h1 {
+  color: white;
+}
 h2 {
   text-align: center;
+  color: white;
 }
 
 .producting {
diff --git a/ZR.Vue/src/views/kanbanManagement/tuzhuangworkshop.vue b/ZR.Vue/src/views/kanbanManagement/tuzhuangworkshop.vue
index 38de12ba..a3f4077f 100644
--- a/ZR.Vue/src/views/kanbanManagement/tuzhuangworkshop.vue
+++ b/ZR.Vue/src/views/kanbanManagement/tuzhuangworkshop.vue
@@ -1,6 +1,14 @@
 <template>
-  <div class="app-container">
-    <h1>涂装车间生产实时看板</h1>
+  <div class="app-container" style="background: black">
+    <el-row>
+      <el-col :span="8"><dv-decoration-8 style="width: 300px; height: 50px" /></el-col>
+      <el-col :span="8"
+        ><dv-decoration-7 style="height: 50px; color: white"><h1>涂装车间生产实时看板</h1></dv-decoration-7></el-col
+      >
+      <el-col :span="8"><dv-decoration-8 :reverse="true" style="width: 300px; height: 50px; float: right" /></el-col>
+    </el-row>
+    <digitalFlop />
+
     <div>
       <el-row :gutter="2">
         <el-col :span="8"><div class="charts" id="process"></div></el-col>
@@ -11,7 +19,7 @@
     <vxe-table border resizable align="center" ref="xTable" :data="OperationList" :row-style="rowClassName" class="vxe-UI">
       <vxe-column type="seq" width="60"></vxe-column>
       <vxe-column field="online_time" title="上线时间"></vxe-column>
-       <vxe-column field="work_order" title="工单" type="html"></vxe-column>
+      <vxe-column field="work_order" title="工单" type="html"></vxe-column>
       <vxe-column field="partNO" title="零件号"></vxe-column>
       <vxe-column field="ProductionQuantity" title="计划数量"></vxe-column>
       <vxe-column field="productedNum" title="完成数量"></vxe-column>
@@ -20,10 +28,11 @@
 </template>
 
 <script>
-
 import XEUtils from 'xe-utils'
 import VXETable from 'vxe-table'
 import * as echarts from 'echarts'
+import digitalFlop from './digitalFlop'
+
 export default {
   name: 'tuzhuangworkshop',
   data() {
@@ -71,6 +80,10 @@ export default {
   mounted() {
     this.drawChart()
   },
+  components: {
+    digitalFlop,
+  },
+
   methods: {
     rowClassName({ rowIndex }) {
       if ([0].includes(rowIndex)) {
@@ -90,9 +103,10 @@ export default {
           { value: 70, name: '已经完成' },
           { value: 30, name: '未完成' },
         ]
-        var myChart = echarts.init(chartDom)
+        var myChart = echarts.init(chartDom, 'dark')
         var option
         option = {
+          backgroundColor: '',
           title: {
             text: '实时生产进度',
             left: 'center',
@@ -131,9 +145,10 @@ export default {
         })
 
         var chartDom1 = document.getElementById('status')
-        var myChart1 = echarts.init(chartDom1)
+        var myChart1 = echarts.init(chartDom1, 'dark')
         var option1
         option1 = {
+          backgroundColor: '',
           title: {
             text: '异常停机统计',
             left: 'center',
@@ -176,9 +191,10 @@ export default {
           { value: 70, name: '合格产品' },
           { value: 30, name: '不合格产品' },
         ]
-        var myChart2 = echarts.init(chartDom2)
+        var myChart2 = echarts.init(chartDom2, 'dark')
         var option2
         option2 = {
+          backgroundColor: '',
           title: {
             text: '合格率',
             left: 'center',
@@ -226,7 +242,7 @@ h1 {
 .charts {
   height: 200px;
 }
-::v-deep .vxe-table--render-default{
- font-size: 30px;
+::v-deep .vxe-table--render-default {
+  font-size: 30px;
 }
 </style>
diff --git a/ZR.Vue/src/views/productManagement/dispatch.vue b/ZR.Vue/src/views/productManagement/dispatch.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/ZR.Vue/src/views/productManagement/productionPlan/planKanban-V1.vue b/ZR.Vue/src/views/productManagement/productionPlan/planKanban-V1.vue
deleted file mode 100644
index 24c58078..00000000
--- a/ZR.Vue/src/views/productManagement/productionPlan/planKanban-V1.vue
+++ /dev/null
@@ -1,332 +0,0 @@
-<template>
-  <div class="app-container">
-    <div>
-      <div class="title">装配车间实时生产状态</div>
-    </div>
-    <vxe-table border resizable align="center" ref="xTable" :data="OperationList" :row-style="rowClassName">
-      <vxe-column type="seq" width="60"></vxe-column>
-      <vxe-column field="online_time" title="上线时间"></vxe-column>
-      <vxe-column field="partNO" title="零件号"></vxe-column>
-      <vxe-column field="work_order" title="工单" type="html" width="90"></vxe-column>
-      <vxe-column field="ProductionQuantity" title="计划数量"></vxe-column>
-      <!-- <vxe-column field="process" title="生产进度" width="500" :title-help="{ message: '小于20%:红色;小于60%:黄色;大于60%绿色' }">
-        <template #default="{ row }">
-          <div class="progress">
-            <div style="width: 400px">
-              <el-progress
-                :text-inside="true"
-                :stroke-width="16"
-                :percentage="row.productProgressRate"
-                :color="customColor(row.productProgressRate)"
-              ></el-progress>
-            </div>
-            <span>{{ row.productedNum }}/{{ row.ProductionQuantity }}</span>
-          </div>
-        </template>
-      </vxe-column> -->
-      <vxe-column field="productedNum" title="完成数量"></vxe-column>
-
-      <!-- <vxe-column field="isProducting" title="设备状态" :title-help="{ message: '生产中:绿色;停止生产:灰色' }" width="100">
-        <template #default="{ row }">
-          <template v-if="row.isProducting">
-            <div class="producting"></div>
-          </template>
-          <template v-else>
-            <div class="productstop"></div>
-          </template>
-        </template>
-      </vxe-column> -->
-      <!-- <vxe-column field="QualityRate" title="合格率" :title-help="{ message: '不良品:红色;良品:灰色' }">
-        <template #default="{ row }">
-          <div class="progress" v-show="row.productedNum != 0">
-            <div style="height: 100px; width: 100px; margin: 0 auto" class="pies"></div>
-            <div style="margin: auto auto">{{ row.qualityRate }}% {{ row.goodproductsNum }}/{{ row.defectiveProductsNum }}</div>
-          </div>
-        </template>
-      </vxe-column> -->
-    </vxe-table>
-  </div>
-</template>
-
-<script>
-import XEUtils from 'xe-utils'
-import VXETable from 'vxe-table'
-import * as echarts from 'echarts'
-import { getOperation } from '@/api/operationManagement/operation.js'
-export default {
-  name: 'assemblyWorkshop',
-  data() {
-    return {
-      OperationList: [
-        {
-          online_time: '8:25',
-          partNO: '359951',
-          work_order: 'W0862',
-          ProductionQuantity: '78',
-          productProgressRate: 90,
-          productedNum: 70,
-          isProducting: true,
-          QualityRate: 80,
-          goodproductsNum: 50,
-          defectiveProductsNum: 30,
-        },
-        {
-          online_time: '8:25',
-          partNO: '359951',
-          work_order: 'W0862',
-          ProductionQuantity: '78',
-          productProgressRate: 0,
-          productedNum: 0,
-          isProducting: true,
-          QualityRate: 100,
-          goodproductsNum: 0,
-          defectiveProductsNum: 0,
-        },
-        {
-          online_time: '8:25',
-          partNO: '359951',
-          work_order: 'W0862',
-          ProductionQuantity: '78',
-          productProgressRate: 0,
-          productedNum: 0,
-          isProducting: true,
-          QualityRate: 100,
-          goodproductsNum: 0,
-          defectiveProductsNum: 0,
-        },
-        {
-          online_time: '8:25',
-          partNO: '359951',
-          work_order: 'W0862',
-          ProductionQuantity: '78',
-          productProgressRate: 0,
-          productedNum: 0,
-          isProducting: true,
-          QualityRate: 100,
-          goodproductsNum: 0,
-          defectiveProductsNum: 0,
-        },
-        {
-          online_time: '8:25',
-          partNO: '359951',
-          work_order: 'W0862',
-          ProductionQuantity: '78',
-          productProgressRate: 0,
-          productedNum: 0,
-          isProducting: true,
-          QualityRate: 100,
-          goodproductsNum: 0,
-          defectiveProductsNum: 0,
-        },
-        {
-          online_time: '8:25',
-          partNO: '359951',
-          work_order: 'W0862',
-          ProductionQuantity: '78',
-          productProgressRate: 0,
-          productedNum: 0,
-          isProducting: true,
-          QualityRate: 100,
-          goodproductsNum: 0,
-          defectiveProductsNum: 0,
-        },
-        {
-          online_time: '8:25',
-          partNO: '359951',
-          work_order: 'W0862',
-          ProductionQuantity: '78',
-          productProgressRate: 0,
-          productedNum: 0,
-          isProducting: true,
-          QualityRate: 100,
-          goodproductsNum: 0,
-          defectiveProductsNum: 0,
-        },
-        {
-          online_time: '8:25',
-          partNO: '359951',
-          work_order: 'W0862',
-          ProductionQuantity: '78',
-          productProgressRate: 0,
-          productedNum: 0,
-          isProducting: true,
-          QualityRate: 100,
-          goodproductsNum: 0,
-          defectiveProductsNum: 0,
-        },
-        {
-          online_time: '8:25',
-          partNO: '359951',
-          work_order: 'W0862',
-          ProductionQuantity: '78',
-          productProgressRate: 0,
-          productedNum: 0,
-          isProducting: true,
-          QualityRate: 100,
-          goodproductsNum: 0,
-          defectiveProductsNum: 0,
-        },
-        {
-          online_time: '8:25',
-          partNO: '359951',
-          work_order: 'W0862',
-          ProductionQuantity: '78',
-          productProgressRate: 0,
-          productedNum: 0,
-          isProducting: true,
-          QualityRate: 100,
-          goodproductsNum: 0,
-          defectiveProductsNum: 0,
-        },
-      ],
-    }
-  },
-  created() {},
-  mounted() {
-    this.drawChart()
-  },
-  methods: {
-    //hub获取信息
-    getOperationList(info) {
-      this.OperationList = info
-      this.drawChart()
-    },
-    //进度条颜色
-    customColor(row) {
-      if (row <= 20) {
-        return 'red'
-      } else if (row <= 60) {
-        return 'yellow'
-      } else {
-        return 'green'
-      }
-    },
-
-    // 饼图配置
-    drawChart() {
-      this.$nextTick(() => {
-        var chartDom = document.getElementsByClassName('pies')
-        console.log('chartDom.length', chartDom.length)
-        for (let i = 0; i < chartDom.length; i++) {
-          const data = [
-            { value: this.OperationList[i].defectiveProductsNum, name: '不良品' },
-            { value: this.OperationList[i].goodproductsNum, name: '良品' },
-          ]
-          var myChart = echarts.init(chartDom[i])
-          var option
-          option = {
-            color: ['red', '#909399'],
-
-            series: [
-              {
-                type: 'pie',
-                radius: '50%',
-                data: data,
-                label: {
-                  normal: {
-                    show: false,
-                  },
-                },
-                labelLine: {
-                  normal: {
-                    show: false,
-                  },
-                },
-              },
-            ],
-          }
-
-          option && myChart.setOption(option)
-
-          //监听，根据视口变化动态从新渲染表格
-          window.addEventListener('resize', function () {
-            myChart.resize()
-          })
-        }
-      })
-    },
-
-    rowClassName({ rowIndex }) {
-      if ([0].includes(rowIndex)) {
-        return {
-          backgroundColor: '#24eb2c',
-          color: '#ffffff',
-        }
-      } else {
-        return {
-          backgroundColor: '#a3adab',
-        }
-      }
-      return null
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.title {
-  font-size: larger;
-  font-weight: bold;
-  color: #409eff;
-  margin: 0, auto;
-  text-align: center;
-}
-
-.progress {
-  display: flex;
-  justify-content: space-between;
-}
-
-.producting {
-  width: 30px;
-  height: 30px;
-  background: green;
-  border: 1px solid green;
-  border-radius: 50%;
-  margin: 0 auto;
-}
-
-.productstop {
-  width: 30px;
-  height: 30px;
-  background: gray;
-  border: 1px solid gray;
-  border-radius: 50%;
-  margin: 0 auto;
-}
-
-.first-col {
-  position: relative;
-  height: 20px;
-}
-.first-col:before {
-  content: '';
-  position: absolute;
-  left: -15px;
-  top: 10px;
-  width: 170px;
-  height: 1px;
-  transform: rotate(18deg);
-  background-color: #e8eaec;
-}
-.first-col .first-col-top {
-  position: absolute;
-  right: 4px;
-  top: -10px;
-}
-.first-col .first-col-bottom {
-  position: absolute;
-  left: 4px;
-  bottom: -10px;
-}
-.my-filter {
-  margin: 10px;
-}
-.page-left {
-  position: absolute;
-  left: 10px;
-  top: 50%;
-  transform: translateY(-50%);
-  z-index: 10;
-}
-</style>
diff --git a/ZR.Vue/src/views/productManagement/production_order.vue b/ZR.Vue/src/views/productManagement/production_order.vue
deleted file mode 100644
index 9b23230d..00000000
--- a/ZR.Vue/src/views/productManagement/production_order.vue
+++ /dev/null
@@ -1,369 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 搜索部分 -->
-    <div>
-      <el-form :model="search" inline v-show="search.showSearch">
-        <el-form-item label="产品编号">
-          <el-input v-model="search.lineCode" placeholder="输入线体编号"></el-input>
-        </el-form-item>
-
-        <el-form-item label="产品名">
-          <el-input v-model="search.lineCode" placeholder="输入线体编号"></el-input>
-        </el-form-item>
-
-        <el-form-item label="本周计划装配数量">
-          <el-input v-model="search.lineCode" placeholder="输入线体编号"></el-input>
-        </el-form-item>
-        <el-form-item label="本周实际装配数量">
-          <el-input v-model="search.lineCode" placeholder="输入线体编号"></el-input>
-        </el-form-item>
-
-        <el-button icon="el-icon-search" circle @click="getList"></el-button>
-      </el-form>
-    </div>
-    <!-- 按钮排 -->
-    <div>
-      <el-row :gutter="2">
-        <el-col :span="1.5">
-          <el-button type="primary" size="small" @click="addItem">增加</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="warning" size="small" @click="updataItem(true)" :disabled="updateDisable">修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" size="small" @click="deleteItem(true)" :disabled="delDisable">删除</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="search.showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-      <el-row>
-        <pagination
-          :v-show="true"
-          :total="pagination.total"
-          :page.sync="pagination.pageNum"
-          :limit.sync="pagination.pageSize"
-          @pagination="getList"
-        />
-      </el-row>
-    </div>
-    <div>
-      <h3>本周计划表</h3>
-      <vxe-table
-        border
-        align="center"
-        :print-config="{}"
-        ref="xTable1"
-        :data="table.worklineList"
-        :loading="table.loading"
-        @checkbox-change="selectChangeEvent"
-        :row-config="{ isHover: true }"
-      >
-        <vxe-column type="checkbox" width="60"></vxe-column>
-        <vxe-column field="lineCode" title="产品编号" sortable></vxe-column>
-        <vxe-column field="lineName" title="产品名称" sortable></vxe-column>
-        <vxe-column field="lineName" title="产品零件号"></vxe-column>
-        <vxe-column field="lineName" title="本周装配数量"></vxe-column>
-        <vxe-column field="lineName" title="产品实际数量"></vxe-column>
-        <vxe-column title="操作" show-overflow>
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="updataItem(false, scope.row)">修改</el-button>
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteItem(false, scope.row)" class="delred">删除</el-button>
-          </template>
-        </vxe-column>
-      </vxe-table>
-      <vxe-pager
-        background
-        :current-page.sync="pagination.pageNum"
-        :page-size.sync="pagination.pageSize"
-        :total="pagination.total"
-        :layouts="['PrevJump', 'PrevPage', 'JumpNumber', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']"
-        @page-change="getList"
-      >
-      </vxe-pager>
-      <h3>本周计划明细表</h3>
-      <vxe-table
-        border
-        align="center"
-        :print-config="{}"
-        ref="xTable2"
-        :data="table.worklineList"
-        :loading="table.loading"
-        @checkbox-change="selectChangeEvent"
-        :row-config="{ isHover: true }"
-      >
-        <vxe-colgroup title="周一">
-          <vxe-column field="name" title="产品类型"></vxe-column>
-          <vxe-column field="name" title="计划数量"></vxe-column>
-          <vxe-column field="name" title="是否更变"></vxe-column>
-          <vxe-column field="name" title="实际数量"></vxe-column>
-        </vxe-colgroup>
-        <vxe-colgroup title="周二">
-          <vxe-column field="name" title="产品类型"></vxe-column>
-          <vxe-column field="name" title="计划数量"></vxe-column>
-          <vxe-column field="name" title="是否更变"></vxe-column>
-          <vxe-column field="name" title="实际数量"></vxe-column>
-        </vxe-colgroup>
-        <vxe-colgroup title="周三">
-          <vxe-column field="name" title="产品类型"></vxe-column>
-          <vxe-column field="name" title="计划数量"></vxe-column>
-          <vxe-column field="name" title="是否更变"></vxe-column>
-          <vxe-column field="name" title="实际数量"></vxe-column>
-        </vxe-colgroup>
-        <vxe-colgroup title="周四">
-          <vxe-column field="name" title="产品类型"></vxe-column>
-          <vxe-column field="name" title="计划数量"></vxe-column>
-          <vxe-column field="name" title="是否更变"></vxe-column>
-          <vxe-column field="name" title="实际数量"></vxe-column>
-        </vxe-colgroup>
-        <vxe-colgroup title="周五">
-          <vxe-column field="name" title="产品类型"></vxe-column>
-          <vxe-column field="name" title="计划数量"></vxe-column>
-          <vxe-column field="name" title="是否更变"></vxe-column>
-          <vxe-column field="name" title="实际数量"></vxe-column>
-        </vxe-colgroup>
-        <vxe-colgroup title="周六">
-          <vxe-column field="name" title="产品类型"></vxe-column>
-          <vxe-column field="name" title="计划数量"></vxe-column>
-          <vxe-column field="name" title="是否更变"></vxe-column>
-          <vxe-column field="name" title="实际数量"></vxe-column>
-        </vxe-colgroup>
-        <vxe-colgroup title="周日">
-          <vxe-column field="name" title="产品类型"></vxe-column>
-          <vxe-column field="name" title="计划数量"></vxe-column>
-          <vxe-column field="name" title="是否更变"></vxe-column>
-          <vxe-column field="name" title="实际数量"></vxe-column>
-        </vxe-colgroup>
-
-        <vxe-column title="操作" show-overflow>
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="updataItem(false, scope.row)">修改</el-button>
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteItem(false, scope.row)" class="delred">删除</el-button>
-          </template>
-        </vxe-column>
-      </vxe-table>
-    </div>
-
-    <!-- 弹窗-- 修改和删除 -->
-    <el-dialog :title="DMLdialog.title" :visible.sync="DMLdialog.visiable" width="600px" append-to-body>
-      <el-form ref="DMLdialog" :model="DMLdialog.form" label-width="150px" label-position="left" :rules="DMLdialog.rules">
-        <el-form-item label="线体编码 " prop="lineCode">
-          <el-input v-model="DMLdialog.form.lineCode" placeholder="输入线体编码"></el-input>
-        </el-form-item>
-        <el-form-item label="线体名称 " prop="lineName">
-          <el-input v-model="DMLdialog.form.lineName" placeholder="输入线体名称"></el-input>
-        </el-form-item>
-        <el-form-item label="车间 " prop="pkWorkshopName">
-          <el-select v-model="DMLdialog.form.fkWorkShopId" placeholder="请选择车间">
-            <el-option
-              v-for="item in DMLdialog.workshopOption"
-              :key="item.id"
-              :label="item.id + '_' + item.workshopId + '_' + item.workshopName"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getWorklineList, insertworkline, updateWorkline, delWorkline, getWorkshopList } from '@/api/basisManagement/workLine.js'
-export default {
-  name: 'workLine',
-  data() {
-    return {
-      //搜索框配置
-      search: {
-        lineCode: '',
-        lineName: '',
-        pkWorkshopName: '',
-        showSearch: true,
-      },
-      //表格
-      table: {
-        loading: true,
-        worklineList: [],
-      },
-      //分页
-      pagination: {
-        total: 0,
-        pageNum: 1,
-        pageSize: 10,
-      },
-      //新增修改数据项配置
-      DMLdialog: {
-        title: '',
-        visiable: false,
-        form: {
-          lineCode: '',
-          lineName: '',
-          fkWorkShopId: '',
-        },
-        workshopOption: [],
-        rules: {
-          lineCode: [{ required: true, message: '线体编码不能为空', trigger: 'blur' }],
-          lineName: [{ required: true, message: '线体名称不能为空', trigger: 'blur' }],
-        },
-      },
-      //修改按钮
-      updateDisable: true,
-      //删除按钮
-      delDisable: true,
-      flag: 'update', //区分修改和删除
-    }
-  },
-  created() {
-    this.getList()
-    this.getWorkshopOption()
-  },
-  methods: {
-    //获取表格数据
-    getList() {
-      const query = { ...this.search, ...this.pagination }
-      delete query.showSearch
-      getWorklineList(query).then((res) => {
-        if (res.code == 200) {
-          this.table.loading = false
-          this.pagination.total = res.data.item1
-          this.table.worklineList = res.data.item2
-        }
-      })
-    },
-    //获取车间
-    getWorkshopOption() {
-      getWorkshopList().then((res) => {
-        if (res.code == 200) this.DMLdialog.workshopOption = res.data
-      })
-    },
-
-    //行更新
-    handleUpdate(row) {},
-    //行删除
-    handleDelete(row) {},
-    selectChangeEvent({ checked }) {
-      const records = this.$refs.xTable1.getCheckboxRecords()
-      if (records.length == 1) {
-        this.updateDisable = false
-      } else {
-        this.updateDisable = true
-      }
-      if (records.length > 0) {
-        this.delDisable = false
-      } else {
-        this.delDisable = true
-      }
-    },
-    //新增按钮
-    addItem() {
-      this.DMLdialog.title = '新增'
-      this.DMLdialog.visiable = true
-      this.flag = 'add'
-    },
-    //新增确认
-    submitForm() {
-      if (this.flag == 'update') {
-        updateWorkline(this.DMLdialog.form).then((res) => {
-          if (res.code == 200 && res.data == 1) {
-            this.$notify.success('修改成功')
-            this.getList()
-            this.DMLdialog.visiable = false
-            this.reset()
-          }
-        })
-      } else if (this.flag == 'add') {
-        this.$refs['DMLdialog'].validate((valid) => {
-          if (valid) {
-            insertworkline(this.DMLdialog.form).then((res) => {
-              if (res.code == 200) {
-                this.getList()
-                this.DMLdialog.visiable = false
-                this.reset()
-              }
-            })
-          }
-        })
-      }
-    },
-    cancel() {
-      this.DMLdialog.visiable = false
-      this.reset()
-    },
-    reset() {
-      this.DMLdialog.form = {
-        lineCode: '',
-        lineName: '',
-      }
-      this.DMLdialog.form.reset()
-    },
-    //修改事件
-    updataItem(flag, row) {
-      this.DMLdialog.title = '修改'
-      this.DMLdialog.visiable = true
-      this.flag = 'update'
-      if (!flag) {
-        this.DMLdialog.form.lineCode = row.lineCode
-        this.DMLdialog.form.lineName = row.lineName
-        this.DMLdialog.form.id = row.id
-
-        this.DMLdialog.form.fkWorkShopId = row.fkWorkShopId
-      } else {
-        const records = this.$refs.xTable1.getCheckboxRecords()
-        if (records.length == 1) {
-          this.DMLdialog.form.lineCode = records[0].lineCode
-          this.DMLdialog.form.lineName = records[0].lineName
-          this.DMLdialog.form.id = records[0].id
-          this.DMLdialog.form.fkWorkShopId = records[0].fkWorkShopId
-        }
-      }
-    },
-    //删除事件
-    deleteItem(flag, row) {
-      if (!flag) {
-        this.$modal
-          .confirm('是否确认删除线体名称为"' + row.lineName + '"的数据项？')
-          .then(function () {
-            const array = []
-            array.push(row.id)
-            return delWorkline(array)
-          })
-          .then(() => {
-            this.getList()
-            this.$modal.msgSuccess('删除成功')
-          })
-          .catch(() => {})
-      } else {
-        const records = this.$refs.xTable1.getCheckboxRecords()
-        if (records.length > 0) {
-          this.$modal
-            .confirm('是否确认删除线体名称为"' + records.map((it) => it.lineName) + '"的数据项？')
-            .then(function () {
-              return delWorkline(records.map((it) => it.id))
-            })
-            .then(() => {
-              this.getList()
-              this.$modal.msgSuccess('删除成功')
-            })
-            .catch(() => {})
-        }
-      }
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.delred {
-  ::v-deep .el-icon-delete {
-    color: #f56c6c;
-  }
-
-  ::v-deep span {
-    color: #f56c6c;
-  }
-}
-</style>
diff --git a/ZR.Vue/src/views/productManagement/production_schedule.vue b/ZR.Vue/src/views/productManagement/production_schedule.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/ZR.Vue/src/views/productManagement/productionPlan/planManagement.vue b/ZR.Vue/src/views/productManagement/workorder.vue
similarity index 99%
rename from ZR.Vue/src/views/productManagement/productionPlan/planManagement.vue
rename to ZR.Vue/src/views/productManagement/workorder.vue
index e8a1a298..c7cf9232 100644
--- a/ZR.Vue/src/views/productManagement/productionPlan/planManagement.vue
+++ b/ZR.Vue/src/views/productManagement/workorder.vue
@@ -94,7 +94,7 @@
 
 <script>
 export default {
-  name: 'production_plan',
+  name: 'workorder',
 
   data() {
     return {
diff --git a/ZR.Vue/src/views/productManagement/workplan.vue b/ZR.Vue/src/views/productManagement/workplan.vue
new file mode 100644
index 00000000..c7cf9232
--- /dev/null
+++ b/ZR.Vue/src/views/productManagement/workplan.vue
@@ -0,0 +1,243 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索部分 -->
+    <div>
+      <el-form :model="search" inline>
+        <!-- <el-form-item label="年">
+          <el-input v-model="search.year" placeholder="输入年份"></el-input>
+        </el-form-item> -->
+        <el-form-item label="周">
+          <el-input v-model="search.week" placeholder="输入周"></el-input>
+        </el-form-item>
+        <el-form-item label="日期">
+          <el-input v-model="search.date" placeholder="输入日期"></el-input>
+        </el-form-item>
+        <el-form-item label="上线时间">
+          <el-input v-model="search.time" placeholder="输入时间"></el-input>
+        </el-form-item>
+        <el-form-item label="班组">
+          <el-input v-model="search.teams" placeholder="输入班组"></el-input>
+        </el-form-item>
+        <el-form-item label="工单">
+          <el-input v-model="search.workorder" placeholder="输入工单"></el-input>
+        </el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
+      </el-form>
+    </div>
+    <h3>油漆车间生产序列计划（第13周）</h3>
+    <!-- 按钮排 -->
+    <!-- 周一至周日 -->
+    <div>
+      <el-row type="flex" justify="space-between">
+        <el-col :span="12">
+          <el-row :gutter="2">
+            <el-col :span="6">
+              <el-button type="primary" size="small" @click="addItem">批量导入生产计划</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="danger" size="small" @click="addItem">紧急插工单</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="warning" size="small" @click="updataItem(true)">修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="warning" size="small" @click="deleteItem(true)">删除</el-button>
+            </el-col>
+          </el-row>
+        </el-col>
+
+        <el-col :span="12">
+          <el-button-group style="float: right">
+            <el-button type="primary" size="big">全部</el-button>
+            <el-button type="info" size="big">周一</el-button>
+            <el-button type="info" size="big">周二</el-button>
+            <el-button type="info" size="big">周三</el-button>
+            <el-button type="info" size="big">周四</el-button>
+            <el-button type="info" size="big">周五</el-button>
+            <el-button type="info" size="big">周六</el-button>
+            <el-button type="info" size="big">周日</el-button>
+          </el-button-group>
+        </el-col>
+      </el-row>
+    </div>
+
+    <!-- 表格 -->
+    <vxe-table
+      border
+      :column-config="{ useKey: true }"
+      :row-config="{ useKey: true }"
+      height="400"
+      :data="tableData"
+      :cell-class-name="cellClassName"
+    >
+      <vxe-column type="seq" width="60"></vxe-column>
+      <vxe-column field="Date" title="日期"></vxe-column>
+      <vxe-column field="shift" title="班别"></vxe-column>
+      <vxe-column field="team" title="班组"></vxe-column>
+      <vxe-column field="round" title="圈数"></vxe-column>
+      <vxe-column field="online_time" title="上线时间"></vxe-column>
+      <vxe-column field="work_order" title="工单" :formatter="formatworkOrder" type="html" width="90"></vxe-column>
+      <vxe-column field="vehicle_NO" title="小车号"></vxe-column>
+      <vxe-column field="part_SN" title="简码"></vxe-column>
+      <vxe-column field="part_NO" title="零件号" width="100" :formatter="formatPartNo" type="html"></vxe-column>
+      <vxe-column field="part_name" title="零件名称" width="120" :formatter="formatPartName" type="html"> </vxe-column>
+      <vxe-column field="paintCode" title="颜色代号"></vxe-column>
+      <vxe-column field="ProgramCode" title="程序号"></vxe-column>
+      <vxe-column field="QuantityPerRack" title="每车件数"></vxe-column>
+      <vxe-column field="RackQuantity" title="小车数量"></vxe-column>
+      <vxe-column field="ShareRack" title="共用小车"></vxe-column>
+      <vxe-column field="ProductionQuantity" title="生产数量"></vxe-column>
+      <vxe-column field="Remark" title="备注"></vxe-column>
+    </vxe-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'workorder',
+
+  data() {
+    return {
+      search: {
+        date: '',
+        time: '',
+        teams: '',
+        workOrder: '',
+      },
+      tableData: [
+        {
+          Date: '2016/3/22',
+          shift: '夜班',
+          team: 'A',
+          round: '08',
+          online_time: '03/23 00:09:45',
+          work_order: 'W0234',
+          vehicle_NO: '059-063',
+          part_SN: '177',
+          part_NO: '300504103',
+          part_name: 'SGM201左外镜副镜壳银河灰',
+          paintCode: '1551',
+          ProgramCode: '0041',
+          QuantityPerRack: '20',
+          RackQuantity: '6',
+          ShareRack: '85',
+          ProductionQuantity: '85',
+          Remark: '-',
+        },
+        {
+          Date: '2016/3/22',
+          shift: '白班',
+          team: 'A',
+          round: '08',
+          online_time: '03/23 00:09:45',
+          work_order: 'W0234',
+          vehicle_NO: '059-063',
+          part_SN: '177',
+          part_NO: '300504103',
+          part_name: 'SGM201左外镜副镜壳银河灰',
+          paintCode: '1551',
+          ProgramCode: '0041',
+          QuantityPerRack: '20',
+          RackQuantity: '6',
+          ShareRack: '85',
+          ProductionQuantity: '85',
+          Remark: '-',
+        },
+        {
+          Date: '2016/3/22',
+          shift: '夜班',
+          team: 'A',
+          round: '08',
+          online_time: '03/23 00:09:45',
+          work_order: 'W0234',
+          vehicle_NO: '059-063',
+          part_SN: '177',
+          part_NO: '300504103',
+          part_name: 'SGM201左外镜副镜壳银河灰',
+          paintCode: '1551',
+          ProgramCode: '0041',
+          QuantityPerRack: '20',
+          RackQuantity: '6',
+          ShareRack: '85',
+          ProductionQuantity: '85',
+          Remark: '-',
+        },
+        {
+          Date: '2016/3/22',
+          shift: '白班',
+          team: 'A',
+          round: '08',
+          online_time: '03/23 00:09:45',
+          work_order: 'W0234',
+          vehicle_NO: '059-063',
+          part_SN: '177',
+          part_NO: '300504103',
+          part_name: 'SGM201左外镜副镜壳银河灰',
+          paintCode: '1551',
+          ProgramCode: '0041',
+          QuantityPerRack: '20',
+          RackQuantity: '6',
+          ShareRack: '85',
+          ProductionQuantity: '85',
+          Remark: '-',
+        },
+        {
+          Date: '2016/3/22',
+          shift: '白班',
+          team: 'A',
+          round: '08',
+          online_time: '03/23 00:09:45',
+          work_order: 'W0234',
+          vehicle_NO: '059-063',
+          part_SN: '177',
+          part_NO: '300504103',
+          part_name: 'SGM201左外镜副镜壳银河灰',
+          paintCode: '1551',
+          ProgramCode: '0041',
+          QuantityPerRack: '20',
+          RackQuantity: '6',
+          ShareRack: '85',
+          ProductionQuantity: '85',
+          Remark: '-',
+        },
+      ],
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {},
+    addItem() {},
+    updataItem() {},
+    deleteItem() {},
+
+    formatworkOrder({ cellValue }) {
+      return `<span style="color:blue;font-weight: bold">  ${cellValue}   </span>`
+    },
+    formatPartNo({ cellValue }) {
+      return `<span style="color:green;font-weight: bold">  ${cellValue}   </span>`
+    },
+    formatPartName({ cellValue }) {
+      return `<span style="color:green;font-weight: bold">  ${cellValue}   </span>`
+    },
+    cellClassName({ row, column }) {
+      if (column.field === 'team') {
+        if (row.team == '夜班') {
+          return 'col-black'
+        }
+      }
+      return null
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+h3 {
+  text-align: center;
+}
+::v-deep .el-button-group {
+  margin-left: 10px;
+}
+</style>
diff --git a/ZR.Vue/src/vxe.scss b/ZR.Vue/src/vxe.scss
index e69de29b..d57b9793 100644
--- a/ZR.Vue/src/vxe.scss
+++ b/ZR.Vue/src/vxe.scss
@@ -0,0 +1,13 @@
+// 修改scss变量
+// $vxe-font-color: #98989e;
+// $vxe-primary-color: #2c7ecf;
+// $vxe-icon-background-color: #98989e;
+// $vxe-table-font-color:#4d99fb;
+// $vxe-table-resizable-color: #95969a;
+// $vxe-table-header-background-color: #28282a;
+// $vxe-table-body-background-color: #030f2f;
+// $vxe-table-background-color: #4a5663;
+// $vxe-table-border-width: 1px;
+// $vxe-table-border-color: #37373a;
+
+// @import 'vxe-table/styles/index.scss';