Skip to content

孙克 / ACSquareStore

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

1

1 个父辈 dab6e9e2
全部展开
内嵌 并排
正在显示 15 个修改的文件 包含 153 行增加 和 206 行删除
source/ACSquareStore/ACSquareStore.csproj
...@@ -102,12 +102,6 @@ ...@@ -102,12 +102,6 @@
<Compile Include="FrmAbout.Designer.cs"> <Compile Include="FrmAbout.Designer.cs">
<DependentUpon>FrmAbout.cs</DependentUpon> <DependentUpon>FrmAbout.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmIdConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmIdConfig.Designer.cs">
<DependentUpon>FrmIdConfig.cs</DependentUpon>
</Compile>
<Compile Include="FrmPwd.cs"> <Compile Include="FrmPwd.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -147,9 +141,6 @@ ...@@ -147,9 +141,6 @@
<EmbeddedResource Include="FrmAbout.resx"> <EmbeddedResource Include="FrmAbout.resx">
<DependentUpon>FrmAbout.cs</DependentUpon> <DependentUpon>FrmAbout.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmIdConfig.resx">
<DependentUpon>FrmIdConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmPwd.resx"> <EmbeddedResource Include="FrmPwd.resx">
<DependentUpon>FrmPwd.cs</DependentUpon> <DependentUpon>FrmPwd.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
source/ACSquareStore/FrmAxisDebug.cs
...@@ -128,11 +128,6 @@ namespace OnlineStore.ACSingleStore ...@@ -128,11 +128,6 @@ namespace OnlineStore.ACSingleStore
{ {
if (this.btnInOutMove.BackColor .Equals(System.Drawing.SystemColors.Control)) if (this.btnInOutMove.BackColor .Equals(System.Drawing.SystemColors.Control))
{ {
if (StoreManager.Store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
int speed = FormUtil.GetIntValue(txtInOutSpeed); int speed = FormUtil.GetIntValue(txtInOutSpeed);
if (speed <= 0) if (speed <= 0)
{ {
...@@ -215,11 +210,6 @@ namespace OnlineStore.ACSingleStore ...@@ -215,11 +210,6 @@ namespace OnlineStore.ACSingleStore
{ {
if (btnInOutMovej.BackColor.Equals(System.Drawing.SystemColors.Control)) if (btnInOutMovej.BackColor.Equals(System.Drawing.SystemColors.Control))
{ {
if (StoreManager.Store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
int speed = FormUtil.GetIntValue(txtInOutSpeed); int speed = FormUtil.GetIntValue(txtInOutSpeed);
if (speed <= 0) if (speed <= 0)
{ {
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
<Compile Include="IO\IOManager.cs" /> <Compile Include="IO\IOManager.cs" />
<Compile Include="IO\KangNaiDe\KNDManager.cs" /> <Compile Include="IO\KangNaiDe\KNDManager.cs" />
<Compile Include="IO\KangNaiDe\MasterTcpClient.cs" /> <Compile Include="IO\KangNaiDe\MasterTcpClient.cs" />
<Compile Include="lineConnect\LineConnect.cs" />
<Compile Include="PanasonicServo\ACCMDManager.cs" /> <Compile Include="PanasonicServo\ACCMDManager.cs" />
<Compile Include="PanasonicServo\ACServerManager.cs" /> <Compile Include="PanasonicServo\ACServerManager.cs" />
<Compile Include="PanasonicServo\ACServerManager_Partial.cs" /> <Compile Include="PanasonicServo\ACServerManager_Partial.cs" />
......
source/DeviceLibrary/StoreConfig/StoreConfig.csv
...@@ -37,16 +37,17 @@ DO,温湿度喷气电磁阀,StartOrStopBlow,12,PRO_AOI_IP_1,0,温湿度喷气电磁阀,Y2-5,B14, ...@@ -37,16 +37,17 @@ DO,温湿度喷气电磁阀,StartOrStopBlow,12,PRO_AOI_IP_1,0,温湿度喷气电磁阀,Y2-5,B14,
,,,14,PRO_AOI_IP_1,0,,Y2-7,B16,, ,,,14,PRO_AOI_IP_1,0,,Y2-7,B16,,
,,,15,PRO_AOI_IP_1,0,,Y2-8,B17,, ,,,15,PRO_AOI_IP_1,0,,Y2-8,B17,,
AXIS,（Y轴-前后轴） ,Middle_Axis,1,COM3,0,,,,, AXIS,（Y轴-前后轴） ,Middle_Axis,1,COM3,0,,,,,
AXIS,(Z轴-升降轴）,UpDown_Axis,2,COM3,0,,,,, AXIS,（Z轴-升降轴）,UpDown_Axis,2,COM3,0,,,,,
AXIS,( X轴-进出轴）,InOut_Axis,3,COM3,0,,,,, AXIS,（X轴-进出轴）,InOut_Axis,3,COM3,0,,,,,
AXIS,（轴四）压紧轴,Comp_Axis,4,COM3,0,,,,, ,,,,,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorO_P1,301400,,,,,,, PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorO_P1,301400,,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorI_P2,321500,,,,,,, PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorI_P2,321500,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOB_P7,321500,,,,,,, PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOB_P7,321500,,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIB_P8,301400,,,,,,, PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIB_P8,301400,,,,,,,
PRO,（Y轴-前后轴）P1 待机原位点,MiddleAxis_P1_Position,325000,,,,,,, PRO,（Y轴-前后轴）P1 待机原位点,MiddleAxis_P1_Position,325000,,,,,,,
PRO,( X轴-进出轴）P1待机原位点,InOutAxis_P1_Position,7900,,,,,,, PRO,（ X轴-进出轴）P1待机原位点,InOutAxis_P1_Position,7900,,,,,,,
PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,318000,,,,,,, PRO,（ X轴-进出轴）P1左侧托架取料点P2,InOutAxis_P2_Position,7900,,,,,,,
PRO,（ X轴-进出轴）P1右侧托架取料点P3,InOutAxis_P3_Position,7900,,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,, PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,, PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,, PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,,
...@@ -83,25 +84,26 @@ PRO,（Y轴-前后轴）P7速度,UpDownAxis_P7_Speed,600,,,,,, , ...@@ -83,25 +84,26 @@ PRO,（Y轴-前后轴）P7速度,UpDownAxis_P7_Speed,600,,,,,, ,
PRO,（Y轴-前后轴）P8速度,UpDownAxis_P8_Speed,600,,,,,,, PRO,（Y轴-前后轴）P8速度,UpDownAxis_P8_Speed,600,,,,,,,
PRO,（Y轴-前后轴）P1速度,MiddleAxis_P1_Speed,500,,,,,,, PRO,（Y轴-前后轴）P1速度,MiddleAxis_P1_Speed,500,,,,,,,
PRO,（Y轴-前后轴）P2速度,MiddleAxis_P2_Speed,500,,,,,,, PRO,（Y轴-前后轴）P2速度,MiddleAxis_P2_Speed,500,,,,,,,
PRO,( X轴-进出轴）P1速度,InOutAxis_P1_Speed,600,,,,,,, PRO,（X轴-进出轴）P1速度,InOutAxis_P1_Speed,600,,,,,,,
PRO,( X轴-进出轴）P2速度,InOutAxis_P2_Speed,600,,,,,,, PRO,（X轴-进出轴）P2速度,InOutAxis_P2_Speed,600,,,,,,,
PRO,( X轴-进出轴）P3速度,InOutAxis_P3_Speed,600,,,,,,, PRO,（X轴-进出轴）P3速度,InOutAxis_P3_Speed,600,,,,,,,
PRO,（X轴-进出轴）P4速度,InOutAxis_P4_Speed,600,,,,,,,
PRO,（Y轴-前后轴） 停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,, PRO,（Y轴-前后轴） 停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,,
PRO,(Z轴-升降轴）停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, , PRO,（Z轴-升降轴）停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, ,
PRO,( X轴-进出轴）停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,, PRO,（X轴-进出轴）停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,,
PRO,（Y轴-前后轴） 停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,1000,,,,,,, PRO,（Y轴-前后轴） 停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,1000,,,,,,,
PRO,(Z轴-升降轴）停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,, PRO,（Z轴-升降轴）停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,,
PRO,( X轴-进出轴）停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,, PRO,（X轴-进出轴）停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,,
PRO,出入库多少次，会自动重置前后轴,Box_ResetMCount,1000,,,,,,, PRO,出入库多少次，会自动重置前后轴,Box_ResetMCount,1000,,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,, PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,, PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,, , PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,, ,
PRO,（Y轴-前后轴） 最小限位,MiddleAxis_PositionMin,0,,,,,,, PRO,（Y轴-前后轴） 最小限位,MiddleAxis_PositionMin,0,,,,,,,
PRO,(Z轴-升降轴）最小限位,UpdownAxis_PositionMin,0,,,,,,, PRO,（Z轴-升降轴）最小限位,UpdownAxis_PositionMin,0,,,,,,,
PRO,( X轴-进出轴）最小限位,InoutAxis_PositionMin,0,,,,,,, PRO,（X轴-进出轴）最小限位,InoutAxis_PositionMin,0,,,,,,,
PRO,（Y轴-前后轴） 最大限位,MiddleAxis_PositionMax,0,,,,,,, PRO,（Y轴-前后轴） 最大限位,MiddleAxis_PositionMax,0,,,,,,,
PRO,(Z轴-升降轴）最大限位,UpdownAxis_PositionMax,0,,,,,,, PRO,（Z轴-升降轴）最大限位,UpdownAxis_PositionMax,0,,,,,,,
PRO,( X轴-进出轴）最大限位,InoutAxis_PositionMax,0,,,,,,, PRO,（X轴-进出轴）最大限位,InoutAxis_PositionMax,0,,,,,,,
PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,, PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,,
PRO,需要吹气的湿度(湿度标准),Max_Humidity,10,,,,,,, PRO,需要吹气的湿度(湿度标准),Max_Humidity,10,,,,,,,
PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,, PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,
......
source/DeviceLibrary/acSquareStore/Square_BoxBean.cs
...@@ -163,7 +163,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -163,7 +163,7 @@ namespace OnlineStore.DeviceLibrary
storeStatus = StoreStatus.ResetMove; storeStatus = StoreStatus.ResetMove;
//启动温湿度服务器 //启动温湿度服务器
HumitureController.Init(Config.Humiture_Port); HumitureController.Init(Config.Humiture_Port);
LineConnect.StartConnect(); //LineConnect.StartConnect();
ReturnHome(); ReturnHome();
StartTime = DateTime.Now; StartTime = DateTime.Now;
...@@ -592,7 +592,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -592,7 +592,7 @@ namespace OnlineStore.DeviceLibrary
TimeSpan span = DateTime.Now - StartTime; TimeSpan span = DateTime.Now - StartTime;
IsRun = false; IsRun = false;
LineConnect.StopConnect(); //LineConnect.StopConnect();
IOManager.instance.CloseAllDO(); IOManager.instance.CloseAllDO();
LogUtil.info(LOGGER, StoreName + ",停止运行，总运行时间：" + span.ToString()); LogUtil.info(LOGGER, StoreName + ",停止运行，总运行时间：" + span.ToString());
...@@ -965,7 +965,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -965,7 +965,7 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
bool noInStore = LineConnect.WaitInStoreList.Count <= 0; bool noInStore = waitOutStoreList.Count <= 0;
if (CurrInOutACount >= this.Config.Box_ResetACount &&noInStore) if (CurrInOutACount >= this.Config.Box_ResetACount &&noInStore)
{ {
if (storeRunStatus < StoreRunStatus.Runing || StoreMove.MoveType == StoreMoveType.InStore || StoreMove.MoveType == StoreMoveType.OutStore) if (storeRunStatus < StoreRunStatus.Runing || StoreMove.MoveType == StoreMoveType.InStore || StoreMove.MoveType == StoreMoveType.OutStore)
...@@ -989,7 +989,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -989,7 +989,8 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, StoreName + "已经累计出入库" + CurrInOutCount + "次，需要复位一下前后轴"); LogUtil.info(LOGGER, StoreName + "已经累计出入库" + CurrInOutCount + "次，需要复位一下前后轴");
} }
} }
else if (LineConnect.CanStartOut() || IsDebug) // else if (LineConnect.CanStartOut() || IsDebug)
else
{ {
InOutPosInfo currInOutFixture = null; InOutPosInfo currInOutFixture = null;
lock (waitOutListLock) lock (waitOutListLock)
...@@ -1208,19 +1209,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -1208,19 +1209,19 @@ namespace OnlineStore.DeviceLibrary
public void ReviceLineInStoreCMD(string posId, string plateH, string plateW, string message) public void ReviceLineInStoreCMD(string posId, string plateH, string plateW, string message)
{ {
string logName = "流水线入库命令【 " + message + "】【" + posId + "】："; string logName = "流水线入库命令【 " + message + "】【" + posId + "】：";
if (!LineConnect.WaitInStoreList.Contains(posId)) //if (!LineConnect.WaitInStoreList.Contains(posId))
{ //{
LogUtil.error(logName + "库位未验证通过，重新验证库位"); // LogUtil.error(logName + "库位未验证通过，重新验证库位");
bool result = ReviceLineCheckInStoreCMD(posId, plateH, plateW, message); // bool result = ReviceLineCheckInStoreCMD(posId, plateH, plateW, message);
if (!result) // if (!result)
{ // {
return; // return;
} // }
} //}
else //else
{ //{
LineConnect.WaitInStoreList.Remove(posId); // LineConnect.WaitInStoreList.Remove(posId);
} //}
//根据发送的posId获取位置列表 //根据发送的posId获取位置列表
ACSquareSPosition position = CSVPositionReader<ACSquareSPosition>.GetPositon(posId); ACSquareSPosition position = CSVPositionReader<ACSquareSPosition>.GetPositon(posId);
if (position == null) if (position == null)
...@@ -1491,11 +1492,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -1491,11 +1492,11 @@ namespace OnlineStore.DeviceLibrary
//如果在空闲中，且有入库未完成，直接发送入库执行中 //如果在空闲中，且有入库未完成，直接发送入库执行中
if (boxStatus.status.Equals((int)StoreStatus.StoreOnline)) if (boxStatus.status.Equals((int)StoreStatus.StoreOnline))
{ {
List<string> list = new List<string>(LineConnect.WaitInStoreList); //List<string> list = new List<string>(LineConnect.WaitInStoreList);
if (list.Count > 0 && (LineConnect.CanStartOut().Equals(false))) //if (list.Count > 0 && (LineConnect.CanStartOut().Equals(false)))
{ //{
boxStatus.status = (int)StoreStatus.InStoreExecute; // boxStatus.status = (int)StoreStatus.InStoreExecute;
} //}
} }
...@@ -1593,17 +1594,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -1593,17 +1594,17 @@ namespace OnlineStore.DeviceLibrary
string[] plateWArray = data[ParamDefine.plateW].Split(splitChar); string[] plateWArray = data[ParamDefine.plateW].Split(splitChar);
string[] plateHArray = data[ParamDefine.plateH].Split(splitChar); string[] plateHArray = data[ParamDefine.plateH].Split(splitChar);
bool urgentReel =FormUtil. GetBoolData( data,ParamDefine.urgentReel); //bool urgentReel =FormUtil. GetBoolData( data,ParamDefine.urgentReel);
bool cutReel= FormUtil.GetBoolData(data, ParamDefine.cutReel); //bool cutReel= FormUtil.GetBoolData(data, ParamDefine.cutReel);
bool smallReel = FormUtil.GetBoolData(data, ParamDefine.smallReel); //bool smallReel = FormUtil.GetBoolData(data, ParamDefine.smallReel);
string rfid = data.ContainsKey(ParamDefine.rfid) ? data[ParamDefine.rfid] : ""; //string rfid = data.ContainsKey(ParamDefine.rfid) ? data[ParamDefine.rfid] : "";
int rfidLoc = FormUtil.GetIntData(data, ParamDefine.rfidLoc); //int rfidLoc = FormUtil.GetIntData(data, ParamDefine.rfidLoc);
string barcode = data.ContainsKey(ParamDefine.barcode) ? data[ParamDefine.barcode] : ""; string barcode = data.ContainsKey(ParamDefine.barcode) ? data[ParamDefine.barcode] : "";
//urgentReel: true 表示紧急料,需要出到料串上 ////urgentReel: true 表示紧急料,需要出到料串上
//cutReel: true 表示分盘料,需要出到料串上 ////cutReel: true 表示分盘料,需要出到料串上
//smallReel: true 小料(7x8),放置到小料架上 ////smallReel: true 小料(7x8),放置到小料架上
//rfid: 分配的料架RFID ////rfid: 分配的料架RFID
//rfidLoc: 料架的架位,值为 - 1时,可以自由分配皮带线, 小料时,架位为1 - 46优先走1 / 2号皮带线,47 - 92优先走3 / 4号皮带线, 70,71,72时只能分配到3 / 4号皮带线; 大料时,架位1 - 6优先走1 / 2号皮带线, 7 - 12优先走3 / 4号皮带线 ////rfidLoc: 料架的架位,值为 - 1时,可以自由分配皮带线, 小料时,架位为1 - 46优先走1 / 2号皮带线,47 - 92优先走3 / 4号皮带线, 70,71,72时只能分配到3 / 4号皮带线; 大料时,架位1 - 6优先走1 / 2号皮带线, 7 - 12优先走3 / 4号皮带线
string dataStr = JsonHelper.SerializeObject(data); string dataStr = JsonHelper.SerializeObject(data);
LogUtil.info(LOGGER, "收到服务器出库消息：【" + dataStr+"】"); LogUtil.info(LOGGER, "收到服务器出库消息：【" + dataStr+"】");
...@@ -1614,7 +1615,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1614,7 +1615,7 @@ namespace OnlineStore.DeviceLibrary
index++; index++;
string plateW = plateWArray[index]; string plateW = plateWArray[index];
string plateH = plateHArray[index]; string plateH = plateHArray[index];
InOutPosInfo intouInfo = new InOutPosInfo(barcode, posId, plateW, plateH, urgentReel, cutReel, smallReel, rfid, rfidLoc); InOutPosInfo intouInfo = new InOutPosInfo(barcode, posId, plateW, plateH );
//根据发送的posId获取位置列表 //根据发送的posId获取位置列表
ACSquareSPosition position = CSVPositionReader<ACSquareSPosition>.GetPositon(posId); ACSquareSPosition position = CSVPositionReader<ACSquareSPosition>.GetPositon(posId);
...@@ -1651,7 +1652,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1651,7 +1652,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error("验证出库【" + intouInfo.ToStr() + "】是否重复出错：" + ex.ToString()); LogUtil.error("验证出库【" + intouInfo.ToStr() + "】是否重复出错：" + ex.ToString());
} }
if (CanStarInOut() && (LineConnect.CanStartOut() || IsDebug)) if (CanStarInOut() || IsDebug )
{ {
bool result = StartOutStoreMove(new InOutParam(intouInfo)); bool result = StartOutStoreMove(new InOutParam(intouInfo));
if (!result) if (!result)
......
source/DeviceLibrary/acSquareStore/Square_BoxBean_Partial.cs
...@@ -56,15 +56,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -56,15 +56,22 @@ namespace OnlineStore.DeviceLibrary
p.InOut_P1 = Config.InOutAxis_P1_Position; p.InOut_P1 = Config.InOutAxis_P1_Position;
p.Middle_P1 = Config.MiddleAxis_P1_Position; p.Middle_P1 = Config.MiddleAxis_P1_Position;
p.InOut_P2 = position.InOutAxis_Door_P2; if (param.PosInfo.ShelfType.Equals(1))
{
p.InOut_P2 = Config.InOutAxis_P2_Position;
}
else
{
p.InOut_P2 = Config.InOutAxis_P3_Position;
}
p.UpDown_P1 = Config.UpDownAxis_DoorO_P1; p.UpDown_P1 = Config.UpDownAxis_DoorO_P1;
p.UpDown_P8 = Config.UpDownAxis_DoorIB_P8; p.UpDown_P8 = Config.UpDownAxis_DoorIB_P8;
p.UpDown_P2 = Config.UpDownAxis_DoorI_P2; p.UpDown_P2 = Config.UpDownAxis_DoorI_P2;
p.UpDown_P7 = Config.UpDownAxis_DoorOB_P7; p.UpDown_P7 = Config.UpDownAxis_DoorOB_P7;
p.ComPress_P2 = position.CompressAxis_P2; //p.ComPress_P2 = position.CompressAxis_P2;
p.ComPress_P3 = position.CompressAxis_C_P3; //p.ComPress_P3 = position.CompressAxis_C_P3;
p.InOut_P3 = position.InOutAxis_P3; p.InOut_P4 = position.InOutAxis_P4;
p.Middle_P2 = position.MiddleAxis_P2; p.Middle_P2 = position.MiddleAxis_P2;
p.UpDown_P3 = position.UpDownAxis_IH_P3; p.UpDown_P3 = position.UpDownAxis_IH_P3;
p.UpDown_P4 = position.UpDownAxis_IL_P4; p.UpDown_P4 = position.UpDownAxis_IL_P4;
...@@ -181,11 +188,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -181,11 +188,11 @@ namespace OnlineStore.DeviceLibrary
isOk = false; isOk = false;
break; break;
} }
else if ((!wait.IsEnd) && StoreMove.MoveStep.Equals(StoreMoveStep.SO_14_WaitTake) && LineConnect.CanReSend()) //else if ((!wait.IsEnd) && StoreMove.MoveStep.Equals(StoreMoveStep.SO_14_WaitTake) && LineConnect.CanReSend())
{ //{
//判断是否需要重发入库结束命令 // //判断是否需要重发入库结束命令
SendOutStoreEnd(StoreMove); // SendOutStoreEnd(StoreMove);
} //}
TimeSpan rwSpan = DateTime.Now - preRWTime; TimeSpan rwSpan = DateTime.Now - preRWTime;
if (!wait.IsEnd && rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6) if (!wait.IsEnd && rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6)
...@@ -214,14 +221,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -214,14 +221,7 @@ namespace OnlineStore.DeviceLibrary
{ {
wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds); wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
} }
else if (wait.WaitType == 7)
{
//wait.IsEnd = (wait.HeightValue.Equals(GetHeight()));
//if (wait.IsEnd)
//{
// LogUtil.debug("等待height=" + wait.HeightValue + "完成");
//}
}
if (wait.IsEnd) if (wait.IsEnd)
{ {
if (StoreMove.OneWaitCanEndStep) if (StoreMove.OneWaitCanEndStep)
...@@ -287,7 +287,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -287,7 +287,15 @@ namespace OnlineStore.DeviceLibrary
//料盘检测 //料盘检测
InStoreLog(" 入库：SI_00 检测料盘信号"); InStoreLog(" 入库：SI_00 检测料盘信号");
StoreMove.NextMoveStep(StoreMoveStep.SI_00_TrayCheck); StoreMove.NextMoveStep(StoreMoveStep.SI_00_TrayCheck);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH)); if (param.PosInfo.ShelfType.Equals(1))
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.HIGH));
}
else
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.HIGH));
}
} }
else else
{ {
...@@ -417,7 +425,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -417,7 +425,7 @@ namespace OnlineStore.DeviceLibrary
InStoreLog("入库：SI_11 叉子进入库位中，进出轴至P3(库位取放料点) "); InStoreLog("入库：SI_11 叉子进入库位中，进出轴至P3(库位取放料点) ");
StoreMove.NextMoveStep(StoreMoveStep.SI_11_DeviceToBag); StoreMove.NextMoveStep(StoreMoveStep.SI_11_DeviceToBag);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed); ACAxisMove(Config.InOut_Axis, moveP.InOut_P4, Config.InOutAxis_P3_Speed);
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_10_LocationCylinder_Down) else if (StoreMove.MoveStep == StoreMoveStep.SI_10_LocationCylinder_Down)
...@@ -425,7 +433,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -425,7 +433,7 @@ namespace OnlineStore.DeviceLibrary
//IOManager.IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW); //IOManager.IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW);
InStoreLog("入库：SI_11 叉子进入库位中，进出轴至P3(库位取放料点) "); InStoreLog("入库：SI_11 叉子进入库位中，进出轴至P3(库位取放料点) ");
StoreMove.NextMoveStep(StoreMoveStep.SI_11_DeviceToBag); StoreMove.NextMoveStep(StoreMoveStep.SI_11_DeviceToBag);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed); ACAxisMove(Config.InOut_Axis, moveP.InOut_P4, Config.InOutAxis_P3_Speed);
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_11_DeviceToBag) else if (StoreMove.MoveStep == StoreMoveStep.SI_11_DeviceToBag)
...@@ -549,7 +557,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -549,7 +557,7 @@ namespace OnlineStore.DeviceLibrary
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_04_DeviceToBag); StoreMove.NextMoveStep(StoreMoveStep.SO_04_DeviceToBag);
OutStoreLog("出库：SO_04 叉子进入库位中， 进出轴至P3(库位取放料点) "); OutStoreLog("出库：SO_04 叉子进入库位中， 进出轴至P3(库位取放料点) ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed); ACAxisMove(Config.InOut_Axis, moveP.InOut_P4, Config.InOutAxis_P3_Speed);
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_04_DeviceToBag) else if (StoreMove.MoveStep == StoreMoveStep.SO_04_DeviceToBag)
{ {
...@@ -599,7 +607,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -599,7 +607,15 @@ namespace OnlineStore.DeviceLibrary
//SO_10_DeviceToDoorPro(); //SO_10_DeviceToDoorPro();
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray); StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW)); if (StoreMove.MoveParam.PosInfo.ShelfType.Equals(1))
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.LOW));
}
else
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.LOW));
}
// StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
// StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0)); // StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoor(); OpenDoor();
...@@ -610,7 +626,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -610,7 +626,15 @@ namespace OnlineStore.DeviceLibrary
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray); StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 "); OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW)); if (StoreMove.MoveParam.PosInfo.ShelfType.Equals(1))
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.LOW));
}
else
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.LOW));
}
// StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
// StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0)); // StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoor(); OpenDoor();
...@@ -640,7 +664,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -640,7 +664,7 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
CloseDoor(); CloseDoor();
//发送消息给流水线 //发送消息给流水线
SendOutStoreEnd(StoreMove); //SendOutStoreEnd(StoreMove);
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_13_GoBack) else if (StoreMove.MoveStep == StoreMoveStep.SO_13_GoBack)
{ {
...@@ -653,7 +677,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -653,7 +677,15 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SO_14_WaitTake); StoreMove.NextMoveStep(StoreMoveStep.SO_14_WaitTake);
OutStoreLog("出库：SO_14_WaitTake 等待拿走物品，最多等待" + OutStoreWaitSeconds + "秒"); OutStoreLog("出库：SO_14_WaitTake 等待拿走物品，最多等待" + OutStoreWaitSeconds + "秒");
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(ms)); StoreMove.WaitList.Add(WaitResultInfo.WaitTime(ms));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW)); if (StoreMove.MoveParam.PosInfo.ShelfType.Equals(1))
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.LOW));
}
else
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.LOW));
}
// StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
// StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0)); // StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
StoreMove.OneWaitCanEndStep = true; StoreMove.OneWaitCanEndStep = true;
} }
...@@ -675,27 +707,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -675,27 +707,6 @@ namespace OnlineStore.DeviceLibrary
} }
private void SendOutStoreEnd(StoreMoveInfo storeMove)
{
int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
int ss = (int)storeStatus;
if (IsDebug)
{
ss = (int)StoreStatus.Debugging;
}
StoreSendBean store = new StoreSendBean(Config.Id, Config.CID, (int)storeStatus, (int)storeRunStatus, hasTray, (int)alarmType);
store.data.Add(ParamDefine.posId, StoreMove.MoveParam.PosInfo.PosId);
store.data.Add(ParamDefine.plateH, StoreMove.MoveParam.PosInfo.PlateH);
store.data.Add(ParamDefine.plateW, StoreMove.MoveParam.PosInfo.PlateW);
store.data.Add(ParamDefine.cutReel, StoreMove.MoveParam.PosInfo.cutReel.ToString());
store.data.Add(ParamDefine.smallReel, StoreMove.MoveParam.PosInfo.smallReel.ToString());
store.data.Add(ParamDefine.urgentReel, StoreMove.MoveParam.PosInfo.urgentReel.ToString());
store.data.Add(ParamDefine.rfid, StoreMove.MoveParam.PosInfo.rfid);
store.data.Add(ParamDefine.rfidLoc, StoreMove.MoveParam.PosInfo.rfidLoc.ToString());
store.data.Add(ParamDefine.barcode, StoreMove.MoveParam.PosInfo.barcode);
LineConnect.OutStoreEnd(store);
}
private void SO_10_DeviceToDoorPro() private void SO_10_DeviceToDoorPro()
{ {
if (DoorIsOpen()) if (DoorIsOpen())
...@@ -715,16 +726,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -715,16 +726,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
public bool InOutAxisCanMove()
{
if (StoreManager.Store.Config.IsHasLocationCylinder.Equals(0))
{
return true;
}
return false;
}
#endregion #endregion
public List<InOutPosInfo> waitOutStoreList = new List<InOutPosInfo>(); public List<InOutPosInfo> waitOutStoreList = new List<InOutPosInfo>();
......
source/DeviceLibrary/store/InOutParam.cs
...@@ -56,17 +56,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -56,17 +56,13 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public class InOutPosInfo public class InOutPosInfo
{ {
public InOutPosInfo(string barcode, string posId, string platew = "", string plateh = "", bool urgentReel = false , bool cutReel = false, bool smallReel = false, string rfid = "", int rfidLoc = 0) public InOutPosInfo(string barcode, string posId, string platew = "", string plateh = "", int shelftype=1)
{ {
this.barcode = barcode; this.barcode = barcode;
this.PosId = posId; this.PosId = posId;
this.PlateW = platew; this.PlateW = platew;
this.PlateH = plateh; this.PlateH = plateh;
this.urgentReel = urgentReel;
this.cutReel = cutReel;
this.smallReel = smallReel;
this.rfid = rfid;
this.rfidLoc = rfidLoc;
} }
/// <summary> /// <summary>
...@@ -86,34 +82,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -86,34 +82,15 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public string PlateH { get; set; } public string PlateH { get; set; }
/// <summary>
/// urgentReel: true 表示紧急料,需要出到料串上
/// </summary>
public bool urgentReel { get; set; }
/// <summary>
/// cutReel: true 表示分盘料,需要出到料串上
/// </summary>
public bool cutReel { get; set; }
/// <summary>
/// smallReel: true 小料(7x8),放置到小料架上
/// </summary>
public bool smallReel { get; set; }
/// <summary> /// <summary>
/// rfid: 分配的料架RFID /// 使用左侧托架=1,还是右侧托架=2
/// </summary> /// </summary>
public string rfid { get; set; } public int ShelfType = 1;
/// <summary>
/// rfidLoc: 料架的架位,值为 - 1时,可以自由分配皮带线,
/// 小料时,架位为1 - 46优先走1 / 2号皮带线,47 - 92优先走3 / 4号皮带线,
/// 70,71,72时只能分配到3 / 4号皮带线;
/// 大料时,架位1 - 6优先走1 / 2号皮带线, 7 - 12优先走3/ 4号皮带线
/// </summary>
public int rfidLoc { get; set; }
public string ToStr() public string ToStr()
{ {
return " barcode[" + barcode + "],PosId [" + PosId + "],plateW [" + PlateW + "],plateH [" + PlateH + "],urgentReel [" + urgentReel return " barcode[" + barcode + "],PosId [" + PosId + "],plateW [" + PlateW + "],plateH [" + PlateH + "],ShelfLR [" + ShelfType + "]";
+ "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "]";
} }
} }
......
source/DeviceLibrary/store/KTK_Store.cs
...@@ -118,18 +118,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -118,18 +118,6 @@ namespace OnlineStore.DeviceLibrary
return new TimeSpan(0); return new TimeSpan(0);
} }
} }
protected void AddAxisMoveTime(ConfigMoveAxis axis)
{
//int axisNo = axis.GetAxisValue();
//if (AxisLastStartTime.ContainsKey(axisNo))
//{
// AxisLastStartTime.Remove(axisNo);
//}
//AxisLastStartTime.Add(axisNo, DateTime.Now);
}
/// <summary> /// <summary>
/// 运动处理 /// 运动处理
/// </summary> /// </summary>
...@@ -251,7 +239,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -251,7 +239,6 @@ namespace OnlineStore.DeviceLibrary
moveAxis.TargetPosition = 0; moveAxis.TargetPosition = 0;
LogUtil.info(LOGGER, moveAxis.DisplayStr + "speed[" + moveAxis.TargetSpeed + "]开始原点返回"); LogUtil.info(LOGGER, moveAxis.DisplayStr + "speed[" + moveAxis.TargetSpeed + "]开始原点返回");
StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true)); StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true));
AddAxisMoveTime(moveAxis);
ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed); ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed);
} }
...@@ -262,7 +249,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -262,7 +249,6 @@ namespace OnlineStore.DeviceLibrary
{ {
StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, targetPosition, targetSpeed)); StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, targetPosition, targetSpeed));
moveAxis.TargetPosition = targetPosition; moveAxis.TargetPosition = targetPosition;
AddAxisMoveTime(moveAxis);
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed); ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
} }
......
source/DeviceLibrary/store/LineMoveP.cs
...@@ -65,19 +65,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -65,19 +65,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 轴3进出轴 库位点取料点P3 /// 轴3进出轴 库位点取料点P3
/// </summary> /// </summary>
public int InOut_P3 { get; set; } public int InOut_P4 { get; set; }
/// <summary>
/// 轴4（ 压紧轴）待机原位点P1
/// </summary>
public int ComPress_P1 { get; set; }
/// <summary>
/// 轴4（ 压紧轴）压紧点 P2
/// </summary>
public int ComPress_P2 { get; set; }
/// <summary>
/// 轴4（ 压紧轴） 压紧前点P3
/// </summary>
public int ComPress_P3{ get; set; }
} }
} }
source/LoadCVSLibrary/position/ACSquareSPosition.cs
...@@ -42,27 +42,27 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -42,27 +42,27 @@ namespace OnlineStore.LoadCSVLibrary
public int UpDownAxis_IL_P4 { get; set; } public int UpDownAxis_IL_P4 { get; set; }
/// <summary> /// <summary>
/// 进出轴（库位点取料点）P3 /// 进出轴库位取料点P4
/// </summary> /// </summary>
[CSVAttribute("进出轴库位点取料点P3")] [CSVAttribute("进出轴库位取料点P4")]
public int InOutAxis_P3 { get; set; } public int InOutAxis_P4 { get; set; }
/// <summary> ///// <summary>
/// 压紧轴（压紧点）P2 ///// 压紧轴（压紧点）P2
/// </summary> ///// </summary>
[CSVAttribute("压紧轴压紧点P2")] //[CSVAttribute("压紧轴压紧点P2")]
public int CompressAxis_P2 { get; set; } //public int CompressAxis_P2 { get; set; }
/// <summary> ///// <summary>
/// 压紧轴（压紧前点）P3 ///// 压紧轴（压紧前点）P3
/// </summary> ///// </summary>
[CSVAttribute("压紧轴压紧前点P3")] //[CSVAttribute("压紧轴压紧前点P3")]
public int CompressAxis_C_P3 { get; set; } //public int CompressAxis_C_P3 { get; set; }
/// <summary> ///// <summary>
/// 轴3(进出轴） 进料口取料点P2 ///// 轴3(进出轴） 进料口取料点P2
/// </summary> ///// </summary>
[CSVAttribute("进出轴进料口取料点P2")] //[CSVAttribute("进出轴进料口取料点P2")]
public int InOutAxis_Door_P2 { get; set; } //public int InOutAxis_Door_P2 { get; set; }
public static bool CheckPosition(ACSquareSPosition position, Box_Config Config) public static bool CheckPosition(ACSquareSPosition position, Box_Config Config)
{ {
...@@ -82,12 +82,8 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -82,12 +82,8 @@ namespace OnlineStore.LoadCSVLibrary
{ {
int iMin = Config.InOut_Axis.PositionMin; int iMin = Config.InOut_Axis.PositionMin;
int iMax = Config.InOut_Axis.PositionMax; int iMax = Config.InOut_Axis.PositionMax;
if (iMin > position.InOutAxis_Door_P2 || iMax < position.InOutAxis_Door_P2)
{ if (iMin > position.InOutAxis_P4 || iMax < position.InOutAxis_P4)
LogUtil.error(position.PositionNum + " InOutAxis_Door_P2位置超出" + Config.InOut_Axis.Explain + "上下限（" + iMin + "-" + iMax + "）");
return false;
}
if (iMin > position.InOutAxis_P3 || iMax < position.InOutAxis_P3)
{ {
LogUtil.error(position.PositionNum + " InOutAxis_P3位置超出" + Config.InOut_Axis.Explain + "上下限（" + iMin + "-" + iMax + "）"); LogUtil.error(position.PositionNum + " InOutAxis_P3位置超出" + Config.InOut_Axis.Explain + "上下限（" + iMin + "-" + iMax + "）");
return false; return false;
......
source/LoadCVSLibrary/storeConfig/config/Box_Config.cs
...@@ -407,8 +407,23 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -407,8 +407,23 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary>
/// PRO,(X轴-进出轴）P1左侧托架取料点P2,InOutAxis_P2_Position,7900,,,,,,,
/// </summary>
[ConfigProAttribute("InOutAxis_P2_Position", true)]
public int InOutAxis_P2_Position { get; set; }
/// <summary>
/// PRO,(X轴-进出轴）P1右侧托架取料点P3,InOutAxis_P3_Position,7900,,,,,,,
/// </summary>
[ConfigProAttribute("InOutAxis_P3_Position", true)]
public int InOutAxis_P3_Position { get; set; }
/// <summary> /// <summary>
/// PRO,(X轴-进出轴）P4速度,InOutAxis_P4_Speed,600,,,,,,,
/// </summary>
[ConfigProAttribute("InOutAxis_P4_Speed", true)]
public int InOutAxis_P4_Speed { get; set; }
/// <summary>
/// PRO IO模块对应的DI数量 IO_DILength 192.168.200.10#16;192.168.200.11#4 /// PRO IO模块对应的DI数量 IO_DILength 192.168.200.10#16;192.168.200.11#4
/// </summary> /// </summary>
[ConfigProAttribute("IO_DILength")] [ConfigProAttribute("IO_DILength")]
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -129,7 +129,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -129,7 +129,7 @@ namespace OnlineStore.LoadCSVLibrary
/// DO, 温湿度喷气电磁阀, StartOrStopBlow,12, 温湿度喷气电磁阀, Y2-5, B14 /// DO, 温湿度喷气电磁阀, StartOrStopBlow,12, 温湿度喷气电磁阀, Y2-5, B14
/// </summary> /// </summary>
public static string StartOrStopBlow = "StartOrStopBlow"; public static string StartOrStopBlow = "StartOrStopBlow";
public static string TrayCheck_Door; // public static string TrayCheck_Door;
} }
public enum IO_VALUE public enum IO_VALUE
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!