钣金

Admin.Core.Api/Admin.Core.Model.xml

@@ -731,77 +731,87 @@
             异常标识:1-正常货道；2-异常货道
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.objId">
+        <member name="T:Admin.Core.Model.ExecutePlanInfo">
+            <summary>
+            计划执行表
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ObjId">
              <summary>
              主键标识 
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executePlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecutePlanCode">
             <summary>
             执行计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productPlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductPlanCode">
             <summary>
             生产计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.orderCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.OrderCode">
             <summary>
             工单编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialCode">
             <summary>
             物料编码
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialName">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialName">
             <summary>
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productLineCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductLineCode">
             <summary>
             产线/工位
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.planAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.PlanAmount">
             <summary>
             计划数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.completeAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CompleteAmount">
             <summary>
             完成数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.beginTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.BeginTime">
             <summary>
             开始时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.endTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.EndTime">
             <summary>
             结束时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.isFlag">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.IsFlag">
             <summary>
             是否标识
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeOrder">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteOrder">
             <summary>
             执行顺序
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeStatus">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteMethod">
             <summary>
-            执行状态
+            执行方式:1-手动；2-自动
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteStatus">
+            <summary>
+            执行状态：1-待执行；2-执行中；3-完成
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.createdTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CreatedTime">
             <summary>
             创建时间
             </summary>

Admin.Core.Extensions/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -731,77 +731,87 @@
             异常标识:1-正常货道；2-异常货道
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.objId">
+        <member name="T:Admin.Core.Model.ExecutePlanInfo">
+            <summary>
+            计划执行表
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ObjId">
              <summary>
              主键标识 
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executePlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecutePlanCode">
             <summary>
             执行计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productPlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductPlanCode">
             <summary>
             生产计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.orderCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.OrderCode">
             <summary>
             工单编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialCode">
             <summary>
             物料编码
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialName">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialName">
             <summary>
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productLineCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductLineCode">
             <summary>
             产线/工位
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.planAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.PlanAmount">
             <summary>
             计划数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.completeAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CompleteAmount">
             <summary>
             完成数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.beginTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.BeginTime">
             <summary>
             开始时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.endTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.EndTime">
             <summary>
             结束时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.isFlag">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.IsFlag">
             <summary>
             是否标识
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeOrder">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteOrder">
             <summary>
             执行顺序
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeStatus">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteMethod">
             <summary>
-            执行状态
+            执行方式:1-手动；2-自动
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteStatus">
+            <summary>
+            执行状态：1-待执行；2-执行中；3-完成
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.createdTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CreatedTime">
             <summary>
             创建时间
             </summary>

Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -731,77 +731,87 @@
             异常标识:1-正常货道；2-异常货道
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.objId">
+        <member name="T:Admin.Core.Model.ExecutePlanInfo">
+            <summary>
+            计划执行表
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ObjId">
              <summary>
              主键标识 
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executePlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecutePlanCode">
             <summary>
             执行计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productPlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductPlanCode">
             <summary>
             生产计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.orderCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.OrderCode">
             <summary>
             工单编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialCode">
             <summary>
             物料编码
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialName">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialName">
             <summary>
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productLineCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductLineCode">
             <summary>
             产线/工位
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.planAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.PlanAmount">
             <summary>
             计划数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.completeAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CompleteAmount">
             <summary>
             完成数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.beginTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.BeginTime">
             <summary>
             开始时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.endTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.EndTime">
             <summary>
             结束时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.isFlag">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.IsFlag">
             <summary>
             是否标识
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeOrder">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteOrder">
             <summary>
             执行顺序
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeStatus">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteMethod">
             <summary>
-            执行状态
+            执行方式:1-手动；2-自动
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteStatus">
+            <summary>
+            执行状态：1-待执行；2-执行中；3-完成
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.createdTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CreatedTime">
             <summary>
             创建时间
             </summary>

Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-5d5075261e039d50060f331463293a4a10e3780e
+49c4153fbc442621b4de025c434593434269fd50

Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs

