接驳台皮带线改为常转

source/AssemblyLineClient/FrmFeedingEquip.cs

@@ -313,7 +313,6 @@ namespace OnlineStore.AssemblyLine
 
 
         private void btnStart_Click(object sender, EventArgs e)
         private void btnStart_Click(object sender, EventArgs e)
         {
         {
-
             StartDebug();
             StartDebug();
         }
         }
         private void btnStop_Click(object sender, EventArgs e)
         private void btnStop_Click(object sender, EventArgs e)

source/AssemblyLineClient/记录.txt

@@ -208,6 +208,14 @@ Config_ProvidingEquip_4.csv
 
 
 PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,,,,
 PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,,,,
 
 
+2.接驳台皮带线改为常转
+3.扫码处增加日志打印
+4.入料三托盘检测放行时间调整。
+5.cid顺序修改
+
+
+
+
 
 
 
 
 
 

source/DeviceLibrary/assemblyLine/DischargeLine.cs

@@ -144,8 +144,9 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 switch (MoveInfo.MoveStep)
                 switch (MoveInfo.MoveStep)
                 {
                 {
-                    case LineMoveStep.DL_R_CylinderDown:  
-                        LogInfo(MoveInfo.MoveType + "完成！");
+                    case LineMoveStep.DL_R_CylinderDown:
+                        IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
+                        LogInfo(MoveInfo.MoveType + "完成，接驳台皮带线常转 ");
                         MoveEndS();
                         MoveEndS();
                         SecondMoveInfo.EndMove();
                         SecondMoveInfo.EndMove();
                         break;
                         break;
@@ -265,24 +266,22 @@ namespace OnlineStore.DeviceLibrary
                     StartOutStoreMove(new InOutParam());
                     StartOutStoreMove(new InOutParam());
                 }
                 }
             }
             }
-            if ((runStatus.Equals(LineRunStatus.Runing) || runStatus.Equals(LineRunStatus.Busy)) )
+            if ((runStatus.Equals(LineRunStatus.Runing) || runStatus.Equals(LineRunStatus.Busy)))
             {
             {
                 TrayLine1.TimerPro();
                 TrayLine1.TimerPro();
                 if (NgISBack())
                 if (NgISBack())
                 {
                 {
                     TrayLine2.TimerPro();
                     TrayLine2.TimerPro();
                 }
                 }
-                
+
                 Line3TimerPro();
                 Line3TimerPro();
 
 
                 //小皮带线常转
                 //小皮带线常转
-                if (runStatus >= LineRunStatus.HomeMoving)
+
+                if (IOValue(IO_Type.SeparateDevice_Run).Equals(IO_VALUE.LOW) && NoErrorAlarm())
                 {
                 {
-                    if (IOValue(IO_Type.SeparateDevice_Run).Equals(IO_VALUE.LOW))
-                    {
-                        IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
-                    }
-                }
+                    IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
+                } 
             }
             }
             IOTimeOutProcess();
             IOTimeOutProcess();
 
 

source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs

@@ -199,8 +199,8 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_07_CRun))
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_07_CRun))
             {
             {
                 MoveEndS();
                 MoveEndS();
-                IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.LOW);
-                LogInfo(hengyiName + "出口有料，送料结束，停止皮带线");
+            //    IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.LOW);
+                LogInfo(hengyiName + "出口有料，送料结束 ");
             }
             }
         }
         }
         #endregion 
         #endregion 

source/DeviceLibrary/assemblymanager/SServerManager.cs

@@ -47,7 +47,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         //##
         //##
         private static string spiltStr = "##";
         private static string spiltStr = "##";
-        public static string CodeReceived(string deviceName, int trayNum, List<string> codeList, int height, int width,string rfid,int feedEquipId=1)
+        public static string CodeReceived(string deviceName, int trayNum, List<string> codeList, int height, int width,string rfid,int feedEquipId)
         {
         {
             string msg = "";
             string msg = "";
             try
             try

source/DeviceLibrary/model/KTK_Store.cs

@@ -173,7 +173,10 @@ namespace OnlineStore.DeviceLibrary
             alarmInfo = new AlarmInfo(DeviceID, aType, alarmDetial, alarmMsg, inoutStatus);
             alarmInfo = new AlarmInfo(DeviceID, aType, alarmDetial, alarmMsg, inoutStatus);
         }
         }
 
 
-        
+        /// <summary>
+        /// 没有严重的报警
+        /// </summary>
+        /// <returns></returns>
         protected bool  NoErrorAlarm()
         protected bool  NoErrorAlarm()
         {
         {
             if (isInSuddenDown || isNoAirCheck)
             if (isInSuddenDown || isNoAirCheck)

source/DeviceLibrary/server/LineServer.cs

@@ -144,7 +144,7 @@ namespace OnlineStore.DeviceLibrary
             int num = equipId % 100;
             int num = equipId % 100;
             string result = "";
             string result = "";
             List<int> IdList = new List<int>();
             List<int> IdList = new List<int>();
-            if (equipId.Equals(2))
+            if (num.Equals(2))
             {
             {
                 for (int i = 7; i <= 18; i++)
                 for (int i = 7; i <= 18; i++)
                 {
                 {
@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary
                     IdList.Add(i);
                     IdList.Add(i);
                 }
                 }
             }
             }
-            else if (equipId.Equals(3))
+            else if (num.Equals(3))
             {
             {
                 for (int i = 11; i <= 18; i++)
                 for (int i = 11; i <= 18; i++)
                 {
                 {