From 2f0cc7d1cecd303cd11484c6750e1c5127796f6a Mon Sep 17 00:00:00 2001
From: anerx <512464164@qq.com>
Date: Fri, 11 Apr 2025 14:31:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=8D=E5=88=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/VarietyManagerViewModel.cs     |  45 ++++
 .../Views/VarietyManagerPage.axaml            | 244 +++++++++---------
 2 files changed, 173 insertions(+), 116 deletions(-)

diff --git a/Seyounth.Hyosung.Ava/ViewModels/VarietyManagerViewModel.cs b/Seyounth.Hyosung.Ava/ViewModels/VarietyManagerViewModel.cs
index 718e348..6788f70 100644
--- a/Seyounth.Hyosung.Ava/ViewModels/VarietyManagerViewModel.cs
+++ b/Seyounth.Hyosung.Ava/ViewModels/VarietyManagerViewModel.cs
@@ -70,6 +70,51 @@ public partial class VarietyManagerViewModel : ObservableObject
         Varieties.Add(new Variety());
     }
 
+    [RelayCommand]
+    private void OnCopyNew(object obj)
+    {
+        if (obj is Variety variety)
+        {
+            var newVariety = new Variety
+            {
+                Id = variety.Id,
+                TopAndBottomPallet = variety.TopAndBottomPallet,
+                MiddlePallet = variety.MiddlePallet,
+                Tray = variety.Tray,
+                PaperTray = variety.PaperTray,
+                StackingLayers = variety.StackingLayers,
+                YarnCarType = variety.YarnCarType,
+                NeedAngleBeam = variety.NeedAngleBeam,
+                NeedFilmCoating = variety.NeedFilmCoating,
+                NeedFilmWrapping = variety.NeedFilmWrapping,
+                HasBox = variety.HasBox,
+                Specifications = variety.Specifications,
+                InnerDiameter = variety.InnerDiameter,
+                LastNo = variety.LastNo,
+                OuterDiameter = variety.OuterDiameter,
+                TotalCount = variety.TotalCount,
+                YarnDiameter = variety.YarnDiameter,
+                YarnThickness = variety.YarnThickness,
+                MasterLabelCount = variety.MasterLabelCount,
+                NeedPackStrap = variety.NeedPackStrap,
+                NeedTopBoard = variety.NeedTopBoard,
+                PaperTubeHeight = variety.PaperTubeHeight,
+                StackHeadCount = variety.StackHeadCount,
+                SubLabelCount = variety.SubLabelCount,
+                YarnCarSide = variety.YarnCarSide,
+                StackHeadSpec = variety.StackHeadSpec,
+                Code = variety.Code,
+                ControlNo = variety.ControlNo,
+                GrossWeight = variety.GrossWeight,
+                NetWeight = variety.NetWeight,
+                SingleWeight = variety.SingleWeight,
+                IsTurn = variety.IsTurn,
+                Lot = variety.Lot,
+            };
+            Varieties.Add(newVariety);
+        }
+    }
+
 
     [RelayCommand]
     private void OnDeletePallet(object obj)
diff --git a/Seyounth.Hyosung.Ava/Views/VarietyManagerPage.axaml b/Seyounth.Hyosung.Ava/Views/VarietyManagerPage.axaml
index 72f9d74..58ddf55 100644
--- a/Seyounth.Hyosung.Ava/Views/VarietyManagerPage.axaml
+++ b/Seyounth.Hyosung.Ava/Views/VarietyManagerPage.axaml
@@ -23,6 +23,18 @@
                 <DataGrid Grid.Row="1" GridLinesVisibility="All"
                           ItemsSource="{Binding ViewModel.Varieties,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <DataGrid.Columns>
+                        <DataGridTemplateColumn Header="复制">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <Button VerticalAlignment="Center" Margin="10,0,10,0"
+                                            Content="复制"
+                                            Classes="Outlined Accent"
+                                            Command="{Binding ElementName=VarietyPage, Path=ViewModel.CopyNewCommand}"
+                                            CommandParameter="{Binding}"
+                                            IsVisible="{Binding RelativeSource={RelativeSource AncestorType=DataGridRow}, Path=IsEditing}" />
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
                         <DataGridTextColumn Header="编号"
                                             Binding="{Binding Id}" />
                         <DataGridTextColumn MinWidth="200" Header="产品编码" Binding="{Binding Code}" />
@@ -71,40 +83,40 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        
-                         <DataGridTemplateColumn Width="180" Header="蜂窝板(上下)">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox
-                                SelectedItem="{Binding TopAndBottomPallet, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                ItemsSource="{Binding ElementName=VarietyPage, Path=ViewModel.HoneyPallets}"
-                                DisplayMemberBinding="{Binding Name}">
-                            </ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
-                <DataGridTemplateColumn Width="180" Header="底托">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox
-                                SelectedItem="{Binding Tray, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                ItemsSource="{Binding ElementName=VarietyPage, Path=ViewModel.Trays}"
-                                DisplayMemberBinding="{Binding Name}">
-                            </ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
-                <DataGridTemplateColumn Width="180" Header="隔板">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox
-                                SelectedItem="{Binding PaperTray, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                ItemsSource="{Binding ElementName=VarietyPage, Path=ViewModel.PaperPallets}"
-                                DisplayMemberBinding="{Binding Name}">
-                            </ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
+
+                        <DataGridTemplateColumn Width="180" Header="蜂窝板(上下)">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ComboBox
+                                        SelectedItem="{Binding TopAndBottomPallet, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ItemsSource="{Binding ElementName=VarietyPage, Path=ViewModel.HoneyPallets}"
+                                        DisplayMemberBinding="{Binding Name}">
+                                    </ComboBox>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn Width="180" Header="底托">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ComboBox
+                                        SelectedItem="{Binding Tray, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ItemsSource="{Binding ElementName=VarietyPage, Path=ViewModel.Trays}"
+                                        DisplayMemberBinding="{Binding Name}">
+                                    </ComboBox>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn Width="180" Header="隔板">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ComboBox
+                                        SelectedItem="{Binding PaperTray, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ItemsSource="{Binding ElementName=VarietyPage, Path=ViewModel.PaperPallets}"
+                                        DisplayMemberBinding="{Binding Name}">
+                                    </ComboBox>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
                         <DataGridTextColumn
                             Binding="{Binding StackHeadSpec  }"
                             Header="垛头尺寸" />
