From 75ca84b7570d7a6a805c27164c3f17c1f2158423 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 13 12月 2024 08:34:26 +0800
Subject: [PATCH] 111
---
CC/iWareSql/DataAccess/TaskHandler.cs | 17 +
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/1、DataProcess_BZ39.cs | 2
CC/iWareCC_ASRS/FormCC.Designer.cs | 331 +++++++++++++++++++-----------------
CC/iWareCC_ASRS/ThreadService/01_BZ01工位（清灰，洗板后工位）/DataProcess_BZ01.cs | 117 +++++++++---
CC/iWareCC_ASRS/FormCC.cs | 43 ++++
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/1、DataProcess_BZ12.cs | 10 +
6 files changed, 325 insertions(+), 195 deletions(-)
diff --git a/CC/iWareCC_ASRS/FormCC.Designer.cs b/CC/iWareCC_ASRS/FormCC.Designer.cs
index e6aecde..6201dae 100644
--- a/CC/iWareCC_ASRS/FormCC.Designer.cs
+++ b/CC/iWareCC_ASRS/FormCC.Designer.cs
@@ -103,22 +103,23 @@
this.btn_TongJi = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
this.tabDevice = new System.Windows.Forms.TabPage();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.lbl_Mode_FJ = new System.Windows.Forms.Label();
- this.lbl_XinTiao_FJ = new System.Windows.Forms.Label();
- this.lbl_Warning_FJ = new System.Windows.Forms.Label();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.lbl_Warning_MB = new System.Windows.Forms.Label();
- this.lbl_XinTiao_MB = new System.Windows.Forms.Label();
- this.lbl_Mode_MB = new System.Windows.Forms.Label();
- this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.lbl_Warning_HB = new System.Windows.Forms.Label();
- this.lbl_XinTiao_HB = new System.Windows.Forms.Label();
- this.lbl_Mode_HB = new System.Windows.Forms.Label();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.lbl_Warning_FX = new System.Windows.Forms.Label();
this.lbl_XinTiao_FX = new System.Windows.Forms.Label();
this.lbl_Mode_FX = new System.Windows.Forms.Label();
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.lbl_Warning_HB = new System.Windows.Forms.Label();
+ this.lbl_XinTiao_HB = new System.Windows.Forms.Label();
+ this.lbl_Mode_HB = new System.Windows.Forms.Label();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.lbl_Warning_MB = new System.Windows.Forms.Label();
+ this.lbl_XinTiao_MB = new System.Windows.Forms.Label();
+ this.lbl_Mode_MB = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.lbl_Warning_FJ = new System.Windows.Forms.Label();
+ this.lbl_XinTiao_FJ = new System.Windows.Forms.Label();
+ this.lbl_Mode_FJ = new System.Windows.Forms.Label();
+ this.button1 = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout();
this.tPModeChoice.SuspendLayout();
this.panel_Model.SuspendLayout();
@@ -127,10 +128,10 @@
this.groupBox1.SuspendLayout();
this.tabPage3.SuspendLayout();
this.tabDevice.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
- this.groupBox4.SuspendLayout();
this.groupBox5.SuspendLayout();
+ this.groupBox4.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// tabControl1
@@ -851,6 +852,7 @@
//
// tabPage3
//
+ this.tabPage3.Controls.Add(this.button1);
this.tabPage3.Controls.Add(this.button25);
this.tabPage3.Controls.Add(this.button24);
this.tabPage3.Controls.Add(this.tb_PackageCode);
@@ -1051,107 +1053,56 @@
this.tabDevice.Text = "设备状态";
this.tabDevice.UseVisualStyleBackColor = true;
//
- // groupBox2
+ // groupBox5
//
- this.groupBox2.Controls.Add(this.lbl_Warning_FJ);
- this.groupBox2.Controls.Add(this.lbl_XinTiao_FJ);
- this.groupBox2.Controls.Add(this.lbl_Mode_FJ);
- this.groupBox2.Location = new System.Drawing.Point(50, 49);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(333, 189);
- this.groupBox2.TabIndex = 0;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "分拣区域";
+ this.groupBox5.Controls.Add(this.lbl_Warning_FX);
+ this.groupBox5.Controls.Add(this.lbl_XinTiao_FX);
+ this.groupBox5.Controls.Add(this.lbl_Mode_FX);
+ this.groupBox5.Location = new System.Drawing.Point(523, 321);
+ this.groupBox5.Name = "groupBox5";
+ this.groupBox5.Size = new System.Drawing.Size(333, 189);
+ this.groupBox5.TabIndex = 3;
+ this.groupBox5.TabStop = false;
+ this.groupBox5.Text = "封箱区域";
//
- // lbl_Mode_FJ
+ // lbl_Warning_FX
//
- this.lbl_Mode_FJ.AutoSize = true;
- this.lbl_Mode_FJ.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbl_Mode_FJ.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
- this.lbl_Mode_FJ.Location = new System.Drawing.Point(16, 33);
- this.lbl_Mode_FJ.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
- this.lbl_Mode_FJ.Name = "lbl_Mode_FJ";
- this.lbl_Mode_FJ.Size = new System.Drawing.Size(91, 24);
- this.lbl_Mode_FJ.TabIndex = 37;
- this.lbl_Mode_FJ.Text = "设备模式: ";
- this.lbl_Mode_FJ.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbl_Warning_FX.AutoSize = true;
+ this.lbl_Warning_FX.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbl_Warning_FX.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
+ this.lbl_Warning_FX.Location = new System.Drawing.Point(16, 129);
+ this.lbl_Warning_FX.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.lbl_Warning_FX.Name = "lbl_Warning_FX";
+ this.lbl_Warning_FX.Size = new System.Drawing.Size(91, 24);
+ this.lbl_Warning_FX.TabIndex = 39;
+ this.lbl_Warning_FX.Text = "报警类型: ";
+ this.lbl_Warning_FX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // lbl_XinTiao_FJ
+ // lbl_XinTiao_FX
//
- this.lbl_XinTiao_FJ.AutoSize = true;
- this.lbl_XinTiao_FJ.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbl_XinTiao_FJ.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
- this.lbl_XinTiao_FJ.Location = new System.Drawing.Point(16, 81);
- this.lbl_XinTiao_FJ.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
- this.lbl_XinTiao_FJ.Name = "lbl_XinTiao_FJ";
- this.lbl_XinTiao_FJ.Size = new System.Drawing.Size(55, 24);
- this.lbl_XinTiao_FJ.TabIndex = 38;
- this.lbl_XinTiao_FJ.Text = "心跳: ";
- this.lbl_XinTiao_FJ.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbl_XinTiao_FX.AutoSize = true;
+ this.lbl_XinTiao_FX.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbl_XinTiao_FX.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
+ this.lbl_XinTiao_FX.Location = new System.Drawing.Point(16, 81);
+ this.lbl_XinTiao_FX.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.lbl_XinTiao_FX.Name = "lbl_XinTiao_FX";
+ this.lbl_XinTiao_FX.Size = new System.Drawing.Size(55, 24);
+ this.lbl_XinTiao_FX.TabIndex = 38;
+ this.lbl_XinTiao_FX.Text = "心跳: ";
+ this.lbl_XinTiao_FX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // lbl_Warning_FJ
+ // lbl_Mode_FX
//
- this.lbl_Warning_FJ.AutoSize = true;
- this.lbl_Warning_FJ.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbl_Warning_FJ.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
- this.lbl_Warning_FJ.Location = new System.Drawing.Point(16, 129);
- this.lbl_Warning_FJ.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
- this.lbl_Warning_FJ.Name = "lbl_Warning_FJ";
- this.lbl_Warning_FJ.Size = new System.Drawing.Size(91, 24);
- this.lbl_Warning_FJ.TabIndex = 39;
- this.lbl_Warning_FJ.Text = "报警类型: ";
- this.lbl_Warning_FJ.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.lbl_Warning_MB);
- this.groupBox3.Controls.Add(this.lbl_XinTiao_MB);
- this.groupBox3.Controls.Add(this.lbl_Mode_MB);
- this.groupBox3.Location = new System.Drawing.Point(523, 49);
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(333, 189);
- this.groupBox3.TabIndex = 1;
- this.groupBox3.TabStop = false;
- this.groupBox3.Text = "码包区域";
- //
- // lbl_Warning_MB
- //
- this.lbl_Warning_MB.AutoSize = true;
- this.lbl_Warning_MB.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbl_Warning_MB.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
- this.lbl_Warning_MB.Location = new System.Drawing.Point(16, 129);
- this.lbl_Warning_MB.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
- this.lbl_Warning_MB.Name = "lbl_Warning_MB";
- this.lbl_Warning_MB.Size = new System.Drawing.Size(91, 24);
- this.lbl_Warning_MB.TabIndex = 39;
- this.lbl_Warning_MB.Text = "报警类型: ";
- this.lbl_Warning_MB.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // lbl_XinTiao_MB
- //
- this.lbl_XinTiao_MB.AutoSize = true;
- this.lbl_XinTiao_MB.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbl_XinTiao_MB.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
- this.lbl_XinTiao_MB.Location = new System.Drawing.Point(16, 81);
- this.lbl_XinTiao_MB.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
- this.lbl_XinTiao_MB.Name = "lbl_XinTiao_MB";
- this.lbl_XinTiao_MB.Size = new System.Drawing.Size(55, 24);
- this.lbl_XinTiao_MB.TabIndex = 38;
- this.lbl_XinTiao_MB.Text = "心跳: ";
- this.lbl_XinTiao_MB.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // lbl_Mode_MB
- //
- this.lbl_Mode_MB.AutoSize = true;
- this.lbl_Mode_MB.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbl_Mode_MB.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
- this.lbl_Mode_MB.Location = new System.Drawing.Point(16, 33);
- this.lbl_Mode_MB.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
- this.lbl_Mode_MB.Name = "lbl_Mode_MB";
- this.lbl_Mode_MB.Size = new System.Drawing.Size(91, 24);
- this.lbl_Mode_MB.TabIndex = 37;
- this.lbl_Mode_MB.Text = "设备模式: ";
- this.lbl_Mode_MB.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbl_Mode_FX.AutoSize = true;
+ this.lbl_Mode_FX.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbl_Mode_FX.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
+ this.lbl_Mode_FX.Location = new System.Drawing.Point(16, 33);
+ this.lbl_Mode_FX.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.lbl_Mode_FX.Name = "lbl_Mode_FX";
+ this.lbl_Mode_FX.Size = new System.Drawing.Size(91, 24);
+ this.lbl_Mode_FX.TabIndex = 37;
+ this.lbl_Mode_FX.Text = "设备模式: ";
+ this.lbl_Mode_FX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// groupBox4
//
@@ -1204,56 +1155,119 @@
this.lbl_Mode_HB.Text = "设备模式: ";
this.lbl_Mode_HB.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // groupBox5
+ // groupBox3
//
- this.groupBox5.Controls.Add(this.lbl_Warning_FX);
- this.groupBox5.Controls.Add(this.lbl_XinTiao_FX);
- this.groupBox5.Controls.Add(this.lbl_Mode_FX);
- this.groupBox5.Location = new System.Drawing.Point(523, 321);
- this.groupBox5.Name = "groupBox5";
- this.groupBox5.Size = new System.Drawing.Size(333, 189);
- this.groupBox5.TabIndex = 3;
- this.groupBox5.TabStop = false;
- this.groupBox5.Text = "封箱区域";
+ this.groupBox3.Controls.Add(this.lbl_Warning_MB);
+ this.groupBox3.Controls.Add(this.lbl_XinTiao_MB);
+ this.groupBox3.Controls.Add(this.lbl_Mode_MB);
+ this.groupBox3.Location = new System.Drawing.Point(523, 49);
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.Size = new System.Drawing.Size(333, 189);
+ this.groupBox3.TabIndex = 1;
+ this.groupBox3.TabStop = false;
+ this.groupBox3.Text = "码包区域";
//
- // lbl_Warning_FX
+ // lbl_Warning_MB
//
- this.lbl_Warning_FX.AutoSize = true;
- this.lbl_Warning_FX.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbl_Warning_FX.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
- this.lbl_Warning_FX.Location = new System.Drawing.Point(16, 129);
- this.lbl_Warning_FX.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
- this.lbl_Warning_FX.Name = "lbl_Warning_FX";
- this.lbl_Warning_FX.Size = new System.Drawing.Size(91, 24);
- this.lbl_Warning_FX.TabIndex = 39;
- this.lbl_Warning_FX.Text = "报警类型: ";
- this.lbl_Warning_FX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbl_Warning_MB.AutoSize = true;
+ this.lbl_Warning_MB.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbl_Warning_MB.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
+ this.lbl_Warning_MB.Location = new System.Drawing.Point(16, 129);
+ this.lbl_Warning_MB.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.lbl_Warning_MB.Name = "lbl_Warning_MB";
+ this.lbl_Warning_MB.Size = new System.Drawing.Size(91, 24);
+ this.lbl_Warning_MB.TabIndex = 39;
+ this.lbl_Warning_MB.Text = "报警类型: ";
+ this.lbl_Warning_MB.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // lbl_XinTiao_FX
+ // lbl_XinTiao_MB
//
- this.lbl_XinTiao_FX.AutoSize = true;
- this.lbl_XinTiao_FX.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbl_XinTiao_FX.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
- this.lbl_XinTiao_FX.Location = new System.Drawing.Point(16, 81);
- this.lbl_XinTiao_FX.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
- this.lbl_XinTiao_FX.Name = "lbl_XinTiao_FX";
- this.lbl_XinTiao_FX.Size = new System.Drawing.Size(55, 24);
- this.lbl_XinTiao_FX.TabIndex = 38;
- this.lbl_XinTiao_FX.Text = "心跳: ";
- this.lbl_XinTiao_FX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbl_XinTiao_MB.AutoSize = true;
+ this.lbl_XinTiao_MB.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbl_XinTiao_MB.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
+ this.lbl_XinTiao_MB.Location = new System.Drawing.Point(16, 81);
+ this.lbl_XinTiao_MB.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.lbl_XinTiao_MB.Name = "lbl_XinTiao_MB";
+ this.lbl_XinTiao_MB.Size = new System.Drawing.Size(55, 24);
+ this.lbl_XinTiao_MB.TabIndex = 38;
+ this.lbl_XinTiao_MB.Text = "心跳: ";
+ this.lbl_XinTiao_MB.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // lbl_Mode_FX
+ // lbl_Mode_MB
//
- this.lbl_Mode_FX.AutoSize = true;
- this.lbl_Mode_FX.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbl_Mode_FX.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
- this.lbl_Mode_FX.Location = new System.Drawing.Point(16, 33);
- this.lbl_Mode_FX.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
- this.lbl_Mode_FX.Name = "lbl_Mode_FX";
- this.lbl_Mode_FX.Size = new System.Drawing.Size(91, 24);
- this.lbl_Mode_FX.TabIndex = 37;
- this.lbl_Mode_FX.Text = "设备模式: ";
- this.lbl_Mode_FX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.lbl_Mode_MB.AutoSize = true;
+ this.lbl_Mode_MB.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbl_Mode_MB.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
+ this.lbl_Mode_MB.Location = new System.Drawing.Point(16, 33);
+ this.lbl_Mode_MB.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.lbl_Mode_MB.Name = "lbl_Mode_MB";
+ this.lbl_Mode_MB.Size = new System.Drawing.Size(91, 24);
+ this.lbl_Mode_MB.TabIndex = 37;
+ this.lbl_Mode_MB.Text = "设备模式: ";
+ this.lbl_Mode_MB.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.lbl_Warning_FJ);
+ this.groupBox2.Controls.Add(this.lbl_XinTiao_FJ);
+ this.groupBox2.Controls.Add(this.lbl_Mode_FJ);
+ this.groupBox2.Location = new System.Drawing.Point(50, 49);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(333, 189);
+ this.groupBox2.TabIndex = 0;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "分拣区域";
+ //
+ // lbl_Warning_FJ
+ //
+ this.lbl_Warning_FJ.AutoSize = true;
+ this.lbl_Warning_FJ.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbl_Warning_FJ.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
+ this.lbl_Warning_FJ.Location = new System.Drawing.Point(16, 129);
+ this.lbl_Warning_FJ.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.lbl_Warning_FJ.Name = "lbl_Warning_FJ";
+ this.lbl_Warning_FJ.Size = new System.Drawing.Size(91, 24);
+ this.lbl_Warning_FJ.TabIndex = 39;
+ this.lbl_Warning_FJ.Text = "报警类型: ";
+ this.lbl_Warning_FJ.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lbl_XinTiao_FJ
+ //
+ this.lbl_XinTiao_FJ.AutoSize = true;
+ this.lbl_XinTiao_FJ.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbl_XinTiao_FJ.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
+ this.lbl_XinTiao_FJ.Location = new System.Drawing.Point(16, 81);
+ this.lbl_XinTiao_FJ.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.lbl_XinTiao_FJ.Name = "lbl_XinTiao_FJ";
+ this.lbl_XinTiao_FJ.Size = new System.Drawing.Size(55, 24);
+ this.lbl_XinTiao_FJ.TabIndex = 38;
+ this.lbl_XinTiao_FJ.Text = "心跳: ";
+ this.lbl_XinTiao_FJ.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lbl_Mode_FJ
+ //
+ this.lbl_Mode_FJ.AutoSize = true;
+ this.lbl_Mode_FJ.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbl_Mode_FJ.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(158)))), ((int)(((byte)(98)))));
+ this.lbl_Mode_FJ.Location = new System.Drawing.Point(16, 33);
+ this.lbl_Mode_FJ.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.lbl_Mode_FJ.Name = "lbl_Mode_FJ";
+ this.lbl_Mode_FJ.Size = new System.Drawing.Size(91, 24);
+ this.lbl_Mode_FJ.TabIndex = 37;
+ this.lbl_Mode_FJ.Text = "设备模式: ";
+ this.lbl_Mode_FJ.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // button1
+ //
+ this.button1.BackColor = System.Drawing.Color.Red;
+ this.button1.Location = new System.Drawing.Point(817, 568);
+ this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(238, 48);
+ this.button1.TabIndex = 157;
+ this.button1.Text = "一键初始化除立体库中的板件";
+ this.button1.UseVisualStyleBackColor = false;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
//
// FormCC
//
@@ -1282,14 +1296,14 @@
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.tabDevice.ResumeLayout(false);
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
- this.groupBox4.ResumeLayout(false);
- this.groupBox4.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
+ this.groupBox4.ResumeLayout(false);
+ this.groupBox4.PerformLayout();
+ this.groupBox3.ResumeLayout(false);
+ this.groupBox3.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
this.ResumeLayout(false);
}
@@ -1385,6 +1399,7 @@
private System.Windows.Forms.Label lbl_Warning_FX;
private System.Windows.Forms.Label lbl_XinTiao_FX;
private System.Windows.Forms.Label lbl_Mode_FX;
+ private System.Windows.Forms.Button button1;
}
}
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index 36a52a0..0960ab9 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -1477,6 +1477,49 @@
item.UpiStatus = (int)UpiStatusEnum.鍒濆;
}
+ //娓呯┖闃熷垪鏁版嵁
+ var list = db.mes_upi_linequeue.ToList();
+ db.mes_upi_linequeue.RemoveRange(list);
+
+ db.SaveChanges();
+ }
+ if (!string.IsNullOrEmpty(alertMsg))
+ {
+ MessageBox.Show("閿欒:" + alertMsg);
+ }
+ else
+ {
+ MessageBox.Show("宸插鐞�");
+ }
+ }
+
+ private void button1_Click(object sender, EventArgs e)
+ {
+
+
+ var alertMsg = "";
+ using (WmsDBModel db = new WmsDBModel())
+ {
+ //鏌ヨ绔嬩綋搴撲腑鐨剈pi鍒楄〃
+ var quanList = db.wms_stock_quan.ToList().Select(x => x.Upi).ToList();
+ var upiList = db.mes_batchOrderUPI_new.Where(x => !quanList.Contains(x.UPI)).ToList();
+ foreach (var item in upiList)
+ {
+ item.AreaCode = (int)AreaCodeEnum.鏃犲尯鍩�;
+ item.UpiStatus = (int)UpiStatusEnum.鍒濆;
+ }
+
+ var packageCodeList = upiList.Select(x => x.PackageCode).ToList();
+ var pList = db.mes_package_gather.Where(x => packageCodeList.Contains(x.PackageCode)).ToList();
+ foreach (var item in pList)
+ {
+ item.AreaCode = (int)AreaCodeEnum.鏃犲尯鍩�;
+ item.UpiStatus = (int)UpiStatusEnum.鍒濆;
+ }
+ //娓呯┖闃熷垪鏁版嵁
+ var list = db.mes_upi_linequeue.ToList();
+ db.mes_upi_linequeue.RemoveRange(list);
+
db.SaveChanges();
}
if (!string.IsNullOrEmpty(alertMsg))
diff --git "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs" "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
index 3d3307b..0697162 100644
--- "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
@@ -31,6 +31,7 @@
{
var alertMsg = "";
LogType logType = LogType.DataProcess_BZ01;
+ string lastUpi = "";//鏈�鍚庤褰曠殑UPI鏁版嵁
while (true)
{
Thread.Sleep(1000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
@@ -64,7 +65,14 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}-璇锋眰浜嗚В鐮侊紝浣嗘槸缁撴灉鏄┖鐨�,姝ゆ寰幆缁撴潫";
continue;
}
+ if (lastUpi == result)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}-閲嶅鐨刄PI{result}";
+ continue;
+ }
var upiCode = result;
+ lastUpi = upiCode;
+
var qitaoReault = false;//榻愬寘缁撴灉
using (WmsDBModel wmsDB = new WmsDBModel())
{
@@ -119,47 +127,80 @@
}
else
{
- //杩橀渶瑕侀獙璇佸湪杩欎簺鍖哄煙涓紝鏄惁姝ｇ‘鎺掗槦锛屽鏋滄病鏈夋纭帓闃燂紝閭ｄ箞灏辫涓轰笉榻愬 銆怑ditby shaocx,2024-12-12銆�
- var queueList = wmsDB.mes_upi_linequeue.Where(x => x.PackageCode == upiObj.PackageCode && x.AreaCode == queryAreaCode)
- .OrderBy(x => x.Id).ToList();
- var fisrtId = queueList.OrderBy(x => x.Id).First().Id;
- var endId = queueList.OrderByDescending(x => x.Id).First().Id;
- //缁х画鏌ヨ杩欎釜鏃堕棿娈靛唴鐨勯槦鍒楁暟鎹�
- //閲嶅啓璇ラ槦鍒�
- queueList = wmsDB.mes_upi_linequeue.Where(x => x.Id >= fisrtId && x.Id <= endId).OrderBy(x => x.Id).ToList();
- var syCount = allList.Where(x => x.Shelf >= upiObj.Shelf).Count();
- if (queueList.Count() != syCount)
+ var isJiXuValidate = true;
+ if (upiObj.Shelf != 1)
{
- qitaoReault = false;
- upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
- }
- else
- {
- //鍒ゆ柇鏄惁涔卞簭
- bool isLuanXuan = false;
- int temp_shelf = 0;
- for (int i = 0; i < queueList.Count; i++)
+ var qianmianList = allList.Where(x => x.Shelf < upiObj.Shelf).ToList();
+ //鐪嬩互鍓嶇殑鏉垮湪鍝噷锛屽繀椤婚兘鍦� 鐮佸灈鍖哄煙
+ var yiqianQuyu = AreaCodeEnum.鐮佸灈鍖哄煙;
+ var count_MD = qianmianList.Where(x => x.AreaCode == (int)yiqianQuyu).Count();
+ if (count_MD != qianmianList.Count())
{
- if (i == 0)
+ isJiXuValidate = false;
+ qitaoReault = false;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ }
+ }
+
+ if (isJiXuValidate)
+ {//鏄惁缁х画楠岃瘉
+ //杩橀渶瑕侀獙璇佸湪杩欎簺鍖哄煙涓紝鏄惁姝ｇ‘鎺掗槦锛屽鏋滄病鏈夋纭帓闃燂紝閭ｄ箞灏辫涓轰笉榻愬 銆怑ditby shaocx,2024-12-12銆�
+ var queueList = wmsDB.mes_upi_linequeue.Where(x => x.PackageCode == upiObj.PackageCode && x.AreaCode == queryAreaCode)
+ .OrderBy(x => x.Id).ToList();
+ var fisrtId = queueList.OrderBy(x => x.Id).First().Id;
+ var endId = queueList.OrderByDescending(x => x.Id).First().Id;
+ //缁х画鏌ヨ杩欎釜鏃堕棿娈靛唴鐨勯槦鍒楁暟鎹�
+ //閲嶅啓璇ラ槦鍒�
+ queueList = wmsDB.mes_upi_linequeue.Where(x => x.Id >= fisrtId && x.Id <= endId).OrderBy(x => x.Id).ToList();
+ var syCount = allList.Where(x => x.Shelf >= upiObj.Shelf).Count();
+ if (queueList.Count() != syCount)
+ {
+ qitaoReault = false;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ }
+ else
+ {
+ //鍒ゆ柇鏄惁涔卞簭
+ bool isLuanXuan = false;
+ int temp_shelf = 0;
+ for (int i = 0; i < queueList.Count; i++)
{
- temp_shelf = queueList[i].Shelf;
- }
- else
- {
- if ((temp_shelf + 1) != queueList[i].Shelf)
- {//璁や负涔卞簭浜�
- qitaoReault = false;
- isLuanXuan = true;
- upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
- break;//璺冲嚭寰幆
+ if (i == 0)
+ {
+ temp_shelf = queueList[i].Shelf;
+ if (temp_shelf != upiObj.Shelf)
+ {
+ qitaoReault = false;
+ isLuanXuan = true;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ break;//璺冲嚭寰幆
+ }
+ if (queueList[i].Upi != upiObj.UPI)
+ {
+ qitaoReault = false;
+ isLuanXuan = true;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ break;//璺冲嚭寰幆
+ }
+ }
+ else
+ {
+ temp_shelf = temp_shelf + 1;
+ if (temp_shelf != queueList[i].Shelf)
+ {//璁や负涔卞簭浜�
+ qitaoReault = false;
+ isLuanXuan = true;
+ upiObj.AreaCode = (int)AreaCodeEnum.缂撳瓨鍒嗘嫞鍖�;
+ break;//璺冲嚭寰幆
+ }
}
}
- }
- if (isLuanXuan == false)
- {
- qitaoReault = true;
- upiObj.AreaCode = (int)AreaCodeEnum.鐮佸灈鍖哄煙;
+ if (isLuanXuan == false)
+ {
+ qitaoReault = true;
+ upiObj.AreaCode = (int)AreaCodeEnum.鐮佸灈鍖哄煙;
+ }
}
}
}
@@ -169,6 +210,12 @@
}
}
+ //if (qitaoReault == false) {
+ // //涓存椂
+ // SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"妯℃嫙鍟婂晩锛屾殏鍋滃晩鍟�";
+ // continue;
+ //}
+
using (StationServiceClient client = new StationServiceClient())
{
var res = await client.WriteQiTaoInfoAsync((int)EDevice.Station, rgvLocation, qitaoReault);
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
index eb7d3d1..b0bb047 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
@@ -66,7 +66,7 @@
var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, upiCode);
if (!isValidate)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-鏈夆�樻湭缁撴潫鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
+ SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}- upi:{upiCode}鏈夆�樻湭缁撴潫鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
continue;
}
//
diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
index 83f0e11..70cb7ae 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
@@ -80,9 +80,17 @@
var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result);
if (!isValidate)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
+ SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-upi锛歿result}鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
continue;
}
+
+ isValidate = TaskHandler.ValidateNoFinishOutTaskFor鐮佹澘浠诲姟(wmsDB);
+ if (!isValidate)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-鏈� 鏈粨鏉� 鐨勪换鍔★紝涓嶈兘澶勭悊,姝ゆ寰幆缁撴潫";
+ continue;
+ }
+
var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
if (upiObj == null)
{
diff --git a/CC/iWareSql/DataAccess/TaskHandler.cs b/CC/iWareSql/DataAccess/TaskHandler.cs
index 9ef1292..aa413f7 100644
--- a/CC/iWareSql/DataAccess/TaskHandler.cs
+++ b/CC/iWareSql/DataAccess/TaskHandler.cs
@@ -143,6 +143,23 @@
return true;
}
+ /// <summary>
+ /// 楠岃瘉 鐮佹澘浠诲姟鏄惁瀛樺湪 鏈粨鏉� 鐨勪换鍔�
+ /// </summary>
+ /// <param name="wmsDB"></param>
+ /// <returns>true:涓嶅瓨鍦� false锛氬瓨鍦�</returns>
+ public static bool ValidateNoFinishOutTaskFor鐮佹澘浠诲姟(WmsDBModel.WmsDBModel wmsDB)
+ {
+ var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus != (int)TaskStatusEnum.宸插畬鎴�
+ && x.TaskStatus != (int)TaskStatusEnum.宸插彇娑�
+ && x.RbTaskType == (int)RbTaskTypeEnum.鐮佹澘浠诲姟
+ ).ToList();
+ if (isExist?.Count() > 0)
+ {
+ return false;
+ }
+ return true;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3