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

Compare commits

base: ICM-WCS:深圳海陵威
Branches Tags
ICM-WCS:develop ICM-WCS:赛特制冷WCS ICM-WCS:深圳海陵威 ICM-WCS:煤科院货架液晶显示屏 ICM-WCS:金川分支 ICM-WCS:master ICM-WCS:软著申请修改
..
compare: ICM-WCS:金川分支
Branches Tags
ICM-WCS:赛特制冷WCS ICM-WCS:深圳海陵威 ICM-WCS:煤科院货架液晶显示屏 ICM-WCS:金川分支 ICM-WCS:develop ICM-WCS:master ICM-WCS:软著申请修改

2 Commits
深圳海陵威 ... 金川分支

Author SHA1 Message Date
hehaibing-1996
c88a8122cc 修改串口 2025-03-21 18:55:17 +08:00
hehaibing-1996
9562d86449 金川部署需要修改Logo、文字提示 
本分支在2014/11/11已经部署至金川现场
之后部署一次 合并提交一次
 2024-11-11 17:43:16 +08:00
44 changed files with 267 additions and 1163 deletions
Expand all files Collapse all files

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

@ -103,18 +103,6 @@ namespace WCS.DAL.DbModels
[SugarColumn(ColumnName = "Bind_shelf_code", IsNullable = true, ColumnDescription = "串联绑定后的大货架编码")]
public string? BigShelfCode { get; set; } = string.Empty;
/// <summary>
/// 每块板子的灯数量
/// </summary>
[SugarColumn(ColumnName = "light_count", IsNullable = true, ColumnDescription = "每块板子的灯数量")]
public int LightCount { get; set; }
/// <summary>
/// 每块板子的灯数量
/// </summary>
[SugarColumn(ColumnName = "first_board_id", IsNullable = true, ColumnDescription = "左上角的板子id")]
public int FirtstBoardId { get; set; }
/// <summary>
/// 序号
/// </summary>

141
WCS.BLL/DbModels/StoreInfoHistoryVoltage.cs
View File

@ -1,141 +0,0 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace WCS.DAL.DbModels
{
[SugarTable("wcs_store_info_history_voltage")]
public partial class StoreInfoHistoryVoltage
{
/// <summary>
/// Id
/// </summary>
[SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsNullable = false, IsIdentity = true)]
public int Id { get; set; }
[SugarColumn(ColumnName = "store_id")]
public int StoreId { get; set; }
/// <summary>
/// 入库的库位编码
/// </summary>
[SugarColumn(ColumnName = "store_code", Length = 50, IsNullable = false, ColumnDescription = "库位编码")]
public string StoreCode { get; set; }
/// <summary>
/// 货架类型Id
/// </summary>
[SugarColumn(ColumnName = "shelf_type_id", IsNullable = false, DefaultValue = "0", ColumnDescription = "货架类型Id")]
public int ShelfTypeId { get; set; }
/// <summary>
/// 模组Id
/// </summary>
[SugarColumn(ColumnName = "module_id", IsNullable = false, ColumnDescription = "模组Id")]
public int ModuleId { get; set; }
/// <summary>
/// 模组编号
/// </summary>
[SugarColumn(ColumnName = "module_code", Length = 50, IsNullable = false, ColumnDescription = "模组编码")]
public string ModuleCode { get; set; }
/// <summary>
/// 货架Id
/// </summary>
[SugarColumn(ColumnName = "shelf_id", IsNullable = false, ColumnDescription = "货架Id")]
public int ShelfId { get; set; }
/// <summary>
/// 货架号
/// </summary>
[SugarColumn(ColumnName = "shelf_code", Length = 50, IsNullable = false, ColumnDescription = "货架编码;货架一般按照报警灯来区分 一个报警灯指示的是一个货架")]
public string ShelfCode { get; set; }
/// <summary>
/// 板子的Id
/// </summary>
[SugarColumn(ColumnName = "board_id", IsNullable = false, ColumnDescription = "模组pcb板id")]
public int BoardId { get; set; }
/// <summary>
/// 板子上第几个灯
/// </summary>
[SugarColumn(ColumnName = "light_number", IsNullable = true, ColumnDescription = "板子上第几个灯")]
public int LightNumber { get; set; }
/// <summary>
/// 优先级;为钢网柜推荐库位预留
/// </summary>
[SugarColumn(ColumnName = "priority", IsNullable = true, ColumnDescription = "板子上第几个灯")]
public int Priority { get; set; }
/// <summary>
/// 记录一下查询时的历史是否有物料
/// </summary>
[SugarColumn(ColumnName = "current_mat_sn", Length = 200, IsNullable = true, ColumnDescription = "当前物料")]
public string CurrentMatSn { get; set; }
/// <summary>
/// 当前电压;当前电压，调试排查问题用
/// </summary>
[SugarColumn(ColumnName = "current_voltage", IsNullable = true, ColumnDescription = "当前电压值")]
public decimal CurrentVoltage { get; set; }
/// <summary>
/// 标准电压;标准电压，调试排查问题用
/// </summary>
[SugarColumn(ColumnName = "standard_voltage", IsNullable = true, ColumnDescription = "标准电压值")]
public decimal StandardVoltage { get; set; }
/// <summary>
/// 偏差电压;偏差电压，调试排查问题用
/// </summary>
[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>
[SugarColumn(ColumnName = "create_time", IsNullable = false, ColumnDescription = "创建时间")]
public DateTime CreateTime { get; set; } = DateTime.Now;
/// <summary>
/// 序号
/// </summary>
[SugarColumn(IsIgnore = true)]
public int RowNumber { get; set; }
/// <summary>
/// 是否已经选择
/// </summary>
[SugarColumn(IsIgnore = true)]
public bool IsSelected { get; set; }
}
}

5
WCS.BLL/HardWare/IShelfBase.cs
View File

@ -124,11 +124,6 @@ namespace WCS.BLL.HardWare
/// </summary>
public void Reset();
/// <summary>
/// 板子与货架状态不一致的复位（未响应的复位）
/// </summary>
public void NoResponseReset();
/// <summary>
/// 货架自检
/// </summary>

5
WCS.BLL/HardWare/SingleLightShelf.cs
View File

