1.增加盟讯公司业务逻辑相关适配 前后端增加配置参数“ISMX”进行控制

2.前端websocket取消心跳机制(原有心跳和断线重连当服务端网线断开后需要等tcp保活期到期后才能发现重连),自己实现心跳和重连
3.前端关闭后任占用后台线程问题修复
This commit is contained in:
hehaibing-1996
2024-05-25 17:25:27 +08:00
parent 472862a978
commit 00621bcd55
82 changed files with 3404 additions and 240 deletions

View File

@ -0,0 +1,132 @@
using HandyControl.Controls;
using HandyControl.Data;
using MiniExcelLibs;
using Ping9719.WpfEx.Mvvm;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Controls;
using System.Windows.Input;
using TouchSocket.Core;
using Newtonsoft.Json;
using WCS.Model.ApiModel.MXBackgroundThread;
using .Api;
namespace .ViewModel
{
public class MXOutOrderViewModel : BindableBase
{
public MXOutOrderViewModel()
{
}
#region Property
private string matCode1;
public string MatCode1
{
get { return matCode1; }
set
{
SetProperty(ref matCode1, value);
}
}
private string orderProdNumber;
public string OrderProdNumber
{
get { return orderProdNumber; }
set
{
SetProperty(ref orderProdNumber, value);
}
}
private string orderWorkNumber;
public string OrderWorkNumber
{
get { return orderWorkNumber; }
set
{
SetProperty(ref orderWorkNumber, value);
}
}
private string pickBillNumber;
public string PickBillNumber
{
get { return pickBillNumber; }
set
{
SetProperty(ref pickBillNumber, value);
}
}
private string warehouseCode;
public string WarehouseCode
{
get { return warehouseCode; }
set
{
SetProperty(ref warehouseCode, value);
}
}
private List<PickOrder> dataGridItemSource;
public List<PickOrder> DataGridItemSource
{
get { return dataGridItemSource; }
set
{
SetProperty(ref dataGridItemSource, value);
}
}
#endregion
#region Command
public ICommand BtnSearchCommand { get => new DelegateCommand(BtnSearch); }
public void BtnSearch()
{
Task.Run(() =>
{
var request = new PickOrderRequest()
{
orderProdNumber = OrderProdNumber,
orderWorkNumber = OrderWorkNumber,
pickBillNumber = PickBillNumber
};
var requeststr = JsonConvert.SerializeObject(request);
var result = ApiHelp.MXGetDataFromHttpLongWait<List<PickOrder>>(requeststr, LocalFile.Config.GetPickOrderUrl, "POST");
if (result != null && result.code == 200 && result.data != null && result.data.Count() > 0)
{
DataGridItemSource = result.data;
}
else if (result != null && result.code == 200 && (result.data == null || result.data.Count == 0))
{
result.message = "输入的搜索条件未查询到发料单信息!";
Growl.Warning(result.message);
DataGridItemSource = result.data;
}
else
{
Growl.Warning("调用MES接口超时搜索失败");
}
});
}
#endregion
}
}