schangxiang@126.com
2025-09-04 e9269528ae01bc4572b68148b9c801b51f23b669
查询优化
已添加1个文件
已修改4个文件
37 ■■■■ 文件已修改
WMS/WMS/EnumDefine/isSendToMesEnum.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WMS/WMS/UI/SynthesizeQuery/FrmMes.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WMS/WMS/WMS.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wcs/yunneiWCS/yunneiWCS/ThreadTask/mesDataTranfficForRealMes.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WMS/WMS/EnumDefine/isSendToMesEnum.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace WMS.EnumDefine
{
    enum isSendToMesEnum
    {
        å¦ = 0,
        æ˜¯ = 1,
        å¼ºåˆ¶å®Œæˆ = 3
    }
}
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));
                    // åº”用该Format,Format完毕。
                    e.FormattingApplied = true;
                }
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" />
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();
                                }
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 + "' ";
                    }