@ -95,11 +95,6 @@ namespace WCS.BLL.HardWare
return;
}
public void NoResponseReset()
{
return;
}
public void SetCurrentMode(Mode mode)
{

88
WCS.BLL/HardWare/SmartShelf.cs
View File

@ -337,7 +337,7 @@ namespace WCS.BLL.HardWare
if (module.CurrentOutSns == null || module.CurrentOutSns.Count == 0)
{
Logs.Write($"GoInOutstoreByModule货架【{ShelfCode}】，模组【{module.ModuleCode}】，不存在需要继续出的物料，给其复位。", LogsType.Outstore);
//不需要这个模组继续亮灯了
module.GoOutOutStoreMode(TcpCleint);
Thread.Sleep(400);
@ -694,18 +694,6 @@ namespace WCS.BLL.HardWare
WarningManager.SendWarning(warningModel);
}
var currentOutStoreMatSns = CurrentOutStoreMatSNs.ToList();
//Task.Run(() =>
//{
// var matDetails = DbHelp.db.Queryable<InventoryDetail>()
// .Where(t => currentOutStoreMatSns.Contains(t.MatSN))
// .Where(t => t.IsLocked)
// .ToList();
// matDetails.ForEach(t => t.IsLocked = false);
// DbHelp.db.Updateable(matDetails).ExecuteCommand();
//});
CurrentOutStoreMatSNs.Clear();
WarningLight.CloseLight(TcpCleint);
SetCurrentMode(Mode.待机模式);
@ -923,31 +911,6 @@ namespace WCS.BLL.HardWare
SetCurrentMode(Mode.待机模式);
}
/// <summary>
/// 板子与货架状态不一致的复位（未响应的复位）
/// </summary>
public void NoResponseReset()
{
//不是待机模式不发送指令
if (CurrentMode != Mode.待机模式)
{
return;
}
//获取状态不一致的板子
var modules = Modules.Where(t => t.IsEnable && t.CurrentMode != Mode.待机模式)
.ToList();
if (modules != null && modules.Count > 0)
{
modules.ForEach(t =>
{
//复位状态不一致的板子
Logs.Write($"复位模组【{t.ModuleCode}({t.CurrentMode})】发送指令成功！");
t.Reset(TcpCleint);
});
}
}
public void QueryVoltage(int moduleId)
{
var moudle = Modules.Where(t => t.ModuleId == moduleId).First();
@ -1735,51 +1698,10 @@ namespace WCS.BLL.HardWare
//当前库位未记录MatSn
if (string.IsNullOrEmpty(storeInfo.CurrentMatSn))
{
if (data[TcpCleint.PreFixLength + 6] == 0x0D &&
data[TcpCleint.PreFixLength + 7] == 0x0D &&
data[TcpCleint.PreFixLength + 8] == 0x0D &&
data[TcpCleint.PreFixLength + 9] == 0x0D)
{
Task.Run(() =>
{
var historyVoltage = new StoreInfoHistoryVoltage()
{
StoreId = storeInfo.Id,
StoreCode = storeInfo.StoreCode,
ShelfTypeId = storeInfo.ShelfTypeId,
ModuleId = storeInfo.ModuleId,
ModuleCode = storeInfo.ModuleCode,
ShelfId = storeInfo.ShelfId,
ShelfCode = storeInfo.ShelfCode,
BoardId = storeInfo.BoardId,
LightNumber = storeInfo.LightNumber,
Priority = storeInfo.Priority,
CurrentMatSn = storeInfo.CurrentMatSn,
CurrentVoltage = storeInfo.CurrentVoltage,
StandardVoltage = storeInfo.StandardVoltage,
OffsetVoltage = storeInfo.OffsetVoltage,
BigShelfCode = storeInfo.BigShelfCode,
R = storeInfo.R,
C = storeInfo.C,
Wei = storeInfo.Wei,
GroupName = "出库自动标定记录历史电压",
CreateTime = DateTime.Now,
};
//自动保存最新的电压值
storeInfo.CurrentVoltage = (data[TcpCleint.PreFixLength + 4] << 8) + data[TcpCleint.PreFixLength + 5];
DbHelp.db.Insertable(historyVoltage).ExecuteCommand();
DbHelp.db.Updateable(storeInfo).ExecuteCommand();
});
Thread.Sleep(10);
return;
}
else
{
//该库位是需要出库的库位，物料被多次取出or给了多个正常出库信号
Logs.Write($"该库位是需要出库的库位，物料被反复取出or给了多个正常出库信号,库位{storeInfo.StoreCode}", LogsType.Outstore);
//暂不进行处理
return;
}
//该库位是需要出库的库位，物料被多次取出or给了多个正常出库信号
Logs.Write($"该库位是需要出库的库位，物料被反复取出or给了多个正常出库信号,库位{storeInfo.StoreCode}", LogsType.Outstore);
//暂不进行处理
return;
}
//不是本次出库需要出的物料

49
WCS.BLL/HardWare/SmartShelfModule.cs
View File

@ -122,22 +122,12 @@ namespace WCS.BLL.HardWare
.OrderBy(t => t.LightNumber)
.ToList();
char[] data = "0000000000000000".ToCharArray();
//禁用
char[] dataBan = "0000000000000000".ToCharArray();
var boardStoreNumber = storeInfos.Count();
foreach (var storeInfo in storeInfos)
{
if (!string.IsNullOrEmpty(storeInfo.CurrentMatSn) && storeInfo.LightNumber > 0 && storeInfo.LightNumber <= boardStoreNumber)
{
data[storeInfo.LightNumber - 1] = '1';
//禁用
if (storeInfo.CurrentMatSn == "禁用")
{
dataBan[storeInfo.LightNumber - 1] = '1';
}
}
}
var dataStr = string.Join("", data.Reverse());
@ -146,13 +136,6 @@ namespace WCS.BLL.HardWare
GoInInstoreData[1] = Convert.ToByte(data1, 2);
GoInInstoreData[2] = Convert.ToByte(data2, 2);
//禁用
var dataBanStr = string.Join("", dataBan.Reverse());
var data1Ban = dataBanStr.Substring(8, 8);
var data2Ban = dataBanStr.Substring(0, 8);
GoInInstoreData[6] = Convert.ToByte(data1Ban, 2);
GoInInstoreData[7] = Convert.ToByte(data2Ban, 2);
tcpClient.Send(tcpClient.GenerateMessage(BoardId, GoInInstoreData));
}
@ -204,21 +187,12 @@ namespace WCS.BLL.HardWare
.OrderBy(t => t.LightNumber)
.ToList();
char[] data = "0000000000000000".ToCharArray();
//禁用功能
char[] dataBan = "0000000000000000".ToCharArray();
var boardStoreNumber = storeInfos.Count();
foreach (var storeInfo in storeInfos)
{
if (!string.IsNullOrEmpty(storeInfo.CurrentMatSn) && storeInfo.LightNumber > 0 && storeInfo.LightNumber <= boardStoreNumber)
{
data[storeInfo.LightNumber - 1] = '1';
//禁用功能
if (storeInfo.CurrentMatSn == "禁用")
{
dataBan[storeInfo.LightNumber - 1] = '1';
}
}
}
var dataStr = string.Join("", data.Reverse());
@ -227,13 +201,6 @@ namespace WCS.BLL.HardWare
CheckModeData[1] = Convert.ToByte(data1, 2);
CheckModeData[2] = Convert.ToByte(data2, 2);
//禁用功能
var dataBanStr = string.Join("", dataBan.Reverse());
var data1Ban = dataBanStr.Substring(8, 8);
var data2Ban = dataBanStr.Substring(0, 8);
CheckModeData[6] = Convert.ToByte(data1Ban, 2);
CheckModeData[7] = Convert.ToByte(data2Ban, 2);
tcpClient.Send(tcpClient.GenerateMessage(BoardId, CheckModeData));
}
@ -251,21 +218,12 @@ namespace WCS.BLL.HardWare
.ToList();
//计算物料在库的库位
char[] data = "0000000000000000".ToCharArray();
//计算禁用的库位
char[] dataBan = "0000000000000000".ToCharArray();
var storeNumber = storeInfos.Count();
foreach (var storeInfo in storeInfos)
{
if (!string.IsNullOrEmpty(storeInfo.CurrentMatSn) && storeInfo.LightNumber > 0 && storeInfo.LightNumber <= storeNumber)
{
data[storeInfo.LightNumber - 1] = '1';
//禁用
if (storeInfo.CurrentMatSn == "禁用")
{
dataBan[storeInfo.LightNumber - 1] = '1';
}
}
}
var dataStr = string.Join("", data.Reverse());
@ -274,13 +232,6 @@ namespace WCS.BLL.HardWare
GoInOutstoreModeData[1] = Convert.ToByte(data1, 2);
GoInOutstoreModeData[2] = Convert.ToByte(data2, 2);
//禁用
var dataBanStr = string.Join("", dataBan.Reverse());
var data1Ban = dataBanStr.Substring(8, 8);
var data2Ban = dataBanStr.Substring(0, 8);
GoInOutstoreModeData[6] = Convert.ToByte(data1Ban, 2);
GoInOutstoreModeData[7] = Convert.ToByte(data2Ban, 2);
//出库位置亮灯
if (outSns != null && outSns.Count > 0)
{

2
WCS.BLL/Manager/DbInit.cs
View File

@ -70,7 +70,7 @@ namespace WCS.BLL.Manager
DbHelp.dbLog.DbMaintenance.CreateDatabase();
Logs.Write("【初始化数据库】创建数据库", LogsType.StartBoot);
DbHelp.db.CodeFirst.InitTables(typeof(ModuleInfo), typeof(ShelfInfo), typeof(StoreInfo),typeof(StoreInfoHistoryVoltage)
DbHelp.db.CodeFirst.InitTables(typeof(ModuleInfo), typeof(ShelfInfo), typeof(StoreInfo)
, typeof(InventoryDetail), typeof(OutOrder), typeof(OutOrderDetail), typeof(OutOrderMatDetail)
, typeof(ShelfTypeInfo), typeof(MatBaseInfo), typeof(MatInfo)
, typeof(StockTakingOrder), typeof(StockTakingOrderMatDetail), typeof(InOutRecord)

354
WCS.BLL/Manager/MXBackgroundThread.cs
View File

@ -18,105 +18,105 @@ namespace WCS.BLL.Manager
{
public static void InitBackgroundThread()
{
//#region 定时任务:回传Mes入库出库
//Task.Run(() =>
//{
// while (true)
// {
// //每5秒同步一次
// Thread.Sleep(5000);
// try
// {
// var records = DbHelp.db.Queryable<InOutRecord>()
// .Where(t => t.OperateTime > DateTime.Now.AddDays(-3)) //只查询回传三天内数据
// .Where(t => t.IsUpload == false)
// .Includes(t => t.StoreInfo)
// .OrderBy(t => t.Id)
// .ToList();
// //入库记录上传
// var inventoryDetails = records.Where(t => t.Direction == DirectionEnum.入库)
// .WhereIF(!string.IsNullOrEmpty(LocalFile.Config.GroupName), t => t.GroupName == LocalFile.Config.GroupName)
// .ToList();
// if (inventoryDetails != null && inventoryDetails.Count > 0)
// {
// for (int i = 0; i < inventoryDetails.Count; i++)
// {
// try
// {
// //请求WMS上传入库记录
// var data = new InputStockInRequest
// {
// materialBar = inventoryDetails[i].MatSN,
// shelfCode = inventoryDetails[i].BigShelfCode,
// shelfX = "R" + inventoryDetails[i].R,
// shelfY = "C" + inventoryDetails[i].C,
// shelfZ = inventoryDetails[i].Wei,
// inUser = inventoryDetails[i].OperateUser,
// inTime = inventoryDetails[i].OperateTime.ToString("yyyy-MM-dd HH:mm:ss"),
// };
// Guid guid = Guid.NewGuid();
// var result = ApiHelp.GetDataFromHttp<ResponseCommon>(LocalFile.Config.InputStockInStr, data, "POST", true);
// if (result != null && (result.Code == 200))
// {
// //上传成功 更改上传状态
// inventoryDetails[i].IsUpload = true;
// DbHelp.db.Updateable(inventoryDetails[i]).ExecuteCommand();
// }
#region 定时任务:回传Mes入库出库
Task.Run(() =>
{
while (true)
{
//每5秒同步一次
Thread.Sleep(5000);
try
{
var records = DbHelp.db.Queryable<InOutRecord>()
.Where(t => t.OperateTime > DateTime.Now.AddDays(-3)) //只查询回传三天内数据
.Where(t => t.IsUpload == false)
.Includes(t => t.StoreInfo)
.OrderBy(t => t.Id)
.ToList();
//入库记录上传
var inventoryDetails = records.Where(t => t.Direction == DirectionEnum.入库)
.WhereIF(!string.IsNullOrEmpty(LocalFile.Config.GroupName), t => t.GroupName == LocalFile.Config.GroupName)
.ToList();
if (inventoryDetails != null && inventoryDetails.Count > 0)
{
for (int i = 0; i < inventoryDetails.Count; i++)
{
try
{
//请求WMS上传入库记录
var data = new InputStockInRequest
{
materialBar = inventoryDetails[i].MatSN,
shelfCode = inventoryDetails[i].BigShelfCode,
shelfX = "R" + inventoryDetails[i].R,
shelfY = "C" + inventoryDetails[i].C,
shelfZ = inventoryDetails[i].Wei,
inUser = inventoryDetails[i].OperateUser,
inTime = inventoryDetails[i].OperateTime.ToString("yyyy-MM-dd HH:mm:ss"),
};
Guid guid = Guid.NewGuid();
var result = ApiHelp.GetDataFromHttp<ResponseCommon>(LocalFile.Config.InputStockInStr, data, "POST", true);
if (result != null && (result.Code == 200))
{
//上传成功 更改上传状态
inventoryDetails[i].IsUpload = true;
DbHelp.db.Updateable(inventoryDetails[i]).ExecuteCommand();
}
// }
// catch (Exception ex)
// {
}
catch (Exception ex)
{
// }
// Thread.Sleep(200);
// }
// }
}
Thread.Sleep(200);
}
}
// //出库记录上传
// var outRecord = records.Where(t => t.Direction == DirectionEnum.出库)
// .Where(t => !string.IsNullOrEmpty(t.OrderNumber))
// .WhereIF(!string.IsNullOrEmpty(LocalFile.Config.GroupName), t => t.GroupName == LocalFile.Config.GroupName)
// .ToList();
// if (outRecord != null && outRecord.Count > 0)
// {
// for (int i = 0; i < outRecord.Count; i++)
// {
// try
// {
// var retString = string.Empty;
//出库记录上传
var outRecord = records.Where(t => t.Direction == DirectionEnum.出库)
.Where(t => !string.IsNullOrEmpty(t.OrderNumber))
.WhereIF(!string.IsNullOrEmpty(LocalFile.Config.GroupName), t => t.GroupName == LocalFile.Config.GroupName)
.ToList();
if (outRecord != null && outRecord.Count > 0)
{
for (int i = 0; i < outRecord.Count; i++)
{
try
{
var retString = string.Empty;
// var data = new BunkerOutRequest()
// {
// materialBar = outRecord[i].MatSN,
// outType = 0,
// pickBillNumber = outRecord[i].OrderNumber,
// qty = outRecord[i].MatQty,
// };
// var result = ApiHelp.GetDataFromHttp<ResponseCommon>(LocalFile.Config.BunkerOutStr, data, "POST", true);
// //请求成功
// if (result != null && result.Code == 200)
// {
// //上传成功 更改上传状态
// outRecord[i].IsUpload = true;
// DbHelp.db.Updateable(outRecord[i]).ExecuteCommand();
// }
var data = new BunkerOutRequest()
{
materialBar = outRecord[i].MatSN,
outType = 0,
pickBillNumber = outRecord[i].OrderNumber,
qty = outRecord[i].MatQty,
};
var result = ApiHelp.GetDataFromHttp<ResponseCommon>(LocalFile.Config.BunkerOutStr, data, "POST", true);
//请求成功
if (result != null && result.Code == 200)
{
//上传成功 更改上传状态
outRecord[i].IsUpload = true;
DbHelp.db.Updateable(outRecord[i]).ExecuteCommand();
}
// }
// catch (Exception ex)
// {
}
catch (Exception ex)
{
// }
// Thread.Sleep(200);
// }
// }
// }
// catch (Exception ex)
// {
// Logs.Write("【定时任务】上传异常：" + ex.Message);
// }
// }
//});
//#endregion
}
Thread.Sleep(200);
}
}
}
catch (Exception ex)
{
Logs.Write("【定时任务】上传异常：" + ex.Message);
}
}
});
#endregion
#region 定时任务：超时退出 出库、入库、盘点模式
Task.Run(() =>
@ -169,97 +169,97 @@ namespace WCS.BLL.Manager
});
#endregion
//#region 定时任务：海康未扫物料码的物料更新数据
//Task.Run(() =>
//{
// while (true)
// {
// //间隔20秒同步一次
// Thread.Sleep(20000);
// try
// {
// var inventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
// .Where(t => t.MatName == "暂时未知")
// .Where(t => t.InstoreTime > DateTime.Now.AddDays(-3))
// .ToList();
// if (inventoryDetails != null && inventoryDetails.Count > 0)
// {
// for (int i = 0; i < inventoryDetails.Count; i++)
// {
// try
// {
// //请求WMS获取物料的信息
// var request = new QueryBybarRequest()
// {
// materialBar = inventoryDetails[i].MatSN
// };
// var result = ApiHelp.GetDataFromHttp<QueryBybarResponse>(LocalFile.Config.QueryBybar, request, "POST", true);
// if (result != null && (result.code == 200) && result.data != null && result.data.Count() > 0)
// {
// //查询成功 更改数值
// var instoreDto = result.data.FirstOrDefault();
// inventoryDetails[i].MatCode = instoreDto.materialCode;
// inventoryDetails[i].MatName = instoreDto.materialName;
// inventoryDetails[i].MatBatch = instoreDto.batchNo;
// inventoryDetails[i].MatSpec = instoreDto.materialSpec;
// inventoryDetails[i].MatQty = (int)instoreDto.materialQty;
// DbHelp.db.Updateable(inventoryDetails[i]).ExecuteCommand();
// }
#region 定时任务：海康未扫物料码的物料更新数据
Task.Run(() =>
{
while (true)
{
//间隔20秒同步一次
Thread.Sleep(20000);
try
{
var inventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
.Where(t => t.MatName == "暂时未知")
.Where(t => t.InstoreTime > DateTime.Now.AddDays(-3))
.ToList();
if (inventoryDetails != null && inventoryDetails.Count > 0)
{
for (int i = 0; i < inventoryDetails.Count; i++)
{
try
{
//请求WMS获取物料的信息
var request = new QueryBybarRequest()
{
materialBar = inventoryDetails[i].MatSN
};
var result = ApiHelp.GetDataFromHttp<QueryBybarResponse>(LocalFile.Config.QueryBybar, request, "POST", true);
if (result != null && (result.code == 200) && result.data != null && result.data.Count() > 0)
{
//查询成功 更改数值
var instoreDto = result.data.FirstOrDefault();
inventoryDetails[i].MatCode = instoreDto.materialCode;
inventoryDetails[i].MatName = instoreDto.materialName;
inventoryDetails[i].MatBatch = instoreDto.batchNo;
inventoryDetails[i].MatSpec = instoreDto.materialSpec;
inventoryDetails[i].MatQty = (int)instoreDto.materialQty;
DbHelp.db.Updateable(inventoryDetails[i]).ExecuteCommand();
}
// }
// catch (Exception ex)
// {
}
catch (Exception ex)
{
// }
// Thread.Sleep(500);
// }
// }
}
Thread.Sleep(500);
}
}
// }
// catch (Exception ex)
// {
// Logs.Write("【定时任务】更新海康物料信息异常：" + ex.Message);
// }
}
catch (Exception ex)
{
Logs.Write("【定时任务】更新海康物料信息异常：" + ex.Message);
}
// Thread.Sleep(3000);
// try
// {
// var inventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
// .Where(t => t.WarehouseCode == null)
// .Where(t => t.InstoreTime > DateTime.Now.AddDays(-30))
// .ToList();
// if (inventoryDetails != null && inventoryDetails.Count > 0)
// {
// for (int i = 0; i < inventoryDetails.Count; i++)
// {
// try
// {
// var url = $"http://192.168.2.23:9213/integrate/hkwsInventoryDetail/selectMaterialBar?materialBar={inventoryDetails[i].MatSN}";
// var result = ApiHelp.GetDataFromHttp<SelectMaterialBarResponse>(url, null, "POST", false);
// if (result != null && result.code == 200 && result.data != null && !string.IsNullOrEmpty(result.data.warehouseCode))
// {
// //查询成功 更改数值
// inventoryDetails[i].WarehouseCode = result.data.warehouseCode;
// DbHelp.db.Updateable(inventoryDetails[i]).ExecuteCommand();
// }
Thread.Sleep(3000);
try
{
var inventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
.Where(t => t.WarehouseCode == null)
.Where(t => t.InstoreTime > DateTime.Now.AddDays(-30))
.ToList();
if (inventoryDetails != null && inventoryDetails.Count > 0)
{
for (int i = 0; i < inventoryDetails.Count; i++)
{
try
{
var url = $"http://192.168.2.23:9213/integrate/hkwsInventoryDetail/selectMaterialBar?materialBar={inventoryDetails[i].MatSN}";
var result = ApiHelp.GetDataFromHttp<SelectMaterialBarResponse>(url, null, "POST", false);
if (result != null && result.code == 200 && result.data != null && !string.IsNullOrEmpty(result.data.warehouseCode))
{
//查询成功 更改数值
inventoryDetails[i].WarehouseCode = result.data.warehouseCode;
DbHelp.db.Updateable(inventoryDetails[i]).ExecuteCommand();
}
// }
// catch (Exception ex)
// {
// Logs.Write("【定时任务】更新仓库代码异常：" + ex.Message);
// }
// Thread.Sleep(500);
// }
// }
// }
// catch (Exception ex)
// {
// }
// }
//});
//#endregion
}
catch (Exception ex)
{
Logs.Write("【定时任务】更新仓库代码异常：" + ex.Message);
}
Thread.Sleep(500);
}
}
}
catch (Exception ex)
{
}
}
});
#endregion
#region 定时任务：监测警示灯关灯机制
//判断灯颜色和模式是否对应

8
WCS.BLL/Manager/WarningManager.cs
View File

@ -136,14 +136,6 @@ namespace WCS.BLL.Manager
}
}
if (warning.WarningType == WarningTypeEnum.入库中未扫描上架 ||
warning.WarningType == WarningTypeEnum.入库中异常取出 ||
warning.WarningType == WarningTypeEnum.出库中丢失 ||
warning.WarningType == WarningTypeEnum.出库中未扫描上架)
{
return;
}
#region 重新发指令进入对应模式
Logs.Write($"GoInRightMode", LogsType.WebSocket);
GoInRightMode(warning);

7
WCS.BLL/Services/IService/IStoreInfoService.cs
View File

@ -52,13 +52,6 @@ namespace WCS.BLL.Services.IService
/// <returns></returns>
public Task<ResponseCommon> queryModuleVoltage(QueryModuleVoltageRequest request);
/// <summary>
/// 查询库位历史电压值-非硬件查询 仅查询软件记录的历史电压
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public Task<ResponseCommon> queryStoreInfoHistoryVoltage(QueryStoreInfoHistoryVoltageRequest request);
/// <summary>
/// 标定+设置偏移量
/// </summary>

21
WCS.BLL/Services/Service/OutstoreService.cs
View File

@ -198,11 +198,11 @@ namespace WCS.BLL.Services.Service
#region 保存数据
//锁库存
//inventoryDetails.ForEach(t =>
//{
// t.IsLocked = true;
//});
//var lockTask = DbHelp.db.Updateable(inventoryDetails).ExecuteCommandAsync();
inventoryDetails.ForEach(t =>
{
t.IsLocked = true;
});
var lockTask = DbHelp.db.Updateable(inventoryDetails).ExecuteCommandAsync();
//保存数据
var order = new OutOrder()
@ -239,7 +239,7 @@ namespace WCS.BLL.Services.Service
await DbHelp.db.Insertable(orderMatDetail).ExecuteCommandAsync();
}).ToList();
//await lockTask;
await lockTask;
await Task.WhenAll(matDetailTasks);
await DbHelp.db.CommitTranAsync();
@ -476,9 +476,8 @@ namespace WCS.BLL.Services.Service
//直接查询
var recordsQueryable = DbHelp.db.Queryable<OutOrder>()
.Where(t => request.OrderExeStatus.Contains(t.OutOrderExeStatus))
.Where(t => t.CreateTime > DateTime.Now.AddDays(-2))
.WhereIF(request.IsMXPD != null, t => t.IsMXPD == request.IsMXPD)
//.WhereIF(LocalFile.Config.IsMx, t => t.CreateTime > DateTime.Now.AddDays(-3))
.WhereIF(LocalFile.Config.IsMx, t => t.CreateTime > DateTime.Now.AddDays(-3))
.WhereIF(!string.IsNullOrEmpty(LocalFile.Config.GroupName), t => t.GroupName == LocalFile.Config.GroupName);
var totalCount = await recordsQueryable.CountAsync();
@ -1072,7 +1071,7 @@ namespace WCS.BLL.Services.Service
});
outOrderDetail.ReqQty = 0;
//matInventoryDetails[i].IsLocked = true;
matInventoryDetails[i].IsLocked = true;
DbHelp.db.Updateable(matInventoryDetails[i]).ExecuteCommand();
}
else
@ -1099,7 +1098,7 @@ namespace WCS.BLL.Services.Service
CreateUser = createUser,
});
//matInventoryDetails[i].IsLocked = true;
matInventoryDetails[i].IsLocked = true;
DbHelp.db.Updateable(matInventoryDetails[i]).ExecuteCommand();
}
}
@ -1274,7 +1273,7 @@ namespace WCS.BLL.Services.Service
{
DbHelp.db.Updateable<InventoryDetail>().SetColumns(it => it.IsLocked == false).Where(it => it.MatSN == listdetail.MatSN).ExecuteCommand();
}
//灭灯
//获取需要出库的物料明细
var outOrderMatDetails = DbHelp.db.Queryable<OutOrderMatDetail>()