@@ -1,6 +1,5 @@
-using Admin.Core.IService;
-using Admin.Core.Model;
-using Admin.Core.Model.Model_New;
+using Admin.Core.Model;
+using System.Threading.Tasks;
 
 namespace Admin.Core.IService
 {
@@ -9,5 +8,9 @@ namespace Admin.Core.IService
     /// </summary>	
     public interface IExecutePlanInfoServices : IBaseServices<ExecutePlanInfo>
     {
+        Task<bool> PlanMoveUp(string id,string station);
+        Task<bool> PlanMoveDown(string id, string station);
+        Task<bool> ExecPlanDelete(string id);
+        Task<ExecutePlanInfo> PlanNextPass(ExecutePlanInfo sm);
     }
 }

Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -731,77 +731,87 @@
             异常标识:1-正常货道；2-异常货道
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.objId">
+        <member name="T:Admin.Core.Model.ExecutePlanInfo">
+            <summary>
+            计划执行表
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ObjId">
              <summary>
              主键标识 
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executePlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecutePlanCode">
             <summary>
             执行计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productPlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductPlanCode">
             <summary>
             生产计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.orderCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.OrderCode">
             <summary>
             工单编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialCode">
             <summary>
             物料编码
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialName">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialName">
             <summary>
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productLineCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductLineCode">
             <summary>
             产线/工位
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.planAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.PlanAmount">
             <summary>
             计划数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.completeAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CompleteAmount">
             <summary>
             完成数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.beginTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.BeginTime">
             <summary>
             开始时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.endTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.EndTime">
             <summary>
             结束时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.isFlag">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.IsFlag">
             <summary>
             是否标识
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeOrder">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteOrder">
             <summary>
             执行顺序
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeStatus">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteMethod">
             <summary>
-            执行状态
+            执行方式:1-手动；2-自动
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteStatus">
+            <summary>
+            执行状态：1-待执行；2-执行中；3-完成
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.createdTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CreatedTime">
             <summary>
             创建时间
             </summary>

Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-99fe8e7d22eaae441e4ddb1a972ccd89d0bbee6a
+c32d564fd4ea407644bba3b1f47518b2a7c7af0d

Admin.Core.Model/Model_New/ExecutePlanInfo.cs

@@ -65,7 +65,7 @@ namespace Admin.Core.Model
         /// 完成数量
         /// </summary>
         [SugarColumn(ColumnName = "COMPLETE_AMOUNT")]
-        public int PompleteAmount { get; set; }
+        public int CompleteAmount { get; set; }
 
         /// <summary>
         /// 开始时间
@@ -90,9 +90,13 @@ namespace Admin.Core.Model
         /// </summary>
         [SugarColumn(ColumnName = "EXECUTE_ORDER")]
         public int ExecuteOrder { get; set; }
-
         /// <summary>
-        /// 执行状态
+        /// 执行方式:1-手动；2-自动
+        /// </summary>
+        [SugarColumn(ColumnName = "EXECUTE_METHOD")]
+        public int ExecuteMethod { get; set; }
+        /// <summary>
+        /// 执行状态：1-待执行；2-执行中；3-完成
         /// </summary>
         [SugarColumn(ColumnName = "EXECUTE_STATUS")]
         public int ExecuteStatus { get; set; }

Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -731,77 +731,87 @@
             异常标识:1-正常货道；2-异常货道
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.objId">
+        <member name="T:Admin.Core.Model.ExecutePlanInfo">
+            <summary>
+            计划执行表
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ObjId">
              <summary>
              主键标识 
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executePlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecutePlanCode">
             <summary>
             执行计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productPlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductPlanCode">
             <summary>
             生产计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.orderCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.OrderCode">
             <summary>
             工单编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialCode">
             <summary>
             物料编码
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialName">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialName">
             <summary>
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productLineCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductLineCode">
             <summary>
             产线/工位
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.planAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.PlanAmount">
             <summary>
             计划数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.completeAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CompleteAmount">
             <summary>
             完成数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.beginTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.BeginTime">
             <summary>
             开始时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.endTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.EndTime">
             <summary>
             结束时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.isFlag">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.IsFlag">
             <summary>
             是否标识
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeOrder">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteOrder">
             <summary>
             执行顺序
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeStatus">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteMethod">
             <summary>
