From 80073b8cd70199dd9ff1d3718150019d8abe3969 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 02 9月 2025 14:21:01 +0800
Subject: [PATCH] 222
---
WMS/WMS/Service References/yunneiWCS/Reference.cs | 16 ++
wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs | 184 +++++++++++++++++---------
WMS/WMS/UI/SynthesizeQuery/FrmMes.Designer.cs | 40 +++--
wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs | 60 ++++++++
wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_V2_Mes.cs | 2
WMS/WMS/Service References/yunneiWCS/item2.xsd | 1
WMS/WMS/UI/SynthesizeQuery/FrmMes.resx | 3
wcs/yunneiWCS/yunneiWCS/ExtendFunction/SystemWarningMsg.cs | 5
sql/DBScript/01_DDL/01_DDL_TABLE_YunNeiDongLi.sql | 1
wcs/yunneiWCS/yunneiWCS/Form1.cs | 99 ++++++++++++++
wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/MesRequest.cs | 6
11 files changed, 335 insertions(+), 82 deletions(-)
diff --git a/WMS/WMS/Service References/yunneiWCS/Reference.cs b/WMS/WMS/Service References/yunneiWCS/Reference.cs
index 48b7f74..4c62dca 100644
--- a/WMS/WMS/Service References/yunneiWCS/Reference.cs
+++ b/WMS/WMS/Service References/yunneiWCS/Reference.cs
@@ -2530,6 +2530,9 @@
private string RemarkField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
+ private System.Nullable<int> SendToMesCountField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
private System.Nullable<System.DateTime> SendToMesTimeField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -2679,6 +2682,19 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
+ public System.Nullable<int> SendToMesCount {
+ get {
+ return this.SendToMesCountField;
+ }
+ set {
+ if ((this.SendToMesCountField.Equals(value) != true)) {
+ this.SendToMesCountField = value;
+ this.RaisePropertyChanged("SendToMesCount");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
public System.Nullable<System.DateTime> SendToMesTime {
get {
return this.SendToMesTimeField;
diff --git a/WMS/WMS/Service References/yunneiWCS/item2.xsd b/WMS/WMS/Service References/yunneiWCS/item2.xsd
index 100fe9a..df7cf47 100644
--- a/WMS/WMS/Service References/yunneiWCS/item2.xsd
+++ b/WMS/WMS/Service References/yunneiWCS/item2.xsd
@@ -134,6 +134,7 @@
<xs:element minOccurs="0" name="LastModifyTime" nillable="true" type="xs:dateTime" />
<xs:element minOccurs="0" name="MesRet" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Remark" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="SendToMesCount" nillable="true" type="xs:int" />
<xs:element minOccurs="0" name="SendToMesTime" nillable="true" type="xs:dateTime" />
<xs:element minOccurs="0" name="containerCode" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="isSendToMes" nillable="true" type="xs:int" />
diff --git a/WMS/WMS/UI/SynthesizeQuery/FrmMes.Designer.cs b/WMS/WMS/UI/SynthesizeQuery/FrmMes.Designer.cs
index 1cb2e24..bca00ab 100644
--- a/WMS/WMS/UI/SynthesizeQuery/FrmMes.Designer.cs
+++ b/WMS/WMS/UI/SynthesizeQuery/FrmMes.Designer.cs
@@ -71,6 +71,7 @@
this.qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.createDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.isSendToMes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.鎺ㄩ�佹鏁� = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.澶囨敞 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.MES杩斿洖 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.鎺ㄩ�佹椂闂� = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -93,14 +94,14 @@
// toolStripLabel5
//
this.toolStripLabel5.Name = "toolStripLabel5";
- this.toolStripLabel5.Size = new System.Drawing.Size(13, 34);
+ this.toolStripLabel5.Size = new System.Drawing.Size(13, 33);
this.toolStripLabel5.Text = "/";
//
// toolStripTextBox1
//
this.toolStripTextBox1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
this.toolStripTextBox1.Name = "toolStripTextBox1";
- this.toolStripTextBox1.Size = new System.Drawing.Size(38, 37);
+ this.toolStripTextBox1.Size = new System.Drawing.Size(38, 36);
this.toolStripTextBox1.Text = "1";
this.toolStripTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.toolStripTextBox1_KeyDown);
//
@@ -108,14 +109,14 @@
//
this.toolStripLabel2.BackColor = System.Drawing.Color.DodgerBlue;
this.toolStripLabel2.Name = "toolStripLabel2";
- this.toolStripLabel2.Size = new System.Drawing.Size(44, 34);
+ this.toolStripLabel2.Size = new System.Drawing.Size(44, 33);
this.toolStripLabel2.Text = "涓嬩竴椤�";
this.toolStripLabel2.Click += new System.EventHandler(this.toolStripLabel2_Click);
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
- this.toolStripLabel1.Size = new System.Drawing.Size(44, 34);
+ this.toolStripLabel1.Size = new System.Drawing.Size(44, 33);
this.toolStripLabel1.Text = "涓婁竴椤�";
this.toolStripLabel1.Click += new System.EventHandler(this.toolStripLabel1_Click);
//
@@ -129,24 +130,24 @@
"姣忛〉30鏉�",
"姣忛〉100鏉�"});
this.toolStripComboBox1.Name = "toolStripComboBox1";
- this.toolStripComboBox1.Size = new System.Drawing.Size(92, 37);
+ this.toolStripComboBox1.Size = new System.Drawing.Size(92, 36);
this.toolStripComboBox1.Text = "姣忛〉10鏉�";
this.toolStripComboBox1.SelectedIndexChanged += new System.EventHandler(this.toolStripComboBox1_SelectedIndexChanged);
//
// bindingNavigatorSeparator2
//
this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
- this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 37);
+ this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 36);
//
// bindingNavigatorSeparator1
//
this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
- this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 37);
+ this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 36);
//
// bindingNavigatorSeparator
//
this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
- this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 37);
+ this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 36);
//
// bindingNavigator1
//
@@ -174,7 +175,7 @@
this.bindingNavigator1.MovePreviousItem = null;
this.bindingNavigator1.Name = "bindingNavigator1";
this.bindingNavigator1.PositionItem = null;
- this.bindingNavigator1.Size = new System.Drawing.Size(1443, 37);
+ this.bindingNavigator1.Size = new System.Drawing.Size(1443, 36);
this.bindingNavigator1.TabIndex = 0;
this.bindingNavigator1.Text = "bindingNavigator1";
//
@@ -182,14 +183,14 @@
//
this.toolStripLabel4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripLabel4.Image")));
this.toolStripLabel4.Name = "toolStripLabel4";
- this.toolStripLabel4.Size = new System.Drawing.Size(20, 34);
+ this.toolStripLabel4.Size = new System.Drawing.Size(20, 33);
this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click);
//
// toolStripLabel3
//
this.toolStripLabel3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripLabel3.Image")));
this.toolStripLabel3.Name = "toolStripLabel3";
- this.toolStripLabel3.Size = new System.Drawing.Size(20, 34);
+ this.toolStripLabel3.Size = new System.Drawing.Size(20, 33);
this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
//
// splitContainer2
@@ -209,7 +210,7 @@
//
this.splitContainer2.Panel2.Controls.Add(this.bindingNavigator1);
this.splitContainer2.Size = new System.Drawing.Size(1443, 448);
- this.splitContainer2.SplitterDistance = 408;
+ this.splitContainer2.SplitterDistance = 409;
this.splitContainer2.SplitterWidth = 3;
this.splitContainer2.TabIndex = 3;
//
@@ -220,7 +221,7 @@
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Margin = new System.Windows.Forms.Padding(2);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1443, 408);
+ this.panel2.Size = new System.Drawing.Size(1443, 409);
this.panel2.TabIndex = 2;
//
// dataGridView1
@@ -249,6 +250,7 @@
this.qty,
this.createDate,
this.isSendToMes,
+ this.鎺ㄩ�佹鏁�,
this.澶囨敞,
this.MES杩斿洖,
this.鎺ㄩ�佹椂闂�,
@@ -259,7 +261,7 @@
this.dataGridView1.Margin = new System.Windows.Forms.Padding(2);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 27;
- this.dataGridView1.Size = new System.Drawing.Size(1443, 408);
+ this.dataGridView1.Size = new System.Drawing.Size(1443, 409);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dataGridView1.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridView1_CellFormatting);
@@ -527,10 +529,9 @@
//
this.ID.DataPropertyName = "ID";
this.ID.FillWeight = 103.2058F;
- this.ID.HeaderText = "ID";
+ this.ID.HeaderText = "鏍囪瘑绗�";
this.ID.Name = "ID";
this.ID.ReadOnly = true;
- this.ID.Visible = false;
//
// Column1
//
@@ -601,6 +602,12 @@
this.isSendToMes.HeaderText = "鏄惁鍙戦��";
this.isSendToMes.Name = "isSendToMes";
this.isSendToMes.ReadOnly = true;
+ //
+ // 鎺ㄩ�佹鏁�
+ //
+ this.鎺ㄩ�佹鏁�.DataPropertyName = "SendToMesCount";
+ this.鎺ㄩ�佹鏁�.HeaderText = "鎺ㄩ�佹鏁�";
+ this.鎺ㄩ�佹鏁�.Name = "鎺ㄩ�佹鏁�";
//
// 澶囨敞
//
@@ -701,6 +708,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn qty;
private System.Windows.Forms.DataGridViewTextBoxColumn createDate;
private System.Windows.Forms.DataGridViewTextBoxColumn isSendToMes;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 鎺ㄩ�佹鏁�;
private System.Windows.Forms.DataGridViewTextBoxColumn 澶囨敞;
private System.Windows.Forms.DataGridViewTextBoxColumn MES杩斿洖;
private System.Windows.Forms.DataGridViewTextBoxColumn 鎺ㄩ�佹椂闂�;
diff --git a/WMS/WMS/UI/SynthesizeQuery/FrmMes.resx b/WMS/WMS/UI/SynthesizeQuery/FrmMes.resx
index c662c91..d52e1d2 100644
--- a/WMS/WMS/UI/SynthesizeQuery/FrmMes.resx
+++ b/WMS/WMS/UI/SynthesizeQuery/FrmMes.resx
@@ -182,6 +182,9 @@
<metadata name="isSendToMes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="鎺ㄩ�佹鏁�.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="澶囨敞.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
diff --git a/sql/DBScript/01_DDL/01_DDL_TABLE_YunNeiDongLi.sql b/sql/DBScript/01_DDL/01_DDL_TABLE_YunNeiDongLi.sql
index c1bcdbb..800ab5c 100644
--- a/sql/DBScript/01_DDL/01_DDL_TABLE_YunNeiDongLi.sql
+++ b/sql/DBScript/01_DDL/01_DDL_TABLE_YunNeiDongLi.sql
@@ -210,6 +210,7 @@
qty int NULL , -- 鏁伴噺
isSendToMes int NULL , -- 鏄惁鎺ㄧ粰MES
+ SendToMesCount int NULL , -- 鎺ㄧ粰MES娆℃暟
SendToMesTime datetime null, -- 鎺ㄧ粰MES鏃堕棿
MesRet NVARCHAR(128) NULL , -- MES杩斿洖缁撴灉
diff --git a/wcs/yunneiWCS/yunneiWCS/ExtendFunction/SystemWarningMsg.cs b/wcs/yunneiWCS/yunneiWCS/ExtendFunction/SystemWarningMsg.cs
index c8167a1..c4f5c24 100644
--- a/wcs/yunneiWCS/yunneiWCS/ExtendFunction/SystemWarningMsg.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ExtendFunction/SystemWarningMsg.cs
@@ -66,5 +66,10 @@
/// MES鏁版嵁鎺ㄩ�佺嚎绋嬫秷鎭�
/// </summary>
public static string msg_mesDataTranffic = "";
+
+ /// <summary>
+ /// MES鏁版嵁鎺ㄩ�佺嚎绋嬫秷鎭�
+ /// </summary>
+ public static string msg_mesDataTranfficForRealMes = "";
}
}
diff --git a/wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs b/wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs
index 6886926..2938dfb 100644
--- a/wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs
+++ b/wcs/yunneiWCS/yunneiWCS/Form1.Designer.cs
@@ -59,6 +59,8 @@
this.label3 = new System.Windows.Forms.Label();
this.lbl_sendTask_errMsg = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.lbl_msg_mesDataTranffic_V2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -66,18 +68,20 @@
// label_title
//
this.label_title.Font = new System.Drawing.Font("瀹嬩綋", 22.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label_title.Location = new System.Drawing.Point(-3, 189);
+ this.label_title.Location = new System.Drawing.Point(-2, 151);
+ this.label_title.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label_title.Name = "label_title";
- this.label_title.Size = new System.Drawing.Size(476, 51);
+ this.label_title.Size = new System.Drawing.Size(357, 41);
this.label_title.TabIndex = 0;
this.label_title.Text = "WCS鏈嶅姟姝ｅ湪鍚姩";
//
// label_PLC
//
this.label_PLC.Font = new System.Drawing.Font("瀹嬩綋", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label_PLC.Location = new System.Drawing.Point(0, 246);
+ this.label_PLC.Location = new System.Drawing.Point(0, 197);
+ this.label_PLC.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label_PLC.Name = "label_PLC";
- this.label_PLC.Size = new System.Drawing.Size(511, 29);
+ this.label_PLC.Size = new System.Drawing.Size(383, 23);
this.label_PLC.TabIndex = 1;
this.label_PLC.Text = "PLC閾炬帴鐘舵��";
//
@@ -87,14 +91,16 @@
this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(1043, 186);
+ this.pictureBox1.Size = new System.Drawing.Size(782, 149);
this.pictureBox1.TabIndex = 2;
this.pictureBox1.TabStop = false;
//
// panel1
//
+ this.panel1.Controls.Add(this.lbl_msg_mesDataTranffic_V2);
+ this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.lbl_ClearDataMsg);
this.panel1.Controls.Add(this.lbl_Thread_lbl_shouEntity_Srm);
this.panel1.Controls.Add(this.label35);
@@ -122,19 +128,20 @@
this.panel1.Controls.Add(this.lbl_sendTask_errMsg);
this.panel1.Controls.Add(this.label1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel1.Location = new System.Drawing.Point(0, 279);
- this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.panel1.Location = new System.Drawing.Point(0, 222);
+ this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1043, 460);
+ this.panel1.Size = new System.Drawing.Size(782, 425);
this.panel1.TabIndex = 3;
//
// lbl_ClearDataMsg
//
this.lbl_ClearDataMsg.AutoSize = true;
this.lbl_ClearDataMsg.ForeColor = System.Drawing.Color.Red;
- this.lbl_ClearDataMsg.Location = new System.Drawing.Point(170, 419);
+ this.lbl_ClearDataMsg.Location = new System.Drawing.Point(128, 335);
+ this.lbl_ClearDataMsg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_ClearDataMsg.Name = "lbl_ClearDataMsg";
- this.lbl_ClearDataMsg.Size = new System.Drawing.Size(67, 15);
+ this.lbl_ClearDataMsg.Size = new System.Drawing.Size(53, 12);
this.lbl_ClearDataMsg.TabIndex = 23;
this.lbl_ClearDataMsg.Text = "閿欒娑堟伅";
//
@@ -142,27 +149,30 @@
//
this.lbl_Thread_lbl_shouEntity_Srm.AutoSize = true;
this.lbl_Thread_lbl_shouEntity_Srm.ForeColor = System.Drawing.Color.Red;
- this.lbl_Thread_lbl_shouEntity_Srm.Location = new System.Drawing.Point(170, 391);
+ this.lbl_Thread_lbl_shouEntity_Srm.Location = new System.Drawing.Point(128, 313);
+ this.lbl_Thread_lbl_shouEntity_Srm.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_Thread_lbl_shouEntity_Srm.Name = "lbl_Thread_lbl_shouEntity_Srm";
- this.lbl_Thread_lbl_shouEntity_Srm.Size = new System.Drawing.Size(67, 15);
+ this.lbl_Thread_lbl_shouEntity_Srm.Size = new System.Drawing.Size(53, 12);
this.lbl_Thread_lbl_shouEntity_Srm.TabIndex = 25;
this.lbl_Thread_lbl_shouEntity_Srm.Text = "閿欒娑堟伅";
//
// label35
//
this.label35.AutoSize = true;
- this.label35.Location = new System.Drawing.Point(15, 419);
+ this.label35.Location = new System.Drawing.Point(11, 335);
+ this.label35.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(105, 15);
+ this.label35.Size = new System.Drawing.Size(83, 12);
this.label35.TabIndex = 22;
this.label35.Text = "娓呴櫎鏁版嵁绾跨▼:";
//
// label36
//
this.label36.AutoSize = true;
- this.label36.Location = new System.Drawing.Point(5, 391);
+ this.label36.Location = new System.Drawing.Point(4, 313);
+ this.label36.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label36.Name = "label36";
- this.label36.Size = new System.Drawing.Size(150, 15);
+ this.label36.Size = new System.Drawing.Size(119, 12);
this.label36.TabIndex = 24;
this.label36.Text = "鍫嗗灈鏈鸿澶囩姸鎬佺嚎绋�:";
//
@@ -170,18 +180,20 @@
//
this.lbl_Thread_HandleOutStockList_Msg.AutoSize = true;
this.lbl_Thread_HandleOutStockList_Msg.ForeColor = System.Drawing.Color.Red;
- this.lbl_Thread_HandleOutStockList_Msg.Location = new System.Drawing.Point(161, 354);
+ this.lbl_Thread_HandleOutStockList_Msg.Location = new System.Drawing.Point(121, 283);
+ this.lbl_Thread_HandleOutStockList_Msg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_Thread_HandleOutStockList_Msg.Name = "lbl_Thread_HandleOutStockList_Msg";
- this.lbl_Thread_HandleOutStockList_Msg.Size = new System.Drawing.Size(67, 15);
+ this.lbl_Thread_HandleOutStockList_Msg.Size = new System.Drawing.Size(53, 12);
this.lbl_Thread_HandleOutStockList_Msg.TabIndex = 21;
this.lbl_Thread_HandleOutStockList_Msg.Text = "閿欒娑堟伅";
//
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(5, 354);
+ this.label12.Location = new System.Drawing.Point(4, 283);
+ this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(150, 15);
+ this.label12.Size = new System.Drawing.Size(119, 12);
this.label12.TabIndex = 20;
this.label12.Text = "澶勭悊鏂板缓鐨勫嚭搴撹〃鍗�:";
//
@@ -189,18 +201,20 @@
//
this.lbl_inStockCodeToTask_errMsg.AutoSize = true;
this.lbl_inStockCodeToTask_errMsg.ForeColor = System.Drawing.Color.Red;
- this.lbl_inStockCodeToTask_errMsg.Location = new System.Drawing.Point(243, 15);
+ this.lbl_inStockCodeToTask_errMsg.Location = new System.Drawing.Point(182, 12);
+ this.lbl_inStockCodeToTask_errMsg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_inStockCodeToTask_errMsg.Name = "lbl_inStockCodeToTask_errMsg";
- this.lbl_inStockCodeToTask_errMsg.Size = new System.Drawing.Size(67, 15);
+ this.lbl_inStockCodeToTask_errMsg.Size = new System.Drawing.Size(53, 12);
this.lbl_inStockCodeToTask_errMsg.TabIndex = 19;
this.lbl_inStockCodeToTask_errMsg.Text = "閿欒娑堟伅";
//
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(12, 15);
+ this.label11.Location = new System.Drawing.Point(9, 12);
+ this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(225, 15);
+ this.label11.Size = new System.Drawing.Size(179, 12);
this.label11.TabIndex = 18;
this.label11.Text = "缁勭洏涓嬪彂鍚庯紝鐢熸垚涓嬬嚎鍏ュ簱浠诲姟:";
//
@@ -208,18 +222,20 @@
//
this.lbl_sendTaskForPick_ErrMsg.AutoSize = true;
this.lbl_sendTaskForPick_ErrMsg.ForeColor = System.Drawing.Color.Red;
- this.lbl_sendTaskForPick_ErrMsg.Location = new System.Drawing.Point(209, 187);
+ this.lbl_sendTaskForPick_ErrMsg.Location = new System.Drawing.Point(157, 150);
+ this.lbl_sendTaskForPick_ErrMsg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_sendTaskForPick_ErrMsg.Name = "lbl_sendTaskForPick_ErrMsg";
- this.lbl_sendTaskForPick_ErrMsg.Size = new System.Drawing.Size(67, 15);
+ this.lbl_sendTaskForPick_ErrMsg.Size = new System.Drawing.Size(53, 12);
this.lbl_sendTaskForPick_ErrMsg.TabIndex = 17;
this.lbl_sendTaskForPick_ErrMsg.Text = "閿欒娑堟伅";
//
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(15, 187);
+ this.label10.Location = new System.Drawing.Point(11, 150);
+ this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(180, 15);
+ this.label10.Size = new System.Drawing.Size(143, 12);
this.label10.TabIndex = 16;
this.label10.Text = "澶勭悊鍒嗘嫞瀹屾垚鐨勪换鍔″鐞�:";
//
@@ -227,18 +243,20 @@
//
this.lbl_SrmfinishConfirm_Msg.AutoSize = true;
this.lbl_SrmfinishConfirm_Msg.ForeColor = System.Drawing.Color.Red;
- this.lbl_SrmfinishConfirm_Msg.Location = new System.Drawing.Point(192, 155);
+ this.lbl_SrmfinishConfirm_Msg.Location = new System.Drawing.Point(144, 124);
+ this.lbl_SrmfinishConfirm_Msg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_SrmfinishConfirm_Msg.Name = "lbl_SrmfinishConfirm_Msg";
- this.lbl_SrmfinishConfirm_Msg.Size = new System.Drawing.Size(67, 15);
+ this.lbl_SrmfinishConfirm_Msg.Size = new System.Drawing.Size(53, 12);
this.lbl_SrmfinishConfirm_Msg.TabIndex = 15;
this.lbl_SrmfinishConfirm_Msg.Text = "閿欒娑堟伅";
//
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(15, 155);
+ this.label9.Location = new System.Drawing.Point(11, 124);
+ this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(150, 15);
+ this.label9.Size = new System.Drawing.Size(119, 12);
this.label9.TabIndex = 14;
this.label9.Text = "鍫嗗灈鏈哄畬鎴愪俊鍙峰鐞�:";
//
@@ -246,18 +264,20 @@
//
this.lbl_NoIssueTaskMsg_GG.AutoSize = true;
this.lbl_NoIssueTaskMsg_GG.ForeColor = System.Drawing.Color.Red;
- this.lbl_NoIssueTaskMsg_GG.Location = new System.Drawing.Point(244, 114);
+ this.lbl_NoIssueTaskMsg_GG.Location = new System.Drawing.Point(183, 91);
+ this.lbl_NoIssueTaskMsg_GG.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_NoIssueTaskMsg_GG.Name = "lbl_NoIssueTaskMsg_GG";
- this.lbl_NoIssueTaskMsg_GG.Size = new System.Drawing.Size(67, 15);
+ this.lbl_NoIssueTaskMsg_GG.Size = new System.Drawing.Size(53, 12);
this.lbl_NoIssueTaskMsg_GG.TabIndex = 13;
this.lbl_NoIssueTaskMsg_GG.Text = "閿欒娑堟伅";
//
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(15, 114);
+ this.label8.Location = new System.Drawing.Point(11, 91);
+ this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(211, 15);
+ this.label8.Size = new System.Drawing.Size(167, 12);
this.label8.TabIndex = 12;
this.label8.Text = "(缂哥洊)娑堣垂鏈笅鍙戠殑浠诲姟绾跨▼:";
//
@@ -265,18 +285,20 @@
//
this.lbl_NoIssueTaskMsg_GT.AutoSize = true;
this.lbl_NoIssueTaskMsg_GT.ForeColor = System.Drawing.Color.Red;
- this.lbl_NoIssueTaskMsg_GT.Location = new System.Drawing.Point(252, 84);
+ this.lbl_NoIssueTaskMsg_GT.Location = new System.Drawing.Point(189, 67);
+ this.lbl_NoIssueTaskMsg_GT.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_NoIssueTaskMsg_GT.Name = "lbl_NoIssueTaskMsg_GT";
- this.lbl_NoIssueTaskMsg_GT.Size = new System.Drawing.Size(67, 15);
+ this.lbl_NoIssueTaskMsg_GT.Size = new System.Drawing.Size(53, 12);
this.lbl_NoIssueTaskMsg_GT.TabIndex = 11;
this.lbl_NoIssueTaskMsg_GT.Text = "閿欒娑堟伅";
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(15, 84);
+ this.label7.Location = new System.Drawing.Point(11, 67);
+ this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(211, 15);
+ this.label7.Size = new System.Drawing.Size(167, 12);
this.label7.TabIndex = 10;
this.label7.Text = "(缂镐綋)娑堣垂鏈笅鍙戠殑浠诲姟绾跨▼:";
//
@@ -284,18 +306,20 @@
//
this.lbl_msg_mesDataTranffic.AutoSize = true;
this.lbl_msg_mesDataTranffic.ForeColor = System.Drawing.Color.Red;
- this.lbl_msg_mesDataTranffic.Location = new System.Drawing.Point(152, 322);
+ this.lbl_msg_mesDataTranffic.Location = new System.Drawing.Point(114, 258);
+ this.lbl_msg_mesDataTranffic.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_msg_mesDataTranffic.Name = "lbl_msg_mesDataTranffic";
- this.lbl_msg_mesDataTranffic.Size = new System.Drawing.Size(67, 15);
+ this.lbl_msg_mesDataTranffic.Size = new System.Drawing.Size(53, 12);
this.lbl_msg_mesDataTranffic.TabIndex = 9;
this.lbl_msg_mesDataTranffic.Text = "閿欒娑堟伅";
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(3, 322);
+ this.label6.Location = new System.Drawing.Point(2, 258);
+ this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(114, 15);
+ this.label6.Size = new System.Drawing.Size(89, 12);
this.label6.TabIndex = 8;
this.label6.Text = "鎺ㄩ�佺粰MES鏁版嵁:";
//
@@ -303,18 +327,20 @@
//
this.lbl_agvSendStatu2.AutoSize = true;
this.lbl_agvSendStatu2.ForeColor = System.Drawing.Color.Red;
- this.lbl_agvSendStatu2.Location = new System.Drawing.Point(152, 295);
+ this.lbl_agvSendStatu2.Location = new System.Drawing.Point(114, 236);
+ this.lbl_agvSendStatu2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_agvSendStatu2.Name = "lbl_agvSendStatu2";
- this.lbl_agvSendStatu2.Size = new System.Drawing.Size(67, 15);
+ this.lbl_agvSendStatu2.Size = new System.Drawing.Size(53, 12);
this.lbl_agvSendStatu2.TabIndex = 7;
this.lbl_agvSendStatu2.Text = "閿欒娑堟伅";
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(3, 295);
+ this.label5.Location = new System.Drawing.Point(2, 236);
+ this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(143, 15);
+ this.label5.Size = new System.Drawing.Size(107, 12);
this.label5.TabIndex = 6;
this.label5.Text = "agvSendStatus[1]:";
//
@@ -322,18 +348,20 @@
//
this.lbl_agvSendStatus1.AutoSize = true;
this.lbl_agvSendStatus1.ForeColor = System.Drawing.Color.Red;
- this.lbl_agvSendStatus1.Location = new System.Drawing.Point(152, 266);
+ this.lbl_agvSendStatus1.Location = new System.Drawing.Point(114, 213);
+ this.lbl_agvSendStatus1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_agvSendStatus1.Name = "lbl_agvSendStatus1";
- this.lbl_agvSendStatus1.Size = new System.Drawing.Size(67, 15);
+ this.lbl_agvSendStatus1.Size = new System.Drawing.Size(53, 12);
this.lbl_agvSendStatus1.TabIndex = 5;
this.lbl_agvSendStatus1.Text = "閿欒娑堟伅";
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(3, 266);
+ this.label4.Location = new System.Drawing.Point(2, 213);
+ this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(143, 15);
+ this.label4.Size = new System.Drawing.Size(107, 12);
this.label4.TabIndex = 4;
this.label4.Text = "agvSendStatus[0]:";
//
@@ -341,18 +369,20 @@
//
this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.AutoSize = true;
this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.ForeColor = System.Drawing.Color.Red;
- this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.Location = new System.Drawing.Point(235, 237);
+ this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.Location = new System.Drawing.Point(176, 190);
+ this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.Name = "lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg";
- this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.Size = new System.Drawing.Size(67, 15);
+ this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.Size = new System.Drawing.Size(53, 12);
this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.TabIndex = 3;
this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.Text = "閿欒娑堟伅";
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(3, 237);
+ this.label3.Location = new System.Drawing.Point(2, 190);
+ this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(226, 15);
+ this.label3.Size = new System.Drawing.Size(179, 12);
this.label3.TabIndex = 2;
this.label3.Text = "娑堣垂浠诲姟绾跨▼(鐩磋揪涓婄嚎鐐逛笓鐢�):";
//
@@ -360,27 +390,50 @@
//
this.lbl_sendTask_errMsg.AutoSize = true;
this.lbl_sendTask_errMsg.ForeColor = System.Drawing.Color.Red;
- this.lbl_sendTask_errMsg.Location = new System.Drawing.Point(192, 48);
+ this.lbl_sendTask_errMsg.Location = new System.Drawing.Point(144, 38);
+ this.lbl_sendTask_errMsg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbl_sendTask_errMsg.Name = "lbl_sendTask_errMsg";
- this.lbl_sendTask_errMsg.Size = new System.Drawing.Size(67, 15);
+ this.lbl_sendTask_errMsg.Size = new System.Drawing.Size(53, 12);
this.lbl_sendTask_errMsg.TabIndex = 1;
this.lbl_sendTask_errMsg.Text = "閿欒娑堟伅";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(12, 48);
+ this.label1.Location = new System.Drawing.Point(9, 38);
+ this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(165, 15);
+ this.label1.Size = new System.Drawing.Size(131, 12);
this.label1.TabIndex = 0;
this.label1.Text = "娑堣垂宸蹭笅鍙戠殑浠诲姟绾跨▼:";
//
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(9, 365);
+ this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(113, 12);
+ this.label2.TabIndex = 26;
+ this.label2.Text = "鎺ㄩ�佺粰MES鏁版嵁(V2):";
+ //
+ // lbl_msg_mesDataTranffic_V2
+ //
+ this.lbl_msg_mesDataTranffic_V2.AutoSize = true;
+ this.lbl_msg_mesDataTranffic_V2.ForeColor = System.Drawing.Color.Red;
+ this.lbl_msg_mesDataTranffic_V2.Location = new System.Drawing.Point(135, 365);
+ this.lbl_msg_mesDataTranffic_V2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lbl_msg_mesDataTranffic_V2.Name = "lbl_msg_mesDataTranffic_V2";
+ this.lbl_msg_mesDataTranffic_V2.Size = new System.Drawing.Size(53, 12);
+ this.lbl_msg_mesDataTranffic_V2.TabIndex = 27;
+ this.lbl_msg_mesDataTranffic_V2.Text = "閿欒娑堟伅";
+ //
// Form1
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
- this.ClientSize = new System.Drawing.Size(1043, 739);
+ this.ClientSize = new System.Drawing.Size(782, 647);
this.Controls.Add(this.panel1);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label_PLC);
@@ -388,7 +441,7 @@
this.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "Form1";
this.Text = "浼熸湰鏅鸿兘WCS";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
@@ -432,7 +485,8 @@
private System.Windows.Forms.Label label35;
private System.Windows.Forms.Label lbl_Thread_lbl_shouEntity_Srm;
private System.Windows.Forms.Label label36;
-
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label lbl_msg_mesDataTranffic_V2;
}
}
diff --git a/wcs/yunneiWCS/yunneiWCS/Form1.cs b/wcs/yunneiWCS/yunneiWCS/Form1.cs
index 73765eb..a77219f 100644
--- a/wcs/yunneiWCS/yunneiWCS/Form1.cs
+++ b/wcs/yunneiWCS/yunneiWCS/Form1.cs
@@ -27,6 +27,7 @@
using yunneiWCS.Common;
using yunneiWCS.SystemInteraction.tianyong;
using yunneiWCS.PLC.Srm;
+using yunneiWCS.SystemInteraction.mes2.dto;
namespace yunneiWCS
{
@@ -2333,6 +2334,103 @@
}
}
+
+ /// <summary>
+ /// MES鏁版嵁鎺ㄩ�� [Editby shaocx,2025-09-02]
+ /// </summary>
+ public void mesDataTranfficForRealMes()
+ {
+ while (true)
+ {
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = "";
+ try
+ {
+ Thread.Sleep(5000);
+ using (dbmodel mod = new dbmodel())
+ {
+ List<Wms_outInStockRecord_V2_Mes> sendMesData = mod.Wms_outInStockRecord_V2_Mes.Where(x => x.isSendToMes == 0).ToList();
+
+ if (sendMesData.Count > 0)
+ {
+ foreach (var itemTask in sendMesData)
+ {
+ try
+ {
+ mesMsg res = null;
+ if (isvirtual)
+ {//妯℃嫙鐜
+ res = new mesMsg();
+ res.ErrorCode = 0;
+ res.ErrorMsg = "妯℃嫙鐜涓嬶紝妯℃嫙鍙戦��";
+ }
+ else
+ {//姝ｅ紡鐜
+ //鑾峰彇淇℃伅鏄庣粏
+ var details = mod.Wms_outInStockRecord_Details_V2_Mes.Where(x => x.mainId == itemTask.ID).ToList();
+ List<InboundStockInfoToMes> pushData = new List<InboundStockInfoToMes>();
+ foreach (var de in details)
+ {
+ pushData.Add(new InboundStockInfoToMes()
+ {
+ containerCode = itemTask.containerCode,
+ createTime = itemTask.CreateTime?.ToString("yyyy-MM-dd HH:mm:ss"),
+ materialCode = de.productCode,
+ materialName = de.productName,
+ positionName = itemTask.sourcePlace,
+ productName = itemTask.materialName,
+ serialNumber = de.serialNumber,
+ supplier = itemTask.supplier,
+ version = itemTask.version,
+ });
+ }
+ ApiResponse<object> ret = null;
+ switch (itemTask.outInFlag)
+ {
+ case (int)OutInFlag.鍏ュ簱:
+ ret = PushMesHandler.Mes_InStockSend(pushData, itemTask.ID.ToString());
+ break;
+ case (int)OutInFlag.鍑哄簱:
+ ret = PushMesHandler.Mes_OutStockSend(pushData, itemTask.ID.ToString());
+ break;
+ default:
+ break;
+ }
+
+ if (ret.Success)
+ {
+ itemTask.isSendToMes = 1;
+ }
+ else
+ {
+ itemTask.isSendToMes = 0;
+ }
+ itemTask.SendToMesTime = DateTime.Now;
+ itemTask.MesRet = ret.Message;
+ itemTask.SendToMesCount = (itemTask.SendToMesCount ?? 0) + 1;
+ mod.SaveChanges();
+ }
+ }
+ catch (Exception ex)
+ {
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = "鎺ㄩ�佺粰MES鏁版嵁寮傚父:" + JsonConvert.SerializeObject(ex);
+ WZ.Useful.Commons.LogTextHelper.WriteLine("Form1", "mesDataTranffic", SystemWarningMsg.msg_mesDataTranffic);
+ }
+ }
+ }
+ else
+ {
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = "娌℃湁鏁版嵁瑕佹帹閫佺粰MES!";
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ SystemWarningMsg.msg_mesDataTranfficForRealMes = "鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:" + ex.Message;
+ WZ.Useful.Commons.LogTextHelper.WriteLine("Form1", "mesDataTranffic鏁版嵁瑕佹帹閫佺粰MES鍑虹幇寮傚父:", SystemWarningMsg.msg_mesDataTranfficForRealMes + "," + JsonConvert.SerializeObject(ex));
+ }
+ }
+
+ }
private void Form1_FormClosing(object sender, FormClosingEventArgs e)
{
Environment.Exit(0);//閫�鍑烘湰杩涚▼鎵�鏈夌嚎绋�
@@ -2824,6 +2922,7 @@
this.lbl_Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg.Text = showNowTime + SystemWarningMsg.Thread_HandleTaskForNoIssuedForDirectOnLinePoint__ErrMsg;
this.lbl_msg_mesDataTranffic.Text = showNowTime + SystemWarningMsg.msg_mesDataTranffic;
+ this.lbl_msg_mesDataTranffic_V2.Text = showNowTime + SystemWarningMsg.msg_mesDataTranfficForRealMes;
this.lbl_sendTaskForPick_ErrMsg.Text = showNowTime + SystemWarningMsg.Thread_sendTaskForPick_ErrMsg;
this.lbl_ClearDataMsg.Text = showNowTime + SystemWarningMsg.Thread_lbl_ClearDataMsg;
diff --git a/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_V2_Mes.cs b/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_V2_Mes.cs
index 0a875ca..ec1041e 100644
--- a/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_V2_Mes.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ORM/Wms_outInStockRecord_V2_Mes.cs
@@ -54,6 +54,8 @@
public int? isSendToMes { get; set; }
+ public int? SendToMesCount { get; set; }
+
public DateTime? SendToMesTime { get; set; }
[StringLength(128)]
diff --git a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
index 40821d8..6e2dc09 100644
--- a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
+++ b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/PushMesHandler.cs
@@ -23,13 +23,14 @@
/// </summary>
/// <param name="pushData"></param>
/// <returns></returns>
- public static ApiResponse<object> Mes_InStockSend(List<InboundStockInfoToMes> pushData)
+ public static ApiResponse<object> Mes_InStockSend(List<InboundStockInfoToMes> pushData, string _identifier)
{
ApiResponse<object> res = null;
try
{
MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>();
mesRequest.data = pushData;
+ mesRequest.identifier = _identifier;
string paprm = JsonConvert.SerializeObject(mesRequest);
Guid guid = System.Guid.NewGuid();
@@ -44,5 +45,62 @@
return res;
}
+
+
+ /// <summary>
+ /// 缁橫ES鎺ㄩ�佸嚭搴撲俊鎭�
+ /// </summary>
+ /// <param name="pushData"></param>
+ /// <returns></returns>
+ public static ApiResponse<object> Mes_OutStockSend(List<InboundStockInfoToMes> pushData, string _identifier)
+ {
+ ApiResponse<object> res = null;
+ try
+ {
+ MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>();
+ mesRequest.data = pushData;
+ mesRequest.identifier = _identifier;
+
+ string paprm = JsonConvert.SerializeObject(mesRequest);
+ Guid guid = System.Guid.NewGuid();
+ res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Outbound_Record", paprm, guid));
+ WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_OutStockSend 杩斿洖鐘舵�佺爜:", res.Code + " 杩斿洖淇℃伅:" + res.Message);
+ }
+ catch (Exception ex)
+ {
+ WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_OutStockSend ", " 鍙戦�佸紓甯�:" + JsonConvert.SerializeObject(ex));
+ res.Message = "鍙戦�佸紓甯�:" + ex.Message;
+ }
+ return res;
+
+ }
+
+
+ /// <summary>
+ /// 缁橫ES鎺ㄩ�佸簱瀛樹俊鎭�
+ /// </summary>
+ /// <param name="pushData"></param>
+ /// <returns></returns>
+ public static ApiResponse<object> Mes_StockSend(List<InboundStockInfoToMes> pushData)
+ {
+ ApiResponse<object> res = null;
+ try
+ {
+ MesRequest<List<InboundStockInfoToMes>> mesRequest = new MesRequest<List<InboundStockInfoToMes>>();
+ mesRequest.data = pushData;
+
+ string paprm = JsonConvert.SerializeObject(mesRequest);
+ Guid guid = System.Guid.NewGuid();
+ res = JsonConvert.DeserializeObject<ApiResponse<object>>(mes_api.postContentForString("T_WMS_Realtime_Data", paprm, guid));
+ WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_OutStockSend 杩斿洖鐘舵�佺爜:", res.Code + " 杩斿洖淇℃伅:" + res.Message);
+ }
+ catch (Exception ex)
+ {
+ WZ.Useful.Commons.LogTextHelper.WriteLine("PushMesHandler", "Mes_OutStockSend ", " 鍙戦�佸紓甯�:" + JsonConvert.SerializeObject(ex));
+ res.Message = "鍙戦�佸紓甯�:" + ex.Message;
+ }
+ return res;
+
+ }
}
}
diff --git a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/MesRequest.cs b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/MesRequest.cs
index ce1db29..4735a49 100644
--- a/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/MesRequest.cs
+++ b/wcs/yunneiWCS/yunneiWCS/SystemInteraction/mes2/dto/MesRequest.cs
@@ -24,5 +24,11 @@
/// 鎺ㄩ�佹椂闂�
/// </summary>
public string Timestamp { get; set; } = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); // 鏃堕棿鎴筹紝濡� "2022-03-15 06:43:15"
+
+
+ /// <summary>
+ /// 鍞竴鏍囪瘑绗�
+ /// </summary>
+ public string identifier { get; set; }
}
}
--
Gitblit v1.9.3