84
WCS.BLL/Services/Service/StoreInfoService.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -492,39 +491,6 @@ namespace WCS.BLL.Services.Service
}
}
/// <summary>
/// 发送指令获取模组的电压值
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public async Task<ResponseCommon> queryStoreInfoHistoryVoltage(QueryStoreInfoHistoryVoltageRequest request)
{
try
{
//获取数据
var list = await DbHelp.db.Queryable<StoreInfoHistoryVoltage>()
.Where(t => request.StoreIds.Contains(t.StoreId))
.OrderByDescending(t => t.Id)
.ToListAsync();
return new ResponseCommon()
{
Code = 200,
Message = "Success",
Data = list
};
}
catch (Exception ex)
{
return new ResponseCommon()
{
Code = 300,
Message = "操作失败：" + ex.Message
};
}
}
public async Task<ResponseCommon> calibrationSetOffset(CalibrationSetOffsetRequest request)
{
try
@ -537,67 +503,22 @@ namespace WCS.BLL.Services.Service
if (shelf != null && shelf is SmartShelf)
{
var smartShelf = (SmartShelf)shelf;
#region 记录当前模组所有库位的上一次的电压
//2024/11/11 程心怡说刘一科长喊加的
//需求来源：微信
//软件加光衰标定值，观察光衰数据
//相当于就是你那边软件要记录一下上一次标定的值
//相当于，到时候我们这边板子上完了，我会手动用你的软件标定一次，你那边就记录数据。
var time = DateTime.Now;
var historyList = new List<StoreInfoHistoryVoltage>();
var storeInfos = DbHelp.db.Queryable<StoreInfo>()
.Where(t => t.ModuleId == module.Id)
.Where(t => t.BoardId == module.BoardId)
.OrderBy(t => t.LightNumber)
.ToList();
storeInfos.ForEach(t =>
{
historyList.Add(new StoreInfoHistoryVoltage()
{
StoreId = t.Id,
StoreCode = t.StoreCode,
ShelfTypeId = t.ShelfTypeId,
ModuleId = module.Id,
ModuleCode = t.ModuleCode,
ShelfId = t.ShelfId,
ShelfCode = t.ShelfCode,
BoardId = t.BoardId,
LightNumber = t.LightNumber,
Priority = t.Priority,
CurrentMatSn = t.CurrentMatSn,
CurrentVoltage = t.CurrentVoltage,
StandardVoltage = t.StandardVoltage,
OffsetVoltage = t.OffsetVoltage,
BigShelfCode = t.BigShelfCode,
R = t.R,
C = t.C,
Wei = t.Wei,
GroupName = t.GroupName,
CreateTime = time,
});
});
DbHelp.db.Insertable(historyList).ExecuteCommand();
#endregion
smartShelf.CalibrationSetOffset(module.Id, request.OffSet);
isSend = true;
}
}
if (isSend)
{
return new ResponseCommon()
{
Code = 200,
Message = "Success"
};
}
else
{
return new ResponseCommon()
{
Code = 201,
Message = "操作失败：未找到对应模组"
};
}
}
catch (Exception ex)
{
@ -681,7 +602,7 @@ namespace WCS.BLL.Services.Service
var DingDing = string.Empty;
MXBackgroundThread.SendDingDingMsg($"【智能货架】库位{storeInfo.StoreCode}被屏蔽（库位管理），请及时调查或维保硬件！", new List<string> { "104379", "103595" }, ref DingDing);
Logs.Write($"【智能货架】库位{storeInfo.StoreCode}被屏蔽（库位管理），请及时调查或维保硬件！");
#region 计算库位禁用率并发送
Task.Run(() =>
{
@ -848,7 +769,7 @@ namespace WCS.BLL.Services.Service
{
Code = 200,
Message = $"Success",
Data = message,
Data = message ,
};
}
catch (Exception ex)
@ -862,7 +783,6 @@ namespace WCS.BLL.Services.Service
}
}
#endregion
}
}

