Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit b7b4eff0 由 LN
选项

简洁模式模式bug修改

1 个父辈 f8494ff8
内嵌 并排
正在显示 5 个修改的文件 包含 124 行增加 和 162 行删除
DeviceLibrary/config/Positions.csv
...@@ -12,55 +12,58 @@ ...@@ -12,55 +12,58 @@
1_10,10,1,1_1_10,6740,0, 1_10,10,1,1_1_10,6740,0,
,,,,,0, ,,,,,0,
2_1,11,1,1_2_1,-3700,0, 2_1,11,1,1_2_1,-3700,0,
2_2,12,2,1_2_2,-8920,0, 2_2,12,1,1_2_2,-8920,0,
2_3,13,3,1_2_3,-14140,0, 2_3,13,1,1_2_3,-14140,0,
2_4,14,4,1_2_4,-19360,0, 2_4,14,1,1_2_4,-19360,0,
2_5,15,5,1_2_5,-24580,0, 2_5,15,1,1_2_5,-24580,0,
2_6,16,6,1_2_6,27620,0, 2_6,16,1,1_2_6,27620,0,
2_7,17,7,1_2_7,22400,0, 2_7,17,1,1_2_7,22400,0,
2_8,18,8,1_2_8,17180,0, 2_8,18,1,1_2_8,17180,0,
2_9,19,9,1_2_9,11960,0, 2_9,19,1,1_2_9,11960,0,
2_10,20,10,1_2_10,6740,0, 2_10,20,1,1_2_10,6740,0,
,,,,,0, ,,,,,0,
3_1,21,1,1_3_1,-3700,0, 3_1,21,1,1_3_1,-3700,0,
3_2,22,2,1_3_2,-8920,0, 3_2,22,1,1_3_2,-8920,0,
3_3,23,3,1_3_3,-14140,0, 3_3,23,1,1_3_3,-14140,0,
3_4,24,4,1_3_4,-19360,0, 3_4,24,1,1_3_4,-19360,0,
3_5,25,5,1_3_5,-24580,0, 3_5,25,1,1_3_5,-24580,0,
3_6,26,6,1_3_6,27620,0, 3_6,26,1,1_3_6,27620,0,
3_7,27,7,1_3_7,22400,0, 3_7,27,1,1_3_7,22400,0,
3_8,28,8,1_3_8,17180,0, 3_8,28,1,1_3_8,17180,0,
3_9,29,9,1_3_9,11960,0, 3_9,29,1,1_3_9,11960,0,
3_10,30,10,1_3_10,6740,0, 3_10,30,1,1_3_10,6740,0,
,,,,,0, ,,,,,0,
4_1,31,1,1_4_1,-3700,0, 4_1,31,1,1_4_1,-3700,0,
4_2,32,2,1_4_2,-8920,0, 4_2,32,1,1_4_2,-8920,0,
4_3,33,3,1_4_3,-14140,0, 4_3,33,1,1_4_3,-14140,0,
4_4,34,4,1_4_4,-19360,0, 4_4,34,1,1_4_4,-19360,0,
4_5,35,5,1_4_5,-24580,0, 4_5,35,1,1_4_5,-24580,0,
4_6,36,6,1_4_6,27620,0, 4_6,36,1,1_4_6,27620,0,
4_7,37,7,1_4_7,22400,0, 4_7,37,1,1_4_7,22400,0,
4_8,38,8,1_4_8,17180,0, 4_8,38,1,1_4_8,17180,0,
4_9,39,9,1_4_9,11960,0, 4_9,39,1,1_4_9,11960,0,
4_10,40,10,1_4_10,6740,0, 4_10,40,1,1_4_10,6740,0,
,,,,,0, ,,,,,0,
5_1,41,1,1_5_1,-3700,0, 5_1,41,1,1_5_1,-3700,0,
5_2,42,2,1_5_2,-8920,0, 5_2,42,1,1_5_2,-8920,0,
5_3,43,3,1_5_3,-14140,0, 5_3,43,1,1_5_3,-14140,0,
5_4,44,4,1_5_4,-19360,0, 5_4,44,1,1_5_4,-19360,0,
5_5,45,5,1_5_5,-24580,0, 5_5,45,1,1_5_5,-24580,0,
5_6,46,6,1_5_6,27620,0, 5_6,46,1,1_5_6,27620,0,
5_7,47,7,1_5_7,22400,0, 5_7,47,1,1_5_7,22400,0,
5_8,48,8,1_5_8,17180,0, 5_8,48,1,1_5_8,17180,0,
5_9,49,9,1_5_9,11960,0, 5_9,49,1,1_5_9,11960,0,
5_10,50,10,1_5_10,6740,0, 5_10,50,1,1_5_10,6740,0,
,,,,,, ,,,,,,
6_1,61,3,6,-3700,0, 6_1,61,3,6,-3700,0,
6_2,62,3,6,-8920,8, 6_2,62,3,6,-8920,8,
6_3,63,3,6,-14140,16, 6_3,63,3,6,-14140,16,
7_1,64,3,6,-3700,24, 6_4,64,3,6,-14139,24,
7_2,65,3,6,-8920,32, 7_1,65,3,6,-3700,56,
7_3,66,3,6,-14140,40, 7_2,66,3,6,-8920,48,
8_1,67,3,6,-3700,48, 7_3,67,3,6,-14140,40,
8_2,68,3,6,-8920,56, 7_4,68,3,6,-14139,32,
8_3,69,3,6,-14140,64, 8_1,69,3,6,-3700,64,
8_2,70,3,6,-8920,72,
8_3,71,3,6,-14140,80,
8_4,72,3,6,-14139,88,
DeviceLibrary/manager/work/TSAVBean.cs
...@@ -313,6 +313,11 @@ namespace TSA_V.DeviceLibrary ...@@ -313,6 +313,11 @@ namespace TSA_V.DeviceLibrary
public static void StartReset() public static void StartReset()
{ {
if (Setting_NInit.Device_SoftMode)
{
LogUtil.info(Name + "重置中，Device_SoftMode 模式，直接返回");
return;
}
if (Status > TSAVStatus.Wait) if (Status > TSAVStatus.Wait)
{ {
LogUtil.info(Name + "重置中：重置之前先停止所有运动"); LogUtil.info(Name + "重置中：重置之前先停止所有运动");
...@@ -942,7 +947,12 @@ namespace TSA_V.DeviceLibrary ...@@ -942,7 +947,12 @@ namespace TSA_V.DeviceLibrary
public static void StopMove() public static void StopMove()
{ {
LogUtil.info("StopMove，停止所有运动"); if (Setting_NInit.Device_SoftMode)
{
LogUtil.info("StopMove，Device_SoftMode 模式，直接返回");
return;
}
LogUtil.info("StopMove，停止所有运动");
BottomCylinderDown(false); BottomCylinderDown(false);
CylinderMove(IOManager.StopCylinder_Down, IOManager.StopCylinder_Up, false); CylinderMove(IOManager.StopCylinder_Down, IOManager.StopCylinder_Up, false);
SideCyliderBack(false); SideCyliderBack(false);
......
TSA-V/App.config
...@@ -4,48 +4,29 @@ ...@@ -4,48 +4,29 @@
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
</configSections> </configSections>
<appSettings> <appSettings>
<!--开机自动运行--> <add key="App_AutoRun" value="0" />
<add key="App_AutoRun" value="1" />
<add key="CodeRun" value="0" /> <add key="CodeRun" value="0" />
<add key="IsDebug" value="1" /> <add key="IsDebug" value="0" />
<add key="IsNeedCount" value="1" /> <add key="IsNeedCount" value="1" />
<add key="CameraName" value="GigE:MV-CE100-30GC (00D18064699)" /> <add key="CameraName" value="GigE:MV-CE100-30GC (00D18064699)" />
<!--界面标题-->
<add key="App_Title" value="SmartWorkstation" /> <add key="App_Title" value="SmartWorkstation" />
<!--默认语言-->
<add key="Default_Language" value="zh-CN" /> <add key="Default_Language" value="zh-CN" />
<!--电路板配置路径-->
<add key="Board_ConfigPath" value="\config\boardData.txt" /> <add key="Board_ConfigPath" value="\config\boardData.txt" />
<!--自动焊接的exe地址-->
<add key="AuToSoldering_FilePath" value="\Debug\SolderingRobot\SolderingRobot.exe" /> <add key="AuToSoldering_FilePath" value="\Debug\SolderingRobot\SolderingRobot.exe" />
<!--元器件配置路径-->
<add key="Component_ConfigPath" value="\config\componentData.txt" /> <add key="Component_ConfigPath" value="\config\componentData.txt" />
<!--元器件库模板地址-->
<add key="Componet_Template" value="\config\BOM-US.csv" /> <add key="Componet_Template" value="\config\BOM-US.csv" />
<add key="Componet_Template_zh-CN" value="\config\元器件信息模板.csv" /> <add key="Componet_Template_zh-CN" value="\config\元器件信息模板.csv" />
<add key="Componet_Template_en-US" value="\config\BOM-US.csv" /> <add key="Componet_Template_en-US" value="\config\BOM-US.csv" />
<add key="ComPath_Config" value="\config\componet\" /> <add key="ComPath_Config" value="\config\componet\" />
<!--电路板图片保存路径-->
<add key="Board_Image_Path" value="config\image\" /> <add key="Board_Image_Path" value="config\image\" />
<!--电路板默认图片-->
<add key="BOARD_IMAGE_DEFAULT" value="defaultBoard.jpg" /> <add key="BOARD_IMAGE_DEFAULT" value="defaultBoard.jpg" />
<!--料格位置配置-->
<add key="Position_Config" value="\config\Positions.csv" /> <add key="Position_Config" value="\config\Positions.csv" />
<!--其他位置配置电子屏标签-->
<add key="Position_Config_Label" value="\config\LabelPositions.csv" /> <add key="Position_Config_Label" value="\config\LabelPositions.csv" />
<!--使用AIO的IO模块
0=康耐得
1=零点
2=南京实点
3=泥人科技,无线体
-->
<add key="UseAIOBOX" value="2" /> <add key="UseAIOBOX" value="2" />
<!--IO模块配置-->
<add key="IO_IP" value="192.168.200.11" /> <add key="IO_IP" value="192.168.200.11" />
<add key="IO_Port" value="502" /> <add key="IO_Port" value="502" />
<add key="PUSICAN_Ip" value="192.168.0.178" /> <add key="PUSICAN_Ip" value="192.168.0.178" />
<add key="PUSICAN_Port" value="4001" /> <add key="PUSICAN_Port" value="4001" />
<!--料格旋转轴配置 一圈=57230 /11=5200-->
<add key="RotateNode_DefaultPosition" value="-1500" /> <add key="RotateNode_DefaultPosition" value="-1500" />
<add key="RotateNode_MicroStepping" value="64" /> <add key="RotateNode_MicroStepping" value="64" />
<add key="RotateNode_MaxSpeed" value="20000" /> <add key="RotateNode_MaxSpeed" value="20000" />
...@@ -71,21 +52,15 @@ ...@@ -71,21 +52,15 @@
<add key="RNode_Addr_2_4" value="9" /> <add key="RNode_Addr_2_4" value="9" />
<add key="RNode_Addr_2_5" value="10" /> <add key="RNode_Addr_2_5" value="10" />
<add key="app.title" value="智能组装工作站" /> <add key="app.title" value="智能组装工作站" />
<!--0=脚踏模式，1=自动模式，间隔指定的时间自动下一步-->
<add key="WorkMode" value="1" /> <add key="WorkMode" value="1" />
<!-- 自动模式间隔时间/秒-->
<add key="AuToModeSeconds" value="5" /> <add key="AuToModeSeconds" value="5" />
<add key="WorkCount_ConfigPath" value="\config\workCount.json" /> <add key="WorkCount_ConfigPath" value="\config\workCount.json" />
<!--元器件库名称的类型，0=英文，1=中文-->
<add key="LibNameType" value="1" /> <add key="LibNameType" value="1" />
<!--AOI程序文件夹-->
<add key="AOIFileConfig" value="\config\AOIConfig\" /> <add key="AOIFileConfig" value="\config\AOIConfig\" />
<!--是否启动AOI-->
<add key="IsNeedAOI" value="1" /> <add key="IsNeedAOI" value="1" />
<add key="DefaultPointSize" value="5" /> <add key="DefaultPointSize" value="5" />
<add key="DefaultPointType" value="1" /> <add key="DefaultPointType" value="1" />
<add key="Config_Pwd" value="123456" /> <add key="Config_Pwd" value="123456" />
<!--调宽配置：电机回原点速度-->
<add key="Line_HomeSpeed" value="2020" /> <add key="Line_HomeSpeed" value="2020" />
<add key="Line_HomeStartSpeed" value="1000" /> <add key="Line_HomeStartSpeed" value="1000" />
<add key="Line_HomeStopSpeed" value="1000" /> <add key="Line_HomeStopSpeed" value="1000" />
...@@ -97,41 +72,25 @@ ...@@ -97,41 +72,25 @@
<add key="Line_DelSpeed" value="8" /> <add key="Line_DelSpeed" value="8" />
<add key="Line_MaxPhaseCurrent" value="4500" /> <add key="Line_MaxPhaseCurrent" value="4500" />
<add key="Line_DelPhaseCurrent" value="2" /> <add key="Line_DelPhaseCurrent" value="2" />
<!--调宽配置：电机回原点后的宽度-->
<add key="Line_HomeWidth" value="508" /> <add key="Line_HomeWidth" value="508" />
<!--调宽配置：宽度转换系数，1mm对应的电机位置-->
<add key="Line_ChangeValue" value="200" /> <add key="Line_ChangeValue" value="200" />
<!--调宽配置：调宽伺服地址-->
<add key="Line_NodeAddr" value="11" /> <add key="Line_NodeAddr" value="11" />
<!--流水线最后一次调的宽度-->
<add key="Line_LastWidth" value="400" /> <add key="Line_LastWidth" value="400" />
<!--宽度对应位置配置-->
<add key="Line_WidthPosition" value="" /> <add key="Line_WidthPosition" value="" />
<add key="Server_Log_Open" value="0" /> <add key="Server_Log_Open" value="0" />
<!--本地开放的http服务器端口号-->
<add key="WebServiceAddr" value="http://localhost:4090/rest/api/v1/station/" /> <add key="WebServiceAddr" value="http://localhost:4090/rest/api/v1/station/" />
<!--组装完成后上传数据的服务器地址-->
<!--<add key="DCSServerAddr" value="http://192.168.8.1:1007/DCS_Integration/Cartridge.asmx?op=CartridgeInfo" />-->
<!--组装工作前，需要输入pcb板条码-->
<add key="NeedPCBCode" value="0" /> <add key="NeedPCBCode" value="0" />
<!--是否调整气缸顺序，配置1时，侧挡气缸前进，底部气缸在上升-->
<add key="SideCylinderMoveFirst" value="1" /> <add key="SideCylinderMoveFirst" value="1" />
<!--是否启用工作区信号触发开始工作-->
<add key="WorkSingleStart" value="0" /> <add key="WorkSingleStart" value="0" />
<!--点位描述显示类型-->
<add key="PointDisplayType" value="1" /> <add key="PointDisplayType" value="1" />
<add key="DisableSideCylinder" value="1" /> <add key="DisableSideCylinder" value="1" />
<!--禁用底部气缸-->
<add key="DisableBottomCylinder" value="1" /> <add key="DisableBottomCylinder" value="1" />
<add key="SMF_Serverurl" value="http://localhost:8800/" /> <add key="SMF_Serverurl" value="http://localhost:8800/" />
<add key="SMF_CID" value="NEOSTATION001" /> <add key="SMF_CID" value="NEOSTATION001" />
<!--禁用 继续未完成工作功能-->
<add key="DisContinueWorking" value="1" /> <add key="DisContinueWorking" value="1" />
<add key="DisShowScreenAlarm" value="1" /> <add key="DisShowScreenAlarm" value="1" />
<!--显示实时视频浮窗-->
<add key="VideoForm_Show" value="1" /> <add key="VideoForm_Show" value="1" />
<add key="ProjectorScreen_Index" value="1" /> <add key="ProjectorScreen_Index" value="1" />
<add key="Device_AutoGuoBan" value="0" />
<add key="ClientSettingsProvider.ServiceUri" value="" /> <add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings> </appSettings>
<log4net> <log4net>
...@@ -198,7 +157,8 @@ ...@@ -198,7 +157,8 @@
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
<!--<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> </runtime>
<!--<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
...@@ -516,7 +476,6 @@ ...@@ -516,7 +476,6 @@
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding>--> </assemblyBinding>-->
</runtime>
<system.web> <system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider"> <membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers> <providers>
......
TSA-V/workForm/FrmTSAV.Designer.cs
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
this.btnTest = new System.Windows.Forms.Button(); this.btnTest = new System.Windows.Forms.Button();
this.btnStart = new System.Windows.Forms.Button(); this.btnStart = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lkPutCom = new System.Windows.Forms.LinkLabel();
this.lklUpdateNum = new System.Windows.Forms.LinkLabel();
this.btnCancel = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button();
this.btnSave = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
this.lblComNotices = new System.Windows.Forms.Label(); this.lblComNotices = new System.Windows.Forms.Label();
...@@ -104,8 +106,6 @@ ...@@ -104,8 +106,6 @@
this.groupPNImg = new System.Windows.Forms.GroupBox(); this.groupPNImg = new System.Windows.Forms.GroupBox();
this.panPNImg = new System.Windows.Forms.Panel(); this.panPNImg = new System.Windows.Forms.Panel();
this.picPNImg = new System.Windows.Forms.PictureBox(); this.picPNImg = new System.Windows.Forms.PictureBox();
this.lklUpdateNum = new System.Windows.Forms.LinkLabel();
this.lkPutCom = new System.Windows.Forms.LinkLabel();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -348,6 +348,30 @@ ...@@ -348,6 +348,30 @@
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "组装信息："; this.groupBox1.Text = "组装信息：";
// //
// lkPutCom
//
this.lkPutCom.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lkPutCom.Location = new System.Drawing.Point(542, 15);
this.lkPutCom.Name = "lkPutCom";
this.lkPutCom.Size = new System.Drawing.Size(94, 17);
this.lkPutCom.TabIndex = 285;
this.lkPutCom.TabStop = true;
this.lkPutCom.Text = "补料";
this.lkPutCom.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lkPutCom.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lkPutCom_LinkClicked);
//
// lklUpdateNum
//
this.lklUpdateNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lklUpdateNum.Location = new System.Drawing.Point(572, 46);
this.lklUpdateNum.Name = "lklUpdateNum";
this.lklUpdateNum.Size = new System.Drawing.Size(64, 17);
this.lklUpdateNum.TabIndex = 284;
this.lklUpdateNum.TabStop = true;
this.lklUpdateNum.Text = "修改";
this.lklUpdateNum.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lklUpdateNum.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lklUpdateNum_LinkClicked);
//
// btnCancel // btnCancel
// //
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
...@@ -995,30 +1019,6 @@ ...@@ -995,30 +1019,6 @@
this.picPNImg.TabIndex = 1; this.picPNImg.TabIndex = 1;
this.picPNImg.TabStop = false; this.picPNImg.TabStop = false;
// //
// lklUpdateNum
//
this.lklUpdateNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lklUpdateNum.Location = new System.Drawing.Point(572, 46);
this.lklUpdateNum.Name = "lklUpdateNum";
this.lklUpdateNum.Size = new System.Drawing.Size(64, 17);
this.lklUpdateNum.TabIndex = 284;
this.lklUpdateNum.TabStop = true;
this.lklUpdateNum.Text = "修改";
this.lklUpdateNum.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lklUpdateNum.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lklUpdateNum_LinkClicked);
//
// lkPutCom
//
this.lkPutCom.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lkPutCom.Location = new System.Drawing.Point(542, 15);
this.lkPutCom.Name = "lkPutCom";
this.lkPutCom.Size = new System.Drawing.Size(94, 17);
this.lkPutCom.TabIndex = 285;
this.lkPutCom.TabStop = true;
this.lkPutCom.Text = "补料";
this.lkPutCom.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lkPutCom.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lkPutCom_LinkClicked);
//
// FrmWork // FrmWork
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......
TSA-V/workForm/FrmTSAV.cs
...@@ -43,12 +43,12 @@ namespace TSA_V ...@@ -43,12 +43,12 @@ namespace TSA_V
string modeStr = ""; string modeStr = "";
lblGuoBan.Visible = false; lblGuoBan.Visible = false;
if (Setting_NInit.Device_SoftMode) if (Setting_NInit.Device_SoftMode)
{ {
modeStr = "-" + ResourceCulture.GetString("FrmBoardSelect_chbSoftMode_Text", "简洁模式"); modeStr = "-" + ResourceCulture.GetString("FrmBoardSelect_chbSoftMode_Text", "简洁模式");
lblGuoBan.Text = ResourceCulture.GetString("FrmBoardSelect_chbSoftMode_Text", "简洁模式"); lblGuoBan.Text = ResourceCulture.GetString("FrmBoardSelect_chbSoftMode_Text", "简洁模式");
lblGuoBan.Visible = true; lblGuoBan.Visible = true;
} }
else if (TSAVBean.OnlyGuoBan) else if (TSAVBean.OnlyGuoBan)
{ {
modeStr = "-" + ResourceCulture.GetString("FrmBoardSelect_chbGuoban_Text", "过板模式"); modeStr = "-" + ResourceCulture.GetString("FrmBoardSelect_chbGuoban_Text", "过板模式");
lblGuoBan.Text = ResourceCulture.GetString("FrmBoardSelect_chbGuoban_Text", "过板模式"); lblGuoBan.Text = ResourceCulture.GetString("FrmBoardSelect_chbGuoban_Text", "过板模式");
...@@ -73,11 +73,11 @@ namespace TSA_V ...@@ -73,11 +73,11 @@ namespace TSA_V
//获取记录运行未完成的步骤序号 //获取记录运行未完成的步骤序号
//int TagNumber = ConfigAppSettings.GetIntValue(Setting_Init.TagNumber); //int TagNumber = ConfigAppSettings.GetIntValue(Setting_Init.TagNumber);
int TagNumber = Setting_NInit.Work_TagNumber; int TagNumber = Setting_NInit.Work_TagNumber;
if (workSmtList.Count > 0&&TagNumber!=0&& isContinue) if (workSmtList.Count > 0 && TagNumber != 0 && isContinue)
{ {
var workSmt = workSmtList.Single(a => a.pointNum == TagNumber); var workSmt = workSmtList.Single(a => a.pointNum == TagNumber);
smtPoint = workSmt; smtPoint = workSmt;
preIndex = TagNumber-1; preIndex = TagNumber - 1;
} }
else else
{ {
...@@ -100,7 +100,7 @@ namespace TSA_V ...@@ -100,7 +100,7 @@ namespace TSA_V
{ {
radioButton2.Checked = true; radioButton2.Checked = true;
AutoVisiable(true); AutoVisiable(true);
} }
} }
else else
{ {
...@@ -114,7 +114,7 @@ namespace TSA_V ...@@ -114,7 +114,7 @@ namespace TSA_V
if (CurrProject == null) if (CurrProject == null)
{ {
LogUtil.info("没有读取到AOI,结束,IsNeedAOI=true！"); LogUtil.info("没有读取到AOI,结束,IsNeedAOI=true！");
needShowMsg+= ResourceCulture.GetString("加载AOI失败")+"\r\n"; needShowMsg += ResourceCulture.GetString("加载AOI失败") + "\r\n";
//MessageBox.Show(ResourceCulture.GetString("加载AOI失败")); //MessageBox.Show(ResourceCulture.GetString("加载AOI失败"));
//this.Close(); //this.Close();
} }
...@@ -327,7 +327,7 @@ namespace TSA_V ...@@ -327,7 +327,7 @@ namespace TSA_V
lblMsg.Visible = !Setting_NInit.Device_SoftMode; lblMsg.Visible = !Setting_NInit.Device_SoftMode;
lblMsg.Text = TSAVBean.GetShowMsg(); lblMsg.Text = TSAVBean.GetShowMsg();
lblMsg.ForeColor = Color.Red; lblMsg.ForeColor = Color.Red;
lblShortageInfo.Text = WorkInfo.LastShortageMsg; lblShortageInfo.Text =Setting_NInit.Device_SoftMode?"": WorkInfo.LastShortageMsg;
lblShortageInfo.ForeColor = Color.Red; lblShortageInfo.ForeColor = Color.Red;
if (TSAVBean.Status.Equals(TSAVStatus.Runing)) if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{ {
...@@ -440,6 +440,10 @@ namespace TSA_V ...@@ -440,6 +440,10 @@ namespace TSA_V
{ {
btnStart.Visible = true; btnStart.Visible = true;
btnGoHome.Visible = false; btnGoHome.Visible = false;
if (Setting_NInit.Device_SoftMode)
{
btnGoHome.Visible = false;
}
} }
else else
{ {
...@@ -478,6 +482,12 @@ namespace TSA_V ...@@ -478,6 +482,12 @@ namespace TSA_V
{ {
//btnGoHome.Enabled = false; //btnGoHome.Enabled = false;
if (Setting_NInit.Device_SoftMode)
{
LogUtil.error("Device_SoftMode 模式，点击" + btnGoHome + ", 重新开始");
PreOrNext(true,true );
return;
}
if (TSAVBean.LineStep.moveType.Equals(1)) if (TSAVBean.LineStep.moveType.Equals(1))
{ {
DialogResult result = MessageBox.Show(ResourceCulture.GetString(ResourceCulture.SureReset, "是否确定重置，重置后当前工作将结束"), DialogResult result = MessageBox.Show(ResourceCulture.GetString(ResourceCulture.SureReset, "是否确定重置，重置后当前工作将结束"),
...@@ -764,11 +774,16 @@ namespace TSA_V ...@@ -764,11 +774,16 @@ namespace TSA_V
private bool preIsShow = false; private bool preIsShow = false;
private void btnNextPoint_Click(object sender, EventArgs e) private void btnNextPoint_Click(object sender, EventArgs e)
{ {
if (Setting_NInit.Device_SoftMode)
{
PreOrNext(true);
}
//if (!TSAVBean.Work.IsWorking) //if (!TSAVBean.Work.IsWorking)
//{ //{
// return; // return;
//} //}
if (TSAVBean.Status.Equals(TSAVStatus.Runing)) else if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{ {
Next(true); Next(true);
} }
...@@ -856,6 +871,10 @@ namespace TSA_V ...@@ -856,6 +871,10 @@ namespace TSA_V
private void btnPrePoint_Click(object sender, EventArgs e) private void btnPrePoint_Click(object sender, EventArgs e)
{ {
if (Setting_NInit.Device_SoftMode)
{
PreOrNext(false);
}
if (TSAVBean.Status.Equals(TSAVStatus.Runing)) if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{ {
Next(false); Next(false);
...@@ -866,11 +885,17 @@ namespace TSA_V ...@@ -866,11 +885,17 @@ namespace TSA_V
} }
} }
private void PreOrNext(bool isNext) private void PreOrNext(bool isNext,bool reset=false )
{ {
if (board != null && workSmtList.Count > 0) if (board != null && workSmtList.Count > 0)
{ {
if (isNext) if (reset)
{
//直接到第一个
preIndex = 0;
WorkInfo.ShortageCheck(BoardManager.CurrBoard);
}
else if (isNext)
{ {
preIndex++; preIndex++;
...@@ -931,42 +956,7 @@ namespace TSA_V ...@@ -931,42 +956,7 @@ namespace TSA_V
{ {
FrmProjectorScreen.instance.ShowPoint(true, BoardManager.CurrBoard.PointColor, smtPoint); FrmProjectorScreen.instance.ShowPoint(true, BoardManager.CurrBoard.PointColor, smtPoint);
} }
#region 这段代码是不是没必要
//ComponetInfo com = CSVBomManager.GetCom(this.board.bomName, smtPoint,true);
//TSAVPosition position = null;
//if (com != null)
//{
// position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum);
//}
//else
//{
// position = CSVPositionReader<TSAVPosition>.GetPositonByNum(smtPoint.PositionNum);
//}
//if (position == null)
//{
// //ComponetInfo com = ComponentManager.getById(smtPoint.pointType);
// lblPositionNum.Text = ResourceCulture.GetString(ResourceCulture.ComInsufficient, "元器件库存不足");
//}
//else
//{
// #region 2023-09-22 添加 控制便签功能
// //string count = null;
// //string pnname = null;
// //string ComponentDes = null;
// //if (com != null)
// //{
// // count = com.ComCount.ToString();
// // pnname = com.PN.ToString();
// // ComponentDes = com.ComponentDes;
// //}
// ////调用指示灯显示
// //ScanRequestLabel.RequestPost(position, count, pnname, ComponentDes);
// #endregion
// lblPositionNum.Text = position.PositionNum;
//}
#endregion
int leftCount = workSmtList.Count - 1 - preIndex; int leftCount = workSmtList.Count - 1 - preIndex;
if (preIndex.Equals(0)) if (preIndex.Equals(0))
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!