change-添加过点数据

Aucma.Scada.Business/AssemblyPlanBusiness.cs

@@ -144,6 +144,21 @@ namespace Aucma.Scada.Business
             bool result = false;
             try
             {
+
+                // 先删除多余未完成的组装执行计划
+                 List<ExecutePlanInfo> exePlans =   _executePlanInfoService.GetExecutePlanInfosByProductLineCode(appConfig.stationCode,true);
+                if(exePlans != null && exePlans.Count>5)
+                {
+
+                    exePlans = exePlans.OrderBy(x => x.createdTime).ToList();
+                    List<ExecutePlanInfo> tempList = exePlans.Take(exePlans.Count-5).ToList();
+                    foreach (var exePlan in tempList)
+                    {
+                        _executePlanInfoService.DeleteExecutePlanInfoByPlanCode(exePlan.executePlanCode);
+                    }
+
+                 }
+              
                 var productPlanInfo = _productPlanInfoService.GetProductPlanByPlanCode(productPlanCode);
                 if (productPlanInfo != null)
                 {

Aucma.Scada.Business/InStoreBusiness.cs

@@ -462,6 +462,7 @@ namespace Aucma.Scada.Business
                             completion.StationName = appConfig.stationCode;
                             completion.CompleteDate = DateTime.Now;
                             completion.planCode = planCode;
+                            completion.ProductLineCode = "CX_02";
                             _iMaterialCompletionServices.Add(completion);
                         }
                     }
@@ -679,5 +680,11 @@ namespace Aucma.Scada.Business
 
         #endregion
 
+
+        public BaseSpaceInfo GetSpaceInfo(string spaceCode)
+        {
+           return _spaceInfoService.GetSpaceInfoBySpaceCode(appConfig.foamStoreCode,spaceCode);
+           
+        }
     }
 }

Aucma.Scada.Business/OutStoreBusiness.cs

@@ -549,6 +549,7 @@ namespace Aucma.Scada.Business
                         completion.MaterialName = print.MaterialName;
                         completion.StationName = appConfig.outstationCode;
                         completion.CompleteDate = DateTime.Now;
+                        completion.ProductLineCode = "CX_02";
                         //    completion.planCode = planCode;
                         _iMaterialCompletionServices.Add(completion);
                     }
