1

刘韬
Commit 96d9983a 由刘韬编写于 2023-01-09 20:10:27 +0800
DeviceLibrary/theMachine/Store/StoreMachine_Common.cs
DeviceLibrary/theMachine/Store/StoreMachine_Store.cs
TheMachine/App.config
TheMachine/SettingControl.Designer.cs
TheMachine/SettingControl.cs
TheMachine/TheMachine.csproj
--- a/DeviceLibrary/theMachine/Store/StoreMachine_Common.cs
查看文件 @96d9983
+++ b/DeviceLibrary/theMachine/Store/StoreMachine_Common.cs
查看文件 @96d9983
@@ -17,7 +17,7 @@ namespace DeviceLibrary
        /// 发送托盘需求
        /// </summary>
        /// <param name="TrayType"></param>
-        public RemoteResult SendTrayRequest(string TrayType,ReelParam reelParam)
+        public RemoteResult SendTrayRequest(string TrayType, ReelParam reelParam)
        {
            RemoteLoad remoteLoad = new RemoteLoad();
            remoteLoad.Action = "SetTrayRequest";
@@ -25,6 +25,9 @@ namespace DeviceLibrary
            remoteLoad.RequestLoadInfo = new RequestLoadInfo();
            remoteLoad.RequestLoadInfo.TrayType = TrayType;
            remoteLoad.RequestLoadInfo.LoadParam = reelParam.clone();
+            if (TrayType == TrayTypeE.MTP1.ToString())
+                remoteLoad.RequestLoadInfo.DeviceGroupName = StoreCID.AMH_ML5_2;
+            else
                remoteLoad.RequestLoadInfo.DeviceGroupName = StoreCID.AMH_ML5_1;
            remoteLoad.RequestLoadInfo.IsEmpty = true;
            return Remote.SendAndWait(remoteLoad);

--- a/DeviceLibrary/theMachine/Store/StoreMachine_Store.cs
查看文件 @96d9983
+++ b/DeviceLibrary/theMachine/Store/StoreMachine_Store.cs
查看文件 @96d9983
@@ -225,7 +225,10 @@ namespace DeviceLibrary
                    break;
                case MoveStep.StoreOut_WaitMT:
                    StoreMoveInfo.NextMoveStep(MoveStep.StoreOut_WaitMT);
-                    if (SendTrayRequest(TrayTypeE.MTP2.ToString(), StoreMoveInfo.MoveParam) >RemoteResult.Timeout) {
+                    var tt = TrayTypeE.MTP2.ToString();
+                    if (StoreMoveInfo.MoveParam.PlateW<=15)
+                        tt = TrayTypeE.MTP1.ToString();
+                    if (SendTrayRequest(tt, StoreMoveInfo.MoveParam) >RemoteResult.Timeout) {
                        SRec.info(CID, MachineSide == MachineSideE.Left ? "A侧" : "B侧", "完成出库", StoreMoveInfo.MoveParam.PosID);
                        StoreMoveInfo.WaitList.Add(WaitResultInfo.WaitMsg(crc.GetString("Res0161", "等聊单料门料盘被取走"), MsgLevel.warning));

--- a/TheMachine/App.config
查看文件 @96d9983
+++ b/TheMachine/App.config
查看文件 @96d9983
@@ -71,7 +71,7 @@
    </root>-->
 	</log4net>
    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
    </startup>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

--- a/TheMachine/SettingControl.Designer.cs
查看文件 @96d9983
+++ b/TheMachine/SettingControl.Designer.cs
查看文件 @96d9983
@@ -38,12 +38,12 @@ namespace TheMachine
            this.tp = new System.Windows.Forms.TableLayoutPanel();
            this.tabControl1 = new System.Windows.Forms.TabControl();
            this.tabPage_set = new System.Windows.Forms.TabPage();
-            this.tabPage_ledtower = new System.Windows.Forms.TabPage();
+            this.tabPage_fix = new System.Windows.Forms.TabPage();
-            this.uC_LedConfig1 = new TheMachine.UC.UC_LedConfig();
+            this.fixtureSizeConfigControl1 = new DeviceLibrary.FixtureSizeConfigControl();
            this.tp.SuspendLayout();
            this.tabControl1.SuspendLayout();
            this.tabPage_set.SuspendLayout();
-            this.tabPage_ledtower.SuspendLayout();
+            this.tabPage_fix.SuspendLayout();
            this.SuspendLayout();
            // 
            // chbAutoRun
@@ -127,7 +127,7 @@ namespace TheMachine
            // tabControl1
            // 
            this.tabControl1.Controls.Add(this.tabPage_set);
-            this.tabControl1.Controls.Add(this.tabPage_ledtower);
+            this.tabControl1.Controls.Add(this.tabPage_fix);
            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabControl1.Location = new System.Drawing.Point(0, 0);
            this.tabControl1.Name = "tabControl1";
@@ -146,26 +146,24 @@ namespace TheMachine
            this.tabPage_set.Text = "常规设置";
            this.tabPage_set.UseVisualStyleBackColor = true;
            // 
-            // tabPage_ledtower
+            // tabPage_fix
            // 
-            this.tabPage_ledtower.Controls.Add(this.uC_LedConfig1);
+            this.tabPage_fix.Controls.Add(this.fixtureSizeConfigControl1);
-            this.tabPage_ledtower.Location = new System.Drawing.Point(4, 22);
+            this.tabPage_fix.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tabPage_ledtower.Name = "tabPage_ledtower";
+            this.tabPage_fix.Location = new System.Drawing.Point(4, 22);
-            this.tabPage_ledtower.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage_fix.Name = "tabPage_fix";
-            this.tabPage_ledtower.Size = new System.Drawing.Size(1016, 714);
+            this.tabPage_fix.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage_ledtower.TabIndex = 1;
+            this.tabPage_fix.Size = new System.Drawing.Size(1016, 714);
-            this.tabPage_ledtower.Text = "灯塔设置";
+            this.tabPage_fix.TabIndex = 2;
-            this.tabPage_ledtower.UseVisualStyleBackColor = true;
+            this.tabPage_fix.Text = "治具设置";
+            this.tabPage_fix.UseVisualStyleBackColor = true;
            // 
-            // uC_LedConfig1
+            // fixtureSizeConfigControl1
            // 
-            this.uC_LedConfig1.Config = null;
+            this.fixtureSizeConfigControl1.Location = new System.Drawing.Point(6, 6);
-            this.uC_LedConfig1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.fixtureSizeConfigControl1.Name = "fixtureSizeConfigControl1";
-            this.uC_LedConfig1.Location = new System.Drawing.Point(3, 3);
+            this.fixtureSizeConfigControl1.Size = new System.Drawing.Size(602, 565);
-            this.uC_LedConfig1.Name = "uC_LedConfig1";
+            this.fixtureSizeConfigControl1.TabIndex = 0;
-            this.uC_LedConfig1.Size = new System.Drawing.Size(1010, 708);
-            this.uC_LedConfig1.TabIndex = 7;
-            this.uC_LedConfig1.Tag = "not";
            // 
            // SettingControl
            // 
@@ -179,7 +177,7 @@ namespace TheMachine
            this.tabControl1.ResumeLayout(false);
            this.tabPage_set.ResumeLayout(false);
            this.tabPage_set.PerformLayout();
-            this.tabPage_ledtower.ResumeLayout(false);
+            this.tabPage_fix.ResumeLayout(false);
            this.ResumeLayout(false);
        }
@@ -194,6 +192,7 @@ namespace TheMachine
        private UC.UC_LedConfig uC_LedConfig1;
        private System.Windows.Forms.TabControl tabControl1;
        private System.Windows.Forms.TabPage tabPage_set;
-        private System.Windows.Forms.TabPage tabPage_ledtower;
+        private System.Windows.Forms.TabPage tabPage_fix;
+        private DeviceLibrary.FixtureSizeConfigControl fixtureSizeConfigControl1;
    }
 }
