Skip to content

李娜 / SO827-OutletEquip

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

增机物料显示和操作按钮。修改与环形线交互逻辑。

1 个父辈 056990ed
内嵌 并排
正在显示 10 个修改的文件 包含 317 行增加 和 283 行删除
source/DeviceLibrary/StoreConfig/StoreConfig.csv
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,0,（轴一）旋转轴,Middle_Axis,0,HC,,100,1000,1000,5,50,3000,10,100,0,0
AXIS,0,（轴二）升降轴轴,UpDown_Axis,1,HC,,200,2000,2000,20,250,3000,10,100,0,0
AXIS,0,（轴三）进出轴,InOut_Axis,2,HC,,5000,5000,5000,100,400,3000,10,100,0,0
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,0,（轴一）旋转轴,Middle_Axis,0,HC,,100,1000,1000,20,100,3000,10,100,0,0
AXIS,0,（轴二）升降轴,UpDown_Axis,1,HC,,100,1000,1000,20,150,3000,10,100,0,0
AXIS,0,（轴三）进出轴,InOut_Axis,2,HC,,3000,3000,3000,100,400,3000,10,100,0,0
AXIS,0,（轴四）压紧轴,Comp_Axis,3,HC,,30000,15000,15000,3000,5000,10000,10,100,0,0
,,,,,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口取料低点 P1,UpDownAxis_DoorL_P1,2914,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口取料高点 P2,UpDownAxis_DoorH_P2,3200,,,,,,,,,,,,
PRO,0,升降轴（轴2）NG口放料高点 P5,UpDownAxis_DoorH_P5,3050,,,,,,,,,,,,
PRO,0,升降轴（轴2）NG口放料低点 P6,UpDownAxis_DoorH_P6,3050,,,,,,,,,,,,
PRO,0,旋转轴（轴1）P1/取料点/待机原位点,MiddleAxis_P1,4771,,,,,,,,,,,,
PRO,0,旋转轴（轴1）P3/NG口放料点,MiddleAxis_P3,891,,,,,,,,,,,,
PRO,0,升降轴（轴2）NG口放料高点 P5,UpDownAxis_DoorH_P5,4900,,,,,,,,,,,,
PRO,0,升降轴（轴2）NG口放料低点 P6,UpDownAxis_DoorH_P6,4900,,,,,,,,,,,,
PRO,0,旋转轴（轴1）P1/取料点/待机原位点,MiddleAxis_P1,4760,,,,,,,,,,,,
PRO,0,旋转轴（轴1）P3/NG口放料点,MiddleAxis_P3,2450,,,,,,,,,,,,
PRO,0,进出轴（轴3）P1/待机原位点,InOutAxis_P1,200,,,,,,,,,,,,
PRO,0,进出轴（轴3）P4/NG口放料点,InOutAxis_P4,100,,,,,,,,,,,,
PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1,10000,,,,,,,,,,,,
PRO,0,压紧轴（轴4）P2压紧点列表,CompAxis_P2_List,8=9400,,,,,,,,,,,,
PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1,4760,,,,,,,,,,,,
PRO,0,压紧轴（轴4）P2压紧点列表,CompAxis_P2_List,8=74800,12=71300,28=59300,36=46800,48=40400,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,,,
PRO,0,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,500,,,,,,,,,,,,
......@@ -42,8 +42,8 @@ PRO,0,出出料多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,
PRO,0,出出料多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,,,
PRO,0,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,,,,,,
PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,,,
PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,,,,,,,
PRO,0,是否调试状态,ISDebug,1,,,,,,,,,,,,
PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,,,,,,,,
PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
DI,0,急停,SuddenStop_BTN,0,HC,X00,,,,,,,,,,
......
source/DeviceLibrary/StoreConfig/linePositions.csv
位置,优先级,高度,宽度,料架号,旋转轴P2,升降轴高点P3,升降轴低点P4,进出轴库位点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴取料点P2,,,,,,,,
S1_1,93,12,7,1,280,3050,3050,3400,76170,61249,4400
S1_2,92,12,7,1,280,984,914,3400,76170,55750,4400,,,,,,,984,914
S1_3,91,12,7,1,280,1174,1104,3400,76170,55750,4400,,,,,,,1174,1104
S1_4,90,8,7,1,280,1363,1293,3400,81606,59089,4400,,,,,,,1363,1293
S1_5,89,8,7,1,280,1549,1479,3400,81606,59089,4400,,,,,,,1549,1479
S1_6,88,8,7,1,280,1736,1666,3400,81606,59089,4400,,,,,,,1736,1666
S1_7,87,8,7,1,280,1927,1857,3400,81606,59089,4400,,,,,,,1927,1857
S1_8,86,8,7,1,280,2114,2044,3400,81606,59089,4400,,,,,,,2114,2044
S1_9,85,8,7,1,280,2299,2229,3400,81606,59089,4400,,,,,,,2299,2229
S1_10,84,8,7,1,280,2488,2418,3400,81606,59089,4400,,,,,,,2488,2418
S1_11,83,8,7,1,280,2677,2607,3400,81606,59089,4400,,,,,,,2677,2607
S1_12,82,8,7,1,280,2863,2793,3400,81606,59089,4400,,,,,,,2863,2793
S1_13,81,8,7,1,280,3052,2982,3400,81606,59089,4400,,,,,,,3052,2982
S1_14,80,12,7,1,280,789,719,3400,76170,55750,4400,,,,,,,789,719
S1_15,79,12,7,1,280,976,906,3400,76170,55750,4400,,,,,,,976,906
S1_16,78,12,7,1,280,1163,1093,3400,76170,55750,4400,,,,,,,1163,1093
S1_17,77,8,7,1,280,1349,1279,3400,81606,59089,4400,,,,,,,1349,1279
S1_18,76,8,7,1,280,1538,1468,3400,81606,59089,4400,,,,,,,1538,1468
S1_19,75,8,7,1,280,1725,1655,3400,81606,59089,4400,,,,,,,1725,1655
S1_20,74,8,7,1,280,1912,1842,3400,81606,59089,4400,,,,,,,1912,1842
S1_21,73,8,7,1,280,2098,2028,3400,81606,59089,4400,,,,,,,2098,2028
S1_22,72,8,7,1,280,2290,2220,3400,81606,59089,4400,,,,,,,2290,2220
S1_23,71,8,7,1,280,2475,2405,3400,81606,59089,4400,,,,,,,2475,2405
S1_24,70,8,7,1,280,2663,2593,3400,81606,59089,4400,,,,,,,2663,2593
S1_25,69,8,7,1,280,2852,2782,3400,81606,59089,4400,,,,,,,2852,2782
S1_26,68,8,7,1,280,3038,2968,3400,81606,59089,4400,,,,,,,3038,2968
S1_27,67,28,13,1,849,3218,3148,3400,67385,26217,4600,,,,,,,3218,3148
S1_28,66,28,13,1,849,3723,3653,3400,67385,26217,4600,,,,,,,3723,3653
S1_29,65,28,13,1,849,4216,4146,3400,67385,26217,4600,,,,,,,4216,4146
S1_30,64,28,13,1,849,4708,4638,3400,67385,26217,4600,,,,,,,4708,4638
S1_31,63,36,13,1,849,5204,5134,3400,63385,25000,4600,,,,,,,5204,5134
S2_1,62,12,7,2,849,780,710,3400,76170,55750,4400,,,,,,,780,710
S2_2,61,12,7,2,849,969,899,3400,76170,55750,4400,,,,,,,969,899
S2_3,60,12,7,2,849,1156,1086,3400,76170,55750,4400,,,,,,,1156,1086
S2_4,59,8,7,2,849,1343,1273,3400,81606,59089,4400,,,,,,,1343,1273
S2_5,58,8,7,2,849,1533,1463,3400,81606,59089,4400,,,,,,,1533,1463
S2_6,57,8,7,2,849,1717,1647,3400,81606,59089,4400,,,,,,,1717,1647
S2_7,56,8,7,2,849,1906,1836,3400,81606,59089,4400,,,,,,,1906,1836
S2_8,55,8,7,2,849,2094,2024,3400,81606,59089,4400,,,,,,,2094,2024
S2_9,54,8,7,2,849,2279,2209,3400,81606,59089,4400,,,,,,,2279,2209
S2_10,53,8,7,2,849,2470,2400,3400,81606,59089,4400,,,,,,,2470,2400
S2_11,52,8,7,2,849,2659,2589,3400,81606,59089,4400,,,,,,,2659,2589
S2_12,51,8,7,2,849,2846,2776,3400,81606,59089,4400,,,,,,,2846,2776
S2_13,50,8,7,2,849,2982,2912,3400,81606,59089,4400,,,,,,,2982,2912
S2_14,49,12,7,2,848,797,727,3400,76170,55750,4400,,,,,,,797,727
S2_15,48,12,7,2,848,984,914,3400,76170,55750,4400,,,,,,,984,914
S2_16,47,12,7,2,848,1167,1097,3400,76170,55750,4400,,,,,,,1167,1097
S2_17,46,8,7,2,848,1357,1287,3400,81606,59089,4400,,,,,,,1357,1287
S2_18,45,8,7,2,848,1543,1473,3400,81606,59089,4400,,,,,,,1543,1473
S2_19,44,8,7,2,848,1729,1659,3400,81606,59089,4400,,,,,,,1729,1659
S2_20,43,8,7,2,848,1918,1848,3400,81606,59089,4400,,,,,,,1918,1848
S2_21,42,8,7,2,848,2109,2039,3400,81606,59089,4400,,,,,,,2109,2039
S2_22,41,8,7,2,848,2293,2223,3400,81606,59089,4400,,,,,,,2293,2223
S2_23,40,8,7,2,848,2481,2411,3400,81606,59089,4400,,,,,,,2481,2411
S2_24,39,8,7,2,848,2669,2599,3400,81606,59089,4400,,,,,,,2669,2599
S2_25,38,8,7,2,848,2856,2786,3400,81606,59089,4400,,,,,,,2856,2786
S2_26,37,8,7,2,848,3048,2978,3400,81606,59089,4400,,,,,,,3048,2978
S2_27,36,28,13,2,849,3235,3165,3400,67385,26217,4600,,,,,,,3235,3165
S2_28,35,28,13,2,849,3724,3654,3400,67385,26217,4600,,,,,,,3724,3654
S2_29,34,28,13,2,850,4218,4148,3400,67385,26217,4600,,,,,,,4218,4148
S2_30,33,36,15,2,850,4715,4645,3400,63385,25000,4600,,,,,,,4715,4645
S2_31,32,48,15,2,850,5208,5138,3400,45637,2497,4600,,,,,,,5208,5138
S3_1,31,12,7,3,850,769,699,3400,76170,55750,4400,,,,,,,769,699
S3_2,30,12,7,3,850,955,885,3400,76170,55750,4400,,,,,,,955,885
S3_3,29,12,7,3,850,1143,1073,3400,76170,55750,4400,,,,,,,1143,1073
S3_4,28,8,7,3,850,1331,1261,3400,81606,59089,4400,,,,,,,1331,1261
S3_5,27,8,7,3,850,1523,1453,3400,81606,59089,4400,,,,,,,1523,1453
S3_6,26,8,7,3,850,1709,1639,3400,81606,59089,4400,,,,,,,1709,1639
S3_7,25,8,7,3,850,1897,1827,3400,81606,59089,4400,,,,,,,1897,1827
S3_8,24,8,7,3,850,2083,2013,3400,81606,59089,4400,,,,,,,2083,2013
S3_9,23,8,7,3,850,2272,2202,3400,81606,59089,4400,,,,,,,2272,2202
S3_10,22,8,7,3,850,2460,2390,3400,81606,59089,4400,,,,,,,2460,2390
S3_11,21,8,7,3,850,2646,2576,3400,81606,59089,4400,,,,,,,2646,2576
S3_12,20,8,7,3,850,2832,2762,3400,81606,59089,4400,,,,,,,2832,2762
S3_13,19,28,15,3,850,3022,2952,3400,65595,18662,4600,,,,,,,3022,2952
S3_14,18,12,7,3,848,778,708,3400,76170,55750,4400,,,,,,,778,708
S3_15,17,12,7,3,848,960,890,3400,76170,55750,4400,,,,,,,960,890
S3_16,16,12,7,3,848,1150,1080,3400,76170,55750,4400,,,,,,,1150,1080
S3_17,15,8,7,3,848,1332,1262,3400,81606,59089,4400,,,,,,,1332,1262
S3_18,14,8,7,3,848,1524,1454,3400,81606,59089,4400,,,,,,,1524,1454
S3_19,13,8,7,3,848,1709,1639,3400,81606,59089,4400,,,,,,,1709,1639
S3_20,12,8,7,3,848,1895,1825,3400,81606,59089,4400,,,,,,,1895,1825
S3_21,11,8,7,3,848,2091,2021,3400,81606,59089,4400,,,,,,,2091,2021
S3_22,10,8,7,3,848,2278,2208,3400,81606,59089,4400,,,,,,,2278,2208
S3_23,9,8,7,3,848,2463,2393,3400,81606,59089,4400,,,,,,,2463,2393
S3_24,8,8,7,3,848,2647,2577,3400,81606,59089,4400,,,,,,,2647,2577
S3_25,7,8,7,3,848,2839,2769,3400,81606,59089,4400,,,,,,,2839,2769
S3_26,6,8,7,3,848,3029,2959,3400,81606,59089,4400,,,,,,,3029,2959
S3_27,5,28,15,3,850,3213,3143,3400,65596,18662,4600,,,,,,,3213,3143
S3_28,4,28,15,3,850,3711,3641,3400,65597,18662,4600,,,,,,,3711,3641
S3_29,3,28,15,3,850,4201,4131,3400,65598,18662,4600,,,,,,,4201,4131
S3_30,2,36,15,3,850,4698,4628,3400,63385,25000,4600,,,,,,,4698,4628
S3_31,1,48,15,3,932,5192,5122,3400,45637,2497,4600,,,,,,,5192,5122
位置,优先级,高度,宽度,料架号,旋转轴P2,升降轴高点P3,升降轴低点P4,进出轴库位点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴取料点P2
S1_1,93,12,7,1,280,799,729,3400,71300,55300,4400
S1_2,92,12,7,1,280,984,914,3400,71300,55300,4400
S1_3,91,12,7,1,280,1174,1104,3400,71300,55300,4400
S1_4,90,12,7,1,280,1363,1293,3400,71300,55300,4400
S1_5,89,12,7,1,280,1549,1479,3400,71300,55300,4400
S1_6,88,12,7,1,280,1736,1666,3400,71300,55300,4400
S1_7,87,12,7,1,280,1927,1857,3400,71300,55300,4400
S1_8,86,12,7,1,280,2114,2044,3400,71300,55300,4400
S1_9,85,12,7,1,280,2299,2229,3400,71300,55300,4400
S1_10,84,12,7,1,280,2488,2418,3400,71300,55300,4400
S1_11,83,12,7,1,280,2677,2607,3400,71300,55300,4400
S1_12,82,12,7,1,280,2863,2793,3400,71300,55300,4400
S1_13,81,12,7,1,280,3052,2982,3400,71300,55300,4400
S1_14,80,12,7,1,873,789,719,3400,71300,55300,4400
S1_15,79,12,7,1,873,976,906,3400,71300,55300,4400
S1_16,78,12,7,1,873,1163,1093,3400,71300,55300,4400
S1_17,77,12,7,1,873,1349,1279,3400,71300,55300,4400
S1_18,76,12,7,1,873,1538,1468,3400,71300,55300,4400
S1_19,75,12,7,1,873,1725,1655,3400,71300,55300,4400
S1_20,74,12,7,1,873,1912,1842,3400,71300,55300,4400
S1_21,73,12,7,1,873,2098,2028,3400,71300,55300,4400
S1_22,72,12,7,1,873,2290,2220,3400,71300,55300,4400
S1_23,71,12,7,1,873,2475,2405,3400,71300,55300,4400
S1_24,70,12,7,1,873,2663,2593,3400,71300,55300,4400
S1_25,69,12,7,1,873,2852,2782,3400,71300,55300,4400
S1_26,68,12,7,1,873,3038,2968,3400,71300,55300,4400
S1_27,67,48,15,1,590,3328,3168,4200,40400,3000,4600
S1_28,66,48,15,1,590,3833,3673,4200,40400,3000,4600
S1_29,65,48,15,1,590,4326,4166,4200,40400,3000,4600
S1_30,64,48,15,1,590,4818,4658,4200,40400,3000,4600
S1_31,63,48,15,1,590,5314,5154,4200,40400,3000,4600
S2_1,62,12,7,2,8645,780,710,3400,71300,55300,4400
S2_2,61,12,7,2,8645,969,899,3400,71300,55300,4400
S2_3,60,12,7,2,8645,1156,1086,3400,71300,55300,4400
S2_4,59,12,7,2,8645,1343,1273,3400,71300,55300,4400
S2_5,58,12,7,2,8645,1533,1463,3400,71300,55300,4400
S2_6,57,12,7,2,8645,1717,1647,3400,71300,55300,4400
S2_7,56,12,7,2,8645,1906,1836,3400,71300,55300,4400
S2_8,55,12,7,2,8645,2094,2024,3400,71300,55300,4400
S2_9,54,12,7,2,8645,2279,2209,3400,71300,55300,4400
S2_10,53,12,7,2,8645,2470,2400,3400,71300,55300,4400
S2_11,52,12,7,2,8645,2659,2589,3400,71300,55300,4400
S2_12,51,12,7,2,8645,2846,2776,3400,71300,55300,4400
S2_13,50,12,7,2,8645,2982,2912,3400,71300,55300,4400
S2_14,49,12,7,2,9238,797,727,3400,71300,55300,4400
S2_15,48,12,7,2,9238,984,914,3400,71300,55300,4400
S2_16,47,12,7,2,9238,1167,1097,3400,71300,55300,4400
S2_17,46,12,7,2,9238,1357,1287,3400,71300,55300,4400
S2_18,45,12,7,2,9238,1543,1473,3400,71300,55300,4400
S2_19,44,12,7,2,9238,1729,1659,3400,71300,55300,4400
S2_20,43,12,7,2,9238,1918,1848,3400,71300,55300,4400
S2_21,42,12,7,2,9238,2109,2039,3400,71300,55300,4400
S2_22,41,12,7,2,9238,2293,2223,3400,71300,55300,4400
S2_23,40,12,7,2,9238,2481,2411,3400,71300,55300,4400
S2_24,39,12,7,2,9238,2669,2599,3400,71300,55300,4400
S2_25,38,12,7,2,9238,2856,2786,3400,71300,55300,4400
S2_26,37,12,7,2,9238,3048,2978,3400,71300,55300,4400
S2_27,36,48,15,2,8938,3345,3185,4200,40400,3000,4600
S2_28,35,48,15,2,8938,3834,3674,4200,40400,3000,4600
S2_29,34,48,15,2,8938,4328,4168,4200,40400,3000,4600
S2_30,33,48,15,2,8938,4825,4665,4200,40400,3000,4600
S2_31,32,48,15,2,8938,5318,5158,4200,40400,3000,4600
S3_1,31,12,7,3,6990,769,699,3400,71300,55300,4400
S3_2,30,12,7,3,6990,955,885,3400,71300,55300,4400
S3_3,29,12,7,3,6990,1143,1073,3400,71300,55300,4400
S3_4,28,12,7,3,6990,1331,1261,3400,71300,55300,4400
S3_5,27,12,7,3,6990,1523,1453,3400,71300,55300,4400
S3_6,26,12,7,3,6990,1709,1639,3400,71300,55300,4400
S3_7,25,12,7,3,6990,1897,1827,3400,71300,55300,4400
S3_8,24,12,7,3,6990,2083,2013,3400,71300,55300,4400
S3_9,23,12,7,3,6990,2272,2202,3400,71300,55300,4400
S3_10,22,12,7,3,6990,2460,2390,3400,71300,55300,4400
S3_11,21,12,7,3,6990,2646,2576,3400,71300,55300,4400
S3_12,20,12,7,3,6990,2832,2762,3400,71300,55300,4400
S3_13,19,12,7,3,6990,3022,2952,3400,71300,55300,4600
S3_14,18,12,7,3,7590,778,708,3400,71300,55300,4400
S3_15,17,12,7,3,7590,960,890,3400,71300,55300,4400
S3_16,16,12,7,3,7590,1150,1080,3400,71300,55300,4400
S3_17,15,12,7,3,7590,1332,1262,3400,71300,55300,4400
S3_18,14,12,7,3,7590,1524,1454,3400,71300,55300,4400
S3_19,13,12,7,3,7590,1709,1639,3400,71300,55300,4400
S3_20,12,12,7,3,7590,1895,1825,3400,71300,55300,4400
S3_21,11,12,7,3,7590,2091,2021,3400,71300,55300,4400
S3_22,10,12,7,3,7590,2278,2208,3400,71300,55300,4400
S3_23,9,12,7,3,7590,2463,2393,3400,71300,55300,4400
S3_24,8,12,7,3,7590,2647,2577,3400,71300,55300,4400
S3_25,7,12,7,3,7590,2839,2769,3400,71300,55300,4400
S3_26,6,12,7,3,7590,3029,2959,3400,71300,55300,4400
S3_27,5,48,15,3,7292,3323,3163,4200,40400,3000,4600
S3_28,4,48,15,3,7292,3821,3661,4200,40400,3000,4600
S3_29,3,48,15,3,7292,4311,4151,4200,40400,3000,4600
S3_30,2,48,15,3,7292,4808,4648,4200,40400,3000,4600
S3_31,1,48,15,3,7292,5302,5142,4200,40400,3000,4600
source/DeviceLibrary/bean/EquipBean.cs
......@@ -869,15 +869,15 @@ namespace OnlineStore.DeviceLibrary
}
private void StartMove()
{
LogInfo("开始执行料仓门口的料【" + LineConnect.DoorPosInfo.ToStr() + "】");
LogInfo("开始移栽【" + LineConnect.DoorPosInfo.ToStr() + "】");
bool result = StartOutMove(new InOutParam(LineConnect.DoorPosInfo));
if (!result)
{
LogInfo(" 执行料仓门口的料【" + LineConnect.DoorPosInfo.ToStr() + "】失败");
LogInfo(" 移栽【" + LineConnect.DoorPosInfo.ToStr() + "】失败");
}
else
{
LogInfo(" 执行料仓门口的料【" + LineConnect.DoorPosInfo.ToStr() + "】成功，清理料仓门口数据");
LogInfo(" 移栽【" + LineConnect.DoorPosInfo.ToStr() + "】成功，清理门口数据");
LineConnect.DoorPosInfo = null;
}
}
......@@ -976,14 +976,22 @@ namespace OnlineStore.DeviceLibrary
}
public string GetMoveStr()
{
string msg = "";
msg += "状态： " + storeRunStatus + "\t " + " " + storeStatus + "\n";
msg += "alarm： " + alarmType + "\n";
msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.MoveStep + "\n";
foreach(WorkStation shelf in StationMap.Values)
string msg = LineConnect.DoorPosInfo?.ToStr();
foreach (WorkStation shelf in StationMap.Values)
{
msg += shelf.Name + ": " + shelf.CurrShelf.ToStr()+"\r\n";
}
if (alarmType.Equals(StoreAlarmType.None))
{
msg += "状态： " + storeRunStatus + "\t " + " " + storeStatus + "\t " + "\n";
}
else
{
msg += "状态： " + storeRunStatus + "\t " + " " + storeStatus + "\t " + " " + "报警：" + alarmType + "\n";
}
//msg += "alarm： " + alarmType + "\n";
msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.MoveStep + "\n";
return msg;
}
......
source/DeviceLibrary/bean/EquipBean_Partial.cs
......@@ -56,7 +56,7 @@ namespace OnlineStore.DeviceLibrary
p.InOut_P1 = Config.InOutAxis_P1;
p.InOut_P2 = position.InOutAxis_P2;
p.InOut_P3 = position.InOutAxis_P3;
p.InOut_P3 = Config.InOutAxis_P4;
p.InOut_P4 = Config.InOutAxis_P4;
p.Middle_P1 = Config.MiddleAxis_P1;
p.Middle_P2 = position.MiddleAxis_P2;
......@@ -78,7 +78,6 @@ namespace OnlineStore.DeviceLibrary
{
param.PosInfo.PlateW = position.BagWidth;
}
return true;
}
else if ((param.PosInfo.PlateH <= 0) || (param.PosInfo.PlateW <= 0))
{
......@@ -96,7 +95,6 @@ namespace OnlineStore.DeviceLibrary
{
param.PosInfo.PlateW = position.BagWidth;
}
return true;
}
int v = Config.GetCompP2(param.PosInfo.PlateH);
if (v > 0 && (!param.MoveP.ComPress_P2.Equals(v)))
......@@ -275,15 +273,15 @@ namespace OnlineStore.DeviceLibrary
{
if (!LoadParamPosition(param))
{
LogUtil.error(Name + " 启动出料【" + posId + "】出错，找不到库位信息");
LogUtil.error(Name + " 启动出料【" + param.PosInfo.ToStr() + "】出错，找不到库位");
return false ;
}
if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
LogUtil.error(Name + " 启动出料【" + posId + "】出错，叉子料盘检测有料");
LogUtil.error(Name + " 启动出料【" + param.PosInfo.ToStr() + "】出错，叉子料盘检测有料");
return false ;
}
LogInfo( " 启动出料【" + posId + "】");
LogInfo( " 启动出料【" + param.PosInfo.ToStr() + "】");
storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.OutStoreExecute;
MoveInfo.NewMove(StoreMoveType.OutStore, param);
......@@ -350,7 +348,20 @@ namespace OnlineStore.DeviceLibrary
MoveLog(" 叉子进入出料口，进出轴至P2(进料口取料点) "+ movep.InOut_P2);
ACAxisMove(Config.InOut_Axis, movep.InOut_P2, Config.InOutAxis_P2_Speed);
}
private void MoveToPosition(LineMoveP moveP)
{
if (MoveInfo.MoveParam.PosInfo.IsNg)
{
MoveInfo.NextMoveStep(MoveStep.SO_31_MoveToNG);
MoveLog("移动到NG箱，旋转轴至P3[" + moveP.Middle_P3 + "], 升降轴至P5[" + moveP.UpDown_P5 + "] ");
ACAxisMove(Config.Middle_Axis, moveP.Middle_P3, Config.MiddleAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P5, Config.UpDownAxis_P5_Speed);
}
else
{
SO_21_MoveToBag();
}
}
private void SO_21_MoveToBag()
{
LineMoveP moveP = MoveInfo.MoveParam.MoveP;
......@@ -443,22 +454,12 @@ namespace OnlineStore.DeviceLibrary
}
else
{
SO_21_MoveToBag();
MoveToPosition(moveP);
}
}
else if (MoveInfo.IsStep(MoveStep.SO_17_TrayCheck))
{
if (MoveInfo.MoveParam.PosInfo.IsNg)
{
MoveInfo.NextMoveStep(MoveStep.SO_31_MoveToNG);
MoveLog("移动到NG箱，旋转轴至P3[" + moveP.Middle_P3 + "], 升降轴至P5[" + moveP.UpDown_P5 + "] ");
ACAxisMove(Config.Middle_Axis, moveP.Middle_P3, Config.MiddleAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P5, Config.UpDownAxis_P5_Speed);
}
else
{
SO_21_MoveToBag();
}
{
MoveToPosition(moveP);
}
#region ->料架
else if (MoveInfo.IsStep(MoveStep.SO_21_MoveToBag))
......
source/DeviceLibrary/lineConnect/LineConnect.cs
......@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary
if (cmd.Equals(cmd_startIn))
{
LogUtil.info("[" + CID + "]收到流水线消息：" + message);
InOutPosInfo inout = new InOutPosInfo(reviceInfo.WareCode, "", reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.IsNg, reviceInfo.PosId, reviceInfo.rfid);
InOutPosInfo inout = new InOutPosInfo(reviceInfo.WareCode, "", reviceInfo.PlateW, reviceInfo.PlateH, reviceInfo.IsNg, reviceInfo.PosId, reviceInfo.rfid);
string logName = "收到流水线命令【 " + inout.ToStr() + "】：";
if (DoorPosInfo != null)
......
source/DeviceLibrary/model/EquipBase.cs
......@@ -274,9 +274,7 @@ namespace OnlineStore.DeviceLibrary
public abstract bool StartOutMove(InOutParam param);
protected abstract void OutProcess();
#endregion
public string GetRunStr()
{
string sta = "运行中";
......@@ -366,9 +364,7 @@ namespace OnlineStore.DeviceLibrary
return sta + " " + MoveInfo.MoveType + "_" + MoveInfo.MoveStep;
}
}
public void IOMove(string IoType, IO_VALUE value)
{
IOManager.IOMove(IoType, value, baseConfig.DeviceID);
......
source/DeviceLibrary/model/InOutParam.cs
......@@ -118,11 +118,11 @@ namespace OnlineStore.DeviceLibrary
{
if (IsNg)
{
return $" 仓门口NG料 [{ barcode }] [{ ShelfPosId }] [{PlateW }x{ PlateH }],boxPos[{ BoxPosId }],rfid [{ rfid}]";
return $" 门口NG料 [{ barcode }] [{ ShelfPosId }] [{PlateW }x{ PlateH }],boxPos[{ BoxPosId }],rfid [{ rfid}]";
}
else
{
return $" 仓门口物料 [{ barcode }] [{ ShelfPosId }] [{PlateW }x{ PlateH }],boxPos[{ BoxPosId }],rfid [{ rfid}]";
return $" 门口物料 [{ barcode }] [{ ShelfPosId }] [{PlateW }x{ PlateH }],boxPos[{ BoxPosId }],rfid [{ rfid}]";
}
}
}
......
source/DeviceLibrary/model/StoreMoveInfo.cs
......@@ -234,7 +234,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (WaitType == 2)
{
return $"IO信号等待，IO类型【{ IoType }】,等待值【{ IoValue }】";
return $"IO信号【{ IoType }】=【{ IoValue }】";
}
else if (WaitType == 3)
{
......
source/HCSingleStore/FrmEquip.Designer.cs
......@@ -28,10 +28,16 @@
this.panel2 = new System.Windows.Forms.Panel();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.lblHeartMsg = new System.Windows.Forms.Label();
this.lblMoveEquipInfo = new System.Windows.Forms.Label();
this.btnS3Reset = new System.Windows.Forms.Button();
this.btnS2Reset = new System.Windows.Forms.Button();
this.btnS1Reset = new System.Windows.Forms.Button();
this.btnClearDoor = new System.Windows.Forms.Button();
this.logBox = new System.Windows.Forms.RichTextBox();
this.lblMoveStr = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.btnMoni = new System.Windows.Forms.Button();
this.txtMoni = new System.Windows.Forms.TextBox();
this.button6 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
......@@ -112,6 +118,7 @@
this.打开设备照明ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
this.关闭设备照明ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
......@@ -126,14 +133,6 @@
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.工位1复位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.s2复位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.s3复位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.txtMoni = new System.Windows.Forms.TextBox();
this.btnMoni = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupBox2.SuspendLayout();
......@@ -165,15 +164,19 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Location = new System.Drawing.Point(5, 47);
this.tabControl1.Location = new System.Drawing.Point(4, 47);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(992, 627);
this.tabControl1.Size = new System.Drawing.Size(996, 627);
this.tabControl1.TabIndex = 272;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.lblHeartMsg);
this.tabPage2.Controls.Add(this.lblMoveEquipInfo);
this.tabPage2.Controls.Add(this.btnS3Reset);
this.tabPage2.Controls.Add(this.btnS2Reset);
this.tabPage2.Controls.Add(this.btnS1Reset);
this.tabPage2.Controls.Add(this.btnClearDoor);
this.tabPage2.Controls.Add(this.logBox);
this.tabPage2.Controls.Add(this.lblMoveStr);
this.tabPage2.Controls.Add(this.groupBox2);
......@@ -182,23 +185,74 @@
this.tabPage2.Controls.Add(this.lblWarnMsg);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(984, 594);
this.tabPage2.Size = new System.Drawing.Size(988, 594);
this.tabPage2.TabIndex = 3;
this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true;
//
// lblHeartMsg
//
this.lblHeartMsg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblHeartMsg.AutoSize = true;
this.lblHeartMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblHeartMsg.ForeColor = System.Drawing.Color.Black;
this.lblHeartMsg.Location = new System.Drawing.Point(3, 572);
this.lblHeartMsg.Name = "lblHeartMsg";
this.lblHeartMsg.Size = new System.Drawing.Size(56, 17);
this.lblHeartMsg.TabIndex = 279;
this.lblHeartMsg.Text = "等待启动";
this.lblHeartMsg.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// lblMoveEquipInfo
//
this.lblMoveEquipInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblMoveEquipInfo.AutoSize = true;
this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green;
this.lblMoveEquipInfo.Location = new System.Drawing.Point(714, 11);
this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
this.lblMoveEquipInfo.Size = new System.Drawing.Size(107, 17);
this.lblMoveEquipInfo.TabIndex = 283;
this.lblMoveEquipInfo.Text = "移栽状态:不可出库";
//
// btnS3Reset
//
this.btnS3Reset.BackColor = System.Drawing.Color.White;
this.btnS3Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS3Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS3Reset.Location = new System.Drawing.Point(423, 150);
this.btnS3Reset.Name = "btnS3Reset";
this.btnS3Reset.Size = new System.Drawing.Size(132, 39);
this.btnS3Reset.TabIndex = 282;
this.btnS3Reset.Text = "工位S3复位";
this.btnS3Reset.UseVisualStyleBackColor = false;
this.btnS3Reset.Click += new System.EventHandler(this.btnS3Reset_Click);
//
// btnS2Reset
//
this.btnS2Reset.BackColor = System.Drawing.Color.White;
this.btnS2Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS2Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS2Reset.Location = new System.Drawing.Point(285, 150);
this.btnS2Reset.Name = "btnS2Reset";
this.btnS2Reset.Size = new System.Drawing.Size(132, 39);
this.btnS2Reset.TabIndex = 281;
this.btnS2Reset.Text = "工位S2复位";
this.btnS2Reset.UseVisualStyleBackColor = false;
this.btnS2Reset.Click += new System.EventHandler(this.btnS2Reset_Click);
//
// btnS1Reset
//
this.btnS1Reset.BackColor = System.Drawing.Color.White;
this.btnS1Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS1Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS1Reset.Location = new System.Drawing.Point(147, 150);
this.btnS1Reset.Name = "btnS1Reset";
this.btnS1Reset.Size = new System.Drawing.Size(132, 39);
this.btnS1Reset.TabIndex = 280;
this.btnS1Reset.Text = "工位S1复位";
this.btnS1Reset.UseVisualStyleBackColor = false;
this.btnS1Reset.Click += new System.EventHandler(this.btnS1Reset_Click);
//
// btnClearDoor
//
this.btnClearDoor.BackColor = System.Drawing.Color.White;
this.btnClearDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearDoor.Location = new System.Drawing.Point(9, 150);
this.btnClearDoor.Name = "btnClearDoor";
this.btnClearDoor.Size = new System.Drawing.Size(132, 39);
this.btnClearDoor.TabIndex = 279;
this.btnClearDoor.Text = "清理门口物料";
this.btnClearDoor.UseVisualStyleBackColor = false;
this.btnClearDoor.Click += new System.EventHandler(this.btnClearDoor_Click);
//
// logBox
//
......@@ -206,9 +260,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(4, 127);
this.logBox.Location = new System.Drawing.Point(4, 195);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(970, 311);
this.logBox.Size = new System.Drawing.Size(978, 386);
this.logBox.TabIndex = 278;
this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
......@@ -218,7 +272,7 @@
this.lblMoveStr.AutoSize = true;
this.lblMoveStr.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveStr.ForeColor = System.Drawing.Color.Black;
this.lblMoveStr.Location = new System.Drawing.Point(690, 9);
this.lblMoveStr.Location = new System.Drawing.Point(8, 37);
this.lblMoveStr.Name = "lblMoveStr";
this.lblMoveStr.Size = new System.Drawing.Size(56, 17);
this.lblMoveStr.TabIndex = 277;
......@@ -234,12 +288,36 @@
this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(6, 481);
this.groupBox2.Location = new System.Drawing.Point(6, 454);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(968, 78);
this.groupBox2.Size = new System.Drawing.Size(972, 78);
this.groupBox2.TabIndex = 276;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "流水线通信测试";
this.groupBox2.Visible = false;
//
// btnMoni
//
this.btnMoni.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoni.Location = new System.Drawing.Point(23, 25);
this.btnMoni.Name = "btnMoni";
this.btnMoni.Size = new System.Drawing.Size(100, 33);
this.btnMoni.TabIndex = 277;
this.btnMoni.Text = "模拟";
this.btnMoni.UseVisualStyleBackColor = true;
this.btnMoni.Click += new System.EventHandler(this.btnMoni_Click);
//
// txtMoni
//
this.txtMoni.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtMoni.Location = new System.Drawing.Point(129, 32);
this.txtMoni.Name = "txtMoni";
this.txtMoni.Size = new System.Drawing.Size(829, 26);
this.txtMoni.TabIndex = 276;
this.txtMoni.Text = "\"Cmd\":\"starIn\",\"CanOutStore\":0,\"PosId\":\"\",\"PlateH\":12,\"PlateW\":13,\"WareCode\":\"=13" +
"x12=13172G620;GS1MWG_R2_00001;GS1M;;1124;7500##=13x12=998168*35030238*1124*7500*" +
"000035714##\",\"rfid\":\"B102\",\"IsNg\":true";
//
// button6
//
......@@ -282,7 +360,7 @@
this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(26, 13);
this.lblThisSta.Location = new System.Drawing.Point(8, 11);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(56, 17);
this.lblThisSta.TabIndex = 216;
......@@ -291,11 +369,12 @@
//
// chbDebug
//
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(584, 8);
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(899, 7);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(93, 25);
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271;
this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true;
......@@ -303,11 +382,13 @@
//
// lblWarnMsg
//
this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(9, 44);
this.lblWarnMsg.Location = new System.Drawing.Point(356, 46);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(766, 77);
this.lblWarnMsg.Size = new System.Drawing.Size(625, 59);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
......@@ -319,9 +400,9 @@
this.tabPage3.Controls.Add(this.btnUpdown);
this.tabPage3.Controls.Add(this.btnAxisOn);
this.tabPage3.Controls.Add(this.btnAxisOff);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(984, 594);
this.tabPage3.Size = new System.Drawing.Size(988, 597);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 库位调试 ";
this.tabPage3.UseVisualStyleBackColor = true;
......@@ -1124,54 +1205,54 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6);
//
// 启动AToolStripMenuItem
//
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有设备AToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(114, 6);
//
// 复位RToolStripMenuItem
//
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(114, 6);
//
// 停止TToolStripMenuItem
//
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有设备TToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(114, 6);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator2.Visible = false;
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
//
......@@ -1228,12 +1309,7 @@
this.打开设备照明ToolStripMenuItem,
this.toolStripSeparator14,
this.关闭设备照明ToolStripMenuItem,
this.toolStripSeparator15,
this.工位1复位ToolStripMenuItem,
this.toolStripSeparator16,
this.s2复位ToolStripMenuItem,
this.toolStripSeparator17,
this.s3复位ToolStripMenuItem});
this.toolStripSeparator15});
this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem";
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(91, 25);
this.设置TToolStripMenuItem.Text = "设备调试 ";
......@@ -1241,19 +1317,19 @@
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem2.Size = new System.Drawing.Size(176, 26);
this.toolStripMenuItem2.Text = "启用调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(173, 6);
//
// 板卡调试ToolStripMenuItem
//
this.板卡调试ToolStripMenuItem.Name = "板卡调试ToolStripMenuItem";
this.板卡调试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.板卡调试ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.板卡调试ToolStripMenuItem.Text = "板卡调试";
this.板卡调试ToolStripMenuItem.Visible = false;
this.板卡调试ToolStripMenuItem.Click += new System.EventHandler(this.板卡调试ToolStripMenuItem_Click);
......@@ -1261,28 +1337,33 @@
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator7.Visible = false;
//
// 打开设备照明ToolStripMenuItem
//
this.打开设备照明ToolStripMenuItem.Name = "打开设备照明ToolStripMenuItem";
this.打开设备照明ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.打开设备照明ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.打开设备照明ToolStripMenuItem.Text = "打开设备照明";
this.打开设备照明ToolStripMenuItem.Click += new System.EventHandler(this.打开设备照明ToolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator14.Size = new System.Drawing.Size(173, 6);
//
// 关闭设备照明ToolStripMenuItem
//
this.关闭设备照明ToolStripMenuItem.Name = "关闭设备照明ToolStripMenuItem";
this.关闭设备照明ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.关闭设备照明ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.关闭设备照明ToolStripMenuItem.Text = "关闭设备照明";
this.关闭设备照明ToolStripMenuItem.Click += new System.EventHandler(this.关闭设备照明ToolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(173, 6);
//
// 帮助ToolStripMenuItem
//
this.帮助ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
......@@ -1380,65 +1461,6 @@
//
this.timer2.Interval = 1000;
//
// 工位1复位ToolStripMenuItem
//
this.工位1复位ToolStripMenuItem.Name = "工位1复位ToolStripMenuItem";
this.工位1复位ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.工位1复位ToolStripMenuItem.Text = "S1复位";
this.工位1复位ToolStripMenuItem.Click += new System.EventHandler(this.工位1复位ToolStripMenuItem_Click);
//
// s2复位ToolStripMenuItem
//
this.s2复位ToolStripMenuItem.Name = "s2复位ToolStripMenuItem";
this.s2复位ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.s2复位ToolStripMenuItem.Text = "S2复位";
this.s2复位ToolStripMenuItem.Click += new System.EventHandler(this.s2复位ToolStripMenuItem_Click);
//
// s3复位ToolStripMenuItem
//
this.s3复位ToolStripMenuItem.Name = "s3复位ToolStripMenuItem";
this.s3复位ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.s3复位ToolStripMenuItem.Text = "S3复位";
this.s3复位ToolStripMenuItem.Click += new System.EventHandler(this.s3复位ToolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(177, 6);
//
// toolStripSeparator16
//
this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(177, 6);
//
// toolStripSeparator17
//
this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(177, 6);
//
// txtMoni
//
this.txtMoni.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtMoni.Location = new System.Drawing.Point(129, 32);
this.txtMoni.Name = "txtMoni";
this.txtMoni.Size = new System.Drawing.Size(825, 26);
this.txtMoni.TabIndex = 276;
this.txtMoni.Text = "\"Cmd\":\"starIn\",\"CanOutStore\":0,\"PosId\":\"\",\"PlateH\":12,\"PlateW\":13,\"WareCode\":\"=13" +
"x12=13172G620;GS1MWG_R2_00001;GS1M;;1124;7500##=13x12=998168*35030238*1124*7500*" +
"000035714##\",\"rfid\":\"B102\",\"IsNg\":true";
//
// btnMoni
//
this.btnMoni.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoni.Location = new System.Drawing.Point(23, 25);
this.btnMoni.Name = "btnMoni";
this.btnMoni.Size = new System.Drawing.Size(100, 33);
this.btnMoni.TabIndex = 277;
this.btnMoni.Text = "模拟";
this.btnMoni.UseVisualStyleBackColor = true;
this.btnMoni.Click += new System.EventHandler(this.btnMoni_Click);
//
// FrmEquip
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
......@@ -1575,15 +1597,14 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
private System.Windows.Forms.Timer timer2;
private System.Windows.Forms.Label lblHeartMsg;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator15;
private System.Windows.Forms.ToolStripMenuItem 工位1复位ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator16;
private System.Windows.Forms.ToolStripMenuItem s2复位ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator17;
private System.Windows.Forms.ToolStripMenuItem s3复位ToolStripMenuItem;
private System.Windows.Forms.TextBox txtMoni;
private System.Windows.Forms.Button btnMoni;
private System.Windows.Forms.Button btnS3Reset;
private System.Windows.Forms.Button btnS2Reset;
private System.Windows.Forms.Button btnS1Reset;
private System.Windows.Forms.Button btnClearDoor;
private System.Windows.Forms.Label lblMoveEquipInfo;
}
}
source/HCSingleStore/FrmEquip.cs
......@@ -168,10 +168,7 @@ namespace OnlineStore.ACSingleStore
chbDebug.Checked = equip.IsDebug;
LoadOk = true;
}
//lblHeartMsg.Text = LineConnect.HeartMsg;
lblHeartMsg.Text = LineConnect.DoorPosInfo?.ToStr();
lblMoveEquipInfo.Text = "移栽状态：" + (equip.lineConn.CanStartOut() ? "可出库" : "不可出库") + " " + equip.lineConn.LastUpdateTime.ToLongTimeString() + "";
lblThisSta.Text = equip.GetRunStr();
lblMoveStr.Text = equip.GetMoveStr();
//ReadPosistion();
......@@ -1127,8 +1124,26 @@ namespace OnlineStore.ACSingleStore
{
equip.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
}
private void btnMoni_Click(object sender, EventArgs e)
{
string text = txtMoni.Text.Trim();
LogUtil.info("点击模拟按钮：" + text);
equip.lineConn.HandlerMsg(text);
}
private void 工位1复位ToolStripMenuItem_Click(object sender, EventArgs e)
private void btnClearDoor_Click(object sender, EventArgs e)
{
DialogResult resul = MessageBox.Show("确定清除：" + LineConnect.DoorPosInfo?.ToStr() + "", "提示", MessageBoxButtons.OKCancel);
if (resul.Equals(DialogResult.OK))
{
LogUtil.info(equip.Name + "点击：清理门口料盘：" + LineConnect.DoorPosInfo?.ToStr());
LineConnect.DoorPosInfo = null;
}
}
private void btnS1Reset_Click(object sender, EventArgs e)
{
LogUtil.info(equip.Name + "点击：S1复位");
if (equip.storeRunStatus.Equals(StoreRunStatus.Wait))
......@@ -1139,7 +1154,7 @@ namespace OnlineStore.ACSingleStore
equip.StationMap[1].Reset();
}
private void s2复位ToolStripMenuItem_Click(object sender, EventArgs e)
private void btnS2Reset_Click(object sender, EventArgs e)
{
LogUtil.info(equip.Name + "点击：S2复位");
if (equip.storeRunStatus.Equals(StoreRunStatus.Wait))
......@@ -1150,7 +1165,7 @@ namespace OnlineStore.ACSingleStore
equip.StationMap[2].Reset();
}
private void s3复位ToolStripMenuItem_Click(object sender, EventArgs e)
private void btnS3Reset_Click(object sender, EventArgs e)
{
LogUtil.info(equip.Name + "点击：S3复位");
if (equip.storeRunStatus.Equals(StoreRunStatus.Wait))
......@@ -1160,12 +1175,5 @@ namespace OnlineStore.ACSingleStore
}
equip.StationMap[3].Reset();
}
private void btnMoni_Click(object sender, EventArgs e)
{
string text = txtMoni.Text.Trim();
LogUtil.info("点击模拟按钮：" + text);
equip.lineConn.HandlerMsg(text);
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!