@@ -758,6 +759,8 @@ namespace Aucma.Scada.Business
             bool result = false;
             try
             {
+
+
                 BaseSpaceInfo spaceInfo = _spaceInfoService.GetSpaceInfoBySpaceCode(storeCode, spaceCode);
                 if (spaceInfo.spaceStock > 0)
                 {

Aucma.Scada.Model/domain/MaterialCompletion.cs

@@ -45,6 +45,12 @@ namespace Aucma.Scada.Model.domain
         [SugarColumn(ColumnName = "STATION_NAME")]
         public string StationName { get; set; }
 
+        /// <summary>
+        /// 所属产线
+        /// </summary>
+        [SugarColumn(ColumnName = "PRODUCT_LINE_CODE")]
+        public string ProductLineCode { get; set; }
+
         /// <summary>
         /// 完成时间
         /// </summary>

Aucma.Scada.UI/Aucma.Scada.UI.csproj

@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{43123E0B-B3B0-4FB4-A508-007D644B3E7C}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <RootNamespace>Aucma.Scada.UI</RootNamespace>
     <AssemblyName>Aucma.Scada.UI</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>

Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml

@@ -231,7 +231,7 @@
 
                 </Grid.RowDefinitions>
                 <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
-                    <TextBlock Text="当日产量" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    <TextBlock Text="小时产量" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                 </Border>
 
                 <!--日产量-->
@@ -250,7 +250,7 @@
                                 <lvc:CartesianChart.AxisY>
                                     <lvc:Axis FontSize="20" MinValue="0">
                                         <lvc:Axis.Separator>
-                                            <lvc:Separator Step="10" Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" >
+                                            <lvc:Separator Step="50" Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" >
                                             </lvc:Separator>
                                         </lvc:Axis.Separator>
                                     </lvc:Axis>
@@ -358,7 +358,7 @@
                             <lvc:CartesianChart.AxisX>
                                 <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="20">
                                     <lvc:Axis.Separator>
-                                        <lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
+                                        <lvc:Separator Step="1" Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
                                         </lvc:Separator>
                                     </lvc:Axis.Separator>
                                 </lvc:Axis>
@@ -366,7 +366,7 @@
                             <lvc:CartesianChart.AxisY>
                                 <lvc:Axis FontSize="20" MinValue="0">
                                     <lvc:Axis.Separator>
-                                        <lvc:Separator Step="100" Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" >
+                                        <lvc:Separator Step="200" Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" >
                                         </lvc:Separator>
                                     </lvc:Axis.Separator>
                                 </lvc:Axis>

Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml

@@ -156,7 +156,7 @@
                             <lvc:CartesianChart.AxisX>
                                 <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="20">
                                     <lvc:Axis.Separator>
-                                        <lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
+                                        <lvc:Separator Step="1" Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
                                         </lvc:Separator>
                                     </lvc:Axis.Separator>
                                 </lvc:Axis>

Aucma.Scada.UI/Page/InventoryInfo/BomFoamRearInventory.xaml

@@ -85,7 +85,7 @@
         <Border Grid.Row="1">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="8*"/>
+                    <ColumnDefinition Width="7.5*"/>
                     <ColumnDefinition Width="4*"/>
                 </Grid.ColumnDefinitions>
                 <Border Grid.Column="0" BorderBrush="#1254AB" BorderThickness="2" Margin="5">
@@ -208,8 +208,8 @@
                                                                         <ColumnDefinition />
                                                                         <ColumnDefinition/>
 
-                                                                        <ColumnDefinition/>
-                                                                            <ColumnDefinition Width="2*"/>
+                                                                            <ColumnDefinition Width="1.7*"/>
+                                                                            <ColumnDefinition Width="1.7*"/>
                                                                     </Grid.ColumnDefinitions>
                                                                     <Border Grid.Column="0" BorderBrush="White" BorderThickness="1" >
                                                                         <TextBlock Text="状态" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache

@@ -1,7 +1,7 @@
 Aucma.Scada.UI
 
 
-exe
+winexe
 C#
 .cs
 E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache

@@ -1,19 +1,19 @@
 Aucma.Scada.UI
 
 
-exe
+winexe
 C#
 .cs
-E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\
 Aucma.Scada.UI
 none
 false
 DEBUG;TRACE
-E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\App.xaml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\App.xaml
 19-2058867325
 1-1257182505
 47-1397376950
-138-1776864311
+138-632958852
 Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\AssemblyPlan\QuantityIssuedWindow.xaml;Page\AssemblyPlan\SearchCriteriaWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\BomFoamRearInventory.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\SelectType.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\MaterialStatisticsWindow.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
 
 True

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref

@@ -1,21 +1,21 @@
-E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\App.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\QuantityIssuedWindow.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\SearchCriteriaWindow.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\LogInfoControl.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\MainWindow.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\MaterialStatisticsWindow.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\RecordControl.xaml;;
-FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\App.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\QuantityIssuedWindow.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\SearchCriteriaWindow.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\LogInfoControl.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\MainWindow.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\MaterialStatisticsWindow.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\RecordControl.xaml;;
+FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;
 

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref

@@ -1,4 +1,4 @@
-
+E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
 FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\App.xaml;;
 FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
 FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;

Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs

@@ -1,62 +1,2 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
+
 

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E2E7683773E9FFF79EEA964FBBD5AA51634F3911355ECB5D54C4500F253BBEB9"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "49DCEC69E90C1CE67E335FAD727D9A0EA5BDB91C5A28872F972C85125424550F"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E2E7683773E9FFF79EEA964FBBD5AA51634F3911355ECB5D54C4500F253BBEB9"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "49DCEC69E90C1CE67E335FAD727D9A0EA5BDB91C5A28872F972C85125424550F"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "277C4DE1E9831072A1CCE47A35DA0C34171685632AF936017FDDDFFCB1A56CF1"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0525566B2108EF31BCE3AE0AE4825852465F7167B256C2FF88A40A2E86814F5F"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "277C4DE1E9831072A1CCE47A35DA0C34171685632AF936017FDDDFFCB1A56CF1"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0525566B2108EF31BCE3AE0AE4825852465F7167B256C2FF88A40A2E86814F5F"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "06E986B5DF67B38EB8833E582BEA3126482F553B2211106F1D88FC931F916321"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "499D17A36FA3974B82EDA748E47589FBA03A90DC50E1D4961F25DC669C0324B0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "06E986B5DF67B38EB8833E582BEA3126482F553B2211106F1D88FC931F916321"
+#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "499D17A36FA3974B82EDA748E47589FBA03A90DC50E1D4961F25DC669C0324B0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs

@@ -151,7 +151,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
         /// <summary>
         /// 型号统计柱状图x轴物料类型
         /// </summary>
-        private List<string> materialNameList;
+        private List<string> materialNameList =new List<string>();
 
         public List<string> MaterialNameList
         {
@@ -457,7 +457,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
                 if (materialStats != null)
                 {
                     ModelStatistics.Clear();
-                    MaterialNameList = new List<string>();
+                    MaterialNameList.Clear();
                     ChartValues<double> materialAchievement = new ChartValues<double>();
                     foreach (var item in materialStats)
                     {
@@ -508,7 +508,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
                 {
                     Achievement.Clear();
                     ProductionHourList.Clear();
-                    ProductionHourList = new List<string>();
+                    ProductionHourList.Clear();
                     ChartValues<ObservablePoint> hourAchievement = new ChartValues<ObservablePoint>();
                     int i = 0;
                     foreach (var item in hourAmount)

Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs

@@ -182,7 +182,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         /// <summary>
         /// 库存统计柱状图X轴物料信息
         /// </summary>
-        private List<string> materialNameList;
+        private List<string> materialNameList = new List<string>();
 
         public List<string> MaterialNameList
         {
@@ -289,7 +289,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
             Query();
 
             ChartValues<double> achievement = new ChartValues<double>();
-            MaterialNameList = new List<string>();
+          //  MaterialNameList = new List<string>();
 
              var info = inStoreBusiness.GetFoamStoreStock();
             
@@ -298,6 +298,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
                 if (info != null)
                 {
                     Achievement.Clear();
+                    MaterialNameList.Clear();
                     foreach (var item in info)
                     {
                         if (!string.IsNullOrEmpty(item.materialType))

Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs

@@ -6,6 +6,7 @@ using GalaSoft.MvvmLight.Command;
 using HighWayIot.Config;
 using HighWayIot.Log4net;
 using HighWayIot.Plc;
+using HighWayIot.Repository.service;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -28,6 +29,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
 
         private OutStoreBusiness outStoreBusiness = OutStoreBusiness.Instance;
        
+        
         private InStoreBusiness inStoreBusiness = InStoreBusiness.Instance;
         private InStoreTaskHandle taskHandle = InStoreTaskHandle.Instance;
 
@@ -184,6 +186,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
 
                         foreach (var item in info)
                         {
+                          //  item.typeNameA = GetSubstringAfterFirstDelimiter(item);
                             spaceItems.Add(item);
                         }
 
@@ -199,6 +202,28 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
             }
             
         }
+        /// <summary>
+        /// 截取第一个逗号以后的内容
+        /// </summary>
+        /// <param name="originalString"></param>
+        /// <returns></returns>
+        //public static string GetSubstringAfterFirstDelimiter(BaseSpaceInfo space)
+        //{
+        //    if (string.IsNullOrEmpty(space.typeNameA))
+        //    {
+        //        return "";
+        //    }
+        //    int index = space.typeNameA.IndexOf(",");
+        //    if (index != -1 && index < space.typeNameA.Length - 1)
+        //    {
+        //        return space.typeNameA.Substring(index + 1);
+        //    }
+        //    else
+        //    {
+        //        return space.typeNameA;
+        //    }
+        //}
+
 
         /// <summary>
         /// 货道入库标识设置
@@ -207,6 +232,9 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
         private void UpdateInStoreFlag(object obj)
         {
             string info = obj as string;
+            MessageBoxResult result1 = MessageBox.Show("确认修改入库状态吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result1 == MessageBoxResult.Yes)
+            {
                 bool result = inventoryInfoBusiness.UpdateInStoreFlag(appConfig.foamStoreCode, info);
                 if (result)
                 {
@@ -219,6 +247,8 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
                 }
             }
              
+        }
+
         /// <summary>
         /// 货道出库标识设置
         /// </summary>
@@ -226,6 +256,9 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
         private void UpdateOutStoreFlag(object obj)
         {
             string info = obj as string;
+            MessageBoxResult result1 = MessageBox.Show("确认修改出库状态吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result1 == MessageBoxResult.Yes)
+            {
                 bool result = inventoryInfoBusiness.UpdateOutStoreFlag(appConfig.foamStoreCode, info);
                 if (result)
                 {
@@ -238,6 +271,8 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
                 }
             }
               
+        }
+
         /// <summary>
         /// 货道异常标识设置
         /// </summary>
@@ -245,6 +280,9 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
         private void UpdateUnusualFlag(object obj)
         {
             string info = obj as string;
+            MessageBoxResult result1 = MessageBox.Show("确认修改货道状态吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result1 == MessageBoxResult.Yes)
+            {
                 bool result = inventoryInfoBusiness.UpdateUnusualFlag(appConfig.foamStoreCode, info);
                 if (result)
                 {
@@ -257,6 +295,8 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
                 }
             }
               
+        }
+
         /// <summary>
         /// 修改货道状态
         /// </summary>
@@ -264,6 +304,9 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
         private void UpdateSpaceStatus(object obj)
         {
             string info = obj as string;
+            MessageBoxResult result1 = MessageBox.Show("确认修改货道状态吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result1 == MessageBoxResult.Yes)
+            {
                 bool result = inventoryInfoBusiness.UpdateSpaceStatus(appConfig.foamStoreCode, info);
                 if (result)
                 {
@@ -276,20 +319,28 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
                 }
             }
                
+        }
+
         /// <summary>
         /// 货道明细
         /// </summary>
         /// <param name="obj"></param>
         private void SpaceDetail(object obj)
         {
+           
             string info = obj as string;
             //SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.shellStoreCode, info);
             //spaceDetailWindow.Show();
 
             //inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.shellStoreCode, info);
+            BaseSpaceInfo space = inStoreBusiness.GetSpaceInfo(info);
            
-            var list = inventoryInfoBusiness.GetBaseSpaceDetails(appConfig.foamStoreCode, info);
+            List<BaseSpaceDetail> list = inventoryInfoBusiness.GetBaseSpaceDetails(appConfig.foamStoreCode, info);
+            if(list!=null && list.Count > 0)
+            {
+                list =list.OrderByDescending(x => x.createTime).Take(Math.Min(list.Count,space.spaceStock)).ToList();
               
+            }
             RefreshSpaceDetails(list);
         }
 
@@ -306,7 +357,6 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
                 arg =>
                 {
                     arg.materialName = GetSubstringBetweenCommas(arg.materialName);                   
-                    
                     SpaceDetailDataGrid.Add(arg);
                 });
             }
@@ -314,6 +364,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
 
         static string GetSubstringBetweenCommas(string input)
         {
+            if(string.IsNullOrEmpty(input)) return input;
             // 找到第一个逗号的位置
             int firstCommaIndex = input.IndexOf(',');
             if (firstCommaIndex != -1)
@@ -343,8 +394,9 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
         private void OutOnlyOne(object obj)
         {
             string info = obj as string;
-         
-
+            MessageBoxResult result1 = MessageBox.Show("确认出一个吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result1 == MessageBoxResult.Yes)
+            {
                 bool result = outStoreBusiness.OutOnlyOneBySpaceCode(appConfig.foamStoreCode, info);
                 if (result)
                 {
@@ -357,6 +409,9 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
                 }
             }
 
+            
+        }
+
         /// <summary>
         /// 整条道出
         /// </summary>
@@ -364,6 +419,9 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
         private void OutAll(object obj)
         {
           
+            MessageBoxResult result1 = MessageBox.Show("确认整道出吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result1 == MessageBoxResult.Yes)
+            {
                 string info = obj as string;
                 bool result = outStoreBusiness.OutAllBySpaceCode(appConfig.foamStoreCode, info);
                 if (result)
@@ -378,6 +436,9 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
             }
 
           
+        }
+
+
         ///// <summary>
         ///// 手动出一个
         ///// </summary>

HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-97c2581ea4187049ea02fc6f4823d36eb22d5d39
+57c70e4804f3f76f7bf48d6ecacf52f8ab467915

HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt

@@ -61,3 +61,12 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.Co
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\bin\Debug\HighWayIot.Mqtt.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\bin\Debug\HighWayIot.Mqtt.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\bin\Debug\MQTTnet.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb

HighWayIot.Repository/service/IExecutePlanInfoService.cs

@@ -12,6 +12,14 @@ namespace HighWayIot.Repository.service
         /// <returns></returns>
         List<ExecutePlanInfo> GetExecutePlanInfosByProductLineCode(string productLineCode);
 
+
+        /// <summary>
+        /// 通过产线工位获取执行状态为1或2的计划
+        /// </summary>
+        /// <param name="productLineCode"></param>
+        /// <returns></returns>
+        List<ExecutePlanInfo> GetExecutePlanInfosByProductLineCode(string productLineCode, bool flag);
+
         /// <summary>
         /// 通过生产计划编号获取执行计划
         /// </summary>

HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs

@@ -93,6 +93,35 @@ namespace HighWayIot.Repository.service.Impl
             return planInfos;
         }
 
+
+        /// <summary>
+        /// 通过产线工位获取执行状态为1或2的计划
+        /// </summary>
+        /// <param name="productLineCode"></param>
+        /// <returns></returns>
+        public List<ExecutePlanInfo> GetExecutePlanInfosByProductLineCode(string productLineCode,bool flag)
+        {
+            if (!flag) return null;
+            List<ExecutePlanInfo> planInfos = null;
+            try
+            {
+                Expression<Func<ExecutePlanInfo, bool>> exp = s1 => true;
+                exp = exp.And(x => x.productLineCode == productLineCode && x.executeStatus!=3);
+
+                planInfos = _scadaRepository.GetList(exp);
+
+                logHelper.Info($"根据产线工位编号：{productLineCode}；获取到的执行计划信息：{jsonChange.ModeToJson(planInfos)}");
+            }
+            catch (Exception ex)
+            {
+                logHelper.Error("通过产线工位获取执行计划异常", ex);
+            }
+            return planInfos;
+        }
+
+
+
+
         /// <summary>
         /// 通过生产计划编号获取执行计划
         /// </summary>

HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-9b80b27eba7680c9113bf60611ab79ed8217a7a2
+ca7511340b20c92300885a5385eca6c41a8d5a6f

HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.FileListAbsolute.txt

@@ -103,3 +103,18 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.Co
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.CopyComplete
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.dll
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Rfid.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Rfid.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\GRreader.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.pdb

HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-952f70c5aa24ebe2b0b884df9601a6bd38147cb1
+b6f24cfde60f715e07ec9ccee22ba3c922d3df52

HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt

@@ -172,3 +172,34 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot\obj\Debug\HighWayIot.csproj.CoreCompileI
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot\obj\Debug\HighWayIot.csproj.CopyComplete
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot\obj\Debug\HighWayIot.exe
 E:\c#\AUCMA\aucma.scada\foam\HighWayIot\obj\Debug\HighWayIot.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.exe.config
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.exe
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Repository.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\Oracle.ManagedDataAccess.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\log4net.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\SqlSugar.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Common.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Config.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\Aucma.Scada.Model.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\System.Memory.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\System.Threading.Tasks.Extensions.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\Newtonsoft.Json.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\System.Numerics.Vectors.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\System.Buffers.dll
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Log4net.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Repository.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Repository.dll.config
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Common.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Config.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\Aucma.Scada.Model.pdb
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\Newtonsoft.Json.xml
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.csproj.AssemblyReference.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.csproj.SuggestedBindingRedirects.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.exe.config
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.csproj.CoreCompileInputs.cache
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.csproj.CopyComplete
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.exe
+E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.pdb