--- a/TheMachine/SettingControl.cs
查看文件 @96d9983
+++ b/TheMachine/SettingControl.cs
查看文件 @96d9983
@@ -46,7 +46,7 @@ namespace TheMachine
                return;
-            uC_LedConfig1.Config = RobotManage.Config;
+            //uC_LedConfig1.Config = RobotManage.Config;
        }

--- a/TheMachine/TheMachine.csproj
查看文件 @96d9983
+++ b/TheMachine/TheMachine.csproj
查看文件 @96d9983
@@ -8,7 +8,7 @@
    <OutputType>WinExe</OutputType>
    <RootNamespace>TheMachine</RootNamespace>
    <AssemblyName>SBDH</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <Deterministic>false</Deterministic>
@@ -75,67 +75,99 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="AboutBox1.cs" />
+    <Compile Include="AboutBox1.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="AboutBox1.Designer.cs">
      <DependentUpon>AboutBox1.cs</DependentUpon>
    </Compile>
-    <Compile Include="AxisControl.cs" />
+    <Compile Include="AxisControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="AxisControl.Designer.cs">
      <DependentUpon>AxisControl.cs</DependentUpon>
    </Compile>
    <Compile Include="Common.cs" />
-    <Compile Include="Form1.cs" />
+    <Compile Include="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="Form1.Designer.cs">
      <DependentUpon>Form1.cs</DependentUpon>
    </Compile>