3
WCS.BLL/Tool/TCPClient.cs
View File

@ -260,8 +260,7 @@ namespace WCS.BLL
}
catch (Exception ex)
{
var clientIpHost = tcpClient.IP + ":" + tcpClient.Port;
Logs.Write($"【发送指令时发生异常{clientIpHost}】" + ex.Message, LogsType.Instructions);
Logs.Write("【发送指令时发生异常】" + ex.Message, LogsType.Instructions);
//因异常断连时（网线已经被断了） 手动重连一次
if (ex is NotConnectedException)
{

5
WCS.Model/ApiModel/MXL4/SysOrderMXL4Request.cs
View File

@ -61,11 +61,6 @@ namespace WCS.Model.ApiModel.MXL4
/// </summary>
public string MatBatch { get; set; }
/// <summary>
/// 物料SN
/// </summary>
public string MatSN { get; set; }
/// <summary>
/// 数量
/// </summary>

11
WCS.Model/ApiModel/StoreInfo/QueryStoreInfoHistoryVoltageRequest.cs
View File

@ -1,11 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.StoreInfo
{
public class QueryStoreInfoHistoryVoltageRequest : RequestBase
{
public List<int> StoreIds { get; set; }
}
}

44
WCS.Model/ApiModel/StoreInfo/StoreInfoHistoryVoltageModel.cs
View File

@ -1,44 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WCS.Model.ApiModel.StoreInfo
{
public partial class StoreInfoHistoryVoltageModel
{
public int Id { get; set; }
public string StoreCode { get; set; }
public int ShelfTypeId { get; set; }
public int ModuleId { get; set; }
public string ModuleCode { get; set; }
public int ShelfId { get; set; }
public string ShelfCode { get; set; }
public int BoardId { get; set; }
public int LightNumber { get; set; }
public int Priority { get; set; }
public string CurrentMatSn { get; set; }
public decimal CurrentVoltage { get; set; }
public decimal StandardVoltage { get; set; }
public decimal OffsetVoltage { get; set; }
public string BigShelfCode { get; set; }
public string R { get; set; }
public string C { get; set; }
public string Wei { get; set; }
public string GroupName { get; set; }
public DateTime CreateTime { get; set; }
public int RowNumber { get; set; }
public bool IsSelected { get; set; }
}
}

36
WCS.WebApi/Controllers/HomeController.cs
View File

@ -239,42 +239,6 @@ namespace WCS.WebApi.Controllers
}
}
/// <summary>
/// 重置货架的状态 使其回到待机模式
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("noResponseReset")]
[HttpPost(Name = "noResponseReset")]
public async Task<ResponseBase> noResponseReset(RequestBase request)
{
try
{
var shelfs = new List<IShelfBase>();
shelfs = ShelfManager.Shelves
.Where(t => t.CurrentMode == Mode.待机模式)
.ToList();
foreach (var shelf in shelfs)
{
shelf.NoResponseReset();
}
return new ResponseBase()
{
Code = 200,
Message = "success",
};
}
catch (Exception ex)
{
return new ResponseBase()
{
Code = 300,
Message = ex.Message,
};
}
}
/// <summary>

