From e9269528ae01bc4572b68148b9c801b51f23b669 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 04 9月 2025 10:41:45 +0800
Subject: [PATCH] 查询优化
---
wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs | 2 +-
WMS/WMS/WMS.csproj | 1 +
WMS/WMS/UI/SynthesizeQuery/FrmMes.cs | 9 ++++++++-
wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs | 10 +++++++---
WMS/WMS/EnumDefine/isSendToMesEnum.cs | 15 +++++++++++++++
5 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/WMS/WMS/EnumDefine/isSendToMesEnum.cs b/WMS/WMS/EnumDefine/isSendToMesEnum.cs
new file mode 100644
index 0000000..8c6daec
--- /dev/null
+++ b/WMS/WMS/EnumDefine/isSendToMesEnum.cs
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WMS.EnumDefine
+{
+ enum isSendToMesEnum
+ {
+ 鍚� = 0,
+ 鏄� = 1,
+ 寮哄埗瀹屾垚 = 3
+ }
+}
diff --git a/WMS/WMS/UI/SynthesizeQuery/FrmMes.cs b/WMS/WMS/UI/SynthesizeQuery/FrmMes.cs
index bc6ad5a..cb4624d 100644
--- a/WMS/WMS/UI/SynthesizeQuery/FrmMes.cs
+++ b/WMS/WMS/UI/SynthesizeQuery/FrmMes.cs
@@ -81,10 +81,12 @@
SelectItem info1 = new SelectItem() { Id = "0", Name = "涓嶇瓫閫夌姸鎬�" };
SelectItem info2 = new SelectItem() { Id = "1", Name = "鍚�" };
SelectItem info3 = new SelectItem() { Id = "2", Name = "鏄�" };
+ SelectItem info4 = new SelectItem() { Id = "3", Name = "寮哄埗瀹屾垚" };
infoList.Add(info1);
infoList.Add(info2);
infoList.Add(info3);
+ infoList.Add(info4);
uiComboBox_status.ValueMember = "Id";
uiComboBox_status.DisplayMember = "Name";
@@ -112,6 +114,7 @@
param.version = uiComboBox_version.Text.Trim() != "" ? uiComboBox_version.Text.Trim() : "";//鏈哄瀷
param.supplier = uiTextBox_supplier.Text.Trim() != "" ? uiTextBox_supplier.Text.Trim() : "";//渚涘簲鍟�
param.isSendToMes = Convert.ToByte(uiComboBox_status.SelectedIndex);
+ //绱㈠紩
if (param.isSendToMes == 0)
{
param.isSendToMes = null;
@@ -123,6 +126,10 @@
if (param.isSendToMes == 2)
{
param.isSendToMes = 1;
+ }
+ if (param.isSendToMes == 3)
+ {
+ param.isSendToMes = 3;
}
#endregion
@@ -172,7 +179,7 @@
DataGridView dgv = (DataGridView)sender;
if (dgv.Columns[e.ColumnIndex].Name == "isSendToMes")
{
- e.Value = Enum.GetName(typeof(yesNoStatus), Convert.ToInt32(e.Value));
+ e.Value = Enum.GetName(typeof(isSendToMesEnum), Convert.ToInt32(e.Value));
// 搴旂敤璇ormat锛孎ormat瀹屾瘯銆�
e.FormattingApplied = true;
}
diff --git a/WMS/WMS/WMS.csproj b/WMS/WMS/WMS.csproj
index 131d537..94aa477 100644
--- a/WMS/WMS/WMS.csproj
+++ b/WMS/WMS/WMS.csproj
@@ -104,6 +104,7 @@
<ItemGroup>
<Compile Include="EnumDefine\addUser.cs" />
<Compile Include="EnumDefine\basicData.cs" />
+ <Compile Include="EnumDefine\isSendToMesEnum.cs" />
<Compile Include="EnumDefine\yesNoStatus.cs" />
<Compile Include="EnumDefine\codeStatus.cs" />
<Compile Include="EnumDefine\HTTPService.cs" />
diff --git a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
index 5e68e73..6f95caf 100644
--- a/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs
@@ -29,7 +29,7 @@
//Log4NetHelper.WriteInfoLog(_logType, "娴嬭瘯鍟婂晩鍟婂晩 ");
using (dbmodel mod = new dbmodel())
{
- List<Wms_outInStockRecord_V2_Mes> sendMesData = mod.Wms_outInStockRecord_V2_Mes.Where(x => x.isSendToMes == 0).ToList();
+ List<Wms_outInStockRecord_V2_Mes> sendMesData = mod.Wms_outInStockRecord_V2_Mes.Where(x => x.isSendToMes == 0).OrderBy(x => x.ID).ToList();
if (sendMesData.Count > 0)
{
@@ -76,15 +76,19 @@
SystemWarningMsg.msg_mesDataTranfficForRealMes = $"{MyExtend.MsgTimeStr()},宸叉帹閫佺粨鏉燂紝杩斿洖:{JsonConvert.SerializeObject(ret)}";
if (ret.ErrorCode == 0)
{
- itemTask.isSendToMes = 1;
+ itemTask.isSendToMes = 1;//鎺ㄩ�佹垚鍔�
}
else
{
- itemTask.isSendToMes = 0;
+ itemTask.isSendToMes = 0;//鎺ㄩ�佸け璐�
}
itemTask.SendToMesTime = DateTime.Now;
itemTask.MesRet = ret.ErrorMsg;
itemTask.SendToMesCount = (itemTask.SendToMesCount ?? 0) + 1;
+ if (itemTask.isSendToMes == 0 && itemTask.SendToMesCount > 100)
+ {
+ itemTask.isSendToMes = 3;//琛ㄧず寮哄埗鎺ㄩ�佹垚鍔�
+ }
mod.SaveChanges();
}
diff --git a/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs b/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs
index 60c4d10..cb25b19 100644
--- a/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs
+++ b/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs
@@ -946,7 +946,7 @@
{
sql = sql + " and supplier like '%" + value.supplier + "%'";
}
- if (value.isSendToMes != null && value.isSendToMes != 0)
+ if (value.isSendToMes != null)
{
sql = sql + " and isSendToMes = '" + value.isSendToMes + "' ";
}
--
Gitblit v1.9.3