-    <Compile Include="StoreSettingControl.cs" />
+    <Compile Include="StoreSettingControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="StoreSettingControl.Designer.cs">
      <DependentUpon>StoreSettingControl.cs</DependentUpon>
    </Compile>
-    <Compile Include="SIOControls.cs" />
+    <Compile Include="SIOControls.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="SIOControls.Designer.cs">
      <DependentUpon>SIOControls.cs</DependentUpon>
    </Compile>
-    <Compile Include="IOControls.cs" />
+    <Compile Include="IOControls.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="IOControls.Designer.cs">
      <DependentUpon>IOControls.cs</DependentUpon>
    </Compile>
-    <Compile Include="LogControl.cs" />
+    <Compile Include="LogControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="LogControl.Designer.cs">
      <DependentUpon>LogControl.cs</DependentUpon>
    </Compile>
-    <Compile Include="positionTool\FrmPositionTool.cs" />
+    <Compile Include="positionTool\FrmPositionTool.cs">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="positionTool\FrmPositionTool.Designer.cs">
      <DependentUpon>FrmPositionTool.cs</DependentUpon>
    </Compile>
    <Compile Include="Program.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SettingControl.cs" />
+    <Compile Include="SettingControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="SettingControl.Designer.cs">
      <DependentUpon>SettingControl.cs</DependentUpon>
    </Compile>
-    <Compile Include="UCStoreMachine.cs" />
+    <Compile Include="UCStoreMachine.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="UCStoreMachine.Designer.cs">
      <DependentUpon>UCStoreMachine.cs</DependentUpon>
    </Compile>
-    <Compile Include="UC\StorePosControl.cs" />
+    <Compile Include="UC\StorePosControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="UC\StorePosControl.designer.cs">
      <DependentUpon>StorePosControl.cs</DependentUpon>
    </Compile>
-    <Compile Include="UC\ConfigControl.cs" />
+    <Compile Include="UC\ConfigControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="UC\ConfigControl.designer.cs">
      <DependentUpon>ConfigControl.cs</DependentUpon>
    </Compile>
-    <Compile Include="UC\CylinderButton.cs" />
+    <Compile Include="UC\CylinderButton.cs">
-    <Compile Include="UC\IOControl.cs" />
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="UC\IOControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="UC\IOControl.Designer.cs">
      <DependentUpon>IOControl.cs</DependentUpon>
    </Compile>
-    <Compile Include="UC\uc_boxdebug.cs" />
+    <Compile Include="UC\uc_boxdebug.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="UC\uc_boxdebug.Designer.cs">
      <DependentUpon>uc_boxdebug.cs</DependentUpon>
    </Compile>
-    <Compile Include="UC\UC_LedConfig.cs" />
+    <Compile Include="UC\UC_LedConfig.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="UC\UC_LedConfig.Designer.cs">
      <DependentUpon>UC_LedConfig.cs</DependentUpon>
    </Compile>
@@ -148,6 +180,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="Form1.resx">
      <DependentUpon>Form1.cs</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="StoreSettingControl.resx">
      <DependentUpon>StoreSettingControl.cs</DependentUpon>