change -成品下线质检界面

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

@@ -736,6 +736,41 @@
             是否执行中
             </summary>
         </member>
+        <member name="T:Admin.Core.Model.BaseQualityInspectionItemInfo">
+            <summary>
+            质检项信息
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.BaseQualityInspectionItemInfo.ObjId">
+             <summary>
+             主键标识 
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.BaseQualityInspectionItemInfo.QualityDefectCode">
+            <summary>
+            质检项/质量缺陷编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.BaseQualityInspectionItemInfo.QualityDefectName">
+            <summary>
+            质检项/质量缺陷名字
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.BaseQualityInspectionItemInfo.ParentId">
+            <summary>
+            父级编号
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.BaseQualityInspectionItemInfo.IsFlag">
+            <summary>
+            启用标识
+            </summary>
+        </member>
+        <member name="P:Admin.Core.Model.BaseQualityInspectionItemInfo.IsInSpection">
+            <summary>
+            成品下线是否校验（0-不校验；1-校验）
+            </summary>
+        </member>
         <member name="T:Admin.Core.Model.BaseSpaceDetail">
             <summary>
             货道明细

Admin.Core.IRepository/IRepository_New/IBaseQualityInspectionItemInfoRepository.cs

@@ -0,0 +1,12 @@
+using Admin.Core.Model;
+using Admin.Core.Model.Model_New;
+
+namespace Admin.Core.IRepository
+{
+    /// <summary>
+    /// IBaseBomInfoRepository
+    /// </summary>	
+    public interface IBaseQualityInspectionItemInfoRepository : IBaseRepository<BaseQualityInspectionItemInfo>
+    {
+    }
+}

Admin.Core.IService/IService_New/IBaseQualityInspectionItemInfoServices.cs

@@ -0,0 +1,16 @@
+using Admin.Core.IService;
+using Admin.Core.Model;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Admin.Core.IService
+{
+    /// <summary>
+    /// IBaseMaterialInfoServices
+    /// </summary>	
+    public interface IBaseQualityInspectionItemInfoServices : IBaseServices<BaseQualityInspectionItemInfo>
+    {
+        public Task<List<BaseQualityInspectionItemInfo>> query();
+      
+    }
+}

Admin.Core.Model/Model_New/BaseQualityInspectionItemInfo.cs

@@ -0,0 +1,50 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Admin.Core.Model
+{
+    /// <summary>
+    /// 质检项信息
+    /// </summary>
+    [SugarTable("BASE_QUALITY_INSPECTION_ITEM", "AUCMA_MES")]
+    public class BaseQualityInspectionItemInfo
+    {
+        /// <summary>
+        /// 主键标识 
+        ///</summary>
+        [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)]
+        public int ObjId { get; set; }
+        /// <summary>
+        /// 质检项/质量缺陷编号
+        /// </summary>
+        [SugarColumn(ColumnName = "QUALITY_DEFECT_CODE")]
+        public string? QualityDefectCode { get; set; }
+        /// <summary>
+        /// 质检项/质量缺陷名字
+        /// </summary>
+        [SugarColumn(ColumnName = "QUALITY_DEFECT_NAME")]
+        public string? QualityDefectName { get; set; }
+        /// <summary>
+        /// 父级编号
+        /// </summary>
+        [SugarColumn(ColumnName = "PARENT_ID")]
+        public string? ParentId { get; set; }
+        /// <summary>
+        /// 启用标识
+        /// </summary>
+        [SugarColumn(ColumnName = "IS_FLAG")]
+        public int IsFlag { get; set; }
+        /// <summary>
+        /// 成品下线是否校验（0-不校验；1-校验）
+        /// </summary>
+        [SugarColumn(ColumnName = "IS_INSPECTION")]
+        public string? IsInSpection { get; set; }
+
+
+     
+    }
+}

Admin.Core.Repository/Repository_New/BaseQualityInspectionItemInfoRepository.cs

@@ -0,0 +1,16 @@
+using Admin.Core.Model;
+using Admin.Core.Model.Model_New;
+using Admin.Core.Repository;
+
+namespace Admin.Core.IRepository
+{
+    /// <summary>
+    /// OrderBomInfoRepository
+    /// </summary>	
+    public class BaseQualityInspectionItemInfoRepository : BaseRepository<BaseQualityInspectionItemInfo>, IBaseQualityInspectionItemInfoRepository
+    {
+        public BaseQualityInspectionItemInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
+        {
+        }
+    }
+}