176
WCS.WebApi/Controllers/StoreInfoController.cs
View File

@ -7,8 +7,6 @@ using WCS.Model.ApiModel.StoreInfo;
using WCS.BLL.DbModels;
using WCS.Model.ApiModel.MatBaseInfo;
using WCS.DAL.DbModels;
using WCS.DAL.Db;
using WCS.BLL.Config;
namespace WCS.WebApi.Controllers
{
@ -46,6 +44,7 @@ namespace WCS.WebApi.Controllers
}
#endregion
#region 模组管理
[Route("getModules")]
[HttpPost(Name = "getModules")]
@ -68,13 +67,6 @@ namespace WCS.WebApi.Controllers
return await _storeInfoService.queryModuleVoltage(request);
}
[Route("queryStoreInfoHistoryVoltage")]
[HttpPost(Name = "queryStoreInfoHistoryVoltage")]
public async Task<ResponseBase> queryStoreInfoHistoryVoltage(QueryStoreInfoHistoryVoltageRequest request)
{
return await _storeInfoService.queryStoreInfoHistoryVoltage(request);
}
[Route("calibrationSetOffset")]
[HttpPost(Name = "calibrationSetOffset")]
public async Task<ResponseBase> calibrationSetOffset(CalibrationSetOffsetRequest request)
@ -104,172 +96,6 @@ namespace WCS.WebApi.Controllers
{
return await _storeInfoService.getDisablePercent();
}
[Route("genModuleStoreInfos")]
[HttpPost(Name = "genModuleStoreInfos")]
public async Task<ResponseBase> genModuleStoreInfos(RequestBase request)
{
try
{
if (request.UserName != "aaa")
{
return new ResponseBase()
{
Code = 300,
Message = "用户名不对头！无法生成模组库位"
};
}
//获取货架 此组后端管的货架
var shelfInfos = DbHelp.db.Queryable<ShelfInfo>()
.Where(t => t.GroupName == LocalFile.Config.GroupName)
.OrderBy(t => t.BigShelfCode)
.OrderBy(t => t.ShelfCode)
.ToList();
var lastBindBigShelfCode = string.Empty;
var lastColumnCount = 1;
List<ModuleInfo> moduleInfos = new List<ModuleInfo>();
//生成模组
foreach (var shelfInfo in shelfInfos)
{
var modulePreFix = shelfInfo.IsBind ? shelfInfo.BigShelfCode : shelfInfo.ShelfCode;
//不绑定或者绑定换了面 重新从1开始计数
if (shelfInfo.BigShelfCode != lastBindBigShelfCode)
{
lastColumnCount = 1;
}
lastBindBigShelfCode = shelfInfo.BigShelfCode;
for (int rowIndex = 0; rowIndex < shelfInfo.Rowcounts; rowIndex++)
{
for (int columnIndex = 0; columnIndex < shelfInfo.Columncounts; columnIndex++)
{
var moduleCode = modulePreFix + "-R" + (rowIndex + 1).ToString() + "C" + (lastColumnCount + columnIndex).ToString();
var moduleInfo = new ModuleInfo()
{
ModuleCode = moduleCode,
ShelfTypeId = shelfInfo.ShelfTypeId,
ShelfId = shelfInfo.Id,
ShelfCode = shelfInfo.ShelfCode,
BoardId = shelfInfo.FirtstBoardId++,
LightCount = shelfInfo.LightCount,
CleintIp = shelfInfo.ClientIp,
GroupName = shelfInfo.GroupName,
R = (rowIndex + 1).ToString(),
C = (lastColumnCount + columnIndex).ToString(),
Bigshelfcode = shelfInfo.BigShelfCode,
IsEnable = true,
CurrentMode = BLL.HardWare.Mode.待机模式,
};
moduleInfos.Add(moduleInfo);
}
}
lastColumnCount = lastColumnCount + shelfInfo.Columncounts;
}
DbHelp.db.Insertable(moduleInfos).ExecuteCommand();
//生成库位
moduleInfos = DbHelp.db.Queryable<ModuleInfo>()
.Where(t => t.GroupName == LocalFile.Config.GroupName)
.OrderBy(t => t.Id)
.ToList();
List<StoreInfo> storeInfos = new List<StoreInfo>();
foreach (var moduleInfo in moduleInfos)
{
for (int wei = 0; wei < moduleInfo.LightCount; wei++)
{
var storeCode = moduleInfo.ModuleCode + "-" + (wei + 1).ToString();
var stroreInfo = new StoreInfo()
{
StoreCode = storeCode,
ShelfTypeId = moduleInfo.ShelfTypeId,
ModuleId = moduleInfo.Id,
ModuleCode = moduleInfo.ModuleCode,
ShelfId = moduleInfo.ShelfId,
ShelfCode = moduleInfo.ShelfCode,
BoardId = moduleInfo.BoardId,
LightNumber = wei + 1,
Priority = 0,
CurrentMatSn = string.Empty,
CurrentVoltage = 0,
StandardVoltage = 0,
OffsetVoltage = 0,
BigShelfCode = moduleInfo.Bigshelfcode,
R = moduleInfo.R,
C = moduleInfo.C,
Wei = (wei + 1).ToString(),
GroupName = moduleInfo.GroupName
};
storeInfos.Add(stroreInfo);
}
}
DbHelp.db.Insertable(storeInfos).ExecuteCommand();
return new ResponseBase()
{
Code = 200,
Message = "生成库位成功"
};
}
catch (Exception ex)
{
return new ResponseBase()
{
Code = 300,
Message = ex.Message
};
}
}
[Route("updateClientIp")]
[HttpPost(Name = "updateClientIp")]
public async Task<ResponseBase> updateClientIp(RequestBase request)
{
try
{
if (request.UserName != "aaa")
{
return new ResponseBase()
{
Code = 300,
Message = "用户名不对头！修改货架的IP。"
};
}
//获取货架 此组后端管的货架
var shelfInfos = DbHelp.db.Queryable<ShelfInfo>()
.Where(t => t.ClientIp.Contains(".225."))
.ToList();
shelfInfos.ForEach(t => t.ClientIp = t.ClientIp.Replace(".225.", ".210."));
var moduleInfos = DbHelp.db.Queryable<ModuleInfo>()
.Where(t => t.CleintIp.Contains(".225."))
.ToList();
moduleInfos.ForEach(t => t.CleintIp = t.CleintIp.Replace(".225.", ".210."));
DbHelp.db.Updateable(moduleInfos).UpdateColumns(t => new { t.CleintIp }).ExecuteCommand();
DbHelp.db.Updateable(shelfInfos).UpdateColumns(t => new { t.ClientIp }).ExecuteCommand();
return new ResponseBase()
{
Code = 200,
Message = "更新库位成功"
};
}
catch (Exception ex)
{
return new ResponseBase()
{
Code = 300,
Message = ex.Message
};
}
}
#endregion
}
}

