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

1.导入的接口不导入现在已经绑定了物料的货架

Browse Source
This commit is contained in:
hehaibing-1996
2025-03-11 13:56:05 +08:00
parent 7351a5e67b
commit ae24d73e81
2 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
WCS.WebApi/Controllers/BatchBindMatDetailController.cs
View File

@ -235,15 +235,19 @@ namespace WCS.WebApi.Controllers
Message = "导入失败：上传的文件中不存在有效的数据！"
};
}
var shelfAlreadyBind = DbHelp.db.Queryable<MatDetailCurrentInfo>().Select(t => t.ShelfId).Distinct().ToList();
var shelfCodes = infoList.Select(t => t.货架编号).Distinct().ToList();
//获取系统中的货架
var shelfs = DbHelp.db.Queryable<ShelfInfo>()
.LeftJoin<MatDetailCurrentInfo>((si, mci) => mci.ShelfId == si.Id)
//.Where((si, mci) => mci.Id == 0)//本系统未采取绑定的才进行绑定
.Where((si, mci) => shelfCodes.Contains(si.ShelfCode))
.Where((si, mci) => shelfCodes.Contains(si.ShelfCode) && !shelfAlreadyBind.Contains(si.Id))
.Select((si, mci) => si)
.Distinct()
.ToList();
//var shelfCodesInDb = shelfs.Select(t => t.ShelfCode).Distinct().ToList();
var matCurrentInfos = new List<MatDetailCurrentInfo>();
@ -282,7 +286,8 @@ namespace WCS.WebApi.Controllers
}
}
catch (Exception ex) {
catch (Exception ex)
{
return new ResponseCommon()

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

@ -20,43 +20,43 @@ namespace 智慧物流软件系统
//获取当前配置文件的串口号
var ScannerComList = LocalFile.Config.ScannerComList;
//通过配置的串口号生成对象
ScannerComList.ForEach(COM =>
{
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//停止位
}));
//ScannerComList.ForEach(COM =>
//{
// 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//停止位
// }));
client.Connect(LocalFile.Config.ScannerTimeOut, new CancellationToken());
}
catch (Exception ex)
{
Logs.Write($"初始化扫码枪异常！{ex.Message}", LogsType.Scanner);
}
});
// client.Connect(LocalFile.Config.ScannerTimeOut, new CancellationToken());
// }
// catch (Exception ex)
// {
// Logs.Write($"初始化扫码枪异常！{ex.Message}", LogsType.Scanner);
// }
//});
}
}