Admin.Core.Service/Service_New/BaseQualityInspectionItemInfoServices.cs

@@ -0,0 +1,42 @@
+using Admin.Core.IRepository;
+using Admin.Core.IService;
+using Admin.Core.Model;
+using Admin.Core.Model.Model_New;
+using log4net;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.IdentityModel.Logging;
+using NPOI.SS.Formula.Functions;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Admin.Core.Service
+{
+    public class BaseQualityInspectionItemInfoServices : BaseServices<BaseQualityInspectionItemInfo>, IBaseQualityInspectionItemInfoServices
+    {
+        private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(BaseQualityInspectionItemInfoServices));
+        private readonly IBaseRepository<BaseQualityInspectionItemInfo> _dal;
+        private readonly IBaseQualityInspectionItemInfoRepository _baseQualityInspectionItemInfoRepository;
+
+
+       
+        public BaseQualityInspectionItemInfoServices(IBaseRepository<BaseQualityInspectionItemInfo> dal, IBaseQualityInspectionItemInfoRepository baseQualityInspectionItemInfoRepository)
+        {
+            this._dal = dal;
+            base.BaseDal = dal;
+            _baseQualityInspectionItemInfoRepository = baseQualityInspectionItemInfoRepository;
+        }
+
+        /// <summary>
+        /// 查出BaseQualityInspectionItemInfo中父级id为0且启用标识0的质检项
+        /// </summary>
+        public async Task<List<BaseQualityInspectionItemInfo>> query()
+        {
+            List<BaseQualityInspectionItemInfo> list = await _baseQualityInspectionItemInfoRepository.QueryAsync(x => x.ParentId == "0" && x.IsFlag == 0);
+            return list;
+        }
+
+    }
+}

Aucma.Core.ProductOffLine/Models/QualityInspectionModel.cs

@@ -6,28 +6,28 @@ using System.Threading.Tasks;
 
 namespace Aucma.Core.ProductOffLine.Models
 {
-    public class SelectQualityModel
+    public class QualityInspectionModel
     {
         /// <summary>
         /// 序号
         /// </summary>
         public int No { get; set; }
         /// <summary>
-        /// 物料成品主键
+        /// 主键编号
         /// </summary>
         public int ObjId { get; set; }
         /// <summary>
-        /// 物料编号
+        /// 质检项编号
         /// </summary>
-        public string? MaterialCode { get; set; }
+        public string? QualityDefectCode { get; set; }
         /// <summary>
-        /// 物料名称
+        /// 质检项名称
         /// </summary>
-        public string? MaterialName { get; set; }
+        public string? QualityDefectName { get; set; }
         /// <summary>
-        /// 货道编号
+        /// 是否校验
         /// </summary>
-        public string? SpaceCode { get; set; }
+        public string? IsInSpection { get; set; }
   
     }
 }

Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs

@@ -49,9 +49,11 @@ namespace Aucma.Core.ProductOffLine.ViewModels
             _productOffLineServices = App.ServiceProvider.GetService<IProductOffLineServices>();
             _baseOrderInfoServices = App.ServiceProvider.GetService<IBaseOrderInfoServices>();
             _productPlanInfoServices = App.ServiceProvider.GetService<IProductPlanInfoServices>();        
-            MvCodeHelper.ReceiveCodeEvent += ReceiveCode;
+            
+           // MvCodeHelper.ReceiveCodeEvent += ReceiveCode;
+
             //   test33();
-            ReceiveCode("12345", 1);
+          //  ReceiveCode("12345", 1);
             StartPlcTimer();
             InitEveryDayMethod();
             test2();

Aucma.Core.ProductOffLine/ViewModels/QualityPageViewModel.cs

