Commit cd6ecf3e LN

自动出入库时功能优化

1 个父辈 f364be36
此文件类型无法预览
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.groupAuto = new System.Windows.Forms.GroupBox(); this.groupAuto = new System.Windows.Forms.GroupBox();
this.btnCycleOut = new System.Windows.Forms.Button(); this.btnCycleOut = new System.Windows.Forms.Button();
this.lblTemp = new System.Windows.Forms.Label();
this.btnSaveSinglePosId = new System.Windows.Forms.Button(); this.btnSaveSinglePosId = new System.Windows.Forms.Button();
this.checkBox1 = new System.Windows.Forms.CheckBox(); this.checkBox1 = new System.Windows.Forms.CheckBox();
this.btnSave = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
...@@ -43,6 +42,7 @@ ...@@ -43,6 +42,7 @@
this.cmbPosition = new System.Windows.Forms.ComboBox(); this.cmbPosition = new System.Windows.Forms.ComboBox();
this.label21 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label();
this.btnOutStore = new System.Windows.Forms.Button(); this.btnOutStore = new System.Windows.Forms.Button();
this.lblTemp = new System.Windows.Forms.Label();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.btnClearBuzzer = new System.Windows.Forms.Button(); this.btnClearBuzzer = new System.Windows.Forms.Button();
this.btnSingleTrayIn = new System.Windows.Forms.Button(); this.btnSingleTrayIn = new System.Windows.Forms.Button();
...@@ -301,17 +301,6 @@ ...@@ -301,17 +301,6 @@
this.btnCycleOut.UseVisualStyleBackColor = true; this.btnCycleOut.UseVisualStyleBackColor = true;
this.btnCycleOut.Click += new System.EventHandler(this.btnCycleOut_Click); this.btnCycleOut.Click += new System.EventHandler(this.btnCycleOut_Click);
// //
// lblTemp
//
this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(584, 638);
this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(136, 17);
this.lblTemp.TabIndex = 270;
this.lblTemp.Text = "当前温度--,当前湿度--";
//
// btnSaveSinglePosId // btnSaveSinglePosId
// //
this.btnSaveSinglePosId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveSinglePosId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -441,6 +430,17 @@ ...@@ -441,6 +430,17 @@
this.btnOutStore.UseVisualStyleBackColor = true; this.btnOutStore.UseVisualStyleBackColor = true;
this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click); this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
// //
// lblTemp
//
this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(584, 638);
this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(136, 17);
this.lblTemp.TabIndex = 270;
this.lblTemp.Text = "当前温度--,当前湿度--";
//
// groupBox6 // groupBox6
// //
this.groupBox6.Controls.Add(this.btnClearBuzzer); this.groupBox6.Controls.Add(this.btnClearBuzzer);
...@@ -731,21 +731,23 @@ ...@@ -731,21 +731,23 @@
// //
// picAxis4 // picAxis4
// //
this.picAxis4.Location = new System.Drawing.Point(906, 450); this.picAxis4.Location = new System.Drawing.Point(906, 626);
this.picAxis4.Name = "picAxis4"; this.picAxis4.Name = "picAxis4";
this.picAxis4.Size = new System.Drawing.Size(334, 186); this.picAxis4.Size = new System.Drawing.Size(334, 10);
this.picAxis4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.picAxis4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picAxis4.TabIndex = 305; this.picAxis4.TabIndex = 305;
this.picAxis4.TabStop = false; this.picAxis4.TabStop = false;
this.picAxis4.Visible = false;
// //
// picPPoint // picPPoint
// //
this.picPPoint.Location = new System.Drawing.Point(587, 314); this.picPPoint.Location = new System.Drawing.Point(587, 496);
this.picPPoint.Name = "picPPoint"; this.picPPoint.Name = "picPPoint";
this.picPPoint.Size = new System.Drawing.Size(656, 248); this.picPPoint.Size = new System.Drawing.Size(656, 66);
this.picPPoint.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.picPPoint.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picPPoint.TabIndex = 304; this.picPPoint.TabIndex = 304;
this.picPPoint.TabStop = false; this.picPPoint.TabStop = false;
this.picPPoint.Visible = false;
// //
// groupBox7 // groupBox7
// //
...@@ -759,16 +761,16 @@ ...@@ -759,16 +761,16 @@
this.groupBox7.Controls.Add(this.btnTempClose); this.groupBox7.Controls.Add(this.btnTempClose);
this.groupBox7.Controls.Add(this.btnTempInit); this.groupBox7.Controls.Add(this.btnTempInit);
this.groupBox7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox7.Location = new System.Drawing.Point(4, 563); this.groupBox7.Location = new System.Drawing.Point(587, 331);
this.groupBox7.Name = "groupBox7"; this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(575, 89); this.groupBox7.Size = new System.Drawing.Size(653, 137);
this.groupBox7.TabIndex = 90; this.groupBox7.TabIndex = 90;
this.groupBox7.TabStop = false; this.groupBox7.TabStop = false;
this.groupBox7.Text = "温湿度控制器调试"; this.groupBox7.Text = "温湿度控制器调试";
// //
// btnSelTemp // btnSelTemp
// //
this.btnSelTemp.Location = new System.Drawing.Point(419, 16); this.btnSelTemp.Location = new System.Drawing.Point(261, 76);
this.btnSelTemp.Name = "btnSelTemp"; this.btnSelTemp.Name = "btnSelTemp";
this.btnSelTemp.Size = new System.Drawing.Size(100, 33); this.btnSelTemp.Size = new System.Drawing.Size(100, 33);
this.btnSelTemp.TabIndex = 248; this.btnSelTemp.TabIndex = 248;
...@@ -779,7 +781,7 @@ ...@@ -779,7 +781,7 @@
// txtHum // txtHum
// //
this.txtHum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtHum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHum.Location = new System.Drawing.Point(280, 58); this.txtHum.Location = new System.Drawing.Point(102, 92);
this.txtHum.MaxLength = 10; this.txtHum.MaxLength = 10;
this.txtHum.Name = "txtHum"; this.txtHum.Name = "txtHum";
this.txtHum.Size = new System.Drawing.Size(87, 23); this.txtHum.Size = new System.Drawing.Size(87, 23);
...@@ -790,7 +792,7 @@ ...@@ -790,7 +792,7 @@
// //
this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label29.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label29.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label29.Location = new System.Drawing.Point(195, 61); this.label29.Location = new System.Drawing.Point(17, 95);
this.label29.Name = "label29"; this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(85, 17); this.label29.Size = new System.Drawing.Size(85, 17);
this.label29.TabIndex = 246; this.label29.TabIndex = 246;
...@@ -908,7 +910,7 @@ ...@@ -908,7 +910,7 @@
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(587, 6); this.groupAxis.Location = new System.Drawing.Point(587, 6);
this.groupAxis.Name = "groupAxis"; this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(653, 299); this.groupAxis.Size = new System.Drawing.Size(653, 320);
this.groupAxis.TabIndex = 216; this.groupAxis.TabIndex = 216;
this.groupAxis.TabStop = false; this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服调试"; this.groupAxis.Text = "伺服调试";
......

