微浦MES新增查询界面，控件调整与岗位备料逻辑调整

UAS_MES_WEIP/CustomControl/TextBoxWithIcon/TextBoxWithPlaceHolder.cs

@@ -40,8 +40,10 @@ namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
         }
 
         public delegate void OnTextChange(object sender, EventArgs e);
+        public delegate void OnKeyDown(object sender, KeyEventArgs e);
 
         public event OnTextChange UserControlTextChanged;
+        public event OnKeyDown UserControlOnKeyDown;
 
         public TextBoxWithPlaceHolder()
         {
@@ -80,5 +82,10 @@ namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
         {
             UserControlTextChanged?.Invoke(sender, new EventArgs());
         }
+
+        private void TextBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            UserControlOnKeyDown?.Invoke(sender, e);
+        }
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_PositionStock.cs

@@ -90,7 +90,7 @@ namespace UAS_MES_NEW.Make
                                 sql.Clear();
                                 sql.Append("select sp_id,sp_oneuseqty,sp_fsoncode,sp_soncode,sp_prefix from stepbom left join stepproduct on sp_sbid=sb_id ");
                                 sql.Append("where sb_craftcode='" + ma_craftcode.Text + "' and  sb_prodcode='" + ma_prodcode.Text + "' and ");
-                                sql.Append("sb_bomversion='" + ma_bomversion.Text + "'  and sp_stepcode='" + User.CurrentStepCode + "' and (sp_soncode ='" + bar_prodcode + "' or sp_fsoncode='" + bar_prodcode + "')and sp_tracekind=2 ");
+                                sql.Append("sb_bomversion='" + ma_bomversion.Text + "'  and sp_stepcode='" + User.CurrentStepCode + "' and (sp_soncode ='" + bar_prodcode + "' or sp_fsoncode='" + bar_prodcode + "' or (select count(1) from wp_replace_view@WP where bo_mothercode = '"+ ma_prodcode.Text + "' and bd_soncode = sp_fsoncode and pre_repcode= '"+ bar_prodcode + "') >0  )and sp_tracekind=2 ");
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 if (dt.Rows.Count > 0)
                                 {

UAS_MES_WEIP/FunctionCode/Query/Query_Commandlog.Designer.cs

@@ -0,0 +1,195 @@
+namespace UAS_MES_NEW.Query
+{
+    partial class Query_Commandlog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.Search = new System.Windows.Forms.Button();
+            this.pallecode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder();
+            this.InOutDetailDGV = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.cl_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cl_linecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cl_makecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.sc_stepname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cl_operate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cl_result = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cl_date = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cl_man = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Sp = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // Search
+            // 
+            this.Search.Location = new System.Drawing.Point(197, 28);
+            this.Search.Name = "Search";
+            this.Search.Size = new System.Drawing.Size(68, 21);
+            this.Search.TabIndex = 237;
+            this.Search.Text = "查询";
+            this.Search.UseVisualStyleBackColor = true;
+            this.Search.Click += new System.EventHandler(this.Search_Click);
+            // 
+            // pallecode
+            // 
+            this.pallecode.BackColor = System.Drawing.Color.Transparent;
+            this.pallecode.Location = new System.Drawing.Point(12, 28);
+            this.pallecode.Name = "pallecode";
+            this.pallecode.PlaceHolder = "sn/箱搜索";
+            this.pallecode.Size = new System.Drawing.Size(159, 28);
+            this.pallecode.TabIndex = 236;
+            this.pallecode.UserControlOnKeyDown += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder.OnKeyDown(this.pallecode_UserControlOnKeyDown);
+            // 
+            // InOutDetailDGV
+            // 
+            this.InOutDetailDGV.AllowUserToAddRows = false;
+            this.InOutDetailDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.InOutDetailDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.cl_sncode,
+            this.cl_linecode,
+            this.cl_makecode,
+            this.sc_stepname,
+            this.cl_operate,
+            this.cl_result,
+            this.cl_date,
+            this.cl_man,
+            this.Sp});
+            this.InOutDetailDGV.EnableContentClick = true;
+            this.InOutDetailDGV.Location = new System.Drawing.Point(11, 78);
+            this.InOutDetailDGV.Margin = new System.Windows.Forms.Padding(2);
+            this.InOutDetailDGV.Name = "InOutDetailDGV";
+            this.InOutDetailDGV.RowTemplate.Height = 27;
+            this.InOutDetailDGV.Size = new System.Drawing.Size(665, 385);
+            this.InOutDetailDGV.TabIndex = 219;
+            // 
+            // cl_sncode
+            // 
+            this.cl_sncode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.cl_sncode.DataPropertyName = "cl_sncode";
+            this.cl_sncode.HeaderText = "SN/箱号";
+            this.cl_sncode.Name = "cl_sncode";
+            this.cl_sncode.ReadOnly = true;
+            // 
+            // cl_linecode
+            // 
+            this.cl_linecode.DataPropertyName = "cl_linecode";
+            this.cl_linecode.HeaderText = "线体";
+            this.cl_linecode.Name = "cl_linecode";
+            this.cl_linecode.Width = 70;
+            // 
+            // cl_makecode
+            // 
+            this.cl_makecode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.cl_makecode.DataPropertyName = "cl_makecode";
+            this.cl_makecode.HeaderText = "工单";
+            this.cl_makecode.Name = "cl_makecode";
+            this.cl_makecode.ReadOnly = true;
+            // 
+            // sc_stepname
+            // 
+            this.sc_stepname.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.sc_stepname.DataPropertyName = "sc_stepname";
+            this.sc_stepname.HeaderText = "工序";
+            this.sc_stepname.Name = "sc_stepname";
+            this.sc_stepname.ReadOnly = true;
+            // 
+            // cl_operate
+            // 
+            this.cl_operate.DataPropertyName = "cl_operate";
+            this.cl_operate.HeaderText = "操作";
+            this.cl_operate.Name = "cl_operate";
+            this.cl_operate.Width = 70;
+            // 
+            // cl_result
+            // 
+            this.cl_result.DataPropertyName = "cl_result";
+            this.cl_result.HeaderText = "操作结果";
+            this.cl_result.Name = "cl_result";
+            this.cl_result.ReadOnly = true;
+            this.cl_result.Width = 150;
+            // 
+            // cl_date
+            // 
+            this.cl_date.DataPropertyName = "cl_date";
+            this.cl_date.HeaderText = "日期";
+            this.cl_date.Name = "cl_date";
+            this.cl_date.ReadOnly = true;
+            // 
+            // cl_man
+            // 
+            this.cl_man.DataPropertyName = "cl_man";
+            this.cl_man.HeaderText = "操作人";
+            this.cl_man.Name = "cl_man";
+            this.cl_man.Width = 70;
+            // 
+            // Sp
+            // 
+            this.Sp.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Sp.HeaderText = " ";
+            this.Sp.MinimumWidth = 2;
+            this.Sp.Name = "Sp";
+            this.Sp.Width = 2;
+            // 
+            // Query_Commandlog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(700, 499);
+            this.Controls.Add(this.Search);
+            this.Controls.Add(this.pallecode);
+            this.Controls.Add(this.InOutDetailDGV);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "Query_Commandlog";
+            this.Tag = "Query!Commandlog";
+            this.Text = "操作日志查询";
+            this.Load += new System.EventHandler(this.Warehouse_ProductMakeIn_Load);
+            this.SizeChanged += new System.EventHandler(this.Warehouse_ProductMakeIn_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private CustomControl.DataGrid_View.DataGridViewWithSerialNum InOutDetailDGV;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder pallecode;
+        private System.Windows.Forms.Button Search;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cl_sncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cl_linecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cl_makecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn sc_stepname;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cl_operate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cl_result;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cl_date;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cl_man;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Sp;
+    }
+}