@@ -112,88 +124,88 @@
                             Binding="{Binding StackHeadCount  }"
                             Header="垛头数量" />
                         <DataGridCheckBoxColumn Header="套箱" Binding="{Binding HasBox}" />
-                        
-                        
+
+
                         <DataGridTemplateColumn Header="顶板">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox
-                                SelectedItem="{Binding NeedTopBoard, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                ItemsSource="{Binding Source={helpers:EnumBindingSource {x:Type models1:NeedType}}}">
-                                <ComboBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <TextBlock
-                                            Text="{Binding ., Converter={StaticResource EnumDescriptionConverter}}" />
-                                    </DataTemplate>
-                                </ComboBox.ItemTemplate>
-                            </ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
-                <DataGridTemplateColumn  Header="护角">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox
-                                SelectedItem="{Binding NeedAngleBeam, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                ItemsSource="{Binding Source={helpers:EnumBindingSource {x:Type models1:NeedType}}}">
-                                <ComboBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <TextBlock
-                                            Text="{Binding ., Converter={StaticResource EnumDescriptionConverter}}" />
-                                    </DataTemplate>
-                                </ComboBox.ItemTemplate>
-                            </ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
-                <DataGridTemplateColumn  Header="打带">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox
-                                SelectedItem="{Binding NeedPackStrap, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                ItemsSource="{Binding Source={helpers:EnumBindingSource {x:Type models1:NeedType}}}">
-                                <ComboBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <TextBlock
-                                            Text="{Binding ., Converter={StaticResource EnumDescriptionConverter}}" />
-                                    </DataTemplate>
-                                </ComboBox.ItemTemplate>
-                            </ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
-                <DataGridTemplateColumn  Header="缠膜">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox
-                                SelectedItem="{Binding NeedFilmWrapping, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                ItemsSource="{Binding Source={helpers:EnumBindingSource {x:Type models1:NeedType}}}">
-                                <ComboBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <TextBlock
-                                            Text="{Binding ., Converter={StaticResource EnumDescriptionConverter}}" />
-                                    </DataTemplate>
-                                </ComboBox.ItemTemplate>
-                            </ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
-                <DataGridTemplateColumn Header="覆膜">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox
-                                SelectedItem="{Binding NeedFilmCoating, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                ItemsSource="{Binding Source={helpers:EnumBindingSource {x:Type models1:NeedType}}}">
-                                <ComboBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <TextBlock
-                                            Text="{Binding ., Converter={StaticResource EnumDescriptionConverter}}" />
-                                    </DataTemplate>
-                                </ComboBox.ItemTemplate>
-                            </ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ComboBox
+                                        SelectedItem="{Binding NeedTopBoard, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ItemsSource="{Binding Source={helpers:EnumBindingSource {x:Type models1:NeedType}}}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <TextBlock
+                                                    Text="{Binding ., Converter={StaticResource EnumDescriptionConverter}}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn Header="护角">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ComboBox
+                                        SelectedItem="{Binding NeedAngleBeam, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ItemsSource="{Binding Source={helpers:EnumBindingSource {x:Type models1:NeedType}}}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <TextBlock
+                                                    Text="{Binding ., Converter={StaticResource EnumDescriptionConverter}}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn Header="打带">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ComboBox
+                                        SelectedItem="{Binding NeedPackStrap, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ItemsSource="{Binding Source={helpers:EnumBindingSource {x:Type models1:NeedType}}}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <TextBlock
+                                                    Text="{Binding ., Converter={StaticResource EnumDescriptionConverter}}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn Header="缠膜">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ComboBox
+                                        SelectedItem="{Binding NeedFilmWrapping, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ItemsSource="{Binding Source={helpers:EnumBindingSource {x:Type models1:NeedType}}}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <TextBlock
+                                                    Text="{Binding ., Converter={StaticResource EnumDescriptionConverter}}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn Header="覆膜">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <ComboBox
+                                        SelectedItem="{Binding NeedFilmCoating, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        ItemsSource="{Binding Source={helpers:EnumBindingSource {x:Type models1:NeedType}}}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <TextBlock
+                                                    Text="{Binding ., Converter={StaticResource EnumDescriptionConverter}}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
                         <DataGridTextColumn
                             Binding="{Binding MasterLabelCount  }"
                             Header="主标签数量"
@@ -208,7 +220,7 @@
                                             Binding="{Binding NetWeight}" />
                         <DataGridTextColumn Header="控制号"
                                             Binding="{Binding LastNo}" />
-                        
+
                         <DataGridTemplateColumn Header="操作">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>