-            执行状态
+            执行方式:1-手动；2-自动
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteStatus">
+            <summary>
+            执行状态：1-待执行；2-执行中；3-完成
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.createdTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CreatedTime">
             <summary>
             创建时间
             </summary>

Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -731,77 +731,87 @@
             异常标识:1-正常货道；2-异常货道
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.objId">
+        <member name="T:Admin.Core.Model.ExecutePlanInfo">
+            <summary>
+            计划执行表
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ObjId">
              <summary>
              主键标识 
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executePlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecutePlanCode">
             <summary>
             执行计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productPlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductPlanCode">
             <summary>
             生产计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.orderCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.OrderCode">
             <summary>
             工单编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialCode">
             <summary>
             物料编码
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialName">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialName">
             <summary>
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productLineCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductLineCode">
             <summary>
             产线/工位
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.planAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.PlanAmount">
             <summary>
             计划数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.completeAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CompleteAmount">
             <summary>
             完成数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.beginTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.BeginTime">
             <summary>
             开始时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.endTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.EndTime">
             <summary>
             结束时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.isFlag">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.IsFlag">
             <summary>
             是否标识
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeOrder">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteOrder">
             <summary>
             执行顺序
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeStatus">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteMethod">
             <summary>
-            执行状态
+            执行方式:1-手动；2-自动
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteStatus">
+            <summary>
+            执行状态：1-待执行；2-执行中；3-完成
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.createdTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CreatedTime">
             <summary>
             创建时间
             </summary>

Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-2210f4b85005c89d5bb30f2abe2073faf150f5c3
+a532edabb8a07ce6b888a9633add57bf3b39b11a

Admin.Core.Service/Service_New/BaseBomInfoServices.cs

@@ -1,4 +1,5 @@
 using Admin.Core.IRepository;
+using Admin.Core.IService;
 using Admin.Core.Model;
 using Admin.Core.Model.Model_New;
 

Admin.Core.Service/Service_New/BaseOrderInfoServices.cs

@@ -1,5 +1,6 @@
 using Admin.Core.Common;
 using Admin.Core.IRepository;
+using Admin.Core.IService;
 using Admin.Core.Model;
 using Admin.Core.Model.Model_New;
 using Admin.Core.Model.ViewModels;

Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs

@@ -1,15 +1,134 @@
 using Admin.Core.IRepository;
+using Admin.Core.IService;
 using Admin.Core.Model;