UAS_MES_WEIP/FunctionCode/Query/Query_Commandlog.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Query
+{
+    public partial class Query_Commandlog : Form
+    {
+
+        DataTable dbfind;
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        LogStringBuilder sql = new LogStringBuilder();
+
+        DataTable dt;
+
+        DataHelper dh;
+
+        DataTable dta;
+
+        DataTable dtpi;
+
+        DataTable dtform;
+
+        DataTable dtms;
+
+        int getcount;
+
+        public Query_Commandlog()
+        {
+            InitializeComponent();
+        }
+
+        private void Warehouse_ProductMakeIn_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            getcount = 0;
+            dh = SystemInf.dh;
+            pallecode.Focus();
+        }
+
+        private void Warehouse_ProductMakeIn_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void Search_Click(object sender, EventArgs e)
+        {
+            if (pallecode.Text!="")
+            {
+                sql.Clear();
+                sql.Append("  select cl_linecode,cl_sncode,cl_makecode,cl_operate,cl_result,cl_date,sc_stepname,cl_man from commandlog ");
+                sql.Append("  left join source on cl_sourcecode = sc_code where cl_sncode = '"+pallecode.Text+"' or cl_result like '%"+pallecode.Text+"%' order by cl_id asc  ");
+                DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                BaseUtil.FillDgvWithDataTable(InOutDetailDGV, dt);
+            }
+            else {
+                MessageBox.Show("不可录入为空");
+            }
+
+        }
+        private void pallecode_KeyDown(object sender, KeyEventArgs e)
+        {
+        
+        }
+
+        private void pallecode_UserControlOnKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                Search_Click(this, new EventArgs());
+            }
+        }
+    }
+}

UAS_MES_WEIP/FunctionCode/Query/Query_Commandlog.resx

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="cl_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cl_linecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cl_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="sc_stepname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cl_operate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cl_result.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cl_date.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cl_man.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Sp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

UAS_MES_WEIP/FunctionCode/Special/Special_SmtLocation.cs

@@ -126,10 +126,10 @@ namespace UAS_MES_NEW.Special
                 {
                     DataRow dr = dtb.NewRow();
                     dr[2] = pr_code.Text;
-                    dr[5] = "A";
+                    dr[5] = "B";
                     dr[6] = dbbom.Rows[i]["BD_SONCODE"].ToString();
                     dr[7] = dbbom.Rows[i]["BD_SONCODE"].ToString();
-                    dr[8] = A;
+                    dr[8] = B;
                     dtb.Rows.Add(dr);
                 }
             }

UAS_MES_WEIP/UAS_MES_WEIP.csproj

@@ -836,6 +836,12 @@
     <Compile Include="FunctionCode\Packing\Packing_ProdWeightSet.Designer.cs">
       <DependentUpon>Packing_ProdWeightSet.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Query\Query_Commandlog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Query\Query_Commandlog.Designer.cs">
+      <DependentUpon>Query_Commandlog.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Query\Query_ExeProgress.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1413,6 +1419,9 @@
     <EmbeddedResource Include="FunctionCode\Packing\Packing_ProdWeightSet.resx">
       <DependentUpon>Packing_ProdWeightSet.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Query\Query_Commandlog.resx">
+      <DependentUpon>Query_Commandlog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Query\Query_ExeProgress.resx">
       <DependentUpon>Query_ExeProgress.cs</DependentUpon>
     </EmbeddedResource>
@@ -1521,7 +1530,6 @@
     <EmbeddedResource Include="Main.resx">
       <DependentUpon>Main.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>
@@ -1544,6 +1552,7 @@
     </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
   <ItemGroup>