Skip to content

刘韬 / SO20031_TinStorage

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f92b36c3 由 刘韬
选项

1

1 个父辈 07796b6e
内嵌 并排
正在显示 8 个修改的文件 包含 59 行增加 和 88 行删除
Common/Common.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>MyCommon</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
Common/Setting_Init.cs
......@@ -82,6 +82,7 @@ namespace OnlineStore.Common
public static MyConfig<Runtime_StepE> Runtime_Step = Runtime_StepE.None;
public static MyConfig<string> Runtime_FromPosid = "";
public static MyConfig<string> Runtime_Posid = "";
public static MyConfig<string> Runtime_RFID = "";
public static MyConfig<string> Runtime_PN = "";
......
DeviceLibrary/theMachine/BoxTransport.cs
......@@ -290,8 +290,9 @@ namespace DeviceLibrary
case MoveStep.StoreTS28:
MoveInfo.NextMoveStep(MoveStep.StoreTS29);
//RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(To.posid, WareCode, storeMoveType, FixtureState.ToOut));
if (To.posid != MainMachine.LabelP)
if (To.posid != MainMachine.LabelP && !To.posid.StartsWith("S"))
{
MoveInfo.log($"{storeMoveType}:XY返回待机点");
Y_Axis.AbsMove(MoveInfo, Config.Y_Axis_P1, Config.Y_Axis_P1_speed);
X_Axis.AbsMove(MoveInfo, Config.X_Axis_P1, Config.X_Axis_P1_speed);
}
......
DeviceLibrary/theMachine/CameraPointTest.cs
......@@ -22,6 +22,7 @@ namespace DeviceLibrary
public class tstoredata {
public string name="";
public List<int> value = new List<int>();
public List<string> ngMsg = new List<string>();
}
public class CameraPointTest
{
......@@ -37,14 +38,16 @@ namespace DeviceLibrary
inArea[i].name = "L" + ((char)(0x41 + i)).ToString();
for (int j = 0; j < 4; j++)
{
inArea[i].value.Add(-1);
inArea[i].value.Add(0);
inArea[i].ngMsg.Add("");
}
}
for (int i = 0; i < 5; i++)
{
outArea.Add(new tstoredata());
outArea[i].name = "U" + ((char)(0x41 + i)).ToString();
outArea[i].value.Add(-1);
outArea[i].value.Add(0);
outArea[i].ngMsg.Add("");
}
}
public static event EventHandler<Bitmap> TestStorePointEvent;
......@@ -63,11 +66,21 @@ namespace DeviceLibrary
case TestStorePointPort.入口:
startindex = RobotManage.AllPositionMapNumList.IndexOf("LA1");
haslistindex = TestStorePoint(RobotManage.CameraA.GetImage(0), TestStorePointPort.入口);
Dictionary<int, string> ngmsglist = new Dictionary<int, string>();
RobotManage.mainMachine.NGInfoList.ForEach(ng=> {
var sindex = RobotManage.AllPositionMapNumList.IndexOf(ng.PosID)-startindex;
ngmsglist.Add(sindex, ng.NgMsg);
});
int index = 0;
for (int i = 0; i < 5; i++) {
for (int j = 0; j < 4; j++)
{
inArea[i].value[j]=haslistindex[index];
if (ngmsglist.ContainsKey(index))
{
inArea[i].ngMsg[j] = ngmsglist[index];
inArea[i].value[j] = -1;
}
index++;
}
}
......
DeviceLibrary/theMachine/MainMachine.cs
......@@ -127,6 +127,7 @@ namespace DeviceLibrary
IOMonitor.RegisterIO(IO_Type.LeftDoor_Check, Config, IO_VALUE.LOW, LeftDoor_Close, 1500,100);
IOMonitor.RegisterIO(IO_Type.PrinterDoor_Check, Config, IO_VALUE.HIGH, PrinterDoor_Close, 1500,100);
LedProcessInit();
IOMove(IO_Type.Fan,IO_VALUE.HIGH);
}
private void Entry_Drawer_Open()
......
DeviceLibrary/theMachine/MainMachine_StoreDemo.cs
......@@ -28,26 +28,8 @@ namespace DeviceLibrary
}
public bool IsInStoreReady { get => true; }
public void DemoIn()
{
if (StoreMoveInfo.MoveStep == MoveStep.Wait)
{
StoreMoveInfo.NextMoveStep(MoveStep.StoreIn01);
IOMove(IO_Type.Entry_Drawer_Lock, IO_VALUE.HIGH);
StoreMoveInfo.log($"开始入库任务");
}
}
List<string> nglist = new List<string>();
bool demomode = true;
public void DemoOut()
{
if (StoreMoveInfo.MoveStep == MoveStep.Wait)
{
StoreMoveInfo.NextMoveStep(MoveStep.StoreOut10);
IOMove(IO_Type.Out_Drawer_Lock, IO_VALUE.HIGH);
StoreMoveInfo.log($"开始出任务");
}
}
void StoreDemoProcess()
{
if (CheckWait(StoreMoveInfo))
......@@ -57,15 +39,20 @@ namespace DeviceLibrary
{
case MoveStep.Wait:
StoreMoveInfo.MoveParam.ReelOnFixture = false;
if (demomode && false)
return;
if (IOValue(IO_Type.Taking_Clamp).Equals(IO_VALUE.LOW)) {
if (Setting_Init.Runtime_Step == Runtime_StepE.LabelProcess)
{
StoreMoveInfo.log("检测到上次正在贴标:" + Setting_Init.Runtime_Step + "," + Setting_Init.Runtime_Posid);
LabelingMoveInfo.NewMove(MoveStep.Labeling01);
StoreMoveInfo.NextMoveStep(MoveStep.StoreIn03);
StoreMoveInfo.log("检测到上次正在贴标:" + Setting_Init.Runtime_Step + "," + Setting_Init.Runtime_Posid + "," + Setting_Init.Runtime_FromPosid);
if (!string.IsNullOrEmpty(Setting_Init.Runtime_FromPosid))
{
LabelingMoveInfo.NewMove(MoveStep.Labeling01);
StoreMoveInfo.NextMoveStep(MoveStep.StoreIn03);
}
else
{
Msg.add(crc.GetString("Res0133", "重置前物料正在贴标,无法继续,请手动处理"), MsgLevel.warning, ErrInfo.LabelInPaste);
RobotManage.UserPause(crc.GetString("Res0133", "重置前物料正在贴标,无法继续,请手动处理"));
}
return;
}
......@@ -81,7 +68,7 @@ namespace DeviceLibrary
}
else if (Setting_Init.Runtime_Step >= Runtime_StepE.Printed && Setting_Init.Runtime_Step < Runtime_StepE.LabelPasteFinish)
{
StoreMoveInfo.log("检测到上次正在贴标:" + Setting_Init.Runtime_Step + "," + Setting_Init.Runtime_Posid);
StoreMoveInfo.log("检测到上次正在贴标:" + Setting_Init.Runtime_Step + "," + Setting_Init.Runtime_Posid+","+ Setting_Init.Runtime_FromPosid);
Msg.add(crc.GetString("Res0133","重置前物料正在贴标,无法继续,请手动处理"), MsgLevel.warning, ErrInfo.LabelInPaste);
RobotManage.UserPause(crc.GetString("Res0133","重置前物料正在贴标,无法继续,请手动处理"));
return;
......@@ -132,22 +119,6 @@ namespace DeviceLibrary
StoreMoveInfo.MoveParam.ReelOnFixture = true;
StoreMoveInfo.MoveParam.PosID = Setting_Init.Runtime_Posid;
StoreMoveInfo.MoveParam.WareCode= Setting_Init.Runtime_WareCode;
//{
// var olist = CameraPointTest.GetThingStoreName(TestStorePointPort.出口);
// StoreMoveInfo.log($"检测到出库口有料库位:{string.Join(",", olist)}");
// olist = RobotManage.AllPositionMapNumList.ToList().Where(p => { return p.StartsWith("U") && !olist.Contains(p); }).ToList();
// if (olist.Count == 0)
// {
// StoreMoveInfo.NextMoveStep(MoveStep.Wait);
// StoreMoveInfo.log($"没有检测到出库未有空位");
// return;
// }
// else
// {
// StoreMoveInfo.MoveParam.OutPosID = olist[0];
// StoreMoveInfo.log($"检测到出库位有料:{StoreMoveInfo.MoveParam.OutPosID}, 其他有料出库位:{string.Join(",", olist)}");
// }
//}
}
......@@ -176,6 +147,7 @@ namespace DeviceLibrary
var from = CSVPositionReader<ACStorePosition>.GetPositon(inposid);
var to = CSVPositionReader<ACStorePosition>.GetPositon(LabelP);
StoreMoveInfo.MoveParam.PosID = inposid;
Setting_Init.Runtime_FromPosid = inposid;
//StoreMoveInfo.MoveParam.ReelOnFixture = false;
boxTransport.Start(new BoxStorePosition(Config, from, StoreMoveInfo.MoveParam), new BoxStorePosition(Config, to, StoreMoveInfo.MoveParam), StoreMoveType.InStore, true);
StoreMoveInfo.log($"开始转运入贴标机构");
......@@ -314,28 +286,29 @@ namespace DeviceLibrary
case MoveStep.StoreIn08:
if (boxTransport.IsComplateOrFree)
{
var outposid = "";
var olist = CameraPointTest.GetThingStoreName(TestStorePointPort.入口);
olist = RobotManage.PositionNumList.ToList().Where(p => { return p.StartsWith("L") && !olist.Contains(p); }).ToList();
olist.Remove(LabelP);
if (olist.Count == 0)
{
StoreMoveInfo.NextMoveStep(MoveStep.Wait);
StoreMoveInfo.log($"没有检测到有空余库位");
return;
}
else
{
outposid = olist[olist.Count-1];
StoreMoveInfo.log($"检测到空库位:{outposid}, 其他空库位:{string.Join(",", olist)}");
}
nglist.Add(outposid);
//var outposid = "";
//var olist = CameraPointTest.GetThingStoreName(TestStorePointPort.入口);
//olist = RobotManage.PositionNumList.ToList().Where(p => { return p.StartsWith("L") && !olist.Contains(p); }).ToList();
//olist.Remove(LabelP);
//if (olist.Count == 0)
//{
// StoreMoveInfo.NextMoveStep(MoveStep.Wait);
// StoreMoveInfo.log($"没有检测到有空余库位");
// return;
//}
//else
//{
// outposid = olist[olist.Count-1];
// StoreMoveInfo.log($"检测到空库位:{outposid}, 其他空库位:{string.Join(",", olist)}");
//}
//nglist.Add(outposid);
ServerCM.cancelPutInTask("", StoreMoveInfo.MoveParam.PosID);
nglist.Add(Setting_Init.Runtime_FromPosid);
StoreMoveInfo.NextMoveStep(MoveStep.StoreIn09);
from = CSVPositionReader<ACStorePosition>.GetPositon(LabelP);
to = CSVPositionReader<ACStorePosition>.GetPositon(outposid);
to = CSVPositionReader<ACStorePosition>.GetPositon(Setting_Init.Runtime_FromPosid);
StoreMoveInfo.MoveParam.PosID = outposid;
//StoreMoveInfo.MoveParam.PosID = outposid;
StoreMoveInfo.MoveParam.dateTime = DateTime.Now;
NGInfoList.Add(StoreMoveInfo.MoveParam.clone());
//StoreMoveInfo.MoveParam.ReelOnFixture = false;
......@@ -346,9 +319,11 @@ namespace DeviceLibrary
case MoveStep.StoreIn09:
if (boxTransport.IsComplateOrFree)
{
ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.InStoreEnd);
StoreMoveInfo.NewMove(MoveStep.StoreIn01);
if(!StoreMoveInfo.MoveParam.IsNg)
ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.InStoreEnd);
StoreMoveInfo.NewMove(MoveStep.Wait);
StoreMoveInfo.log($"入库完成");
CameraPointTest.GetThingStoreName(TestStorePointPort.入口);
}
break;
case MoveStep.StoreOut10:
......
LoadCVSLibrary/LoadCSVLibrary.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
TheMachine/Form1.cs
......@@ -706,32 +706,12 @@ namespace TheMachine
//RobotManage.mainMachine.DemoIn();
}
private void button1_Click(object sender, EventArgs e)
{
if (IOManager.IOValue(IO_Type.Out_Drawer).Equals(IO_VALUE.LOW))
{
MessageBox.Show(crc.GetString("Res0020","出料抽屉未关闭"));
return;
}
RobotManage.mainMachine.DemoOut();
}
private void button3_Click(object sender, EventArgs e)
{
}
private void button4_Click_1(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Entry_Drawer_Lock,IO_VALUE.LOW);
}
private void button5_Click(object sender, EventArgs e)
{
RobotManage.mainMachine.RotateEquip.TurnDegree(1);
}
private void button3_Click_1(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Out_Drawer_Lock, IO_VALUE.LOW);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!