Skip to content

李娜 / SO908-XLRStore

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

Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

2 个父辈 09d04f2e 4e3d775d
内嵌 并排
正在显示 4 个修改的文件 包含 38 行增加 和 11 行删除
source/DeviceLibrary/storeBean/EquipBase.cs
...@@ -98,7 +98,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -98,7 +98,6 @@ namespace OnlineStore.DeviceLibrary
{ {
return; return;
} }
OnTimerProcess();
TimeSpan span = DateTime.Now - lastProTimer; TimeSpan span = DateTime.Now - lastProTimer;
if (isInPro && span.TotalSeconds < TimerMaxSeconds) if (isInPro && span.TotalSeconds < TimerMaxSeconds)
{ {
...@@ -107,7 +106,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -107,7 +106,8 @@ namespace OnlineStore.DeviceLibrary
isInPro = true; isInPro = true;
lastProTimer = DateTime.Now; lastProTimer = DateTime.Now;
try try
{ {
OnTimerProcess();
if (IsDebug && runStatus <= RunStatus.Wait) if (IsDebug && runStatus <= RunStatus.Wait)
{ {
isInPro = false; isInPro = false;
......
source/XLRStoreClient/FrmXLRStore.cs
...@@ -100,10 +100,10 @@ namespace OnlineStore.XLRStore ...@@ -100,10 +100,10 @@ namespace OnlineStore.XLRStore
lastLogTime = DateTime.Now.AddMinutes(-10); lastLogTime = DateTime.Now.AddMinutes(-10);
this.Opacity = 100; this.Opacity = 100;
ReelControlA1.ShowData("A上暂存区物料", BufferDataManager.AInStoreInfo); ReelControlA1.ShowData("A上暂存区物料", BufferDataManager.AInStoreInfo,IO_VALUE.HIGH);
ReelControlA2.ShowData("A下暂存区物料", BufferDataManager.AOutStoreInfo); ReelControlA2.ShowData("A下暂存区物料", BufferDataManager.AOutStoreInfo, IO_VALUE.LOW);
ReelControlB1.ShowData("B上暂存区物料", BufferDataManager.BInStoreInfo); ReelControlB1.ShowData("B上暂存区物料", BufferDataManager.BInStoreInfo, IO_VALUE.LOW);
ReelControlB2.ShowData("B下暂存区物料", BufferDataManager.BOutStoreInfo); ReelControlB2.ShowData("B下暂存区物料", BufferDataManager.BOutStoreInfo, IO_VALUE.LOW);
ReelControlA1.linkClear.Click += LinkClear_ClickA1; ReelControlA1.linkClear.Click += LinkClear_ClickA1;
ReelControlA2.linkClear.Click += LinkClear_ClickA2; ReelControlA2.linkClear.Click += LinkClear_ClickA2;
ReelControlB1.linkClear.Click += LinkClear_ClickB1; ReelControlB1.linkClear.Click += LinkClear_ClickB1;
...@@ -476,10 +476,10 @@ namespace OnlineStore.XLRStore ...@@ -476,10 +476,10 @@ namespace OnlineStore.XLRStore
ShelfBControl.ShowData(true, "", input.BatchMove_B.WarnMsg, input.BatchMove_B.MoveInfo, input.BatchMove_B.GetShowColor(), input.BatchMove_B.CurrShelf?.ToStr()); ShelfBControl.ShowData(true, "", input.BatchMove_B.WarnMsg, input.BatchMove_B.MoveInfo, input.BatchMove_B.GetShowColor(), input.BatchMove_B.CurrShelf?.ToStr());
ReelControlA1.ShowData("A上暂存区物料", BufferDataManager.AInStoreInfo); ReelControlA1.ShowData("A上暂存区物料", BufferDataManager.AInStoreInfo,input.IOValue(IO_Type.UpperArea_Check_A));
ReelControlA2.ShowData("A下暂存区物料", BufferDataManager.AOutStoreInfo); ReelControlA2.ShowData("A下暂存区物料", BufferDataManager.AOutStoreInfo, input.IOValue(IO_Type.UnderArea_Check_A));
ReelControlB1.ShowData("B上暂存区物料", BufferDataManager.BInStoreInfo); ReelControlB1.ShowData("B上暂存区物料", BufferDataManager.BInStoreInfo, input.IOValue(IO_Type.UpperArea_Check_B));
ReelControlB2.ShowData("B下暂存区物料", BufferDataManager.BOutStoreInfo); ReelControlB2.ShowData("B下暂存区物料", BufferDataManager.BOutStoreInfo, input.IOValue(IO_Type.UnderArea_Check_B));
if (StoreBean.runStatus > RunStatus.Wait) if (StoreBean.runStatus > RunStatus.Wait)
{ {
......
source/XLRStoreClient/useControl/ReelDataControl.Designer.cs
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
this.lblReelInfo = new System.Windows.Forms.Label(); this.lblReelInfo = new System.Windows.Forms.Label();
this.panName = new System.Windows.Forms.Panel(); this.panName = new System.Windows.Forms.Panel();
this.linkClear = new System.Windows.Forms.LinkLabel(); this.linkClear = new System.Windows.Forms.LinkLabel();
this.lblSingle = new System.Windows.Forms.Label();
this.panName.SuspendLayout(); this.panName.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -73,6 +74,7 @@ ...@@ -73,6 +74,7 @@
this.panName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.panName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.panName.BackColor = System.Drawing.Color.Transparent; this.panName.BackColor = System.Drawing.Color.Transparent;
this.panName.Controls.Add(this.lblSingle);
this.panName.Controls.Add(this.linkClear); this.panName.Controls.Add(this.linkClear);
this.panName.Controls.Add(this.lblText); this.panName.Controls.Add(this.lblText);
this.panName.Location = new System.Drawing.Point(1, 1); this.panName.Location = new System.Drawing.Point(1, 1);
...@@ -95,6 +97,18 @@ ...@@ -95,6 +97,18 @@
this.linkClear.MouseEnter += new System.EventHandler(this.lblText_MouseEnter); this.linkClear.MouseEnter += new System.EventHandler(this.lblText_MouseEnter);
this.linkClear.MouseLeave += new System.EventHandler(this.lblText_MouseLeave); this.linkClear.MouseLeave += new System.EventHandler(this.lblText_MouseLeave);
// //
// lblSingle
//
this.lblSingle.BackColor = System.Drawing.Color.White;
this.lblSingle.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSingle.ForeColor = System.Drawing.Color.Black;
this.lblSingle.Location = new System.Drawing.Point(3, 1);
this.lblSingle.Name = "lblSingle";
this.lblSingle.Size = new System.Drawing.Size(62, 23);
this.lblSingle.TabIndex = 3;
this.lblSingle.Text = "检测有料";
this.lblSingle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// ReelDataControl // ReelDataControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -119,5 +133,6 @@ ...@@ -119,5 +133,6 @@
private System.Windows.Forms.Label lblReelInfo; private System.Windows.Forms.Label lblReelInfo;
private System.Windows.Forms.Panel panName; private System.Windows.Forms.Panel panName;
public System.Windows.Forms.LinkLabel linkClear; public System.Windows.Forms.LinkLabel linkClear;
private System.Windows.Forms.Label lblSingle;
} }
} }
source/XLRStoreClient/useControl/ReelDataControl.cs
...@@ -7,6 +7,7 @@ using System.Linq; ...@@ -7,6 +7,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using OnlineStore.DeviceLibrary; using OnlineStore.DeviceLibrary;
using OnlineStore.LoadCSVLibrary;
namespace OnlineStore.XLRStore namespace OnlineStore.XLRStore
{ {
...@@ -33,7 +34,7 @@ namespace OnlineStore.XLRStore ...@@ -33,7 +34,7 @@ namespace OnlineStore.XLRStore
{ {
panName.BackColor = Color.Transparent; panName.BackColor = Color.Transparent;
} }
public void ShowData(string text, InOutPosInfo posInfo) public void ShowData(string text, InOutPosInfo posInfo,IO_VALUE value)
{ {
lblText.Text = text; lblText.Text = text;
if (posInfo == null) if (posInfo == null)
...@@ -49,6 +50,17 @@ namespace OnlineStore.XLRStore ...@@ -49,6 +50,17 @@ namespace OnlineStore.XLRStore
this.BackColor = Color.LimeGreen; this.BackColor = Color.LimeGreen;
linkClear.Visible = true ; linkClear.Visible = true ;
} }
if (value.Equals(IO_VALUE.LOW))
{
lblSingle.Visible = false;
lblSingle.Text = "";
}
else
{
lblSingle.Visible = true;
lblSingle.Text = "检测有料";
lblSingle.BackColor = Color.LimeGreen;
}
} }
public ReelDataControl() public ReelDataControl()
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!