ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

51
WCS.Model/ApiModel/MXBackgroundThread/ApiResult.cs Normal file
View File

@ -0,0 +1,51 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.MXBackgroundThread
{
public class ApiResult
{
/// <summary>
/// 处理结果 200成功
/// </summary>
public int code { get; set; }
/// <summary>
/// 处理消息
/// </summary>
public string message { get; set; }
}
public class ApiResult<T> : ApiResult
{
/// <summary>
/// 数据
/// </summary>
public T data { get; set; }
}
public class ApiResultMsg
{
/// <summary>
/// 处理结果 200成功
/// </summary>
public int code { get; set; }
/// <summary>
/// 处理消息
/// </summary>
public string msg { get; set; }
}
public class ApiResultMsg<T> : ApiResultMsg
{
/// <summary>
/// 数据
/// </summary>
public T data { get; set; }
}
}

27
WCS.Model/ApiModel/MXBackgroundThread/BunkerOutRequest.cs Normal file
View File

@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.MXBackgroundThread
{
public class BunkerOutRequest
{
public string materialBar { get; set; }
/// <summary>
///
/// </summary>
public int outType { get; set; } = 0;
/// <summary>
///
/// </summary>
public string pickBillNumber { get; set; }
/// <summary>
///
/// </summary>
public int qty { get; set; } = 0;
/// <summary>
///
/// </summary>
public int warehouseType { get; set; } = 20;
}
}

25
WCS.Model/ApiModel/MXBackgroundThread/InputStockInRequest.cs Normal file
View File

@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.MXBackgroundThread
{
public class InputStockInRequest
{
public string materialBar { get; set; }
public string shelfCode { get; set; }
public string shelfX { get; set; }
public string shelfY { get; set; }
public string shelfZ { get; set; }
public string inUser { get; set; } = string.Empty;
public string inTime { get; set; }
public int warehouseType { get; set; } = 20;
}
}

14
WCS.Model/ApiModel/MXBackgroundThread/MXMesResponseCommon.cs Normal file
View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.MXBackgroundThread
{
public class MXMesResponseCommon
{
public int code { get; set; }
public string message { get; set; }
public string msg { get; set; }
public object data { get; set; }
}
}

72
WCS.Model/ApiModel/MXBackgroundThread/PickOrderRequest.cs Normal file
View File

@ -0,0 +1,72 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.MXBackgroundThread
{
public class PickOrderRequest
{
public string orderProdNumber { get; set; }
public string orderWorkNumber { get; set; }
public string pickBillNumber { get; set; }
}
public class PickOrderResponse
{
/// <summary>
///
/// </summary>
public int code { get; set; }
/// <summary>
///
/// </summary>
public string msg { get; set; }
/// <summary>
///
/// </summary>
public List<PickOrder> data { get; set; }
}
public class PickOrder
{
public bool IsSelected { get; set; }
public int id { get; set; }
public string pickBillNumber { get; set; }
public string relationPickNumber { get; set; }
public string orderProdIds { get; set; }
public string orderProdNumbers { get; set; }
public string orderWorkIds { get; set; }
public string orderWorkNumbers { get; set; }
public string dictType { get; set; }
public string dictTypeStr
{
get
{
switch (dictType)
{
case "1":
return "生产领料";
default: return "其他";
}
}
}
public string dictStatus { get; set; }
public string dictStatusStr
{
get
{
switch (dictStatus)
{
case "15":
return "待领料";
case "10":
return "部分领料";
default: return dictStatus.ToString();
}
}
}
public string createdBy { get; set; }
public string createdDt { get; set; }
public string updatedBy { get; set; }
public string updatedDt { get; set; }
}
}

49
WCS.Model/ApiModel/MXBackgroundThread/QueryByBar.cs Normal file
View File

