.

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

@@ -2618,7 +2618,7 @@
         </member>
         <member name="P:Admin.Core.Model.ExecutePlanInfo.ExecuteStatus">
             <summary>
-            执行状态：1-待执行；2-执行中；3-完成
+            执行状态：1-待执行；2-执行中；3-完成,4-暂停
             </summary>
         </member>
         <member name="P:Admin.Core.Model.ExecutePlanInfo.CreatedTime">

Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs

@@ -67,16 +67,36 @@ namespace Admin.Core.Repository
         /// <exception cref="System.NotImplementedException"></exception>
         public async Task<List<SheetMetalTypeDataView>> GetSheetMetalTypeData(string productLineCode)
         {
+            //string sql = @$" WITH CTT AS (SELECT MIN(START_TIME) START_TIME, MAX(END_TIME) END_TIME
+            //                             FROM VIEW_CURRENT_TEAM_TIME)
+            //                SELECT FB.MATERIAL_CODE as MATERUALNAME,
+            //                       SUM(CASE WHEN FB.BOX_TYPE = 1 THEN FB.OUTPUT_AMOUNT ELSE 0 END) FRONTPLATE_AMOUNT,
+            //                       SUM(CASE WHEN FB.BOX_TYPE = 2 THEN FB.OUTPUT_AMOUNT ELSE 0 END) REARPANEL_AMOUNT
+            //                FROM VIEW_RECORD_FRONT_BACK_COMP FB
+            //                         CROSS JOIN CTT
+            //                WHERE FB.RECORD_TIME >= CTT.START_TIME
+            //                  AND FB.RECORD_TIME < CTT.END_TIME
+            //                GROUP BY FB.MATERIAL_CODE";
+
             string sql = @$"WITH CTT AS (SELECT MIN(START_TIME) START_TIME, MAX(END_TIME) END_TIME
-                                         FROM VIEW_CURRENT_TEAM_TIME)
+             FROM VIEW_CURRENT_TEAM_TIME),
+    F AS(
+        SELECT *  FROM VIEW_RECORD_FRONT_BACK_COMP FB
+    ),
+     G AS(
+         SELECT *
+         FROM F FB,CTT
+         WHERE FB.RECORD_TIME >= CTT.START_TIME AND FB.RECORD_TIME < CTT.END_TIME
+     )
 SELECT FB.MATERIAL_CODE as MATERUALNAME,
        SUM(CASE WHEN FB.BOX_TYPE = 1 THEN FB.OUTPUT_AMOUNT ELSE 0 END) FRONTPLATE_AMOUNT,
        SUM(CASE WHEN FB.BOX_TYPE = 2 THEN FB.OUTPUT_AMOUNT ELSE 0 END) REARPANEL_AMOUNT
-                            FROM VIEW_RECORD_FRONT_BACK_COMP FB
-                                     CROSS JOIN CTT
-                            WHERE FB.RECORD_TIME >= CTT.START_TIME
-                              AND FB.RECORD_TIME < CTT.END_TIME
-                            GROUP BY FB.MATERIAL_CODE";
+FROM G FB
+GROUP BY FB.MATERIAL_CODE
+
+
+
+ ";
 
             return await Db.CopyNew().Ado.SqlQueryAsync<SheetMetalTypeDataView>(sql);
         }

Aucma.Core.SheetMetal/Views/IndexPageView.xaml

@@ -272,7 +272,7 @@
                                 <lvc:CartesianChart.AxisY>
                                     <lvc:Axis FontSize="18" Foreground="White" MinValue="0">
                                         <lvc:Axis.Separator>
-                                            <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Step="10"  Stroke="#404F56" >
+                                            <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Step="500"  Stroke="#404F56" >
                                             </lvc:Separator>
                                         </lvc:Axis.Separator>
                                     </lvc:Axis>
@@ -397,7 +397,7 @@
                             <lvc:CartesianChart.AxisY>
                                 <lvc:Axis FontSize="18" Foreground="White" MinValue="0">
                                     <lvc:Axis.Separator>
-                                        <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"   Step="10" Stroke="#404F56" >
+                                        <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"   Step="500" Stroke="#404F56" >
                                         </lvc:Separator>
                                     </lvc:Axis.Separator>
                                 </lvc:Axis>

Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs

@@ -602,9 +602,6 @@ namespace Aucma.Core.SheetMetalTasks
                 //{
                 if (obj_backPanel != null)
                 {
-
-                  
-
                     //计划编号10个字：D6000-D6009、物料编号10个字：D6010-D6019、计划数量1个字：D6020、应答字1个字D6021
                     obj_backPanel.plc.WriteString("D4000", planInfo.TaskCode);
                     obj_backPanel.plc.WriteInt16("D4022", productId.ToString());
@@ -1328,7 +1325,7 @@ namespace Aucma.Core.SheetMetalTasks
                 {
                     if (obj_backPanel != null)
                     {
-                        //计划编号10个字：D6000-D6009、物料编号10个字：D6010-D6019、计划数量1个字：D6020、应答字1个字D6021
+                        //计划编号10个字：D4000-D4009、物料编号10个字：D4010-D4019、计划数量1个字：D4020、应答字1个字D4021
                         obj_backPanel.plc.WriteString("D4000", planInfo.TaskCode);
                         string processNumber = GetProcessNumberBy(planInfo.MaterialCode);
                         obj_backPanel.plc.WriteString("D4010", planInfo.MaterialSpecificatons);
@@ -1476,6 +1473,9 @@ namespace Aucma.Core.SheetMetalTasks
                             lastComplateAmount = backPanelComplates.First().CompleteAmount;//最新的完工数量
                             backPanelComplate.OutPutAmount = complateAmount - lastComplateAmount;//实际产量
                             sumComplateAmount = backPanelComplates.Sum(x => x.OutPutAmount) + backPanelComplate.OutPutAmount; //计划总产量
+
+                             //sumComplateAmount = sidePanelComplates.Sum(x => x.OutPutAmount) + sidePanelComplate.OutPutAmount;
+                            //sumComplateAmount = complateAmount;  // 改为plc读取的数量
                             if (backPanelComplate.OutPutAmount == 0)
                             {
                                 Thread.Sleep(5000);