3
WCS.WebApi/Program.cs
View File

@ -39,9 +39,6 @@ namespace WebApi
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD>ط<EFBFBD><D8B7>߳<EFBFBD>
WarningManager.StartWarningMessageThread();
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̨<EFBFBD><CCA8><EFBFBD><EFBFBD>Ӳ<EFBFBD><D3B2>״̬<D7B4>߳<EFBFBD> <20><>ʱ<EFBFBD>˳<EFBFBD>ģʽ<C4A3><CABD><EFBFBD><EFBFBD><EFBFBD>عصƵȻ<C6B5><C8BB><EFBFBD>
MXBackgroundThread.InitBackgroundThread();
//<2F><>Ѷ<EFBFBD><D1B6>˾<EFBFBD><CBBE>̨<EFBFBD>߳<EFBFBD>
if (LocalFile.Config.IsMx)
{

16
WCS.WebApi/data/jsconfig.json
View File

@ -1,16 +0,0 @@
{
"ModuleCodePatterns": null,
"IsSameMatCodeOut": true,
"DataDbPath": "Server=192.168.2.2; Database=EdgeDB; uid = sa; pwd = 8ik,9ol.; Trusted_Connection = False;",
"LogDbPath": "Server=192.168.2.2; Database=EdgeDB; uid = sa; pwd = 8ik,9ol.; Trusted_Connection = False;",
"AuthDbPath": "Server=192.168.2.2; Database=EdgeDB; uid = sa; pwd = 8ik,9ol.; Trusted_Connection = False;",
"IsAccessWMS": true,
"WMSUrl": null,
"IsResetDBOrTable": false,
"InstoreTimeOut": 5000,
"IsMx": true,
"InputStockInStr": "http://192.168.2.23:9289/integrate/instock/inputStockIn",
"BunkerOutStr": "http://192.168.2.23:9289/integrate/inOut/bunkerOut",
"QueryBybar": "http://192.168.2.23:9213/integrate/instock/queryBybar",
"GroupName": "CC"
}

BIN
版本履历表.xlsx
View File

Binary file not shown.

4
货架标准上位机/App.xaml
View File

@ -21,8 +21,8 @@
<!--字体-->
<FontFamily x:Key="IconFont">pack://application,,,/智能仓储WCS管理系统;component/Fonts/#iconfont</FontFamily>
<!--字符串-->
<sys:String x:Key="AboutInfo1">卓越盟讯</sys:String>
<!--<sys:String x:Key="AboutInfo1">金川数智</sys:String>-->
<!--<sys:String x:Key="AboutInfo1">卓越盟讯</sys:String>-->
<sys:String x:Key="AboutInfo1">金川数智</sys:String>
<sys:String x:Key="AboutInfo2">智造未来</sys:String>
</ResourceDictionary>
</Application.Resources>

0
货架标准上位机/Excel/出库单据导入模板.xlsx → 货架标准上位机/Excel/出库导入模板.xlsx
View File

BIN
货架标准上位机/Resources/Logo.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 264 KiB

BIN
货架标准上位机/Resources/Logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
货架标准上位机/Resources/LogoJC.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 264 KiB

BIN
货架标准上位机/Resources/LogoJC.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
货架标准上位机/Resources/LogoMX.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
货架标准上位机/Resources/LogoMX.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

54
货架标准上位机/ScannerManager.cs
View File

@ -4,9 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using TouchSocket.Core;
using TouchSocket.SerialPorts;
using TouchSocket.Sockets;
using System.IO.Ports;
using 智能仓储WCS管理系统.Views.Controls;
namespace 智能仓储WCS管理系统
@ -24,33 +22,29 @@ namespace 智能仓储WCS管理系统
{
try
{
var client = new SerialPortClient();
//成功连接到端口
client.Connected = (client, e) =>
{
Logs.Write($"扫码枪{client.MainSerialPort.PortName},已成功连接！", LogsType.Scanner);
//初始化扫码枪对象
var Scanner = new Scanner()
{
SerialPortClient = (SerialPortClient)client,
//ScannerDisplayControl = new ScannerDisplayControl(client.MainSerialPort.PortName),
COM = client.MainSerialPort.PortName,
TempCode = string.Empty,
};
Scanners.Add(Scanner);
return EasyTask.CompletedTask;
};
client.Setup(new TouchSocket.Core.TouchSocketConfig()
.SetSerialPortOption(new SerialPortOption()
{
BaudRate = 9600,//波特率
DataBits = 8,//数据位
Parity = System.IO.Ports.Parity.None,//校验位
PortName = COM,
StopBits = System.IO.Ports.StopBits.One//停止位
}));
var _serialPort = new SerialPort();
client.Connect(LocalFile.Config.ScannerTimeOut, new CancellationToken());
// 初始化串口配置
_serialPort = new SerialPort
{
PortName = COM,
BaudRate = 9600,
Parity = Parity.None,
DataBits = 8,
StopBits = StopBits.One,
Handshake = Handshake.None,
Encoding = Encoding.UTF8 // 根据设备要求选择编码
};
_serialPort.Open();
var Scanner = new Scanner()
{
SerialPort = _serialPort,
//ScannerDisplayControl = new ScannerDisplayControl(client.MainSerialPort.PortName),
COM = COM,
TempCode = string.Empty,
};
Scanners.Add(Scanner);
}
catch (Exception ex)
{
@ -63,7 +57,7 @@ namespace 智能仓储WCS管理系统
public class Scanner
{
public SerialPortClient SerialPortClient { get; set; }
public SerialPort SerialPort { get; set; }
public ScannerDisplayControl ScannerDisplayControl { get; set; }

31
货架标准上位机/ViewModels/DeviceViewModel.cs
View File

@ -61,37 +61,6 @@ namespace 智能仓储WCS管理系统.ViewModel
Growl.Error("打开文件夹失败。");
}
}
public ICommand NoResponseResetCommand { get => new DelegateCommand(NoResponseReset); }
/// <summary>
/// 打开用户
/// </summary>
public void NoResponseReset()
{
var result = HandyControl.Controls.MessageBox.Show("此功能用于“未成功退出入库、出库”等异常提示\r\n建议所有货架都处于待机模式时使用，继续复位请点击[确定]", "提示", MessageBoxButton.OKCancel);
if (result == MessageBoxResult.Cancel)
return;
#region 调用接口 请求重置所有货架的状态
var body = new RequestBase()
{
UserName = LocalStatic.CurrentUser,
DeviceType = LocalFile.Config.DeviceType,
};
var Result = ApiHelp.GetDataFromHttp<ResponseBase>(LocalFile.Config.ApiIpHost + "home/noResponseReset", body, "POST");
if (Result != null && Result.Code == 200)
{
Growl.Warning("已给状态不一致的板子发送复位指令，建议点击第一个按钮[货架状态初始化]重置所有货架状态！");
}
else if (Result != null)
{
Growl.Warning(Result.Message);
}
else
{
Growl.Warning("调用接口失败！");
}
#endregion
}
}
public class DeviceReadModel : BindableBase

55
货架标准上位机/ViewModels/InInventoryViewModel.cs
View File

@ -30,6 +30,7 @@ using WCS.Model.ApiModel.MatBaseInfo;
using System.Security.Cryptography;
using Ping9719.WpfEx;
using System.Diagnostics.Eventing.Reader;
using System.IO.Ports;
namespace 智能仓储WCS管理系统.ViewModel
{
@ -41,30 +42,44 @@ namespace 智能仓储WCS管理系统.ViewModel
var scanners = ScannerManager.Scanners;
foreach (var scanner in scanners)
{
scanner.SerialPortClient.Received = (client, e) =>
{
//获取串口号
var COM = client.MainSerialPort.PortName;
//获取扫码枪对象
var scanner = ScannerManager.Scanners.Where(t => t.COM == COM).FirstOrDefault();
if (scanner == null)
return EasyTask.CompletedTask;
int newBytes = e.ByteBlock.Len;
if (newBytes > 0)
{
var currentScanedCode = Encoding.UTF8.GetString(e.ByteBlock, 0, e.ByteBlock.Len);
Logs.Write($"接收到扫码枪[{scanner.COM}]扫码数据{currentScanedCode}", LogsType.Scanner);
scanner.TempCode += currentScanedCode;
//校验末尾码
CheckDataCompleteness(scanner);
scanner.ScannerDisplayControl.RefreshValues(scanner.ShelfCode, scanner.MatSn, scanner.InstoreUser);
}
return EasyTask.CompletedTask;
};
scanner.SerialPort.DataReceived += SerialPort_DataReceived;
}
RevertScannerStatus();
}
public void SerialPort_DataReceived(object sender, SerialDataReceivedEventArgs e)
{
try
{
var _serialPort = sender as SerialPort;
if (_serialPort == null)
return;
//// 读取所有可用数据
string receivedData = _serialPort.ReadExisting();
//获取串口号
var COM = _serialPort.PortName;
//获取扫码枪对象
var scanner = ScannerManager.Scanners.Where(t => t.COM == COM).FirstOrDefault();
if (scanner == null)
return;
//int newBytes = e.ByteBlock.Len;
if (receivedData.Length > 0)
{
var currentScanedCode = receivedData;
Logs.Write($"接收到扫码枪[{scanner.COM}]扫码数据{currentScanedCode}", LogsType.Scanner);
scanner.TempCode += currentScanedCode;
//校验末尾码
CheckDataCompleteness(scanner);
scanner.ScannerDisplayControl.RefreshValues(scanner.ShelfCode, scanner.MatSn, scanner.InstoreUser);
}
}
catch (Exception ex)
{
Console.WriteLine($"接收数据错误: {ex.Message}");
}
}
#region Property
private string shelfCode;
public string ShelfCode

49
货架标准上位机/ViewModels/OutInventoryImportDucumentViewModel.cs
View File

@ -6,12 +6,10 @@ using System.Collections.ObjectModel;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
using WCS.BLL.DbModels;
using WCS.Model;
using WCS.Model.ApiModel.Home;
using WCS.Model.ApiModel.MatBaseInfo;
using WCS.Model.ApiModel.MatInventoryDetail;
using 智能仓储WCS管理系统.Api;
@ -21,46 +19,6 @@ namespace 智能仓储WCS管理系统.ViewModels
public class OutInventoryImportDucumentViewModel : BindableBase
{
#region Property
private List<ShelfTypeModel> shelfTypeItems;
public List<ShelfTypeModel> ShelfTypeItems
{
get { return shelfTypeItems; }
set
{
SetProperty(ref shelfTypeItems, value);
}
}
public void InitShelfTypeItems()
{
//调用接口更新！
Task.Run(() =>
{
var body = new RequestBase()
{
UserName = LocalStatic.CurrentUser,
DeviceType = LocalFile.Config.DeviceType,
};
var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<ShelfTypeModel>>(LocalFile.Config.ApiIpHost + "home/getShelfTypes", body, "POST");
if (Result != null && Result.Data != null && Result.Data.Lists.Count() > 0)
{
ShelfTypeItems = Result.Data.Lists;
SelectedShelfTypeItem = Result.Data.Lists.First();
}
});
}
private ShelfTypeModel selectedShelfTypeItem;
public ShelfTypeModel SelectedShelfTypeItem
{
get { return selectedShelfTypeItem; }
set
{
SetProperty(ref selectedShelfTypeItem, value);
}
}
private ObservableCollection<MatInventorySummaryModel> dataGridItemSource;
public ObservableCollection<MatInventorySummaryModel> DataGridItemSource
{
@ -91,10 +49,9 @@ namespace 智能仓储WCS管理系统.ViewModels
#region 选择文件保存路径
Microsoft.Win32.SaveFileDialog sfd = new Microsoft.Win32.SaveFileDialog();
sfd.Filter = ".xlsx文件(*.xlsx)|*.xlsx";
sfd.FileName = "出库单据导入模板";
sfd.FileName = "出库导入模板";
sfd.Title = "请选择文件保存地址";
sfd.OverwritePrompt = true;
if (sfd.ShowDialog() != true)
{
return;
@ -108,8 +65,6 @@ namespace 智能仓储WCS管理系统.ViewModels
try
{
File.Copy(sourceFile, destinationFile, true); // true表示如果目标文件存在，则覆盖它
// 设置文件的最后写入时间为当前时间
File.SetLastWriteTime(destinationFile, DateTime.Now);
Growl.Success("文件下载成功！");
}
catch (IOException ioEx)
@ -219,8 +174,6 @@ namespace 智能仓储WCS管理系统.ViewModels
{
var body = new SysOutOrderByMatCodeRequest()
{
ShelfTypeId = SelectedShelfTypeItem.Id,
ShelfTypeName = SelectedShelfTypeItem.ShelfTypeName,
OrderType = "出库",
OrderSource = "WCS前端",
ItemList = DataGridItemSource.Select(t => new MatCodeItemList()

5
货架标准上位机/Views/Controls/DeviceView.xaml
View File

@ -18,11 +18,6 @@
<Button Margin="5,3" Padding="30,0" Name="resetShelf" Content="货架状态初始化" Command="{Binding ResetAllShelfCommand}"></Button>
<Button Margin="5,3" Padding="30,0" Content="打开打印模板路径" Command="{Binding BarcodePrintTemplateCommand}"></Button>
<Button Margin="5,3"
Padding="30,0"
Content="未成功退出模式的模组复位"
Command="{Binding NoResponseResetCommand}"></Button>
</StackPanel>
</GroupBox>

2
货架标准上位机/Views/MXWindows/MXPDView.xaml
View File

@ -168,7 +168,7 @@
<DataGridTextColumn IsReadOnly="True" Header="序号" Binding="{Binding RowNumber}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="库位" Binding="{Binding StoreCode}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="物料编码" Binding="{Binding MatCode}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="数量" Binding="{Binding MatQty}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="数量" Binding="{Binding OriginalQty}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="物料名称" Binding="{Binding MatName}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" MaxWidth="300" Header="规格" Binding="{Binding MatSpec}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="批次" Binding="{Binding MatBatch}"></DataGridTextColumn>

2
货架标准上位机/Views/OutInventoryAddDucumentView.xaml
View File

@ -34,7 +34,7 @@
<Border Background="AliceBlue" Padding="0">
<Grid >
<StackPanel Margin="3" Orientation="Horizontal">
<StackPanel Margin="3" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
<StackPanel Margin="3" Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock VerticalAlignment="Center"
Text="货架类型：" FontSize="22" >
</TextBlock>

15
货架标准上位机/Views/OutInventoryImportDucumentView.xaml
View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:hc="https://handyorg.github.io/handycontrol"
Height="500" Width="850" WindowStyle="None" Loaded="Window_Loaded" Background="{x:Null}" BorderThickness="0" AllowsTransparency="True" WindowStartupLocation="CenterScreen" Opacity="1">
Height="500" Width="850" WindowStyle="None" Background="{x:Null}" BorderThickness="0" AllowsTransparency="True" WindowStartupLocation="CenterScreen" Opacity="1">
<hc:Window.Resources>
<ResourceDictionary>
<Style TargetType="Button" BasedOn="{StaticResource ButtonDefault}">
@ -34,19 +34,6 @@
<Border Background="AliceBlue" Padding="0">
<Grid >
<StackPanel Margin="3" Orientation="Horizontal">
<StackPanel Margin="3" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock VerticalAlignment="Center"
Text="货架类型：" FontSize="22" >
</TextBlock>
<ComboBox
IsEnabled="{Binding ShelfTypeIsEnabled}"
VerticalAlignment="Center"
DisplayMemberPath="ShelfTypeName"
ItemsSource="{Binding ShelfTypeItems}"
SelectedItem="{Binding SelectedShelfTypeItem}"
FontSize="22"
IsEditable="False"/>
</StackPanel>
<Button MinHeight="40" FontSize="18" Margin="3"
Content="&#xe613;导入" FontFamily="{StaticResource IconFont}"
Foreground="WhiteSmoke"

5
货架标准上位机/Views/OutInventoryImportDucumentView.xaml.cs
View File

@ -59,10 +59,5 @@ namespace 智能仓储WCS管理系统
this.DialogResult = false;
this.Close();
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
viewModel.InitShelfTypeItems();
}
}
}

5
货架标准上位机/Views/StoreInfoView.xaml
View File

@ -90,11 +90,6 @@
SelectionChanged="dataGrid_SelectionChanged"
RowHeight="39"
AutoGenerateColumns="False" FontSize="13">
<DataGrid.ContextMenu>
<ContextMenu Name="dgmenu1" StaysOpen="true">
<MenuItem Header="查询历史电压" Click="MenuItem_Click"/>
</ContextMenu>
</DataGrid.ContextMenu>
<DataGrid.Columns>
<DataGridTextColumn IsReadOnly="True" Header="序号" Binding="{Binding RowNumber}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="货架编码" Binding="{Binding ShelfCode}"></DataGridTextColumn>

51
货架标准上位机/Views/StoreInfoView.xaml.cs
View File

@ -1,5 +1,4 @@
using HandyControl.Controls;
using Ping9719.WpfEx;
using Ping9719.WpfEx;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@ -15,10 +14,7 @@ using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using WCS.Model.ApiModel.StoreInfo;
using WCS.Model;
using 智能仓储WCS管理系统.ViewModel;
using 智能仓储WCS管理系统.Api;
namespace 智能仓储WCS管理系统
{
@ -90,50 +86,5 @@ namespace 智能仓储WCS管理系统
{
;
}
private void MenuItem_Click(object sender, RoutedEventArgs e)
{
//先获取选中的模组
var storeInfo = viewModel.SelectedataGridItem;
#region 调用接口 发送指令进行查询
try
{
var body = new QueryStoreInfoHistoryVoltageRequest()
{
StoreIds = new List<int>() { storeInfo.Id },
UserName = LocalStatic.CurrentUser,
DeviceType = LocalFile.Config.DeviceType,
};
var Result = ApiHelp.GetDataFromHttp<ResponseCommon<List<StoreInfoHistoryVoltageModel>>>(LocalFile.Config.ApiIpHost + "storeInfo/queryStoreInfoHistoryVoltage", body, "POST");
if (Result != null && Result.Code == 200)
{
if (Result.Data == null || Result.Data.Count == 0)
{
Growl.Success("查询成功！该库位没有历史电压值数据！");
return;
}
else
{
Growl.Success("查询成功！请查看弹窗内数据！");
var window = new StoreInfoHistoryVoltageWindow(Result.Data, storeInfo.StoreCode);
window.ShowDialog();
}
}
else if (Result != null)
{
Growl.Success(Result.Message);
}
}
catch (Exception ex)
{
Growl.Warning("查询失败：" + ex.Message);
}
finally
{
}
#endregion
}
}
}

2
货架标准上位机/Views/Windows/CalibrationWindow.xaml.cs
View File

@ -133,7 +133,7 @@ namespace 智能仓储WCS管理系统
Growl.Success("发送标定指令成功！");
this.Close();
}
else if (Result1 != null)
else if (Result != null)
{
Growl.Error(Result1.Message);
}

27
货架标准上位机/Views/Windows/StoreInfoHistoryVoltageWindow.xaml
View File

@ -1,27 +0,0 @@
<Window x:Class="智能仓储WCS管理系统.StoreInfoHistoryVoltageWindow"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Title="电压历史数据（标定时记录上一次数据）" Height="650" Width="660" ResizeMode="NoResize" FontSize="25"
Icon="/Resources/Logo.ico" WindowStartupLocation="CenterScreen" >
<Grid Background="AliceBlue">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<TextBlock Text="库位编码" Name="storeCodeTxt" FontSize="40" HorizontalAlignment="Center"></TextBlock>
<DataGrid Grid.Row="1" Name="dataGrid" FontSize="15" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False">
<DataGrid.Columns>
<DataGridTextColumn Header="电压标准值" Binding="{Binding StandardVoltage}" Width="*"/>
<DataGridTextColumn Header="电压偏移值" Binding="{Binding OffsetVoltage}" Width="*"/>
<DataGridTextColumn Header="电压当前值" Binding="{Binding CurrentVoltage}" Width="*"/>
<DataGridTextColumn Header="记录时间" Binding="{Binding CreateTime,StringFormat='yyyy-MM-dd HH:mm:ss'}" Width="1.5*"/>
</DataGrid.Columns>
</DataGrid>
<Button Content="关闭" Height="45" FontSize="28" Grid.Row="2" Click="Button_Click"></Button>
</Grid>
</Window>

44
货架标准上位机/Views/Windows/StoreInfoHistoryVoltageWindow.xaml.cs
View File

@ -1,44 +0,0 @@
using HandyControl.Controls;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using WCS.Model;
using WCS.Model.ApiModel;
using WCS.Model.ApiModel.StoreInfo;
using WCS.Model.ApiModel.User;
using 智能仓储WCS管理系统.Api;
namespace 智能仓储WCS管理系统
{
/// <summary>
/// CalibrationWindow.xaml 的交互逻辑
/// </summary>
public partial class StoreInfoHistoryVoltageWindow : System.Windows.Window
{
public StoreInfoHistoryVoltageWindow(List<StoreInfoHistoryVoltageModel> list,string storeCode)
{
InitializeComponent();
dataGrid.ItemsSource = list;
this.storeCodeTxt.Text = storeCode;
}
private void Button_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
}
}

9
货架标准上位机/货架标准上位机.csproj
View File

@ -8,8 +8,8 @@
<LangVersion>latest</LangVersion>
<Company>重庆盟讯电子科技有限公司</Company>
<Copyright>Copyright © 2024</Copyright>
<AssemblyVersion>1.0.4</AssemblyVersion>
<FileVersion>1.0.4</FileVersion>
<AssemblyVersion>1.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
<ApplicationIcon>Resources\Logo.ico</ApplicationIcon>
<Authors>重庆盟讯电子科技有限公司</Authors>
<Product>智能仓储WCS管理系统</Product>
@ -60,8 +60,8 @@
<PackageReference Include="SqlSugar" Version="5.1.4.149" />
<PackageReference Include="SqlSugar.MySqlConnector" Version="5.1.3.42" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
<PackageReference Include="System.IO.Ports" Version="9.0.0" />
<PackageReference Include="TouchSocket.Http" Version="2.0.3" />
<PackageReference Include="TouchSocket.SerialPorts" Version="2.0.2" />
</ItemGroup>
<ItemGroup>
@ -104,9 +104,6 @@
<None Update="Excel\出库单据导入模板.xlsx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Excel\出库导入模板.xlsx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Excel\物料管理导入模板.xlsx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>