@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.MXBackgroundThread
{
public class QueryBybarRequest
{
//条码
public string materialBar { get; set; }
}
public class InStoreDto
{
public string materialBar { get; set; }
/// <summary>
///
/// </summary>
public string materialCode { get; set; }
/// <summary>
/// 有源蜂鸣器
/// </summary>
public string materialName { get; set; }
/// <summary>
/// TMB09A03/5X9电压3V
/// </summary>
public string materialSpec { get; set; }
public double materialQty { get; set; }
public string batchNo { get; set; }
}
public class QueryBybarResponse
{
/// <summary>
///
/// </summary>
public int code { get; set; }
/// <summary>
///
/// </summary>
public string message { get; set; }
/// <summary>
///
/// </summary>
public List<InStoreDto> data { get; set; }
}
}

64
WCS.Model/ApiModel/MXBackgroundThread/RecommendedBarCodeRequest.cs Normal file
View File

@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.MXBackgroundThread
{
public class RecommendedBarCodeRequest
{
public string pickBillNumber { get; set; }
public string warehouseCode { get; set; } = string.Empty;
public int warehouseType { get; set; } = 10;
}
public class FistPushRecommendedBarCodeRequest : RecommendedBarCodeRequest
{
public string reportSide { get; set; } = null;
}
public class RecommendedBarCodeResponse
{
/// <summary>
///
/// </summary>
public int code { get; set; }
/// <summary>
///
/// </summary>
public string message { get; set; }
/// <summary>
///
/// </summary>
public List<PickOrderDetailGetReturnList> data { get; set; }
}
public class PickOrderDetailGetReturnList
{
public bool IsInstore { get; set; }
public int id { get; set; }
public string materialBar { get; set; }
public string materialId { get; set; }
public string materialCode { get; set; }
public string materialName { get; set; }
public string materialSpec { get; set; }
public string unitOfMeasure { get; set; }
public string batchNo { get; set; }
public double qty { get; set; }
public string warehouseId { get; set; }
public string warehouseCode { get; set; }
public string warehouseName { get; set; }
public string shelfCode { get; set; }
public string shelfX { get; set; }
public string shelfY { get; set; }
public string shelfZ { get; set; }
public string inUser { get; set; }
public string inTime { get; set; }
public string outUser { get; set; }
public string outTime { get; set; }
public string createdBy { get; set; }
public string createdDt { get; set; }
public string updatedBy { get; set; }
public string updatedDt { get; set; }
}
}

31
WCS.Model/ApiModel/MXBackgroundThread/SelectMaterialBarDto.cs Normal file
View File

@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.MXBackgroundThread
{
public class SelectMaterialBarDto
{
public string materialBar { get; set; }
public string warehouseCode { get; set; }
public string warehouseName { get; set; }
}
public class SelectMaterialBarResponse
{
/// <summary>
///
/// </summary>
public int code { get; set; }
/// <summary>
///
/// </summary>
public string msg { get; set; }
/// <summary>
///
/// </summary>
public SelectMaterialBarDto data { get; set; }
}
}

14
WCS.Model/ApiModel/MatInventoryDetail/CompareMatInventoryDetailRequest.cs Normal file
View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.MatInventoryDetail
{
public class CompareMatInventoryDetailRequest : RequestBase
{
public List<string> MatSns { get; set; }
public string GroupName { get; set; }
}
}

2
WCS.Model/ApiModel/StoreInfo/ModuleInfoModel.cs
View File

@ -24,7 +24,7 @@ namespace WCS.Model.ApiModel.StoreInfo
public string C { get; set; }
public string? Bigshelfcode { get; set; }
public string? BigShelfCode { get; set; }
public bool IsEnable { get; set; }

2
WCS.Model/ApiModel/StoreInfo/ShelfInfoModel.cs
View File

@ -49,7 +49,7 @@ namespace WCS.Model.ApiModel.StoreInfo
public bool IsBind { get; set; }
public string BindShelfCode { get; set; } = string.Empty;
public string BigShelfCode { get; set; }
public int RowNumber { get; set; }