Skip to content

张东亮 / SO1131-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 66a61cc9 由 张东亮
选项

入库完成验证是否在库位

1 个父辈 5bf264e4
内嵌 并排
正在显示 8 个修改的文件 包含 88 行增加 和 153 行删除
source/DeviceLibrary/manager/SServerManager.cs
......@@ -411,7 +411,50 @@ namespace OnlineStore.DeviceLibrary
}
return msg;
}
private static string Addr_InstorePosCheck = "/service/store/posQuery";
/// <summary>
/// 查询入库是否完成
/// </summary>
/// <param name="posName"></param>
/// <param name="barcode"></param>
/// <returns></returns>
public static bool InstorePosCheck(string posName, string barcode)
{
try
{
if (string.IsNullOrEmpty(serverAddr))
{
LogUtil.error("InstorePosCheck [" + barcode + "] :未找到服务器地址");
return false;
}
Dictionary<string, string> paramMap = new Dictionary<string, string>();
paramMap.Add("posName", posName);
paramMap.Add("barcode", barcode);
string server = GetAddr(Addr_InstorePosCheck, paramMap);
DateTime startTime = DateTime.Now;
string resultStr = HttpHelper.Post(server, "");
LogUtil.info("InstorePosCheck " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
RfidData data = JsonHelper.DeserializeJsonToObject<RfidData>(resultStr);
if (data == null)
{
LogUtil.error(" InstorePosCheck【 " + barcode + "】 没有收到服务器反馈");
return false;
}
else if (data.code.Equals(0).Equals(true))
{
return true;
}
}
catch (Exception ex)
{
LogUtil.error($"InstorePosCheck:{posName},{barcode}", ex);
}
return false;
}
/// <summary>
/// 1 皮带线扫码后调用,用于获取尺寸后升起气缸
......
source/DeviceLibrary/storeBean/EquipBase.cs
......@@ -151,11 +151,6 @@ namespace OnlineStore.DeviceLibrary
return;
}
BaseTimerProcess();
//if (TimerMaxSeconds > 3 && runStatus >= RunStatus.Runing)
//{
// TimerMaxSeconds = 3;
//}
}
catch (Exception ex)
{
......
source/DeviceLibrary/storeBean/XLRStoreBean.cs
......@@ -149,11 +149,6 @@ namespace OnlineStore.DeviceLibrary
}
private void EquipStartRun(EquipBase moveEquip)
{
if (moveEquip.IsDebug)
{
LogUtil.info(moveEquip.Name + "调试状态，暂不启动");
}
else
{
bool result = moveEquip.StartRun();
Thread.Sleep(60);
......@@ -211,7 +206,6 @@ namespace OnlineStore.DeviceLibrary
private void EquipReset(EquipBase equip, bool isNeedAllReset)
{
//调试状态不再重置
if (!equip.IsDebug)
{
if (isNeedAllReset || (!equip.NoAlarm()))
{
......@@ -330,7 +324,6 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.EndMove();
foreach (EquipBase equip in this.equipsMap.Values)
{
if (!equip.IsDebug)
{
equip.StopRun();
}
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
......@@ -702,8 +702,6 @@ namespace OnlineStore.DeviceLibrary
protected override void OnTimerProcess()
{
if (IsDebug) return;
//if (!runStatus.Equals(RunStatus.Runing))
// return;
TimeSpan tsUppA = DateTime.Now - errUpperA;
TimeSpan tsUnA = DateTime.Now - errUnderA;
TimeSpan tsUppB = DateTime.Now - errUpperB;
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Camera.cs
......@@ -26,27 +26,26 @@ namespace OnlineStore.DeviceLibrary
public event CameraAcqEventHandler camera_event;
public void RegisterCameraGrabImage(CameraAcqEventHandler grabbedEventHandler)
{
camera_event += grabbedEventHandler;
//camera_event += grabbedEventHandler;
}
void LoadCameraConfig(object boxA, object boxB)
{
Task.Factory.StartNew(new Action(() =>
{
if (loadCameraState)
return;
string path = @".\Config\Camera.json";
if (!File.Exists(path))
{
LogUtil.error(Name + "找不到监控相机配置文件" + path);
}
//Task.Factory.StartNew(new Action(() =>
//{
// if (loadCameraState)
// return;
// string path = @".\Config\Camera.json";
// if (!File.Exists(path))
// {
// LogUtil.error(Name + "找不到监控相机配置文件" + path);
// }
camera = new Asa.Camera.VisionLib(path,true);
camera.PreviewImage(boxACamName, (IntPtr)boxA);
camera.PreviewImage(boxBCamName, (IntPtr)boxB);
camera.Open(boxACamName);
camera.Open(boxBCamName);
loadCameraState = true;
}));
// camera = new Asa.Camera.VisionLib(path,true);
// camera.PreviewImage(boxACamName, (IntPtr)boxA);
// camera.PreviewImage(boxBCamName, (IntPtr)boxB);
// camera.Open();
// loadCameraState = true;
//}));
}
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs
......@@ -438,6 +438,20 @@ namespace OnlineStore.DeviceLibrary
}
BothXAxis_To_P1();
PullAxis_Inout_To_Cam();
bool rtn = SServerManager.InstorePosCheck(MoveInfo.MoveParam.PosInfo.PosId, MoveInfo.MoveParam.PosInfo.barcode);
if (!rtn)
{
InOutParam inOut = new InOutParam(new InOutPosInfo(MoveInfo.MoveParam.PosInfo.barcode, MoveInfo.MoveParam.PosInfo.PosId));
LogInfo($"入库 {MoveInfo.SLog}：验证入库完成失败，将该库位出库[{inOut.PosInfo.ToStr()}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
if (CheckASide())
{
waitAOutStoreList.Enqueue(inOut);
}
else
{
waitBOutStoreList.Enqueue(inOut);
}
}
break;
case StepEnum.SI_19_InoutBack:
if (!CheckInStoreOtherSideInfo())
......
source/XLRStoreClient/boxForm/FrmBoxEquip.Designer.cs
......@@ -39,10 +39,6 @@
this.lblThisSta = new System.Windows.Forms.Label();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.lblInoutInfo = new System.Windows.Forms.Label();
......@@ -65,10 +61,6 @@
this.groupDO.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage3.SuspendLayout();
this.groupBox5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.groupBox6.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout();
this.tableLayoutPanel4.SuspendLayout();
......@@ -319,9 +311,9 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(486, 0);
this.lblThisSta.Location = new System.Drawing.Point(489, 0);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(478, 71);
this.lblThisSta.Size = new System.Drawing.Size(481, 256);
this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -341,8 +333,6 @@
//
// tabPage3
//
this.tabPage3.Controls.Add(this.groupBox5);
this.tabPage3.Controls.Add(this.groupBox2);
this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
......@@ -351,57 +341,13 @@
this.tabPage3.Text = " 设备状态 ";
this.tabPage3.UseVisualStyleBackColor = true;
//
// groupBox5
//
this.groupBox5.Controls.Add(this.pictureBox2);
this.groupBox5.Dock = System.Windows.Forms.DockStyle.Right;
this.groupBox5.Location = new System.Drawing.Point(495, 176);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(490, 342);
this.groupBox5.TabIndex = 280;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "B面相机";
//
// pictureBox2
//
this.pictureBox2.BackColor = System.Drawing.Color.DarkGray;
this.pictureBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox2.Location = new System.Drawing.Point(3, 23);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(484, 316);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox2.TabIndex = 1;
this.pictureBox2.TabStop = false;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.pictureBox1);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left;
this.groupBox2.Location = new System.Drawing.Point(0, 176);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(490, 342);
this.groupBox2.TabIndex = 279;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "A面相机";
//
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.DarkGray;
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox1.Location = new System.Drawing.Point(3, 23);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(484, 316);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
//
// groupBox6
//
this.groupBox6.Controls.Add(this.tableLayoutPanel3);
this.groupBox6.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox6.Location = new System.Drawing.Point(0, 0);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(985, 176);
this.groupBox6.Size = new System.Drawing.Size(985, 518);
this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "当前状态";
......@@ -413,13 +359,14 @@
this.tableLayoutPanel3.Controls.Add(this.lblInoutInfo, 0, 0);
this.tableLayoutPanel3.Controls.Add(this.lblInstoreList, 0, 2);
this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel4, 0, 1);
this.tableLayoutPanel3.Location = new System.Drawing.Point(9, 22);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 23);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 3;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 13.10345F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 53.10345F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(973, 145);
this.tableLayoutPanel3.Size = new System.Drawing.Size(979, 492);
this.tableLayoutPanel3.TabIndex = 282;
//
// lblInoutInfo
......@@ -428,7 +375,7 @@
this.lblInoutInfo.ForeColor = System.Drawing.Color.Green;
this.lblInoutInfo.Location = new System.Drawing.Point(3, 0);
this.lblInoutInfo.Name = "lblInoutInfo";
this.lblInoutInfo.Size = new System.Drawing.Size(967, 19);
this.lblInoutInfo.Size = new System.Drawing.Size(973, 64);
this.lblInoutInfo.TabIndex = 281;
this.lblInoutInfo.Text = "当前出入库：";
this.lblInoutInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -439,9 +386,9 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(3, 96);
this.lblInstoreList.Location = new System.Drawing.Point(3, 326);
this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(967, 49);
this.lblInstoreList.Size = new System.Drawing.Size(973, 166);
this.lblInstoreList.TabIndex = 277;
//
// tableLayoutPanel4
......@@ -452,11 +399,11 @@
this.tableLayoutPanel4.Controls.Add(this.lblMoveInfo, 0, 0);
this.tableLayoutPanel4.Controls.Add(this.lblThisSta, 1, 0);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 22);
this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 67);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 1;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(967, 71);
this.tableLayoutPanel4.Size = new System.Drawing.Size(973, 256);
this.tableLayoutPanel4.TabIndex = 282;
//
// lblMoveInfo
......@@ -626,10 +573,6 @@
this.groupDO.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.groupBox5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.groupBox2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.groupBox6.ResumeLayout(false);
this.tableLayoutPanel3.ResumeLayout(false);
this.tableLayoutPanel4.ResumeLayout(false);
......@@ -676,10 +619,6 @@
protected System.Windows.Forms.Button btnStop;
private System.Windows.Forms.TabPage tabPage3;
protected System.Windows.Forms.Button btnDebugAxis;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
private System.Windows.Forms.Button btnHlhasReel;
......
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
......@@ -33,8 +33,6 @@ namespace OnlineStore.XLRStore
Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
LoadIOList();
picture1 = pictureBox1.Handle;
picture2 = pictureBox2.Handle;
}
private void FrmStoreIOStatus_Load(object sender, EventArgs e)
{
......@@ -47,52 +45,8 @@ namespace OnlineStore.XLRStore
chbDebug.Checked = boxBean.IsDebug;
FrmPosDebug frmPosDebug = new FrmPosDebug();
AddForm(tabControl1, " 库位调试 ", frmPosDebug);
boxBean.RegisterCameraGrabImage(BoxBean_camera_event);
IsLoad = true;
}
/// <summary>
/// 监控相机A采集图像事件
/// </summary>
/// <param name="cameraArgs"></param>
private void BoxBean_camera_event(CameraArgs cameraArgs)
{
if (!this.IsHandleCreated) return;
try
{
this.Invoke(new Action(() =>
{
//if (!groupBox2.Text.Contains("-"))
// groupBox2.Text = $"A相机-{cameraArgs.IP}-ch{cameraArgs.ChannelNum}";
//pictureBox1.Image = null;
if (BoxEquip.boxACamName.Equals(cameraArgs.CamName))
pictureBox1.Image = (Image)cameraArgs.Image.Clone();
else
{
pictureBox2.Image = (Image)cameraArgs.Image.Clone();
}
}));
}
catch
{
}
}
//private void BoxBean_camera_B_event(IPCameraEventArgs cameraArgs)
//{
// if (!this.IsHandleCreated) return;
// try
// {
// this.Invoke(new Action(() =>
// {
// if (!groupBox5.Text.Contains("-"))
// groupBox5.Text = $"B相机-{cameraArgs.IP}-ch{cameraArgs.ChannelNum}";
// //pictureBox2.Image = null;
// pictureBox2.Image = (Image)cameraArgs.Image.Clone();
// }));
// }
// catch { }
//}
protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
protected Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
protected void ReadIOList()
......@@ -549,19 +503,19 @@ namespace OnlineStore.XLRStore
}
if (frmAxisMove == null)
{
frmAxisMove = new FrmAxisMove(boxBean.IsDebug);
frmAxisMove = new FrmAxisMove(true);
frmAxisMove.ShowDialog();
}
else
{
if (frmAxisMove.IsDisposed)
{
frmAxisMove = new FrmAxisMove(boxBean.IsDebug);
frmAxisMove = new FrmAxisMove(true);
frmAxisMove.ShowDialog();
}
else
{
frmAxisMove.DebugStatus(boxBean.IsDebug);
frmAxisMove.DebugStatus(true);
frmAxisMove.ShowDialog();
}
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!