45.9 KB | 宽: | 高:

47.7 KB | 宽: | 高:

source/ACSingleStore/image/jp/axis.png
source/ACSingleStore/image/jp/axis.png
source/ACSingleStore/image/jp/axis.png
source/ACSingleStore/image/jp/axis.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

45.9 KB | 宽: | 高:

48.7 KB | 宽: | 高:

source/ACSingleStore/image/us/axis.png
source/ACSingleStore/image/us/axis.png
source/ACSingleStore/image/us/axis.png
source/ACSingleStore/image/us/axis.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
...@@ -275,3 +275,8 @@ PRO,(轴五)上料轴出料时检测到料盘需要下降的高度,BatchAxis_Dow ...@@ -275,3 +275,8 @@ PRO,(轴五)上料轴出料时检测到料盘需要下降的高度,BatchAxis_Dow
20200919 20200919
特殊条码可配置: 特殊条码里面,类似这样的 T;PartNum;1=7x32 特殊条码可配置: 特殊条码里面,类似这样的 T;PartNum;1=7x32
扫到条码是T0001,以T开头,则替换为:T0001;T0001;1 扫到条码是T0001,以T开头,则替换为:T0001;T0001;1
20201126
中英文修改,翻译内容修改。增加日文。
自动出入库时,若没有出库的料盘,不再继续入库,直接停止自动出入库。
\ No newline at end of file \ No newline at end of file
...@@ -1361,9 +1361,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -1361,9 +1361,19 @@ namespace OnlineStore.DeviceLibrary
} }
if (readId.Equals("")) if (readId.Equals(""))
{ {
//开始自动入库 //如果有出库的料,继续自动入库,否则停止自动出入库
string msg = AutomaticBaiting.doStartBatchIn(); if (AutomaticBaiting.BatchOutStoreCount > 0 || AutomaticBaiting.BatchOutStoreHeight > 0)
LogUtil.info("自动出入库:库位号【" + GetAutoPosid(false) + "】,开始入库" + msg); {
//开始自动入库
string msg = AutomaticBaiting.doStartBatchIn();
LogUtil.info("自动出入库:已有出库[" + AutomaticBaiting.BatchOutStoreCount+"]盘料共["+ AutomaticBaiting.BatchOutStoreHeight +
"]mm,开始自动入库:库位号【" + GetAutoPosid(false) + "】,开始入库" + msg);
}
else
{
LogUtil.info("自动出入库:已有出库[" + AutomaticBaiting.BatchOutStoreCount + "]盘料共[" + AutomaticBaiting.BatchOutStoreHeight + "]mm,无料盘可入库,停止自动出入库");
autoNext = false;
}
} }
else else
{ {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!