@@ -1,32 +1,47 @@
-using Admin.Core.Model;
+using Admin.Core.IService;
+using Admin.Core.Model;
+using Admin.Core.Service;
 using Aucma.Core.ProductOffLine.Models;
 using Aucma.Core.ProductOffLine.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Documents;
 
 namespace Aucma.Core.ProductOffLine.ViewModels
 {
     public partial class QualityPageViewModel : ObservableObject
     {
+        private readonly IBaseQualityInspectionItemInfoServices? _baseQualityInspectionItemInfoServices;
         public QualityPageViewModel() {
-
+            QualityPageView.getAllQualityEvent += test;
+            _baseQualityInspectionItemInfoServices = App.ServiceProvider.GetService<IBaseQualityInspectionItemInfoServices>();
             AutoDirectionCommand = new RelayCommand(DirectionEdit);
             SelectQualityCommand = new RelayCommand(SelectQuality);
             init();
             LoadData();
         }
-        public void init()
+
+        public async Task<List<BaseQualityInspectionItemInfo>> test()
+        {
+            List<BaseQualityInspectionItemInfo> list = await _baseQualityInspectionItemInfoServices.query();
+            return list;
+        }
+
+        public async void init()
         {
+           await _baseQualityInspectionItemInfoServices.query();
         }
 
         List<MaterialComplateInfo> materialComplateInfos = new List<MaterialComplateInfo>();

Aucma.Core.ProductOffLine/ViewModels/SelectQualityViewModel.cs

@@ -2,13 +2,16 @@
 using Admin.Core.Model;
 using Admin.Core.Service;
 using Aucma.Core.ProductOffLine.Models;
+using Aucma.Core.ProductOffLine.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
+using NPOI.POIFS.Properties;
 using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Data;
 using System.Drawing;
 using System.Linq;
@@ -24,42 +27,80 @@ namespace Aucma.Core.ProductOffLine.ViewModels
 {
     public partial class SelectQualityViewModel : ObservableObject
     {
+      
         public ICommand QueryCommand { get; set; }
         public ICommand SaveCommand { get; set; }
+        private readonly IBaseQualityInspectionItemInfoServices? _baseQualityInspectionItemInfoServices;
       
-     
-        private readonly IBaseMaterialInfoServices? _baseMaterialInfoServices;
         public SelectQualityViewModel() {
-            _baseMaterialInfoServices = App.ServiceProvider.GetService<IBaseMaterialInfoServices>();
+            _baseQualityInspectionItemInfoServices = App.ServiceProvider.GetService<IBaseQualityInspectionItemInfoServices>();
+          
              QueryCommand = new RelayCommand(ExecuteQuery);
             SaveCommand = new RelayCommand(ExecuteSave);
+            
              Init();
         }
+      
         /// <summary>
         /// 3.查询BASE_MATERIALINFO表存在的成品类型以供修改
         /// </summary>
-        public void Init()
+        public async void Init()
         {  
+            ExecuteQuery();       
         }
 
         private async void ExecuteQuery()
         {
-           
+            List<BaseQualityInspectionItemInfo> list = await _baseQualityInspectionItemInfoServices.query();
+            qualityItemGrid.Clear();
+            for (int i = 0; i < list.Count; i++)
+            {
+                qualityItemGrid.Add(new QualityInspectionModel() { No = i + 1, ObjId = list[i].ObjId, QualityDefectCode = list[i].QualityDefectCode, QualityDefectName = list[i].QualityDefectName, IsInSpection = list[i].IsInSpection == "0" ? "否" : "是" });
+            }
         }
 
         private async void ExecuteSave()
         {
-           
+            List<BaseQualityInspectionItemInfo> list = new List<BaseQualityInspectionItemInfo>();
+            // 处理保存按钮点击事件
+            foreach (QualityInspectionModel item in qualityItemGrid)
+            {
+                if ((!"是".Equals(item.IsInSpection) && !"否".Equals(item.IsInSpection)))
+                {
+                    MessageBox.Show("质检编号:" + item.QualityDefectCode + " 质检名称:" + item.QualityDefectName + "  是否质检应该是或者否");
+                    return;
+                }
+                list.Add(new BaseQualityInspectionItemInfo()
+                {
+                    ObjId = item.ObjId,
+                    QualityDefectCode = item.QualityDefectCode,
+                    QualityDefectName = item.QualityDefectName,
+                    ParentId ="0",
+                    IsFlag = 0,
+                    IsInSpection = item.IsInSpection == "是"?"1":"0"
+                }) ;
+            }
+            bool result = await _baseQualityInspectionItemInfoServices.UpdateAsync(list);
+            if (result)
+            {
+                MessageBox.Show("保存成功");
             }
+            else
+            {
+                MessageBox.Show("保存失败");
+            }
+        }
+
+
 
         #region 初始化datagrid
-        private ObservableCollection<DirectionEditModel> materialDataGrid = new ObservableCollection<DirectionEditModel>();
-        public ObservableCollection<DirectionEditModel> MaterialDataGrid
+        private ObservableCollection<QualityInspectionModel> qualityItemGrid = new ObservableCollection<QualityInspectionModel>();
+        public ObservableCollection<QualityInspectionModel> QualityItemGrid
         {
-            get { return materialDataGrid; }
+            get { return qualityItemGrid; }
             set
             {
-                materialDataGrid = value;
+                qualityItemGrid = value;
                 OnPropertyChanged();//属性通知
             }
         }

Aucma.Core.ProductOffLine/Views/QualityPageView.xaml

@@ -49,7 +49,7 @@
                         </WrapPanel>
                     </Border>
                     <Button  Content="自动方向设置" Command="{Binding AutoDirectionCommand}"  Margin="100,0,0,0"  Background="Blue" Foreground="White"/>
-                    <Button  Content="质检项设置"   Command="{Binding SelectQualityCommand}"  Background="Blue" Foreground="White" Width="120" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                    <Button  Content="质检项设置"   Command="{Binding SelectQualityCommand}"  Margin="50,0,0,0" Background="Blue" Foreground="White" Width="120" VerticalAlignment="Top" HorizontalAlignment="Left"/>
                 </WrapPanel>
             </Grid>
             <Grid Grid.Row="2">
@@ -64,7 +64,6 @@
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False"
                       Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" >
-                    <!-- 表头剧中-->
                     <DataGrid.ColumnHeaderStyle>
                         <Style TargetType="DataGridColumnHeader">
                             <Setter Property="HorizontalContentAlignment" Value="Center">
@@ -82,9 +81,9 @@
                         <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*"  IsReadOnly="True"/>
                             <DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品条码" Width="2*" IsReadOnly="True"/>
                             <DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品名称" Width="2*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding MaterialCode}" Header="内胆预装检漏" Width="2*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding MaterialName}" Header="成品检漏" Width="2*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding SpaceCode}" Header="终检" Width="*"/>
+                            <DataGridTextColumn x:Name="quality1" Binding="{Binding MaterialCode}" Header="内胆预装检漏" Width="2*" IsReadOnly="True"/>
+                            <DataGridTextColumn x:Name="quality2" Binding="{Binding MaterialName}" Header="成品检漏" Width="2*" IsReadOnly="True"/>
+                            <DataGridTextColumn x:Name="quality3" Binding="{Binding SpaceCode}"    Header="终检" Width="*" IsReadOnly="True"/>
                     </DataGrid.Columns>
                 </DataGrid>
           

Aucma.Core.ProductOffLine/Views/QualityPageView.xaml.cs

@@ -1,4 +1,8 @@
-using Aucma.Core.ProductOffLine.ViewModels;
+using Admin.Core.IService;
+using Admin.Core.Model;
+using Admin.Core.Service;
+using Aucma.Core.ProductOffLine.ViewModels;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,10 +25,35 @@ namespace Aucma.Core.ProductOffLine.Views
     /// </summary>
     public partial class QualityPageView : UserControl
     {
+        public delegate Task<List<BaseQualityInspectionItemInfo>> getAllQuality();
+        public static event getAllQuality getAllQualityEvent;
+
         public QualityPageView()
         {
+
             InitializeComponent();
-            this.DataContext = new QualityPageViewModel();
+            QualityPageViewModel viewmodel = new QualityPageViewModel();
+            this.DataContext = viewmodel;
+            qualityItem();
+        }
+
+
+        public async void qualityItem()
+        {
+            List<BaseQualityInspectionItemInfo> list = await getAllQualityEvent?.Invoke();
+            foreach (BaseQualityInspectionItemInfo item in list)
+            {
+
+                foreach (var column in qualityGrid.Columns)
+                {
+                    DataGridColumn dataGridColumn = column as DataGridColumn;
+                    if (dataGridColumn.Header.ToString().Equals(item.QualityDefectName) && "0".Equals(item.IsInSpection))
+                    {
+                        dataGridColumn.Visibility = Visibility.Collapsed;
+                    }
+                }
+            }
+        //    this.quality1.Visibility = Visibility.Collapsed;
         }
 
     }

Aucma.Core.ProductOffLine/Views/SelectQualityView.xaml

@@ -4,9 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Core.ProductOffLine.Views"
-      mc:Ignorable="d"
-         Title="质检项目设置" Height="650" Width="900" Name="window" Background="White"
-        ResizeMode="NoResize" Topmost="True"
+      mc:Ignorable="d"  Title="质检项目设置" Height="650" Width="600" Name="window" Background="White" ResizeMode="NoResize" Topmost="True"
        >
     <Border Margin="5" Background="#1254AB" CornerRadius="10">
         <Border.Effect> 
@@ -14,8 +12,8 @@
         </Border.Effect>
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="87*"/>
-                <ColumnDefinition Width="803*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="8*"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="*"/>
@@ -28,13 +26,50 @@
             <!--计划列表-->
             <Border Grid.Row="1" BorderBrush="#1254AB" BorderThickness="3" CornerRadius="5" Background="Transparent" Margin="1,1,5,5" Grid.ColumnSpan="2">
 
-                <DataGrid x:Name="dataShow" ItemsSource="{Binding Items}" AutoGenerateColumns="False" Background="Transparent" 
+                <DataGrid Name="qualityItemGrid" ItemsSource="{Binding QualityItemGrid}" Background="Transparent" 
                       FontSize="15" ColumnHeaderHeight="35" 
-                      RowHeight="31" RowHeaderWidth="0" 
+                      RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False"
-                      Foreground="#FFFFFF">
+                      Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" >
+                    <DataGrid.ColumnHeaderStyle>
+                        <Style TargetType="DataGridColumnHeader">
+                            <Setter Property="HorizontalContentAlignment" Value="Center">
+                            </Setter>
+                            <Setter Property="Background" Value="Transparent" />
+                        </Style>
+                    </DataGrid.ColumnHeaderStyle>
+                    <DataGrid.CellStyle>
+                        <Style TargetType="DataGridCell">
+                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                        </Style>
+                    </DataGrid.CellStyle>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*"  IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding QualityDefectCode}" Header="质检编号" Width="2*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding QualityDefectName}" Header="质检名称" Width="2*" IsReadOnly="True"/>
+                        <DataGridTextColumn x:Name="test11" Binding="{Binding IsInSpection}" Header="是否校验" Width="*" />
+                    </DataGrid.Columns>
                 </DataGrid>
+                <!--<DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Border x:Name="levelControl"   VerticalAlignment="Center" >
+                                    <StackPanel >
+                                        <TextBlock x:Name="txtName" TextWrapping="Wrap"  Text="{Binding MaterialName}" ToolTip="{Binding MaterialName}" />
+                                        <TextBlock  Text="{Binding IsExec}"  Visibility="Collapsed"   />
+                                    </StackPanel>
+                                </Border>
+                                <DataTemplate.Triggers>
+                                    <DataTrigger Binding="{Binding IsExec}" Value="2">
+                                        <Setter TargetName="txtName"  Property="Foreground"   Value="Green" ></Setter>
+                                        -->
+                <!--<Setter TargetName="levelControl"  Property="Background"   Value="Green" ></Setter>-->
+                <!--
+
+                                    </DataTrigger>
+                                </DataTemplate.Triggers>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>-->
             </Border>
 
         </Grid>

Aucma.Core.ProductOffLine/Views/SelectQualityView.xaml.cs

@@ -1,4 +1,9 @@
-using Aucma.Core.ProductOffLine.ViewModels;
+using Admin.Core.IRepository;
+using Admin.Core.IService;
+using Admin.Core.Model;
+using Admin.Core.Repository;
+using Admin.Core.Service;
+using Aucma.Core.ProductOffLine.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,6 +13,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
+using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -20,10 +26,15 @@ namespace Aucma.Core.ProductOffLine.Views
     /// </summary>
     public partial class SelectQualityView : Window
     {
+      
         public SelectQualityView()
         {
             InitializeComponent(); 
-            this.DataContext = new SelectQualityViewModel();
+            SelectQualityViewModel viewModel = new SelectQualityViewModel();
+            this.DataContext = viewModel;
+         
         }
+
+      
     }
 }

Aucma.Core.SheetMetal/Views/IndexPage.xaml

@@ -258,6 +258,7 @@
                                             </Border>
                                             <DataTemplate.Triggers>
                                                 <DataTrigger Binding="{Binding IsExec}" Value="2">
+                                                    <Setter TargetName="txtName"  Property="Visibility"   Value="Collapsed" ></Setter>
                                                     <Setter TargetName="txtName"  Property="Foreground"   Value="Green" ></Setter>
                                                 </DataTrigger>
                                             </DataTemplate.Triggers>