临时提交

SCADA_DAQ/Customer/UctFrmPalletizingManual.xaml

@@ -0,0 +1,15 @@
+<wpfcontrol:BaseUctFrm  xmlns:wpfcontrol="clr-namespace:SCADA.CommonCtrl.WpfControl;assembly=SCADA.CommonCtrl"
+                        x:Class="SCADA_DAQ.Customer.UctFrmPalletizingManual"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:SCADA_DAQ.Customer"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="UctFrmPalletizingManual">
+
+    <Grid>
+        
+    </Grid>
+</wpfcontrol:BaseUctFrm>

SCADA_DAQ/Customer/UctFrmPalletizingManual.xaml.cs

@@ -0,0 +1,31 @@
+using SCADA.CommonCtrl.WpfControl;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SCADA_DAQ.Customer
+{
+    /// <summary>
+    /// UctFrmPalletizingManual.xaml 的交互逻辑
+    /// </summary>
+    [UctMenu("码垛手动", Icon = "GestureTap")]
+    public partial class UctFrmPalletizingManual : BaseUctFrm
+    {
+        public UctFrmPalletizingManual()
+        {
+            InitializeComponent();
+            ToolBar.Visibility = Visibility.Collapsed;
+        }
+    }
+}

SCADA_DAQ/SCADA_DAQ.csproj.user

@@ -5,6 +5,9 @@
     <Compile Update="Customer\UctFrmMain.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Customer\UctFrmPalletizingManual.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="Customer\UctFrmParameterSet.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -13,6 +16,9 @@
     <Page Update="Customer\UctFrmMain.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="Customer\UctFrmPalletizingManual.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Customer\UctFrmParameterSet.xaml">
       <SubType>Designer</SubType>
     </Page>