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

19
WCS.BLL/DbModels/DingDingSendUser.cs Normal file
View File

@ -0,0 +1,19 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace WCS.BLL.DbModels
{
[SugarTable("ding_ding_send_user")]
public class DingDingSendUser
{
/// <summary>
/// 工号
/// </summary>
[SugarColumn(ColumnName = "user_name", Length = 50, IsNullable = true, ColumnDescription = "创建人")]
public string UserName { get; set; }
}
}

2
WCS.BLL/DbModels/DocumentSerialNumber.cs
View File

@ -12,7 +12,7 @@ namespace WCS.BLL.DbModels
/// <summary>
/// 用于记录单据生成到哪个序号了
/// </summary>
[SugarTable("document_serial_number")]
[SugarTable("wcs_document_serial_number")]
public class DocumentSerialNumber
{
/// <summary>

29
WCS.BLL/DbModels/InOutRecord.cs
View File

@ -12,7 +12,7 @@ namespace WCS.BLL.DbModels
/// <summary>
/// 出入库记录
/// </summary>
[SugarTable("in_out_record")]
[SugarTable("wcs_in_out_record")]
public class InOutRecord
{
/// <summary>
@ -115,6 +115,33 @@ namespace WCS.BLL.DbModels
[SugarColumn(ColumnName = "operate_user", Length = 100, IsNullable = true, ColumnDescription = "创建人")]
public string OperateUser { get; set; }
/// <summary>
/// 串联绑定后的大货架编码
/// </summary>
[SugarColumn(ColumnName = "Bind_shelf_code", IsNullable = true, ColumnDescription = "串联绑定后的大货架编码")]
public string? BigShelfCode { get; set; } = string.Empty;
/// <summary>
/// Row 行
/// </summary>
[SugarColumn(ColumnName = "R", Length = 10, IsNullable = true, ColumnDescription = "库位 行")]
public string R { get; set; }
/// <summary>
/// Column 列
/// </summary>
[SugarColumn(ColumnName = "C", Length = 10, IsNullable = true, ColumnDescription = "库位 列")]
public string C { get; set; }
/// <summary>
/// Column 位
/// </summary>
[SugarColumn(ColumnName = "Wei", Length = 10, IsNullable = true, ColumnDescription = "库位 位 第几个库位灯")]
public string Wei { get; set; }
/// <summary>
/// 货架的组别、区域（区分单个软件管哪些货架的，前端的配置文件配置一个组别，查询时只显示当前组别的货架）
/// </summary>
[SugarColumn(ColumnName = "group_name", Length = 50, IsNullable = false, DefaultValue = "0", ColumnDescription = "货架的组别、区域（区分单个软件管哪些货架的，前端的配置文件配置一个组别，查询时只显示当前组别的货架）")]
public string GroupName { get; set; }
/// <summary>
/// 序号
/// </summary>

33
WCS.BLL/DbModels/InventoryDetail.cs
View File

@ -11,7 +11,7 @@ namespace WCS.BLL.DbModels
/// <summary>
/// 库存明细表
/// </summary>
[SugarTable("inventory_detail")]
[SugarTable("wcs_inventory_detail")]
public class InventoryDetail
{
/// <summary>
@ -102,7 +102,38 @@ namespace WCS.BLL.DbModels
/// </summary>
[SugarColumn(ColumnName = "is_locked", IsNullable = false, ColumnDescription = "物料是否已被锁定")]
public bool IsLocked { get; set; } = false;
/// <summary>
/// 串联绑定后的大货架编码
/// </summary>
[SugarColumn(ColumnName = "big_shelf_code", IsNullable = true, ColumnDescription = "串联绑定后的大货架编码")]
public string? BigShelfCode { get; set; } = string.Empty;
/// <summary>
/// Row 行
/// </summary>
[SugarColumn(ColumnName = "R", Length = 10, IsNullable = true, ColumnDescription = "库位 行")]
public string R { get; set; }
/// <summary>
/// Column 列
/// </summary>
[SugarColumn(ColumnName = "C", Length = 10, IsNullable = true, ColumnDescription = "库位 列")]
public string C { get; set; }
/// <summary>
/// Column 位
/// </summary>
[SugarColumn(ColumnName = "Wei", Length = 10, IsNullable = true, ColumnDescription = "库位 位 第几个库位灯")]
public string Wei { get; set; }
/// <summary>
/// WarehouseCode 仓库代码
/// </summary>
[SugarColumn(ColumnName = "WarehouseCode", Length = 10, IsNullable = true, ColumnDescription = "仓库代码")]
public string WarehouseCode { get; set; }
/// <summary>
/// 货架的组别、区域（区分单个软件管哪些货架的，前端的配置文件配置一个组别，查询时只显示当前组别的货架）
/// </summary>
[SugarColumn(ColumnName = "group_name", Length = 50, IsNullable = false, DefaultValue = "0", ColumnDescription = "货架的组别、区域（区分单个软件管哪些货架的，前端的配置文件配置一个组别，查询时只显示当前组别的货架）")]
public string GroupName { get; set; }
/// <summary>
/// 序号
/// </summary>

2
WCS.BLL/DbModels/MatBaseInfo.cs
View File

@ -10,7 +10,7 @@ namespace WCS.BLL.DbModels
///<summary>
///物料基础信息
///</summary>
[SugarTable("mat_base_info")]
[SugarTable("wcs_mat_base_info")]
public partial class MatBaseInfo
{
/// <summary>

2
WCS.BLL/DbModels/MatInfo.cs
View File

@ -10,7 +10,7 @@ namespace WCS.BLL.DbModels
///<summary>
///物料信息表
///</summary>
[SugarTable("mat_info")]
[SugarTable("wcs_mat_info")]
public class MatInfo
{
/// <summary>

8
WCS.BLL/DbModels/ModuleInfo.cs
View File

@ -11,7 +11,7 @@ namespace WCS.DAL.DbModels
///<summary>
///模组信息表
///</summary>
[SugarTable("module_info")]
[SugarTable("wcs_module_info")]
public class ModuleInfo
{
@ -62,7 +62,11 @@ namespace WCS.DAL.DbModels
/// </summary>
[SugarColumn(ColumnName = "client_ip", Length = 50, IsNullable = false, ColumnDescription = "货架对应Can模块的Ip")]
public string CleintIp { get; set; }
/// <summary>
/// 货架的组别、区域（区分单个软件管哪些货架的，前端的配置文件配置一个组别，查询时只显示当前组别的货架）
/// </summary>
[SugarColumn(ColumnName = "group_name", Length = 50, IsNullable = false, ColumnDescription = "货架的组别、区域（区分单个软件管哪些货架的，前端的配置文件配置一个组别，查询时只显示当前组别的货架）")]
public string GroupName { get; set; }
/// <summary>
/// R 行
/// </summary>

8
WCS.BLL/DbModels/OutOrder.cs
View File

@ -6,7 +6,7 @@ namespace WCS.BLL.DbModels
/// <summary>
/// 出库单据
/// </summary>
[SugarTable("out_order")]
[SugarTable("wcs_out_order")]
public class OutOrder
{
/// <summary>
@ -63,6 +63,12 @@ namespace WCS.BLL.DbModels
[SugarColumn(ColumnName = "shelf_type_id", IsNullable = false, DefaultValue = "0", ColumnDescription = "货架类型Id")]
public int ShelfTypeId { get; set; } = 0;
/// <summary>
/// 货架的组别、区域（区分单个软件管哪些货架的，前端的配置文件配置一个组别，查询时只显示当前组别的货架）
/// </summary>
[SugarColumn(ColumnName = "group_name", Length = 50, IsNullable = false, DefaultValue = "0", ColumnDescription = "货架的组别、区域（区分单个软件管哪些货架的，前端的配置文件配置一个组别，查询时只显示当前组别的货架）")]
public string GroupName { get; set; }
/// <summary>
/// 创建时间
/// </summary>

2
WCS.BLL/DbModels/OutOrderDetail.cs
View File

@ -6,7 +6,7 @@ namespace WCS.BLL.DbModels
/// <summary>
/// 出库单据明细表
/// </summary>
[SugarTable("out_order_detail")]
[SugarTable("wcs_out_order_detail")]
public class OutOrderDetail
{
/// <summary>

2
WCS.BLL/DbModels/OutOrderMatDetail.cs
View File

@ -11,7 +11,7 @@ namespace WCS.BLL.DbModels
/// <summary>
/// 出库物料明细（库存数据加锁后缓存对应的数据并记录状态）
/// </summary>
[SugarTable("out_order_mat_detail")]
[SugarTable("wcs_out_order_mat_detail")]
public class OutOrderMatDetail
{
/// <summary>

4
WCS.BLL/DbModels/ShelfInfo.cs
View File

@ -8,7 +8,7 @@ using WCS.BLL.HardWare;
namespace WCS.DAL.DbModels
{
[SugarTable("shelf_info")]
[SugarTable("wcs_shelf_info")]
public class ShelfInfo
{
@ -83,7 +83,7 @@ namespace WCS.DAL.DbModels
/// 串联绑定后的大货架编码
/// </summary>
[SugarColumn(ColumnName = "Bind_shelf_code", IsNullable = true, ColumnDescription = "串联绑定后的大货架编码")]
public string? BindShelfCode { get; set; } = string.Empty;
public string? BigShelfCode { get; set; } = string.Empty;
/// <summary>
/// 序号

2
WCS.BLL/DbModels/ShelfTypeInfo.cs
View File

@ -10,7 +10,7 @@ namespace WCS.BLL.DbModels
/// <summary>
/// 货架类型
/// </summary>
[SugarTable("shelf_type")]
[SugarTable("wcs_shelf_type")]
public class ShelfTypeInfo
{
[SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsNullable = false, IsIdentity = true)]

2
WCS.BLL/DbModels/StockTakingOrder.cs
View File

@ -11,7 +11,7 @@ namespace WCS.BLL.DbModels
/// <summary>
/// 盘点单据
/// </summary>
[SugarTable("stock_taking_order")]
[SugarTable("wcs_stock_taking_order")]
public class StockTakingOrder
{
/// <summary>

2
WCS.BLL/DbModels/StockTakingOrderMatDetail.cs
View File

@ -11,7 +11,7 @@ namespace WCS.BLL.DbModels
/// <summary>
/// 盘点单据物料明细
/// </summary>
[SugarTable("stock_taking_order_matdetail")]
[SugarTable("wcs_stock_taking_order_matdetail")]
public class StockTakingOrderMatDetail
{
/// <summary>

31
WCS.BLL/DbModels/StoreInfo.cs
View File

@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace WCS.DAL.DbModels
{
[SugarTable("store_info")]
[SugarTable("wcs_store_info")]
public partial class StoreInfo
{
/// <summary>
@ -25,7 +25,7 @@ namespace WCS.DAL.DbModels
/// 货架类型Id
/// </summary>
[SugarColumn(ColumnName = "shelf_type_id", IsNullable = false, DefaultValue = "0", ColumnDescription = "货架类型Id")]
public int ShelfTypeId { get; set; }
public int ShelfTypeId { get; set; }
/// <summary>
/// 模组Id
/// </summary>
@ -92,6 +92,33 @@ namespace WCS.DAL.DbModels
[SugarColumn(ColumnName = "offset_voltage", IsNullable = true, ColumnDescription = "电压偏移值")]
public decimal OffsetVoltage { get; set; }
/// <summary>
/// 串联绑定后的大货架编码
/// </summary>
[SugarColumn(ColumnName = "Bind_shelf_code", IsNullable = true, ColumnDescription = "串联绑定后的大货架编码")]
public string? BigShelfCode { get; set; } = string.Empty;
/// <summary>
/// Row 行
/// </summary>
[SugarColumn(ColumnName = "R", Length = 10, IsNullable = true, ColumnDescription = "库位 行")]
public string R { get; set; }
/// <summary>
/// Column 列
/// </summary>
[SugarColumn(ColumnName = "C", Length = 10, IsNullable = true, ColumnDescription = "库位 列")]
public string C { get; set; }
/// <summary>
/// Column 位
/// </summary>
[SugarColumn(ColumnName = "Wei", Length = 10, IsNullable = true, ColumnDescription = "库位 位 第几个库位灯")]
public string Wei { get; set; }
/// <summary>
/// 货架的组别、区域（区分单个软件管哪些货架的，前端的配置文件配置一个组别，查询时只显示当前组别的货架）
/// </summary>
[SugarColumn(ColumnName = "group_name", Length = 50, IsNullable = false, DefaultValue = "0", ColumnDescription = "货架的组别、区域（区分单个软件管哪些货架的，前端的配置文件配置一个组别，查询时只显示当前组别的货架）")]
public string GroupName { get; set; }
/// <summary>
/// 序号
/// </summary>

2
WCS.BLL/DbModels/SystemApiLogRecord.cs
View File

@ -10,7 +10,7 @@ namespace WCS.BLL.DbModels
/// <summary>
/// 系统接口日志记录
/// </summary>
[SugarTable("system_api_log_record")]
[SugarTable("wcs_system_api_log_record")]
public class SystemApiLogRecord
{
/// <summary>