默认图片修改

DeviceLibrary/DeviceLibrary.csproj

@@ -128,7 +128,9 @@
     <None Include="config\user.sqlite3">
     <None Include="config\user.sqlite3">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     </None>
-    <None Include="config\defaultBoard0.jpg" />
+    <Content Include="config\image\defaultBoard.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="config\元器件信息模板.csv">
     <None Include="config\元器件信息模板.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     </None>

TSA-V/FrmBoardList.cs

@@ -329,8 +329,8 @@ namespace TSA_V
                 string oldName = ConfigAppSettings.GetValue(Setting_Init.BOARD_IMAGE_DEFAULT);
                 string oldName = ConfigAppSettings.GetValue(Setting_Init.BOARD_IMAGE_DEFAULT);
                 string newName = board.boardName + Path.GetExtension(oldName);
                 string newName = board.boardName + Path.GetExtension(oldName);
                 string configPath = ConfigAppSettings.GetValue(Setting_Init.BOARD_IMAGE_PATH);
                 string configPath = ConfigAppSettings.GetValue(Setting_Init.BOARD_IMAGE_PATH);
-                string oldPath = Application.StartupPath + "/" + configPath + "/" + oldName;
-                string newPath = Application.StartupPath + "/" + configPath + "/" + newName;
+                string oldPath = Application.StartupPath + @"\" + configPath +@"\" + oldName;
+                string newPath = Application.StartupPath + @"\" + configPath + @"\" + newName;
                 if (File.Exists(oldPath))
                 if (File.Exists(oldPath))
                 {
                 {
                     File.Copy(oldPath, newPath, true);
                     File.Copy(oldPath, newPath, true);

TSA-V/记录.txt

@@ -94,3 +94,11 @@ SmartWorkstation.exe.config文件需要增加参数：
 20210518
 20210518
 1.条码根据开头的匹配
 1.条码根据开头的匹配
 2.
 2.
+
+
+20210623
+修改内容：
+1.  增加配置，此配置值为1时，板子到位后侧挡气缸先前进，底部气缸再上升。
+   需要再 SmartWorkstation.exe.config配置文件增加如下一行配置 ：
+  <add key ="SideCylinderMoveFirst" value ="1"/>
+2.导入元器件库时，不同料配置同库位，增加提示确认。
\ No newline at end of file