+using Admin.Core.Model.Model_New;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System;
 
 namespace Admin.Core.Service
 {
-    public class ExecutePlanInfoServices : BaseServices<BaseBomInfo>, IExecutePlanInfoServices
+    public class ExecutePlanInfoServices : BaseServices<ExecutePlanInfo>, IExecutePlanInfoServices
     {
-        private readonly IBaseRepository<BaseBomInfo> _dal;
-        public ExecutePlanInfoServices(IBaseRepository<BaseBomInfo> dal)
+        private readonly IBaseRepository<ExecutePlanInfo> _dal;
+        private readonly IProductOrderInfoServices _productOrderInfoServices;
+        public ExecutePlanInfoServices(IBaseRepository<ExecutePlanInfo> dal, IProductOrderInfoServices productOrderInfoServices)
         {
             this._dal = dal;
             base.BaseDal = dal;
+            _productOrderInfoServices = productOrderInfoServices;
         }
+
+        #region 计划删除
+        /// <summary>
+        /// 计划删除
+        /// </summary>
+        /// <param name="planCode"></param>
+        /// <returns></returns>
+        public async Task<bool> ExecPlanDelete(string id)
+        {
+            return await _dal.DeleteByIdAsync(id);
+        }
+        #endregion
+
+        #region 执行计划下移
+        /// <summary>
+        /// 执行计划下移
+        /// </summary>
+        /// <param name="planInfos"></param>
+        /// <param name="planCode"></param>
+        /// <returns></returns>
+        public async Task<bool> PlanMoveDown(string id,string station)
+        {
+            List<ExecutePlanInfo> execPlans = new List<ExecutePlanInfo>();
+            var list = await _dal.QueryAsync(d=>d.ProductLineCode.Equals(station));
+            List<ExecutePlanInfo> planInfos = (list.OrderBy(d => d.ExecuteOrder)).ToList();
+            if (planInfos == null) return false;
+
+            ExecutePlanInfo planInfo = planInfos.FirstOrDefault(x => x.ObjId == int.Parse(id));
+            int executeOrder = planInfo.ExecuteOrder;
+            int planIndex = planInfos.IndexOf(planInfo);
+            if (planIndex == 0 && planInfos.Count == 0) return false;
+            if ((planInfos.Count - 1) == planIndex) return false;
+
+            var lastPlanInfo = planInfos[planIndex + 1];
+            planInfo.ExecuteOrder = lastPlanInfo.ExecuteOrder;
+            lastPlanInfo.ExecuteOrder = executeOrder;
+            execPlans.Add(planInfo);
+            execPlans.Add(lastPlanInfo);
+            var result = await _dal.UpdateAsync(execPlans);
+            if (result)
+                return true;
+            else
+                return false;
+
+
+        }
+        #endregion
+
+        #region 计划上移
+        /// <summary>
+        /// 计划上移
+        /// </summary>
+        /// <param name="planInfos"></param>
+        /// <param name="planCode"></param>
+        /// <returns></returns>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public async Task<bool> PlanMoveUp(string id, string station)
+        {
+            List<ExecutePlanInfo> execPlans = new List<ExecutePlanInfo>();
+
+            var list = await _dal.QueryAsync(d => d.ProductLineCode.Equals(station));
+            List<ExecutePlanInfo> planInfos = (list.OrderBy(d => d.ExecuteOrder)).ToList();
+
+            if (planInfos == null) return false;
+
+            ExecutePlanInfo planInfo = planInfos.FirstOrDefault(x => x.ObjId == int.Parse(id));
+            int executeOrder = planInfo.ExecuteOrder;
+            int planIndex = planInfos.IndexOf(planInfo);
+
+            if (planIndex == 0) return false;
+
+            var lastPlanInfo = planInfos[planIndex - 1];
+            planInfo.ExecuteOrder = lastPlanInfo.ExecuteOrder;
+            lastPlanInfo.ExecuteOrder = executeOrder;
+            execPlans.Add(planInfo);
+            execPlans.Add(lastPlanInfo);
+            var result = await _dal.UpdateAsync(execPlans);
+            if (result)
+                return true;
+            else
+                return false;
+        }
+
+        #endregion
+
+        #region 计划下达
+        /// <summary>
+        /// 计划下达
+        /// </summary>
+        /// <param name="planCode"></param>
+        /// <param name="nowPlanCode"></param>
+        /// <returns></returns>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public async Task<ExecutePlanInfo> PlanNextPass(ExecutePlanInfo sm)
+        {
+            ExecutePlanInfo planInfo = null;
+            try
+            {
+                List<ExecutePlanInfo> planInfos = new List<ExecutePlanInfo>();
+                if (sm != null)
+                {
+                    //下传计划到PLC,同时更改计划状态
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return planInfo;
+        }
+        #endregion
     }
 }

Admin.Core.Service/Service_New/MaterialCompletionServices.cs

@@ -1,4 +1,5 @@
 using Admin.Core.IRepository;
+using Admin.Core.IService;
 using Admin.Core.Model.Model_New;
 
 namespace Admin.Core.Service

Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -731,77 +731,87 @@
             异常标识:1-正常货道；2-异常货道
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.objId">
+        <member name="T:Admin.Core.Model.ExecutePlanInfo">
+            <summary>
+            计划执行表
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ObjId">
              <summary>
              主键标识 
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executePlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecutePlanCode">
             <summary>
             执行计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productPlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductPlanCode">
             <summary>
             生产计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.orderCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.OrderCode">
             <summary>
             工单编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialCode">
             <summary>
             物料编码
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialName">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialName">
             <summary>
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productLineCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductLineCode">
             <summary>
             产线/工位
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.planAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.PlanAmount">
             <summary>
             计划数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.completeAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CompleteAmount">
             <summary>
             完成数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.beginTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.BeginTime">
             <summary>
             开始时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.endTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.EndTime">
             <summary>
             结束时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.isFlag">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.IsFlag">
             <summary>
             是否标识
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeOrder">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteOrder">
             <summary>
             执行顺序
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeStatus">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteMethod">
             <summary>
-            执行状态
+            执行方式:1-手动；2-自动
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteStatus">
+            <summary>
+            执行状态：1-待执行；2-执行中；3-完成
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.createdTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CreatedTime">
             <summary>
             创建时间
             </summary>

Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-0631c1564ee587dfcb251dd4648e690ad352ce3f
+cb3c2b852b350203a41567cd2b6a2fceabefdf81

Admin.Core.Tasks/QuartzNet/Jobs/Job_Admin_Quartz.cs

@@ -2,7 +2,6 @@
 using Admin.Core.IService;
 using Admin.Core.IService.ISys;
 using Admin.Core.Service;
-using Admin.Core.Service.Service_New;
 using Quartz;
 using System;
 using System.Threading.Tasks;

Admin.Core.Tasks/QuartzNet/Jobs/Job_SheetMetalTask_Quartz.cs

@@ -16,7 +16,7 @@ namespace Admin.Core.Tasks
     public class Job_SheetMetalTask_Quartz : JobBase, IJob
     {
         #region 钣金任务
-        public delegate void SmDelegate(List<SmTaskExecution> sm);
+        public delegate void SmDelegate();
         public static event SmDelegate SmDelegateEvent;
         #endregion
 
@@ -34,8 +34,7 @@ namespace Admin.Core.Tasks
         }
         public async Task Run(IJobExecutionContext context)
         {
-           var smList =await _smTaskExecutionServices.QueryAsync();
-            SmDelegateEvent?.Invoke(smList);
+            SmDelegateEvent?.Invoke();
         }
     }
 }

