Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 45f62419
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 45 行增加 和 43 行删除
source/AssemblyLineClient/FrmProvidingEquip.Designer.cs
......@@ -587,7 +587,7 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "升降轴位置配置";
//
// btnBoxP
// btnP3
//
this.btnP3.BackColor = System.Drawing.SystemColors.Control;
this.btnP3.Cursor = System.Windows.Forms.Cursors.Default;
......@@ -595,7 +595,7 @@
this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP3.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnP3.Location = new System.Drawing.Point(316, 76);
this.btnP3.Name = "btnBoxP";
this.btnP3.Name = "btnP3";
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP3.Size = new System.Drawing.Size(163, 34);
this.btnP3.TabIndex = 312;
......@@ -603,7 +603,7 @@
this.btnP3.UseVisualStyleBackColor = true;
this.btnP3.Click += new System.EventHandler(this.btnBoxP_Click);
//
// txtBoxP
// txtP3
//
this.txtP3.BackColor = System.Drawing.SystemColors.Window;
this.txtP3.Cursor = System.Windows.Forms.Cursors.IBeam;
......@@ -611,7 +611,7 @@
this.txtP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP3.Location = new System.Drawing.Point(483, 80);
this.txtP3.MaxLength = 12;
this.txtP3.Name = "txtBoxP";
this.txtP3.Name = "txtP3";
this.txtP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtP3.Size = new System.Drawing.Size(111, 26);
this.txtP3.TabIndex = 311;
......@@ -619,13 +619,14 @@
//
// btnSave
//
this.btnSave.BackColor = System.Drawing.SystemColors.Control;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Location = new System.Drawing.Point(180, 136);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(110, 34);
this.btnSave.TabIndex = 310;
this.btnSave.Text = "保存位置";
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.UseVisualStyleBackColor = false;
//
// txtP1
//
......@@ -680,7 +681,7 @@
this.label4.Text = "料盘尺寸：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnMoveto
// btnP2
//
this.btnP2.BackColor = System.Drawing.SystemColors.Control;
this.btnP2.Cursor = System.Windows.Forms.Cursors.Default;
......@@ -688,7 +689,7 @@
this.btnP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP2.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnP2.Location = new System.Drawing.Point(12, 76);
this.btnP2.Name = "btnMoveto";
this.btnP2.Name = "btnP2";
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP2.Size = new System.Drawing.Size(163, 34);
this.btnP2.TabIndex = 306;
......@@ -696,7 +697,7 @@
this.btnP2.UseVisualStyleBackColor = true;
this.btnP2.Click += new System.EventHandler(this.btnMoveto_Click);
//
// txtSizePosition
// txtP2
//
this.txtP2.BackColor = System.Drawing.SystemColors.Window;
this.txtP2.Cursor = System.Windows.Forms.Cursors.IBeam;
......@@ -704,7 +705,7 @@
this.txtP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP2.Location = new System.Drawing.Point(179, 80);
this.txtP2.MaxLength = 12;
this.txtP2.Name = "txtSizePosition";
this.txtP2.Name = "txtP2";
this.txtP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtP2.Size = new System.Drawing.Size(111, 26);
this.txtP2.TabIndex = 305;
......
source/AssemblyLineClient/useControl/AxisMoveControl.cs
......@@ -123,14 +123,32 @@ namespace OnlineStore.AssemblyLine
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if (comboBox1.SelectedIndex > 0)
if (comboBox1.SelectedIndex >= 0)
{
ConfigMoveAxis axis = axisList[comboBox1.SelectedIndex].Config;
PortName = axis.DeviceName;
SlvAddr = axis.GetAxisValue();
txtAxisDeviceName.Text = PortName;
txtAxisValue.Text = SlvAddr.ToString();
Color color = Color.Black;
if (comboBox1.SelectedIndex.Equals(0))
{
color = Color.Red;
}
else if (comboBox1.SelectedIndex.Equals(1))
{
color = Color.Blue;
}
btnOpenAxis.ForeColor = color;
btnCloseAxis.ForeColor = color;
btnAxisAMove.ForeColor = color;
btnAxisRMove.ForeColor = color;
btnAxisVMove.ForeColor = color;
btnAxisReturnHome.ForeColor = color;
btnAxisStop.ForeColor = color;
btnComAlarmClear.ForeColor = color;
btnReadPosition.ForeColor = color;
btnGetAlarm.ForeColor = color;
}
}
......
source/Common/Common.csproj
......@@ -58,8 +58,6 @@
<Compile Include="util\ConfigAppSettings.cs" />
<Compile Include="util\FormUtil.cs" />
<Compile Include="util\HttpHelper.cs" />
<Compile Include="util\HumitureController.cs" />
<Compile Include="util\HumitureServer.cs" />
<Compile Include="util\JsonHelper.cs" />
<Compile Include="util\LogUtil.cs" />
<Compile Include="util\MyWebClient.cs">
......
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
......@@ -158,8 +158,8 @@ namespace OnlineStore.DeviceLibrary
}
isInPro = false;
}
protected override void ResetProcess( )
protected override void ResetProcess()
{
if (MoveInfo.IsInWait)
{
......@@ -175,8 +175,8 @@ namespace OnlineStore.DeviceLibrary
{
case LineMoveStep.MH_UpDownHomeMove:
MoveInfo.NextMoveStep(LineMoveStep.MH_UpDownCylinder_Up);
LogInfo(MoveInfo.MoveType+" ： (上下轴原点返回完成，上下轴走到待机点 )开始");
UpdownUpMove();
LogInfo(MoveInfo.MoveType + " ： (上下轴原点返回完成，上下轴走到待机点 )开始");
UpdownUpMove();
break;
case LineMoveStep.MH_UpDownCylinder_Up:
......@@ -198,10 +198,10 @@ namespace OnlineStore.DeviceLibrary
lineStatus = LineStatus.Debugging;
}
else
{
{
lineStatus = LineStatus.StoreOnline;
}
break;
break;
default: break;
}
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
......@@ -278,7 +278,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.PO_05_WaitBox);
LogInfo("出料PO_05_WaitBox【" + posId + "】处理（等待可以移栽） 更新盘号【" + num + "】为空盘");
MoveInfo.WaitList.Add(WaitResultInfo.WaitBoxCanReviceTray());
TrayManager.UpdateTrayInfo(num );
TrayManager.UpdateTrayInfo(num);
//阻挡气缸移动
InStoreLog("放托盘（放开阻挡）：SecondMoveInfo=MO_13_TopCylinder_Down 物品已移走，顶升气缸1下降）");
......@@ -325,7 +325,7 @@ namespace OnlineStore.DeviceLibrary
//出料皮带线停止出库
LineManager.Line.DLineStopOut(Config.DLineEquipNum, Config.DLineLineNum);
}
else if( MoveInfo.MoveStep.Equals(LineMoveStep.PO_10_BeforeAfterCylinderAfter))
else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_10_BeforeAfterCylinderAfter))
{
LogInfo("出料【" + posId + "】处理完成！");
runStatus = LineRunStatus.Runing;
......
source/DeviceLibrary/assemblymanager/ALineManager.cs
......@@ -56,6 +56,7 @@ namespace OnlineStore.DeviceLibrary
DeviceConfig.SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>();
DeviceConfig.ProIOIpMap = new Dictionary<string, string>();
DeviceConfig.ProRFIpMap = new Dictionary<string, string>();
moveECMap = new Dictionary<int, MoveEquip_Config>();
feedingECMap = new Dictionary<int, FeedingEquip_Config>();
providingECMap = new Dictionary<int, ProvidingEquip_Config>();
......
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
......@@ -12,11 +12,8 @@ using System.Windows.Forms;
namespace OnlineStore.DeviceLibrary
{
public class CodeManager
{
// public static List<string> cameraNameList = new List<string>();
public static List<string> codeTypeList = new List<string>();
{
public static List<string> codeTypeList = new List<string>();
public static List<string> balserNameList = new List<string>();
public static List<string> hikNameList = new List<string>();
......@@ -25,24 +22,12 @@ namespace OnlineStore.DeviceLibrary
/// 初始化摄像机名称和二维码类型
/// </summary>
public static void LoadConfig()
{
// string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName);
string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
// cameraNameList = new List<string>();
{
string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
codeTypeList = new List<string>();
HDLogUtil.LogName = "RollingLogFileAppender";
try
{
//string[] nameArray = nameStr.Split(spiltChar);
//foreach (string str in nameArray)
//{
// if (str.Trim().Equals(""))
// {
// continue;
// }
// //LogUtil.info("加载到配置摄像机名称：" + str.Trim());
// cameraNameList.Add(str.Trim());
//}
{
string[] codeArray = codeStr.Split(spiltChar);
foreach (string str in codeArray)
{
......@@ -55,8 +40,7 @@ namespace OnlineStore.DeviceLibrary
}
LoadCamera(false);
CodeLibrary.HDCodeLearnHelper.LoadConfig("", codeStr);
CodeLibrary.HDCodeLearnHelper.LoadConfig("", codeStr);
}
catch (Exception ex)
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!