From 60a4de55deb1aeeb5621028a8f8c732c38027f81 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 12月 2024 14:19:35 +0800
Subject: [PATCH] 222
---
CC/iWareSql/DataAccess/TaskHandler.cs | 2
CC/iWareCC_ASRS/App.config | 20
CC/iWareCC_ASRS/Common/SystemWarningMsg.cs | 6
CC/iWareCommon/log4net_iWare.config | 48 +-
CC/iWareCommon/Utils/Log4Net/LogType.cs | 6
CC/iWareModel/Entity/MES/Respone.cs | 26 +
CC/iWareCC_ASRS/FormCC.cs | 30
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/RbTaskTypeEnum.cs | 6
CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs | 2
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/2、DataProcess_BZ21_IssueTask.cs | 115 +++++++
CC/iWareModel/EnumType/WMS/RbTaskTypeEnum.cs | 6
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/1、DataProcess_BZ12.cs | 16
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/3、DataProcess_BZ21_FinishTask.cs | 2
CC/iWareCC_ASRS/WmsTask/MainTaskDecompose.cs | 12
/dev/null | 76 ----
CC/iWareModel/iWareModel.csproj | 2
CC/iWareCC_ASRS/FormCC.Designer.cs | 150 ++++----
CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs | 81 +++++
CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs | 81 +++++
CC/iWareModel/EnumType/WMS/PushStatusEnum.cs | 39 ++
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/1、DataProcess_BZ21.cs | 174 +---------
CC/iWareCC_ASRS/iWareCC.csproj | 8
22 files changed, 521 insertions(+), 387 deletions(-)
diff --git a/CC/iWareCC_ASRS/App.config b/CC/iWareCC_ASRS/App.config
index 04c8529..868f894 100644
--- a/CC/iWareCC_ASRS/App.config
+++ b/CC/iWareCC_ASRS/App.config
@@ -19,20 +19,12 @@
<add key="IsSimulationPLC" value="false"/>
<!-- 鏄惁鏄殢鏈哄鎵惧簱浣嶏紝寤鸿鏄痜alse-->
<add key="IsRandomFindPlace" value="false"/>
- <!-- 瑗挎腐WMS鐨凙PI-->
- <add key="XiGang_WMSApi" value="http://localhost:8084/api/"/>
- <!-- 瑗挎腐WMS鐨勫彂鍔ㄦ満鍑哄簱-->
- <add key="XiGang_WMSApi_OutStoreToMes" value="MES/OutStoreToMes"/>
- <!-- 瑗挎腐WMS鐨勭粍鐩�-->
- <add key="XiGang_WMSApi_SalverMaterialBind" value="Task_Main/SalverMaterialBind"/>
- <!-- 瑗挎腐WMS鐨勭粍鐩樹笅鍙�-->
- <add key="XiGang_WMSApi_IssueInStoreTask" value="Task_Main/IssueInStoreTaskForCC"/>
- <!--AGV鐨勪富鏈篽ost-->
- <add key="AgvHost" value="http://192.168.10.120:8088/"/>
- <!--AGV-鑾峰彇鏈哄櫒浜轰俊鎭�-->
- <add key="RobotsStatus" value="robotsStatus"/>
- <!-- 鏄惁鍚敤鏂板叆搴撳彛 -->
- <add key="IsEnableNewInStorePlace" value="false"/>
+ <!-- MES API-->
+ <add key="Mes_Api" value="http://172.17.1.22:44374/api/LuLi/"/>
+ <!-- MES鍖呰瀹屾垚鎺ュ彛-->
+ <add key="Mes_Api_packagecompleted" value="packagecompleted"/>
+ <!-- MES鍑虹焊鏈烘帴鍙�-->
+ <add key="Mes_Api_papercut" value="cartons-machine"/>
</appSettings>
<connectionStrings>
<add name="WmsDBModel" connectionString="data source=172.17.1.111;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=admin@123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
diff --git a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
index 899b712..82c5614 100644
--- a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
+++ b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
@@ -58,7 +58,7 @@
/// <summary>
/// RGV涓嬪彂鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_RgvRelease = string.Empty;
+ public static string _lbl_Alert_PushPaperCutToMes = string.Empty;
/// <summary>
/// RGV浠诲姟瀹屾垚纭鐨勮鍛婃秷鎭�
@@ -83,7 +83,7 @@
/// <summary>
/// 浠诲姟鍒嗚В绾跨▼鐨勬秷鎭�
/// </summary>
- public static string _lbl_Alert_MainTaskDecompose = string.Empty;
+ public static string _lbl_Alert_DataProcess_BZ21_IssueTask = string.Empty;
/// <summary>
/// 浠诲姟鍒嗚В绾跨▼-缁勭洏鍏ュ簱鐨勬秷鎭�
@@ -145,7 +145,7 @@
/// <summary>
/// 鍑哄簱浠诲姟閫氱煡MES 鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_OutTaskRetryToMes = string.Empty;
+ public static string _lbl_Alert_PushPackageCodeToMes = string.Empty;
}
}
diff --git a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
index aa477b0..82b405b 100644
--- a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
+++ b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
@@ -76,7 +76,7 @@
{
IssueTaskHandle(i_deviceId, out errMsg);
}
- SystemWarningMsg._lbl_Alert_RgvRelease = errMsg;
+ SystemWarningMsg._lbl_Alert_PushPaperCutToMes = errMsg;
Thread.Sleep(2000);//2绉掍竴娆�
}
diff --git a/CC/iWareCC_ASRS/FormCC.Designer.cs b/CC/iWareCC_ASRS/FormCC.Designer.cs
index 4801f01..329ea04 100644
--- a/CC/iWareCC_ASRS/FormCC.Designer.cs
+++ b/CC/iWareCC_ASRS/FormCC.Designer.cs
@@ -230,8 +230,8 @@
this.ck_AutoIssueInStoreTask = new System.Windows.Forms.CheckBox();
this.lbl_alert_DataProcess_BZ39 = new System.Windows.Forms.Label();
this.ck_DataProcess_BZ39 = new System.Windows.Forms.CheckBox();
- this.lbl_Alert_RgvReleaseFinish_BuChang = new System.Windows.Forms.Label();
- this.ckBRgvFinishedHandle_BuChang = new System.Windows.Forms.CheckBox();
+ this.lbl_Alert_PushPackageCodeToMes = new System.Windows.Forms.Label();
+ this.ck_PushPackageCodeToMes = new System.Windows.Forms.CheckBox();
this.lbl_Alert_DataProcess_RobotBuffer_FinishTask = new System.Windows.Forms.Label();
this.ck_DataProcess_RobotBuffer_FinishTask = new System.Windows.Forms.CheckBox();
this.lbl_Alter_OutTaskRetryToMes = new System.Windows.Forms.Label();
@@ -246,8 +246,8 @@
this.ck_DataProcess_RobotBuffer_IssueOutboundTask = new System.Windows.Forms.CheckBox();
this.lbl_DataProcess_ValidateQiTao = new System.Windows.Forms.Label();
this.ck_DataProcess_ValidateQiTao = new System.Windows.Forms.CheckBox();
- this.lbl_MainTaskDecompose = new System.Windows.Forms.Label();
- this.ckMainTaskDecompose = new System.Windows.Forms.CheckBox();
+ this.lbl_DataProcess_BZ21_IssueTask = new System.Windows.Forms.Label();
+ this.ck_DataProcess_BZ21_IssueTask = new System.Windows.Forms.CheckBox();
this.lbl_Alert_DeleteData = new System.Windows.Forms.Label();
this.ckDeleteData = new System.Windows.Forms.CheckBox();
this.lbl_Alert_DataProcess_BZ12_IssueTask = new System.Windows.Forms.Label();
@@ -260,14 +260,14 @@
this.lbl_Alert_Srm3Release = new System.Windows.Forms.Label();
this.ckBSrm3Release = new System.Windows.Forms.CheckBox();
this.ckBSrm3FinishedHandle = new System.Windows.Forms.CheckBox();
- this.lbl_Alert_RgvReleaseFinish = new System.Windows.Forms.Label();
+ this.lbl_Alert_PushPaperCutToMes = new System.Windows.Forms.Label();
this.lbl_Alert_Srm2ReleaseFinish = new System.Windows.Forms.Label();
this.lbl_Alter_Srm1ReleaseFinish = new System.Windows.Forms.Label();
this.lbl_Alert_RgvRelease = new System.Windows.Forms.Label();
this.lbl_Alert_Srm2Release = new System.Windows.Forms.Label();
this.lbl_Alert_DataProcess_BZ39_IssueInboundTask = new System.Windows.Forms.Label();
this.ckB_DataProcess_BZ39_IssueInboundTask = new System.Windows.Forms.CheckBox();
- this.ckBRgvFinishedHandle = new System.Windows.Forms.CheckBox();
+ this.ckB_PushPaperCutToMes = new System.Windows.Forms.CheckBox();
this.ckBSrm1FinishedHandle = new System.Windows.Forms.CheckBox();
this.ckBRgvRelease = new System.Windows.Forms.CheckBox();
this.ckBSrm2Release = new System.Windows.Forms.CheckBox();
@@ -3002,8 +3002,8 @@
this.groupBox1.Controls.Add(this.ck_AutoIssueInStoreTask);
this.groupBox1.Controls.Add(this.lbl_alert_DataProcess_BZ39);
this.groupBox1.Controls.Add(this.ck_DataProcess_BZ39);
- this.groupBox1.Controls.Add(this.lbl_Alert_RgvReleaseFinish_BuChang);
- this.groupBox1.Controls.Add(this.ckBRgvFinishedHandle_BuChang);
+ this.groupBox1.Controls.Add(this.lbl_Alert_PushPackageCodeToMes);
+ this.groupBox1.Controls.Add(this.ck_PushPackageCodeToMes);
this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_RobotBuffer_FinishTask);
this.groupBox1.Controls.Add(this.ck_DataProcess_RobotBuffer_FinishTask);
this.groupBox1.Controls.Add(this.lbl_Alter_OutTaskRetryToMes);
@@ -3018,8 +3018,8 @@
this.groupBox1.Controls.Add(this.ck_DataProcess_RobotBuffer_IssueOutboundTask);
this.groupBox1.Controls.Add(this.lbl_DataProcess_ValidateQiTao);
this.groupBox1.Controls.Add(this.ck_DataProcess_ValidateQiTao);
- this.groupBox1.Controls.Add(this.lbl_MainTaskDecompose);
- this.groupBox1.Controls.Add(this.ckMainTaskDecompose);
+ this.groupBox1.Controls.Add(this.lbl_DataProcess_BZ21_IssueTask);
+ this.groupBox1.Controls.Add(this.ck_DataProcess_BZ21_IssueTask);
this.groupBox1.Controls.Add(this.lbl_Alert_DeleteData);
this.groupBox1.Controls.Add(this.ckDeleteData);
this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_BZ12_IssueTask);
@@ -3032,14 +3032,14 @@
this.groupBox1.Controls.Add(this.lbl_Alert_Srm3Release);
this.groupBox1.Controls.Add(this.ckBSrm3Release);
this.groupBox1.Controls.Add(this.ckBSrm3FinishedHandle);
- this.groupBox1.Controls.Add(this.lbl_Alert_RgvReleaseFinish);
+ this.groupBox1.Controls.Add(this.lbl_Alert_PushPaperCutToMes);
this.groupBox1.Controls.Add(this.lbl_Alert_Srm2ReleaseFinish);
this.groupBox1.Controls.Add(this.lbl_Alter_Srm1ReleaseFinish);
this.groupBox1.Controls.Add(this.lbl_Alert_RgvRelease);
this.groupBox1.Controls.Add(this.lbl_Alert_Srm2Release);
this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_BZ39_IssueInboundTask);
this.groupBox1.Controls.Add(this.ckB_DataProcess_BZ39_IssueInboundTask);
- this.groupBox1.Controls.Add(this.ckBRgvFinishedHandle);
+ this.groupBox1.Controls.Add(this.ckB_PushPaperCutToMes);
this.groupBox1.Controls.Add(this.ckBSrm1FinishedHandle);
this.groupBox1.Controls.Add(this.ckBRgvRelease);
this.groupBox1.Controls.Add(this.ckBSrm2Release);
@@ -3124,28 +3124,28 @@
this.ck_DataProcess_BZ39.UseVisualStyleBackColor = true;
this.ck_DataProcess_BZ39.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // lbl_Alert_RgvReleaseFinish_BuChang
+ // lbl_Alert_PushPackageCodeToMes
//
- this.lbl_Alert_RgvReleaseFinish_BuChang.AutoSize = true;
- this.lbl_Alert_RgvReleaseFinish_BuChang.BackColor = System.Drawing.Color.White;
- this.lbl_Alert_RgvReleaseFinish_BuChang.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_RgvReleaseFinish_BuChang.Location = new System.Drawing.Point(937, 339);
- this.lbl_Alert_RgvReleaseFinish_BuChang.Name = "lbl_Alert_RgvReleaseFinish_BuChang";
- this.lbl_Alert_RgvReleaseFinish_BuChang.Size = new System.Drawing.Size(70, 15);
- this.lbl_Alert_RgvReleaseFinish_BuChang.TabIndex = 51;
- this.lbl_Alert_RgvReleaseFinish_BuChang.Text = "label11";
+ this.lbl_Alert_PushPackageCodeToMes.AutoSize = true;
+ this.lbl_Alert_PushPackageCodeToMes.BackColor = System.Drawing.Color.White;
+ this.lbl_Alert_PushPackageCodeToMes.ForeColor = System.Drawing.Color.Red;
+ this.lbl_Alert_PushPackageCodeToMes.Location = new System.Drawing.Point(236, 221);
+ this.lbl_Alert_PushPackageCodeToMes.Name = "lbl_Alert_PushPackageCodeToMes";
+ this.lbl_Alert_PushPackageCodeToMes.Size = new System.Drawing.Size(70, 15);
+ this.lbl_Alert_PushPackageCodeToMes.TabIndex = 51;
+ this.lbl_Alert_PushPackageCodeToMes.Text = "label11";
//
- // ckBRgvFinishedHandle_BuChang
+ // ck_PushPackageCodeToMes
//
- this.ckBRgvFinishedHandle_BuChang.AutoSize = true;
- this.ckBRgvFinishedHandle_BuChang.Location = new System.Drawing.Point(729, 335);
- this.ckBRgvFinishedHandle_BuChang.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckBRgvFinishedHandle_BuChang.Name = "ckBRgvFinishedHandle_BuChang";
- this.ckBRgvFinishedHandle_BuChang.Size = new System.Drawing.Size(184, 19);
- this.ckBRgvFinishedHandle_BuChang.TabIndex = 50;
- this.ckBRgvFinishedHandle_BuChang.Text = "RGV任务完成补偿线程";
- this.ckBRgvFinishedHandle_BuChang.UseVisualStyleBackColor = true;
- this.ckBRgvFinishedHandle_BuChang.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ck_PushPackageCodeToMes.AutoSize = true;
+ this.ck_PushPackageCodeToMes.Location = new System.Drawing.Point(3, 221);
+ this.ck_PushPackageCodeToMes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.ck_PushPackageCodeToMes.Name = "ck_PushPackageCodeToMes";
+ this.ck_PushPackageCodeToMes.Size = new System.Drawing.Size(216, 19);
+ this.ck_PushPackageCodeToMes.TabIndex = 50;
+ this.ck_PushPackageCodeToMes.Text = "推送mes包装完成接口线程";
+ this.ck_PushPackageCodeToMes.UseVisualStyleBackColor = true;
+ this.ck_PushPackageCodeToMes.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// lbl_Alert_DataProcess_RobotBuffer_FinishTask
//
@@ -3309,28 +3309,28 @@
this.ck_DataProcess_ValidateQiTao.UseVisualStyleBackColor = true;
this.ck_DataProcess_ValidateQiTao.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // lbl_MainTaskDecompose
+ // lbl_DataProcess_BZ21_IssueTask
//
- this.lbl_MainTaskDecompose.AutoSize = true;
- this.lbl_MainTaskDecompose.BackColor = System.Drawing.Color.White;
- this.lbl_MainTaskDecompose.ForeColor = System.Drawing.Color.Red;
- this.lbl_MainTaskDecompose.Location = new System.Drawing.Point(643, 54);
- this.lbl_MainTaskDecompose.Name = "lbl_MainTaskDecompose";
- this.lbl_MainTaskDecompose.Size = new System.Drawing.Size(70, 15);
- this.lbl_MainTaskDecompose.TabIndex = 35;
- this.lbl_MainTaskDecompose.Text = "label11";
+ this.lbl_DataProcess_BZ21_IssueTask.AutoSize = true;
+ this.lbl_DataProcess_BZ21_IssueTask.BackColor = System.Drawing.Color.White;
+ this.lbl_DataProcess_BZ21_IssueTask.ForeColor = System.Drawing.Color.Red;
+ this.lbl_DataProcess_BZ21_IssueTask.Location = new System.Drawing.Point(214, 270);
+ this.lbl_DataProcess_BZ21_IssueTask.Name = "lbl_DataProcess_BZ21_IssueTask";
+ this.lbl_DataProcess_BZ21_IssueTask.Size = new System.Drawing.Size(70, 15);
+ this.lbl_DataProcess_BZ21_IssueTask.TabIndex = 35;
+ this.lbl_DataProcess_BZ21_IssueTask.Text = "label11";
//
- // ckMainTaskDecompose
+ // ck_DataProcess_BZ21_IssueTask
//
- this.ckMainTaskDecompose.AutoSize = true;
- this.ckMainTaskDecompose.Location = new System.Drawing.Point(432, 54);
- this.ckMainTaskDecompose.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckMainTaskDecompose.Name = "ckMainTaskDecompose";
- this.ckMainTaskDecompose.Size = new System.Drawing.Size(166, 19);
- this.ckMainTaskDecompose.TabIndex = 34;
- this.ckMainTaskDecompose.Text = "任务分解线程-出库";
- this.ckMainTaskDecompose.UseVisualStyleBackColor = true;
- this.ckMainTaskDecompose.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ck_DataProcess_BZ21_IssueTask.AutoSize = true;
+ this.ck_DataProcess_BZ21_IssueTask.Location = new System.Drawing.Point(3, 270);
+ this.ck_DataProcess_BZ21_IssueTask.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.ck_DataProcess_BZ21_IssueTask.Name = "ck_DataProcess_BZ21_IssueTask";
+ this.ck_DataProcess_BZ21_IssueTask.Size = new System.Drawing.Size(125, 19);
+ this.ck_DataProcess_BZ21_IssueTask.TabIndex = 34;
+ this.ck_DataProcess_BZ21_IssueTask.Text = "合包任务下发";
+ this.ck_DataProcess_BZ21_IssueTask.UseVisualStyleBackColor = true;
+ this.ck_DataProcess_BZ21_IssueTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// lbl_Alert_DeleteData
//
@@ -3470,16 +3470,16 @@
this.ckBSrm3FinishedHandle.UseVisualStyleBackColor = true;
this.ckBSrm3FinishedHandle.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // lbl_Alert_RgvReleaseFinish
+ // lbl_Alert_PushPaperCutToMes
//
- this.lbl_Alert_RgvReleaseFinish.AutoSize = true;
- this.lbl_Alert_RgvReleaseFinish.BackColor = System.Drawing.Color.White;
- this.lbl_Alert_RgvReleaseFinish.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_RgvReleaseFinish.Location = new System.Drawing.Point(935, 303);
- this.lbl_Alert_RgvReleaseFinish.Name = "lbl_Alert_RgvReleaseFinish";
- this.lbl_Alert_RgvReleaseFinish.Size = new System.Drawing.Size(70, 15);
- this.lbl_Alert_RgvReleaseFinish.TabIndex = 21;
- this.lbl_Alert_RgvReleaseFinish.Text = "label11";
+ this.lbl_Alert_PushPaperCutToMes.AutoSize = true;
+ this.lbl_Alert_PushPaperCutToMes.BackColor = System.Drawing.Color.White;
+ this.lbl_Alert_PushPaperCutToMes.ForeColor = System.Drawing.Color.Red;
+ this.lbl_Alert_PushPaperCutToMes.Location = new System.Drawing.Point(212, 186);
+ this.lbl_Alert_PushPaperCutToMes.Name = "lbl_Alert_PushPaperCutToMes";
+ this.lbl_Alert_PushPaperCutToMes.Size = new System.Drawing.Size(70, 15);
+ this.lbl_Alert_PushPaperCutToMes.TabIndex = 21;
+ this.lbl_Alert_PushPaperCutToMes.Text = "label11";
//
// lbl_Alert_Srm2ReleaseFinish
//
@@ -3548,17 +3548,17 @@
this.ckB_DataProcess_BZ39_IssueInboundTask.UseVisualStyleBackColor = true;
this.ckB_DataProcess_BZ39_IssueInboundTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // ckBRgvFinishedHandle
+ // ckB_PushPaperCutToMes
//
- this.ckBRgvFinishedHandle.AutoSize = true;
- this.ckBRgvFinishedHandle.Location = new System.Drawing.Point(727, 299);
- this.ckBRgvFinishedHandle.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckBRgvFinishedHandle.Name = "ckBRgvFinishedHandle";
- this.ckBRgvFinishedHandle.Size = new System.Drawing.Size(152, 19);
- this.ckBRgvFinishedHandle.TabIndex = 11;
- this.ckBRgvFinishedHandle.Text = "RGV任务完成处理";
- this.ckBRgvFinishedHandle.UseVisualStyleBackColor = true;
- this.ckBRgvFinishedHandle.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ckB_PushPaperCutToMes.AutoSize = true;
+ this.ckB_PushPaperCutToMes.Location = new System.Drawing.Point(4, 182);
+ this.ckB_PushPaperCutToMes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.ckB_PushPaperCutToMes.Name = "ckB_PushPaperCutToMes";
+ this.ckB_PushPaperCutToMes.Size = new System.Drawing.Size(168, 19);
+ this.ckB_PushPaperCutToMes.TabIndex = 11;
+ this.ckB_PushPaperCutToMes.Text = "推送mes出纸机接口";
+ this.ckB_PushPaperCutToMes.UseVisualStyleBackColor = true;
+ this.ckB_PushPaperCutToMes.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// ckBSrm1FinishedHandle
//
@@ -6060,7 +6060,7 @@
private System.Windows.Forms.GroupBox gBoxThread;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.CheckBox ckB_DataProcess_BZ39_IssueInboundTask;
- private System.Windows.Forms.CheckBox ckBRgvFinishedHandle;
+ private System.Windows.Forms.CheckBox ckB_PushPaperCutToMes;
private System.Windows.Forms.CheckBox ckBSrm1FinishedHandle;
private System.Windows.Forms.CheckBox ckBRgvRelease;
private System.Windows.Forms.CheckBox ckBSrm2Release;
@@ -6073,7 +6073,7 @@
private System.Windows.Forms.Label lbl_Alert_RgvRelease;
private System.Windows.Forms.Label lbl_Alert_Srm2ReleaseFinish;
private System.Windows.Forms.Label lbl_Alter_Srm1ReleaseFinish;
- private System.Windows.Forms.Label lbl_Alert_RgvReleaseFinish;
+ private System.Windows.Forms.Label lbl_Alert_PushPaperCutToMes;
private System.Windows.Forms.RadioButton rbHand;
private System.Windows.Forms.Label lbl_WCFMsg;
private System.Windows.Forms.Label lbl_IsSimulationPLC;
@@ -6150,8 +6150,8 @@
private System.Windows.Forms.CheckBox ck_DataProcess_BZ12_IssueTask;
private System.Windows.Forms.Label lbl_Alert_DeleteData;
private System.Windows.Forms.CheckBox ckDeleteData;
- private System.Windows.Forms.Label lbl_MainTaskDecompose;
- private System.Windows.Forms.CheckBox ckMainTaskDecompose;
+ private System.Windows.Forms.Label lbl_DataProcess_BZ21_IssueTask;
+ private System.Windows.Forms.CheckBox ck_DataProcess_BZ21_IssueTask;
private System.Windows.Forms.Label lbl_DataProcess_ValidateQiTao;
private System.Windows.Forms.CheckBox ck_DataProcess_ValidateQiTao;
private System.Windows.Forms.Label lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask;
@@ -6376,8 +6376,8 @@
private System.Windows.Forms.Label label18;
private System.Windows.Forms.TextBox tb_query_Salver;
private System.Windows.Forms.Label label20;
- private System.Windows.Forms.Label lbl_Alert_RgvReleaseFinish_BuChang;
- private System.Windows.Forms.CheckBox ckBRgvFinishedHandle_BuChang;
+ private System.Windows.Forms.Label lbl_Alert_PushPackageCodeToMes;
+ private System.Windows.Forms.CheckBox ck_PushPackageCodeToMes;
private System.Windows.Forms.Button btn_1019;
private System.Windows.Forms.Label lbl_R_1019_Scan;
private System.Windows.Forms.Button button21;
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index d8b0b67..4d87e0e 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -28,7 +28,7 @@
using System.Windows.Forms;
using XiGang.Core.Model;
using XiGang.Core.Model.ViewModels;
-using static iWareCC.ThreadService._04_BZ21_鎼繍鏁村灈鏈哄櫒浜篲.DataProcess_BZ21;
+
namespace iWareCC
{
@@ -245,15 +245,18 @@
new Thread(DataProcess_BZ39_IssueInboundTask.Handler).Start();
new Thread(DataProcess_BZ12.Hander).Start();
new Thread(DataProcess_BZ12_IssueTask.Handler).Start();
-
+
new Thread(DataProcess_BZ12_FinishTask.Handler).Start();
new Thread(DataProcess_BZ21.Hander).Start();
+ new Thread(DataProcess_BZ21_IssueTask.Handler).Start();
+
new Thread(DataProcess_BZ21_FinishTask.Handler).Start();
new Thread(DeleteData).Start();
- //new Thread(PrintHandler.Handler).Start();
+ new Thread(PushPackageCodeToMes.Handler).Start();
+ new Thread(PushPaperCutToMes.Handler).Start();
@@ -354,17 +357,17 @@
this.lbl_Alert_Srm3ReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm3ReleaseFinish;
this.lbl_Alert_Srm4ReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm4ReleaseFinish;
- this.lbl_Alert_RgvRelease.Text = showNowTime + SystemWarningMsg._lbl_Alert_RgvRelease;
- this.lbl_Alert_RgvReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange;
- this.lbl_Alert_RgvReleaseFinish_BuChang.Text = showNowTime + SystemWarningMsg._lbl_Alert_RgvReleaseFinish_BuChang;
+
+ this.lbl_Alert_PushPaperCutToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_PushPaperCutToMes;
+ this.lbl_Alert_PushPackageCodeToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_PushPackageCodeToMes;
this.lbl_Alert_DataProcess_BZ12_IssueTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ12_IssueTask;
this.lbl_Alert_DataProcess_RobotBuffer_FinishTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask;
- this.lbl_MainTaskDecompose.Text = showNowTime + SystemWarningMsg._lbl_Alert_MainTaskDecompose;
+ this.lbl_DataProcess_BZ21_IssueTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask;
- this.lbl_DataProcess_RobotBuffer_ModeChange.Text = showNowTime + SystemWarningMsg._lbl_Alert_MainTaskDecompose_ZPRK;
+ this.lbl_DataProcess_RobotBuffer_ModeChange.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange;
this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound;
@@ -379,9 +382,6 @@
this.lbl_alert_DataProcess_269.Text = showNowTime + SystemWarningMsg._lbl_alert_DataProcess_269;
this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask;
-
-
- this.lbl_Alter_OutTaskRetryToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_OutTaskRetryToMes;
@@ -1489,7 +1489,7 @@
SetAllCheckBoxChecked(true);
//灏嗙壒娈婄殑鍙栨秷
this.ck_DataProcess_BZ12_IssueTask.Checked = false;
- this.ckMainTaskDecompose.Checked = false;
+ this.ck_DataProcess_BZ21_IssueTask.Checked = false;
this.gBoxThread.Enabled = true;
}
@@ -1543,14 +1543,14 @@
//RGV浠诲姟涓嬪彂
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService, ckBRgvRelease);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish, ckBRgvFinishedHandle);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish_BuChang, ckBRgvFinishedHandle_BuChang);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish, ckB_PushPaperCutToMes);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish_BuChang, ck_PushPackageCodeToMes);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_HandlerIssuingTask, ck_DataProcess_BZ12_IssueTask);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTask, ck_DataProcess_RobotBuffer_FinishTask);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_MainTaskDecompose, ckMainTaskDecompose);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_MainTaskDecompose, ck_DataProcess_BZ21_IssueTask);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange, ck_DataProcess_RobotBuffer_ModeChange);
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 a1b27f0..ef00399 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"
@@ -63,10 +63,10 @@
}
var upiCode = result.Replace("/r", ""); ;
short lastnum = 0;//鏄惁鏈澘
- short isrotate = 0;//鏄惁鏃嬭浆
- short placeX = 0;
- short placeY = 0;
- short placeZ = 0;
+ //short isrotate = 0;//鏄惁鏃嬭浆
+ //short placeX = 0;
+ //short placeY = 0;
+ //short placeZ = 0;
string place = "";
using (WmsDBModel wmsDB = new WmsDBModel())
{
@@ -83,10 +83,10 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
continue;
}
- isrotate = short.Parse(upiObj.Info17);
- placeX = (short)upiObj.MachineXCenter;
- placeY = (short)upiObj.MachineYCenter;
- placeZ = (short)upiObj.MachineZCenter;
+ //isrotate = short.Parse(upiObj.Info17);
+ //placeX = (short)upiObj.MachineXCenter;
+ //placeY = (short)upiObj.MachineYCenter;
+ //placeZ = (short)upiObj.MachineZCenter;
if (upiObj.UpiStatus == (int)UpiStatusEnum.宸茬爜鍨� || upiObj.UpiStatus == (int)UpiStatusEnum.鐮佸灈涓�)
{
continue;
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
similarity index 62%
rename from "CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
rename to "CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
index b48aa38..e82dbab 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
@@ -4,6 +4,8 @@
using iWareCommon.Common.Globle;
using iWareCommon.Utils;
using iWareModel;
+using iWareModel.Entity.MES;
+using iWareModel.EnumType.WMS;
using iWareSql.DataAccess;
using iWareSql.WmsDBModel;
using Newtonsoft.Json.Linq;
@@ -65,8 +67,8 @@
SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-璇锋眰浜嗚В鐮侊紝浣嗘槸缁撴灉鏄┖鐨�,姝ゆ寰幆缁撴潫";
continue;
}
- short cartonwidth = 0;//绾哥瀹�
- short cartonhigh = 0;//绾哥楂�
+ //short cartonwidth = 0;//绾哥瀹�
+ //short cartonhigh = 0;//绾哥楂�
string place = "22";
using (WmsDBModel wmsDB = new WmsDBModel())
{
@@ -85,62 +87,14 @@
}
//string upi = "LS070700101B0001GS";
//璋冪敤鍑虹焊鏈烘帴鍙�
- var res = new HTTPService("http://172.17.1.22:44374/api/LuLi/").getContent<Respone>("cartons-machine?PackageCode=" + upiObj.PackageCode, Guid.NewGuid(), 10000);
- if (res.iState == 0)
- {
- /*
- var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
- if (papertable != null)
- {
- papertable.PushStatus = (int)PushStatusEnum.PushSuccess;
- papertable.ApiMessage = res.message;
- papertable.PushNum++;
- }
- else
- {
- var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
- papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- papercut.ApiMessage = res.message;
- papercut.PushNum = 1;
- papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
- wmsDB.mes_push_papercut.Add(papercut);
- }
- //*/
- var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
- papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- papercut.ApiMessage = res.message;
- papercut.PushNum = 1;
- papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
- wmsDB.mes_push_papercut.Add(papercut);
- }
- else
- {
- /*
- var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
- if (papertable != null)
- {
- papertable.PushStatus = (int)PushStatusEnum.PushFail;
- papertable.ApiMessage = res.message;
- papertable.PushNum++;
- }
- else
- {
- var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
- papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- papercut.ApiMessage = res.message;
- papercut.PushNum = 1;
- papercut.PushStatus = (int)PushStatusEnum.PushFail;
- wmsDB.mes_push_papercut.Add(papercut);
- }
- //*/
- var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
- papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- papercut.ApiMessage = res.message;
- papercut.PushNum = 1;
- papercut.PushStatus = (int)PushStatusEnum.PushFail;
- wmsDB.mes_push_papercut.Add(papercut);
- continue;
- }
+ var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
+ papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ papercut.ApiMessage = "";
+ papercut.PushNum = 1;
+ papercut.PushStatus = (int)PushStatusEnum.NotPush;
+ papercut.CreateTime = papercut.UpdateTime = DateTime.Now;
+ wmsDB.mes_push_papercut.Add(papercut);
+
//鏇存柊琛�
var mesgather = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
if (mesgather != null)
@@ -148,11 +102,11 @@
mesgather.AreaCode = (int)AreaCodeEnum.鍚堝寘瑁佸垏鍖�;
mesgather.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
}
- var upilist = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
- var upilength = upilist.Max(x => x.Length);
- var upiwidth = upilist.Max(x => x.Width);
- cartonhigh = (short)upiObj.Info3;
- cartonwidth = (short)upiObj.Info2;
+ //var upilist = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
+ //var upilength = upilist.Max(x => x.Length);
+ //var upiwidth = upilist.Max(x => x.Width);
+ //cartonhigh = (short)upiObj.Info3;
+ //cartonwidth = (short)upiObj.Info2;
upiObj.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
upiObj.AreaCode = (int)AreaCodeEnum.鍚堝寘瑁佸垏鍖�;
//璁板綍浠诲姟
@@ -189,10 +143,10 @@
PlanNo = upiObj.PlanNo,
OrderId = upiObj.OrderId,
PackageCode = upiObj.PackageCode,
- RbTaskType = (int)RbTaskTypeEnum.澶规澘浠诲姟,
- RbTaskTypeEnumName = RbTaskTypeEnum.澶规澘浠诲姟.ToString(),
- TaskStatus = (int)TaskStatusEnum.宸蹭笅鍙�,
- TaskStatusName = TaskStatusEnum.宸蹭笅鍙�.ToString(),
+ RbTaskType = (int)RbTaskTypeEnum.鍚堝寘浠诲姟,
+ RbTaskTypeEnumName = RbTaskTypeEnum.鍚堝寘浠诲姟.ToString(),
+ TaskStatus = (int)TaskStatusEnum.鏂板缓,
+ TaskStatusName = TaskStatusEnum.鏂板缓.ToString(),
TaskMsg = "澶规澘",
CreateTime = DateTime.Now,
CreateUserName = "CC",
@@ -237,6 +191,7 @@
continue;
}
+ /*
using (StationServiceClient client = new StationServiceClient())
{
@@ -252,6 +207,7 @@
Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 鎴愬姛,WriteInStoreTaskInfoAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
}
}
+ //*/
WmsRecordUpiProcessHandler.SaveWmsRecordUpiProcess(wmsDB, upiObj, "BZ21", "鍚堝寘");
@@ -269,91 +225,7 @@
}
}
}
- /// <summary>
- /// 鍚憁es鎺ㄩ�佸寘瑁呭畬鎴�
- /// </summary>
- public static void PushPackageCode()
- {
- while (true)
- {
- Thread.Sleep(2000);
- using (WmsDBModel edm = new WmsDBModel())
- {
- var value = edm.mes_push_packagecode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
- if (value != null)
- {
- PushPackageCodeInput input = new PushPackageCodeInput();
- input.PackageCode = value.PackageCode;
- var res = HttpHelper.GetHttpResponse<PushPackageCodeInput, Respone>(" ", input, 10000);
- if (res.iState == 0)
- {
- value.PushStatus = (int)PushStatusEnum.PushSuccess;
- value.ApiMessage = res.message;
- }
- else
- {
- value.PushStatus = (int)PushStatusEnum.Pushing;
- value.PushNum++;
- value.ApiMessage += res.message;
- if (value.PushNum == 3)
- {
- value.PushStatus = (int)PushStatusEnum.PushFail;
- }
- }
- edm.SaveChanges();
- }
- }
- }
- }
- public class PushPackageCodeInput
- {
- public string PackageCode { get; set; }
- }
- public class Respone
- {
- /// <summary>
- /// 杩斿洖鐮�
- /// </summary>
- public int iState { get; set; }
- /// <summary>
- /// 杩斿洖娑堟伅
- /// </summary>
- public string message { get; set; }
- /// <summary>
- /// 鑷畾涔夎繑鍥�
- /// </summary>
- public string data { get; set; }
- }
- /// <summary>
- /// 鎺ㄩ�佺姸鎬�
- /// </summary>
- public enum PushStatusEnum
- {
- /// <summary>
- /// 鏈帹閫�
- /// </summary>
- [Description("鏈帹閫�")]
- NotPush = 0,
-
- /// <summary>
- /// 鎺ㄩ�佷腑
- /// </summary>
- [Description("鎺ㄩ�佷腑")]
- Pushing = 1,
-
- /// <summary>
- /// 鎺ㄩ�佹垚鍔�
- /// </summary>
- [Description("鎺ㄩ�佹垚鍔�")]
- PushSuccess = 2,
-
- /// <summary>
- /// 鎺ㄩ�佸け璐�
- /// </summary>
- [Description("鎺ㄩ�佸け璐�")]
- PushFail = 3,
- }
}
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/2\343\200\201DataProcess_BZ21_IssueTask.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/2\343\200\201DataProcess_BZ21_IssueTask.cs"
new file mode 100644
index 0000000..75e92e5
--- /dev/null
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/2\343\200\201DataProcess_BZ21_IssueTask.cs"
@@ -0,0 +1,115 @@
+锘縰sing Admin.NET.Application;
+using iWareCC.Common.Helper;
+using iWareCC.StationService;
+using iWareCommon.Common.Globle;
+using iWareCommon.Utils;
+using iWareModel;
+using iWareSql.DataAccess;
+using iWareSql.DBModel;
+using iWareSql.WmsDBModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection.Emit;
+using System.ServiceModel.Configuration;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using WZ.Useful.Commons;
+using XiGang.Core.Model;
+
+namespace iWareCC.ThreadService
+{
+ /// <summary>
+ /// 涓嬪彂鍚堝寘浠诲姟
+ /// </summary>
+ public static class DataProcess_BZ21_IssueTask
+ {
+
+ public static async void Handler()
+ {
+ var alertMsg = "";
+ LogType logType = LogType.DataProcess_BZ21_IssueTask;
+ while (true)
+ {
+ Thread.Sleep(1000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask = string.Empty;
+ try
+ {//SystemValue.isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask &&
+ if (SystemValue.isStartedModel)
+ {
+ var rgvLocation = StationLocationEnum.BZ21.ToString();
+
+ using (WmsDBModel wmsDB = new WmsDBModel())
+ {
+ //涓嶉渶瑕侀獙璇侊紝鏈変换鍔″氨涓嬪彂锛屾彁楂樻晥鐜�
+ /*
+ //瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
+ var isValidate = TaskHandler.ValidateIssueOutTaskForRobotBuffer(wmsDB);
+ if (!isValidate)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
+ continue;
+ }
+ //*/
+
+ var task = wmsDB.wms_rbline_task.Where(x =>
+ x.RbTaskType == (int)RbTaskTypeEnum.鍚堝寘浠诲姟
+ && x.TaskStatus == (int)TaskStatusEnum.鏂板缓).OrderBy(x => x.CreateTime).FirstOrDefault();
+ if (task == null)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask = $"{rgvLocation.ToString()},鏍规嵁 娌℃湁鎵惧埌 鏂板缓 鐨勪换鍔� ";
+ FormCC.currHandlerPackageCodeForIssueOutboundTask = "";
+ continue;
+ }
+
+ var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == task.UPI).FirstOrDefault();
+ if (upiObj == null)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask = $"{rgvLocation.ToString()},鏍规嵁UPI:{task.UPI}娌℃湁鎵惧埌瀵硅薄 ";
+ continue;
+ }
+
+ short cartonwidth = 0;//绾哥瀹�
+ short cartonhigh = 0;//绾哥楂�
+ var upilist = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == upiObj.PackageCode).ToList();
+ var upilength = upilist.Max(x => x.Length);
+ var upiwidth = upilist.Max(x => x.Width);
+ cartonhigh = (short)upiObj.Info3;
+ cartonwidth = (short)upiObj.Info2;
+
+ //杩欓噷涓嬪彂 浠诲姟
+ using (StationServiceClient client = new StationServiceClient())
+ {
+
+ var plcres = client.WriteSurroundTaskInfo((int)EDevice.Station, rgvLocation, short.Parse(task.TaskNo),
+ (short)upilength, (short)upiwidth, cartonhigh, cartonwidth, 0, 0);
+ if (!plcres.result)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,WriteInStoreTaskInfoAsync 杩斿洖:{plcres.resMsg}";
+ continue;
+ }
+ else
+ {
+ Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 鎴愬姛,WriteInStoreTaskInfoAsync锛屽弬鏁�: 绔欑偣{rgvLocation}");
+ }
+ }
+
+ task.TaskStatus = (int)TaskStatusEnum.宸蹭笅鍙�;
+ task.TaskStatusName = TaskStatusEnum.宸蹭笅鍙�.ToString();
+
+ wmsDB.SaveChanges();
+ }
+
+ }
+ }
+ catch (Exception ex)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+ Log4NetHelper.WriteErrorLog(logType, " 鍑虹幇寮傚父锛�" + ex.Message, ex);
+ }
+ }
+ }
+
+ }
+}
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs"
similarity index 99%
rename from "CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21_FinishTask.cs"
rename to "CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs"
index 57252a4..28274f7 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21_FinishTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs"
@@ -52,7 +52,7 @@
{
var task = wmsDB.wms_rbline_task.Where(x =>
x.TaskNo == obj.R_SurrouondTaskNo.ToString()
- && x.RbTaskType == (int)RbTaskTypeEnum.澶规澘浠诲姟
+ && x.RbTaskType == (int)RbTaskTypeEnum.鍚堝寘浠诲姟
).OrderByDescending(x=>x.Id).FirstOrDefault();
if (task == null)
{
diff --git a/CC/iWareCC_ASRS/WmsTask/MainTaskDecompose.cs b/CC/iWareCC_ASRS/WmsTask/MainTaskDecompose.cs
index f49706b..03dab19 100644
--- a/CC/iWareCC_ASRS/WmsTask/MainTaskDecompose.cs
+++ b/CC/iWareCC_ASRS/WmsTask/MainTaskDecompose.cs
@@ -29,7 +29,7 @@
{
try
{
- SystemWarningMsg._lbl_Alert_MainTaskDecompose = "";
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask = "";
if (SystemValue.isAllowRuning_MainTaskDecompose && SystemValue.isStartedModel)
{
using (DbModel context = new DbModel())
@@ -58,7 +58,7 @@
var errMsg = "";
if (!MyExtendHelper.IsNoFinishedOutTaskGroupbyArea(context, ref errMsg))
{
- SystemWarningMsg._lbl_Alert_MainTaskDecompose += "涓嶅厑璁稿垎瑙ｅ嚭搴撲换鍔�:" + errMsg + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask += "涓嶅厑璁稿垎瑙ｅ嚭搴撲换鍔�:" + errMsg + SysGloble.SPLIT_STR;
isAllowDecomposeOutTask = false;
}
//var _list = MyExtendHelper.GetHasCatogryStationCodeAreaList();
@@ -66,7 +66,7 @@
var _list = MyExtendHelper.GetHasCatogryAndNoFinishedOutStoreTaskStationCodeAreaList(context, ref dict_hasNoFinishedOutStoreTaskStationCodeAreaList);
if (_list != null && _list.Count >= 2)
{
- SystemWarningMsg._lbl_Alert_MainTaskDecompose += "涓嶅厑璁稿垎瑙ｅ嚭搴撲换鍔�:鍥涗釜鍑哄簱鍙ｇ洰鍓嶆湁" + _list.Count + "涓鍗犵敤浜�,瓒呰繃浜嗚瀹氬��:" + 2 + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask += "涓嶅厑璁稿垎瑙ｅ嚭搴撲换鍔�:鍥涗釜鍑哄簱鍙ｇ洰鍓嶆湁" + _list.Count + "涓鍗犵敤浜�,瓒呰繃浜嗚瀹氬��:" + 2 + SysGloble.SPLIT_STR;
isAllowDecomposeOutTask = false;
}
if (isAllowDecomposeOutTask)
@@ -82,7 +82,7 @@
}
catch (Exception ex)
{
- SystemWarningMsg._lbl_Alert_MainTaskDecompose += "鍒嗚В绾跨▼鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask += "鍒嗚В绾跨▼鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
Log4NetHelper.WriteErrorLog(LogType.CCWCFService, "HandlerIssuingTask鍑虹幇寮傚父锛�" + ex.Message, ex);
}
Thread.Sleep(2000);//浼戠湢2绉�
@@ -123,12 +123,12 @@
result = SingleHandlerForOutTask(context, doMain);
if (result.result) context.SaveChanges();
- SystemWarningMsg._lbl_Alert_MainTaskDecompose = result.resMsg + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask = result.resMsg + SysGloble.SPLIT_STR;
}
}
else
{
- SystemWarningMsg._lbl_Alert_MainTaskDecompose += "娌℃湁瑕佸垎瑙ｇ殑浠诲姟" + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask += "娌℃湁瑕佸垎瑙ｇ殑浠诲姟" + SysGloble.SPLIT_STR;
}
}
diff --git a/CC/iWareCC_ASRS/WmsTask/OutTaskRetryToMes.cs b/CC/iWareCC_ASRS/WmsTask/OutTaskRetryToMes.cs
deleted file mode 100644
index ff3b7cf..0000000
--- a/CC/iWareCC_ASRS/WmsTask/OutTaskRetryToMes.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-锘縰sing iWareCommon.Common.Globle;
-using iWareCommon.Utils;
-using iWareModel;
-using iWareSql;
-using iWareSql.DataAccess;
-using iWareSql.DBModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using XiGang.Core.Model;
-
-namespace iWareCC
-{
- /// <summary>
- /// 鍑哄簱浠诲姟锛屽け璐ョ殑鎺ㄩ�佺粰MES
- /// </summary>
- public static class OutTaskRetryToMes
- {
- public static void Handler()
- {
- while (true)
- {
- try
- {
- var errMsg = "";
- if (SystemValue.isAllowRuning_OutTaskRetryToMes && SystemValue.isStartedModel)
- {
- using (DbModel context = new DbModel())
- {
- var list = context.Task_Main.Where(x => (x.IsNeedOnLine != null && x.IsNeedOnLine == true)
- && (x.IsOnLine == null || x.IsOnLine == false)
- //&& (x.OnLineToMesCount == null || x.OnLineToMesCount <= 3)
- ).ToList();
- if (list != null && list.Count > 0)
- {
- SystemWarningMsg._lbl_Alert_OutTaskRetryToMes = "鍑哄簱浠诲姟锛屽彂閫佺粰MES涓婄嚎璇锋眰锛岀洰鍓嶆湁" + list.Count + "鏉�";
- foreach (var item in list)
- {
- if (item.OnLineToMesCount > 3)
- {
- continue;
- }
- MesRetModel<string> ret = SingleToMes(item);
- if (ret.code != 200)
- {
- SystemWarningMsg._lbl_Alert_OutTaskRetryToMes = "鍑哄簱浠诲姟锛屽彂閫佺粰MES涓婄嚎璇锋眰澶辫触:" + ret.msg + ",搴忓垪鍙�:" + item.SerialNumber + ",璁㈣揣鍙�:" + item.OrderNo;
- break;//璺冲嚭寰幆
- }
- }
- }
- else
- {
- SystemWarningMsg._lbl_Alert_OutTaskRetryToMes = "鍑哄簱浠诲姟锛屽彂閫佺粰MES涓婄嚎璇锋眰锛岀洰鍓嶆湁0鏉�";
- }
- SystemWarningMsg._lbl_Alert_OutTaskRetryToMes = "鍑哄簱浠诲姟锛屽彂閫佺粰MES涓婄嚎璇锋眰 鎴愬姛銆傘��";
- }
- }
- }
- catch (Exception ex)
- {
- SystemWarningMsg._lbl_Alert_OutTaskRetryToMes = "鍑哄簱浠诲姟锛屽彂閫佺粰MES涓婄嚎璇锋眰 鍑虹幇寮傚父:" + ex.Message;
- Log4NetHelper.WriteErrorLog(LogType.CCWCFService, "鍑哄簱浠诲姟锛屽彂閫佺粰MES涓婄嚎璇锋眰 鍑虹幇寮傚父锛�" + ex.Message, ex);
- }
- Thread.Sleep(5000);//浼戠湢5绉�
- }
- }
-
- private static MesRetModel<string> SingleToMes(Task_Main mainTask)
- {
- return MesService.updateOnlineStatus(mainTask);
- }
- }
-}
diff --git a/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs b/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs
new file mode 100644
index 0000000..5d034dc
--- /dev/null
+++ b/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs
@@ -0,0 +1,81 @@
+锘縰sing iWareCommon.Common.Globle;
+using iWareCommon.Utils;
+using iWareModel;
+using iWareModel.Entity.MES;
+using iWareModel.EnumType.WMS;
+using iWareSql;
+using iWareSql.DataAccess;
+using iWareSql.DBModel;
+using iWareSql.WmsDBModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using XiGang.Core.Model;
+
+namespace iWareCC
+{
+ /// <summary>
+ /// 鎺ㄩ�丮ES- 鍖呰瀹屾垚鎺ュ彛
+ /// </summary>
+ public static class PushPackageCodeToMes
+ {
+ public static string Mes_Api = ConfigHelper.GetConfigString("Mes_Api");
+ public static string Mes_Api_packagecompleted = ConfigHelper.GetConfigString("Mes_Api_packagecompleted");
+ public static void Handler()
+ {
+ LogType logType = LogType.PushPackageCodeToMes;
+ while (true)
+ {
+ try
+ {
+ var errMsg = "";
+ //if (SystemValue.isAllowRuning_OutTaskRetryToMes && SystemValue.isStartedModel)
+ if (SystemValue.isStartedModel)
+ {
+ using (WmsDBModel edm = new WmsDBModel())
+ {
+ var value = edm.mes_push_packagecode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
+ if (value != null)
+ {
+ var res = new HTTPService(Mes_Api).getContent<Respone>(Mes_Api_packagecompleted
+ + "?PackageCode=" + value.PackageCode, Guid.NewGuid(), 10000);
+ value.UpdateTime = DateTime.Now;
+ if (res.iState == 0)
+ {
+ value.PushStatus = (int)PushStatusEnum.PushSuccess;
+ value.ApiMessage = res.message;
+ }
+ else
+ {
+ value.PushStatus = (int)PushStatusEnum.Pushing;
+ value.PushNum++;
+ value.ApiMessage += res.message;
+ if (value.PushNum == 3)
+ {
+ value.PushStatus = (int)PushStatusEnum.PushFail;
+ }
+ }
+ edm.SaveChanges();
+ }
+ else
+ {
+ SystemWarningMsg._lbl_Alert_PushPackageCodeToMes = "娌℃湁瑕佸鐞嗙殑鏁版嵁";
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ SystemWarningMsg._lbl_Alert_PushPackageCodeToMes = " 鎺ㄩ�丮ES- 鍖呰瀹屾垚鎺ュ彛 鍑虹幇寮傚父:" + ex.Message;
+ Log4NetHelper.WriteErrorLog(logType, " 鎺ㄩ�丮ES- 鍖呰瀹屾垚鎺ュ彛 鍑虹幇寮傚父锛�" + ex.Message, ex);
+ }
+ Thread.Sleep(1000);
+ }
+ }
+
+ }
+
+}
diff --git a/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs b/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs
new file mode 100644
index 0000000..5ad92fd
--- /dev/null
+++ b/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs
@@ -0,0 +1,81 @@
+锘縰sing iWareCommon.Common.Globle;
+using iWareCommon.Utils;
+using iWareModel;
+using iWareModel.Entity.MES;
+using iWareModel.EnumType.WMS;
+using iWareSql;
+using iWareSql.DataAccess;
+using iWareSql.DBModel;
+using iWareSql.WmsDBModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using XiGang.Core.Model;
+
+namespace iWareCC
+{
+ /// <summary>
+ /// 鎺ㄩ�丮ES- 鍑虹焊鏈烘帴鍙�
+ /// </summary>
+ public static class PushPaperCutToMes
+ {
+ public static string Mes_Api = ConfigHelper.GetConfigString("Mes_Api");
+ public static string Mes_Api_papercut = ConfigHelper.GetConfigString("Mes_Api_papercut");
+ public static void Handler()
+ {
+ LogType logType = LogType.PushPaperCutToMes;
+ while (true)
+ {
+ try
+ {
+ var errMsg = "";
+ //if (SystemValue.isAllowRuning_OutTaskRetryToMes && SystemValue.isStartedModel)
+ if (SystemValue.isStartedModel)
+ {
+ using (WmsDBModel edm = new WmsDBModel())
+ {
+ var value = edm.mes_push_papercut.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
+ if (value != null)
+ {
+ var res = new HTTPService(Mes_Api).getContent<Respone>(Mes_Api_papercut
+ + "?PackageCode=" + value.PackageCode, Guid.NewGuid(), 10000);
+ value.UpdateTime = DateTime.Now;
+ if (res.iState == 0)
+ {
+ value.PushStatus = (int)PushStatusEnum.PushSuccess;
+ value.ApiMessage = res.message;
+ }
+ else
+ {
+ value.PushStatus = (int)PushStatusEnum.Pushing;
+ value.PushNum++;
+ value.ApiMessage += res.message;
+ if (value.PushNum == 3)
+ {
+ value.PushStatus = (int)PushStatusEnum.PushFail;
+ }
+ }
+ edm.SaveChanges();
+ }
+ else
+ {
+ SystemWarningMsg._lbl_Alert_PushPaperCutToMes = "娌℃湁瑕佸鐞嗙殑鏁版嵁";
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ SystemWarningMsg._lbl_Alert_PushPaperCutToMes = " 鎺ㄩ�丮ES- 鍖呰瀹屾垚鎺ュ彛 鍑虹幇寮傚父:" + ex.Message;
+ Log4NetHelper.WriteErrorLog(logType, " 鎺ㄩ�丮ES- 鍖呰瀹屾垚鎺ュ彛 鍑虹幇寮傚父锛�" + ex.Message, ex);
+ }
+ Thread.Sleep(1000);
+ }
+ }
+
+ }
+
+}
diff --git a/CC/iWareCC_ASRS/iWareCC.csproj b/CC/iWareCC_ASRS/iWareCC.csproj
index d81fdf5..6436e6b 100644
--- a/CC/iWareCC_ASRS/iWareCC.csproj
+++ b/CC/iWareCC_ASRS/iWareCC.csproj
@@ -172,15 +172,17 @@
<Compile Include="ThreadService\03_BZ12%28鏈哄櫒浜虹爜鍖呭伐浣�%29\2銆丏ataProcess_BZ12_IssueTask.cs" />
<Compile Include="ThreadService\03_BZ12%28鏈哄櫒浜虹爜鍖呭伐浣�%29\1銆丏ataProcess_BZ12.cs" />
<Compile Include="ThreadService\03_BZ12%28鏈哄櫒浜虹爜鍖呭伐浣�%29\3銆丏ataProcess_BZ12_FinishTask.cs" />
- <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡DataProcess_BZ21.cs" />
- <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡DataProcess_BZ21_FinishTask.cs" />
+ <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡2銆丏ataProcess_BZ21_IssueTask.cs" />
+ <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡1銆丏ataProcess_BZ21.cs" />
+ <Compile Include="ThreadService\04_BZ21锛堟惉杩愭暣鍨涙満鍣ㄤ汉锛塡3銆丏ataProcess_BZ21_FinishTask.cs" />
<Compile Include="ThreadService\05_BZ30%28榻愬楠岃瘉%29\DataProcess_ValidateQiTao.cs" />
<Compile Include="WCF\CCWcfService.cs" />
<Compile Include="WCF\ICCWcfService.cs" />
<Compile Include="WmsTask\AutoUpdateEngineInfoTask.cs" />
<Compile Include="WmsTask\MainTaskDecompose_ZPRK.cs" />
<Compile Include="WmsTask\PrintHandler.cs" />
- <Compile Include="WmsTask\OutTaskRetryToMes.cs" />
+ <Compile Include="WmsTask\PushPaperCutToMes.cs" />
+ <Compile Include="WmsTask\PushPackageCodeToMes.cs" />
<Compile Include="WmsTask\EmptySalverTransferTask.cs" />
<Compile Include="WmsTask\MainTaskDecompose.cs" />
<EmbeddedResource Include="FormCC.resx">
diff --git a/CC/iWareCommon/Utils/Log4Net/LogType.cs b/CC/iWareCommon/Utils/Log4Net/LogType.cs
index 9bd1272..85d008b 100644
--- a/CC/iWareCommon/Utils/Log4Net/LogType.cs
+++ b/CC/iWareCommon/Utils/Log4Net/LogType.cs
@@ -46,15 +46,15 @@
/// <summary>
/// 鍫嗗灈鏈虹殑PLC鏁版嵁璁块棶鏈嶅姟鏃ュ織
/// </summary>
- SrmSdaService = 203,
+ PushPaperCutToMes = 203,
/// <summary>
/// 杈撻�佺嚎鐨凱LC鏁版嵁璁块棶鏈嶅姟鏃ュ織
/// </summary>
- LineSdaService = 204,
+ PushPackageCodeToMes = 204,
/// <summary>
/// RGV鐨凱LC鏁版嵁璁块棶鏈嶅姟鏃ュ織
/// </summary>
- RgvSdaService = 205,
+ DataProcess_BZ21_IssueTask = 205,
#endregion
diff --git a/CC/iWareCommon/log4net_iWare.config b/CC/iWareCommon/log4net_iWare.config
index 2d536c0..8ae0e37 100644
--- a/CC/iWareCommon/log4net_iWare.config
+++ b/CC/iWareCommon/log4net_iWare.config
@@ -526,8 +526,8 @@
</appender>
<!-- 鍫嗗灈鏈虹殑PLC鏁版嵁璁块棶鏈嶅姟鏃ュ織 銆愪俊鎭�戞棩蹇�-->
- <appender name="SrmSdaService_Info" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\SrmSdaService_Info\\" />
+ <appender name="PushPaperCutToMes_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\PushPaperCutToMes_Info\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -537,13 +537,13 @@
<param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="SrmSdaService_Info" />
+ <loggerToMatch value="PushPaperCutToMes_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--鍫嗗灈鏈虹殑PLC鏁版嵁璁块棶鏈嶅姟鏃ュ織 銆愰敊璇�戞棩蹇�-->
- <appender name="SrmSdaService_Error" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\SrmSdaService_Error\\" />
+ <appender name="PushPaperCutToMes_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\PushPaperCutToMes_Error\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -553,14 +553,14 @@
<param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="SrmSdaService_Error" />
+ <loggerToMatch value="PushPaperCutToMes_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!-- 杈撻�佺嚎鐨凱LC鏁版嵁璁块棶鏈嶅姟鏃ュ織 銆愪俊鎭�戞棩蹇�-->
- <appender name="LineSdaService_Info" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\LineSdaService_Info\\" />
+ <appender name="PushPackageCodeToMes_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\PushPackageCodeToMes_Info\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -570,13 +570,13 @@
<param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="LineSdaService_Info" />
+ <loggerToMatch value="PushPackageCodeToMes_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--杈撻�佺嚎鐨凱LC鏁版嵁璁块棶鏈嶅姟鏃ュ織 銆愰敊璇�戞棩蹇�-->
- <appender name="LineSdaService_Error" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\LineSdaService_Error\\" />
+ <appender name="PushPackageCodeToMes_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\PushPackageCodeToMes_Error\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -586,13 +586,13 @@
<param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="LineSdaService_Error" />
+ <loggerToMatch value="PushPackageCodeToMes_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!-- RGV鐨凱LC鏁版嵁璁块棶鏈嶅姟鏃ュ織 銆愪俊鎭�戞棩蹇�-->
- <appender name="RgvSdaService_Info" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\RgvSdaService_Info\\" />
+ <appender name="DataProcess_BZ21_IssueTask_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\DataProcess_BZ21_IssueTask_Info\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -602,13 +602,13 @@
<param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="RgvSdaService_Info" />
+ <loggerToMatch value="DataProcess_BZ21_IssueTask_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--RGV鐨凱LC鏁版嵁璁块棶鏈嶅姟鏃ュ織 銆愰敊璇�戞棩蹇�-->
- <appender name="RgvSdaService_Error" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\RgvSdaService_Error\\" />
+ <appender name="DataProcess_BZ21_IssueTask_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\DataProcess_BZ21_IssueTask_Error\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -618,7 +618,7 @@
<param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="RgvSdaService_Error" />
+ <loggerToMatch value="DataProcess_BZ21_IssueTask_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
@@ -664,14 +664,14 @@
<appender-ref ref="SdaService_Info"/>
<appender-ref ref="SdaService_Error"/>
<!--鍫嗗灈鏈虹殑PLC鏁版嵁璁块棶鏈嶅姟鏃ュ織-->
- <appender-ref ref="SrmSdaService_Info"/>
- <appender-ref ref="SrmSdaService_Error"/>
+ <appender-ref ref="PushPaperCutToMes_Info"/>
+ <appender-ref ref="PushPaperCutToMes_Error"/>
<!--杈撻�佺嚎鐨凱LC鏁版嵁璁块棶鏈嶅姟鏃ュ織-->
- <appender-ref ref="LineSdaService_Info"/>
- <appender-ref ref="LineSdaService_Error"/>
+ <appender-ref ref="PushPackageCodeToMes_Info"/>
+ <appender-ref ref="PushPackageCodeToMes_Error"/>
<!--RGV鐨凱LC鏁版嵁璁块棶鏈嶅姟鏃ュ織-->
- <appender-ref ref="RgvSdaService_Info"/>
- <appender-ref ref="RgvSdaService_Error"/>
+ <appender-ref ref="DataProcess_BZ21_IssueTask_Info"/>
+ <appender-ref ref="DataProcess_BZ21_IssueTask_Error"/>
</root>
</log4net>
</configuration>
\ No newline at end of file
diff --git a/CC/iWareModel/Entity/MES/Respone.cs b/CC/iWareModel/Entity/MES/Respone.cs
new file mode 100644
index 0000000..b585a44
--- /dev/null
+++ b/CC/iWareModel/Entity/MES/Respone.cs
@@ -0,0 +1,26 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace iWareModel.Entity.MES
+{
+ public class Respone
+ {
+ /// <summary>
+ /// 杩斿洖鐮�
+ /// </summary>
+ public int iState { get; set; }
+
+ /// <summary>
+ /// 杩斿洖娑堟伅
+ /// </summary>
+ public string message { get; set; }
+
+ /// <summary>
+ /// 鑷畾涔夎繑鍥�
+ /// </summary>
+ public string data { get; set; }
+ }
+}
diff --git a/CC/iWareModel/EnumType/WMS/PushStatusEnum.cs b/CC/iWareModel/EnumType/WMS/PushStatusEnum.cs
new file mode 100644
index 0000000..d028c6b
--- /dev/null
+++ b/CC/iWareModel/EnumType/WMS/PushStatusEnum.cs
@@ -0,0 +1,39 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace iWareModel.EnumType.WMS
+{
+ /// <summary>
+ /// 鎺ㄩ�佺姸鎬�
+ /// </summary>
+ public enum PushStatusEnum
+ {
+ /// <summary>
+ /// 鏈帹閫�
+ /// </summary>
+ [Description("鏈帹閫�")]
+ NotPush = 0,
+
+ /// <summary>
+ /// 鎺ㄩ�佷腑
+ /// </summary>
+ [Description("鎺ㄩ�佷腑")]
+ Pushing = 1,
+
+ /// <summary>
+ /// 鎺ㄩ�佹垚鍔�
+ /// </summary>
+ [Description("鎺ㄩ�佹垚鍔�")]
+ PushSuccess = 2,
+
+ /// <summary>
+ /// 鎺ㄩ�佸け璐�
+ /// </summary>
+ [Description("鎺ㄩ�佸け璐�")]
+ PushFail = 3,
+ }
+}
diff --git a/CC/iWareModel/EnumType/WMS/RbTaskTypeEnum.cs b/CC/iWareModel/EnumType/WMS/RbTaskTypeEnum.cs
index b1ac2b9..8337406 100644
--- a/CC/iWareModel/EnumType/WMS/RbTaskTypeEnum.cs
+++ b/CC/iWareModel/EnumType/WMS/RbTaskTypeEnum.cs
@@ -30,10 +30,10 @@
鐮佹澘浠诲姟 = 3,
/// <summary>
- /// 澶规澘浠诲姟
+ /// 鍚堝寘浠诲姟
/// </summary>
- [Description("澶规澘浠诲姟")]
- 澶规澘浠诲姟 = 4
+ [Description("鍚堝寘浠诲姟")]
+ 鍚堝寘浠诲姟 = 4
}
}
\ No newline at end of file
diff --git a/CC/iWareModel/iWareModel.csproj b/CC/iWareModel/iWareModel.csproj
index feeb416..a9a9a60 100644
--- a/CC/iWareModel/iWareModel.csproj
+++ b/CC/iWareModel/iWareModel.csproj
@@ -60,6 +60,7 @@
<Compile Include="Entity\MES\MesUpdateOnlineStatusParamModel.cs" />
<Compile Include="Entity\MES\MesRetModel.cs" />
<Compile Include="Entity\MES\Mes_BtjReceiveModel.cs" />
+ <Compile Include="Entity\MES\Respone.cs" />
<Compile Include="Entity\QueryParam.cs" />
<Compile Include="Entity\ResponseListDataEntity.cs" />
<Compile Include="Entity\ResponseListDataPageEntity.cs" />
@@ -114,6 +115,7 @@
<Compile Include="EnumType\WMS\AreaCodeEnum.cs" />
<Compile Include="EnumType\WMS\PrintClassifyEnum.cs" />
<Compile Include="EnumType\WMS\PrintTypeEnum.cs" />
+ <Compile Include="EnumType\WMS\PushStatusEnum.cs" />
<Compile Include="EnumType\WMS\RbRunModeEnum.cs" />
<Compile Include="EnumType\WMS\RbTaskTypeEnum.cs" />
<Compile Include="EnumType\WMS\StockStatusEnum.cs" />
diff --git a/CC/iWareSql/DataAccess/TaskHandler.cs b/CC/iWareSql/DataAccess/TaskHandler.cs
index cc87064..97727dc 100644
--- a/CC/iWareSql/DataAccess/TaskHandler.cs
+++ b/CC/iWareSql/DataAccess/TaskHandler.cs
@@ -92,7 +92,7 @@
public static bool ValidateIssueTaskForBZ21(WmsDBModel.WmsDBModel wmsDB, string str)
{
var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�
- && x.RbTaskType == (int)RbTaskTypeEnum.澶规澘浠诲姟 && x.UPI == str).ToList();
+ && x.RbTaskType == (int)RbTaskTypeEnum.鍚堝寘浠诲姟 && x.UPI == str).ToList();
if (isExist?.Count() > 0)
{
return false;
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/RbTaskTypeEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/RbTaskTypeEnum.cs
index 6f604dc..100f306 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/RbTaskTypeEnum.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/RbTaskTypeEnum.cs
@@ -27,9 +27,9 @@
鐮佹澘浠诲姟 = 3,
/// <summary>
- /// 澶规澘浠诲姟
+ /// 鍚堝寘浠诲姟
/// </summary>
- [Description("澶规澘浠诲姟")]
- 澶规澘浠诲姟 = 4
+ [Description("鍚堝寘浠诲姟")]
+ 鍚堝寘浠诲姟 = 4
}
--
Gitblit v1.9.3