Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

Aucma.Core.ProductOffLine/Business/offLineBusiness.cs

@@ -217,7 +217,7 @@ namespace Aucma.Core.ProductOffLine.Business
             {
         try
         {
-                Thread.Sleep(10000);
+            Thread.Sleep(10000);
             TempOffLineInfo.ProductSNCode = BarCode.Trim(); //产品SN条码*1
             TempOffLineInfo.ProductScanTime = System.DateTime.Now; // 扫码时间*2
             TempOffLineInfo.ProductOrderNo = "";
@@ -225,7 +225,7 @@ namespace Aucma.Core.ProductOffLine.Business
 
             //1.查询条码系统
          //   string result = await _productOffLineServices.QueryChecked(BarCode);
-              string result = "Y@1104@16160030000000910780@000010034895@@ @000000@000000009000004899@BCD-160C,家电下乡@@BCD-160C@test皓月白-家电下乡@161601300@160@1-00版@家电下乡产品@默认@2010-09-01";
+              string result = "Y@1104@16160030000000910780@000010034895@@ @000000@000000009000003987@BCD-160C,家电下乡@@BCD-160C@test皓月白-家电下乡@161601300@160@1-00版@家电下乡产品@默认@2010-09-01";
 
                 //查询到的数据分割处理,结果中用"@"号分隔，刷新页面显示
                 string[] FArrayList = result.Split('@');

Aucma.Core.ProductOffLine/Models/TempInfo.cs

@@ -124,5 +124,10 @@ namespace Aucma.Core.ProductOffLine.Models
         /// 扫码重复是否允许放行，界面加选择栏
         /// </summary>
         public bool ChkOut { get; set; }
+
+        /// <summary>
+        /// 按型号统计使用的数量
+        /// </summary>
+        public int Count { get; set; }
     }
 }

Aucma.Core.ProductOffLine/ViewModels/QualityPageViewModel.cs

@@ -65,7 +65,14 @@ namespace Aucma.Core.ProductOffLine.ViewModels
                 {
                     // 未设置方向模式或者设置自动模式，默认自动
                     BaseMaterialInfo info = _baseMaterialInfoServices.Query(x => x.MaterialCode == materialType).FirstOrDefault();
-                    direction = info.InboundDirection;
+                    if (info != null)
+                    {
+                        direction = info.InboundDirection;
+                    }
+                    else  // 自动模式未设置入库方向，默认为A
+                    {
+                        direction = "A";
+                    }
                 }
                
             });

Aucma.Core.ProductOffLine/ViewModels/StatisticsPageViewModel.cs

@@ -42,6 +42,21 @@ namespace Aucma.Core.ProductOffLine.ViewModels
                     });
 
                 }
+                var countByProductModel = list.GroupBy(x => x.ProductModel).Select(group => new
+                 {
+                     ProductCode = group.First().ProductCode,
+                     ProductRemark = group.First().ProductRemark,
+                     ProductModel = group.Key,
+                     Count = group.Count()
+                 }).ToList();
+                foreach (var item in countByProductModel)
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        TotalItem.Add(new TempInfo() { No = TotalItem.Count + 1,ProductCode = item.ProductCode, ProductModel = item.ProductModel,ProductRemark = item.ProductRemark, Count = item.Count });
+                    });
+
+                }
             }
            
         }
@@ -58,6 +73,18 @@ namespace Aucma.Core.ProductOffLine.ViewModels
                 OnPropertyChanged();//属性通知
             }
         }
+        // 按照型号统计
+        private ObservableCollection<TempInfo> totalItem = new ObservableCollection<TempInfo>() { };
+        public ObservableCollection<TempInfo> TotalItem
+        {
+            get { return totalItem; }
+            set
+            {
+                totalItem = value;
+                OnPropertyChanged();//属性通知
+            }
+        }
+        
         #endregion
 
         #region 查询

Aucma.Core.ProductOffLine/Views/StatisticsPageView.xaml

@@ -130,7 +130,7 @@
                     </Grid.RowDefinitions>-->
             
                     <UniformGrid Grid.Row="1">
-                        <DataGrid Grid.Row="0" ItemsSource="{Binding MaterialDataGrid}" Background="Transparent" 
+                        <DataGrid Grid.Row="0" ItemsSource="{Binding TotalItem}" Background="Transparent" 
                        ColumnHeaderHeight="35"  
                       RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
@@ -152,11 +152,11 @@
                             </DataGrid.CellStyle>
                             <DataGrid.Columns>
                                 <DataGridTextColumn Binding="{Binding No}" Header="序号" />
-                                <DataGridTextColumn Binding="{Binding ProductPlanCode}" Header="库" Width="1*" />
+                                <DataGridTextColumn Binding="{Binding ProductCode}" Header="物料编码" Width="3*"  />
-                                <DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料条码" Width="3*"  />
+                                <DataGridTextColumn Binding="{Binding ProductModel}" Header="产品型号" Width="3*"  />
-                                <DataGridTextColumn Binding="{Binding MaterialName}" Header="物料型号" Width="3*"  />
+                                <DataGridTextColumn Binding="{Binding ProductRemark}" Header="标签特征" Width="3*"  />
-                                <DataGridTextColumn Binding="{Binding PlanAmount}" Header="数量" Width="*"  />
+                                <DataGridTextColumn Binding="{Binding Count}" Header="产品数量" Width="3*"  /> 
-                                <DataGridTextColumn Binding="{Binding CompleteAmount}" Header="入库时间" Width="2*" />
+
                             </DataGrid.Columns>
                         </DataGrid>
 

Aucma.Core.Scanner/Scanner/ScannerService.cs

@@ -13,7 +13,6 @@ namespace Aucma.Core.Scanner
         {
             try
             {
-
                 MvCodeHelper.DeviceListAcq();//获取创建设备
                 MvCodeHelper.StartGrab();  // 开启触发扫码接收数据