Admin.Core.Tasks/bin/Debug/net6.0/Admin.Core.Model.xml

@@ -731,77 +731,87 @@
             异常标识:1-正常货道；2-异常货道
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.objId">
+        <member name="T:Admin.Core.Model.ExecutePlanInfo">
+            <summary>
+            计划执行表
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ObjId">
              <summary>
              主键标识 
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executePlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecutePlanCode">
             <summary>
             执行计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productPlanCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductPlanCode">
             <summary>
             生产计划编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.orderCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.OrderCode">
             <summary>
             工单编号
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialCode">
             <summary>
             物料编码
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.materialName">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.MaterialName">
             <summary>
             物料名称
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.productLineCode">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ProductLineCode">
             <summary>
             产线/工位
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.planAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.PlanAmount">
             <summary>
             计划数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.completeAmount">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CompleteAmount">
             <summary>
             完成数量
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.beginTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.BeginTime">
             <summary>
             开始时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.endTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.EndTime">
             <summary>
             结束时间
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.isFlag">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.IsFlag">
             <summary>
             是否标识
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeOrder">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteOrder">
             <summary>
             执行顺序
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.executeStatus">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteMethod">
             <summary>
-            执行状态
+            执行方式:1-手动；2-自动
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteStatus">
+            <summary>
+            执行状态：1-待执行；2-执行中；3-完成
             </summary>
         </member>
-        <member name="P:Admin.Core.Model.ExecutePlanInfo.createdTime">
+        <member name="P:Admin.Core.Model.ExecutePlanInfo.CreatedTime">
             <summary>
             创建时间
             </summary>