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

调试中的修改

Browse Source
This commit is contained in:
hehaibing-1996
2025-01-17 15:23:20 +08:00
parent 0bec70f175
commit de682b3884
5 changed files with 123 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ namespace WCS.DAL.DbModels
/// <summary> /// <summary>
/// 货架编码;货架一般按照报警灯来区分 一个报警灯指示的是一个货架 /// 货架编码;货架一般按照报警灯来区分 一个报警灯指示的是一个货架
/// </summary> /// </summary>
[SugarColumn(ColumnName = "shelf_code", Length = 50, IsNullable = false, ColumnDescription = "货架编码;货架一般按照报警灯来区分 一个报警灯指示的是一个货架")] [SugarColumn(ColumnName = "shelf_code", Length = 64, IsNullable = false, ColumnDescription = "货架编码;货架一般按照报警灯来区分 一个报警灯指示的是一个货架")]
public string ShelfCode { get; set; } public string ShelfCode { get; set; }
/// <summary> /// <summary>
@ -33,7 +33,7 @@ namespace WCS.DAL.DbModels
/// <summary> /// <summary>
/// 货架类型名称 /// 货架类型名称
/// </summary> /// </summary>
[SugarColumn(ColumnName = "shelf_type_name", Length = 50, IsNullable = false, ColumnDescription = "货架类型名称")] [SugarColumn(ColumnName = "shelf_type_name", Length = 64, IsNullable = false, ColumnDescription = "货架类型名称")]
public string ShelfTypeName { get; set; } public string ShelfTypeName { get; set; }
/// <summary> /// <summary>

136
WCS.BLL/Manager/MKYBackgroundThread.cs
View File

@ -64,58 +64,22 @@ namespace WCS.BLL.Manager
var finishedTask = finsishedTaks[i]; var finishedTask = finsishedTaks[i];
try try
{ {
//////上传单据 //上传单据
////#region 上传单据 #region 上传单据
////var request = new SysOrderRequest() var request = new SysOrderRequest()
////{ {
//// guid = finishedTask.Guid.ToString(), guid = finishedTask.Guid.ToString(),
//// itemNo = finishedTask.ItemNo, itemNo = finishedTask.ItemNo,
//// matCode = finishedTask.MatCode, matCode = finishedTask.MatCode,
//// matBatch = finishedTask.MatBatch, matBatch = finishedTask.MatBatch,
//// matSN = finishedTask.MatSN, matSN = finishedTask.MatSN,
//// orderNumber = finishedTask.OrderNumber, orderNumber = finishedTask.OrderNumber,
//// orderType = (int)finishedTask.TaskMode, orderType = (int)finishedTask.TaskMode,
//// storeCode = finishedTask.StoreCode, storeCode = finishedTask.StoreCode,
//// qty = finishedTask.Qty, qty = finishedTask.Qty,
////}; };
////var result = ApiHelp.GetDataFromHttp<SysOrderResponse>(@"http://172.16.129.8:8989/ztwcs/stockBillBack", request, "POST", true); var result = ApiHelp.GetDataFromHttp<SysOrderResponse>(@"http://10.41.235.10:18989/ztwcs/stockBillBack", request, "POST", true);
////if (result != null && (result.code == 200)) if (result != null && (result.code == 200))
////{
//// //上传成功
//// var uploadedTask = new UploadededTask()
//// {
//// ShelfId = finishedTask.ShelfId,
//// ShelfCode = finishedTask.ShelfCode,
//// ModuleId = finishedTask.ModuleId,
//// ModuleCode = finishedTask.ModuleCode,
//// StoreId = finishedTask.StoreId,
//// StoreCode = finishedTask.StoreCode,
//// TaskID = finishedTask.TaskID,
//// ItemNo = finishedTask.ItemNo,
//// Guid = finishedTask.Guid,
//// TaskMode = finishedTask.TaskMode,
//// OrderNumber = finishedTask.OrderNumber,
//// ButtonColor = finishedTask.ButtonColor,
//// MatCode = finishedTask.MatCode,
//// MatName = finishedTask.MatName,
//// MatSpec = finishedTask.MatSpec,
//// MatBatch = finishedTask.MatBatch,
//// MatSN = finishedTask.MatSN,
//// Qty = finishedTask.Qty,
//// CreateTime = finishedTask.CreateTime,
//// FinishQty = finishedTask.FinishQty,
//// FinishTime = finishedTask.FinishTime,
//// UploadTime = DateTime.Now,
//// };
//// DbHelp.db.Insertable(uploadedTask).ExecuteCommand();
//// DbHelp.db.Deleteable(finishedTask).ExecuteCommand();
////}
////#endregion
//为了调试
Random random = new Random();
int number = random.Next(1 , 100);
if (number <= 30)
{ {
//上传成功 //上传成功
var uploadedTask = new UploadededTask() var uploadedTask = new UploadededTask()
@ -146,6 +110,74 @@ namespace WCS.BLL.Manager
DbHelp.db.Insertable(uploadedTask).ExecuteCommand(); DbHelp.db.Insertable(uploadedTask).ExecuteCommand();
DbHelp.db.Deleteable(finishedTask).ExecuteCommand(); DbHelp.db.Deleteable(finishedTask).ExecuteCommand();
} }
//上传成功 但是此物料已经被删除！！！
else if (result != null && (result.code == 500) && result.message.Contains("未查询到条码信息【"))
{
//上传成功
var uploadedTask = new UploadededTask()
{
ShelfId = finishedTask.ShelfId,
ShelfCode = finishedTask.ShelfCode,
ModuleId = finishedTask.ModuleId,
ModuleCode = finishedTask.ModuleCode,
StoreId = finishedTask.StoreId,
StoreCode = finishedTask.StoreCode,
TaskID = finishedTask.TaskID,
ItemNo = finishedTask.ItemNo,
Guid = finishedTask.Guid,
TaskMode = finishedTask.TaskMode,
OrderNumber = finishedTask.OrderNumber,
ButtonColor = finishedTask.ButtonColor,
MatCode = finishedTask.MatCode,
MatName = finishedTask.MatName,
MatSpec = finishedTask.MatSpec,
MatBatch = finishedTask.MatBatch,
MatSN = finishedTask.MatSN + "(已删除)",
Qty = finishedTask.Qty,
CreateTime = finishedTask.CreateTime,
FinishQty = finishedTask.FinishQty,
FinishTime = finishedTask.FinishTime,
UploadTime = DateTime.Now,
};
DbHelp.db.Insertable(uploadedTask).ExecuteCommand();
DbHelp.db.Deleteable(finishedTask).ExecuteCommand();
}
#endregion
//为了调试
//Random random = new Random();
//int number = random.Next(1 , 100);
//if (number <= 30)
//{
// //上传成功
// var uploadedTask = new UploadededTask()
// {
// ShelfId = finishedTask.ShelfId,
// ShelfCode = finishedTask.ShelfCode,
// ModuleId = finishedTask.ModuleId,
// ModuleCode = finishedTask.ModuleCode,
// StoreId = finishedTask.StoreId,
// StoreCode = finishedTask.StoreCode,
// TaskID = finishedTask.TaskID,
// ItemNo = finishedTask.ItemNo,
// Guid = finishedTask.Guid,
// TaskMode = finishedTask.TaskMode,
// OrderNumber = finishedTask.OrderNumber,
// ButtonColor = finishedTask.ButtonColor,
// MatCode = finishedTask.MatCode,
// MatName = finishedTask.MatName,
// MatSpec = finishedTask.MatSpec,
// MatBatch = finishedTask.MatBatch,
// MatSN = finishedTask.MatSN,
// Qty = finishedTask.Qty,
// CreateTime = finishedTask.CreateTime,
// FinishQty = finishedTask.FinishQty,
// FinishTime = finishedTask.FinishTime,
// UploadTime = DateTime.Now,
// };
// DbHelp.db.Insertable(uploadedTask).ExecuteCommand();
// DbHelp.db.Deleteable(finishedTask).ExecuteCommand();
//}
} }
catch (Exception ex) catch (Exception ex)

13
WCS.BLL/Services/Service/MXL4Service.cs
View File

@ -51,7 +51,7 @@ namespace WCS.BLL.Services.Service
storeCodeList.RemoveAll(t => storeCodesInDB.Contains(t)); storeCodeList.RemoveAll(t => storeCodesInDB.Contains(t));
return new ResponseCommon<object> return new ResponseCommon<object>
{ {
Code = 200, Code = 201,
Message = $"操作失败：库位【{string.Join(",", storeCodeList)}】不存在！", Message = $"操作失败：库位【{string.Join(",", storeCodeList)}】不存在！",
}; };
} }
@ -67,7 +67,7 @@ namespace WCS.BLL.Services.Service
var task = currenTasksNotThisMode.First(); var task = currenTasksNotThisMode.First();
return new ResponseCommon<object> return new ResponseCommon<object>
{ {
Code = 200, Code = 201,
Message = $"操作失败：库位【{task.StoreCode}】当前在{task.TaskMode}！", Message = $"操作失败：库位【{task.StoreCode}】当前在{task.TaskMode}！",
}; };
} }
@ -106,6 +106,7 @@ namespace WCS.BLL.Services.Service
MatName = orderDetail.MatName, MatName = orderDetail.MatName,
MatSpec = orderDetail.MatSpec, MatSpec = orderDetail.MatSpec,
MatBatch = orderDetail.MatBatch, MatBatch = orderDetail.MatBatch,
MatSN = orderDetail.MatSN,
Qty = orderDetail.Qty Qty = orderDetail.Qty
}; };
tasks.Add(task); tasks.Add(task);
@ -136,7 +137,7 @@ namespace WCS.BLL.Services.Service
{ {
return new ResponseCommon<object> return new ResponseCommon<object>
{ {
Code = 200, Code = 201,
Message = "操作失败：" + ex.Message, Message = "操作失败：" + ex.Message,
}; };
@ -162,7 +163,7 @@ namespace WCS.BLL.Services.Service
storeCodeList.RemoveAll(t => storeCodesInDB.Contains(t)); storeCodeList.RemoveAll(t => storeCodesInDB.Contains(t));
return new ResponseCommon return new ResponseCommon
{ {
Code = 200, Code = 201,
Message = $"操作失败：库位【{string.Join(",", storeCodeList)}】不存在！", Message = $"操作失败：库位【{string.Join(",", storeCodeList)}】不存在！",
}; };
} }
@ -208,7 +209,7 @@ namespace WCS.BLL.Services.Service
{ {
return new ResponseCommon return new ResponseCommon
{ {
Code = 200, Code = 201,
Message = "操作失败：" + ex.Message, Message = "操作失败：" + ex.Message,
}; };
} }
@ -236,7 +237,7 @@ namespace WCS.BLL.Services.Service
{ {
return new ResponseCommon return new ResponseCommon
{ {
Code = 200, Code = 201,
Message = "操作失败：" + ex.Message, Message = "操作失败：" + ex.Message,
}; };
} }

28
WCS.BLL/Services/Service/SingleLightService.cs
View File

@ -24,6 +24,25 @@ namespace WCS.BLL.Services.Service
{ {
public class SingleLightService : ISingleLightService public class SingleLightService : ISingleLightService
{ {
public string ExtractUntilSecondDashCorrect(string input)
{
int firstDashIndex = input.IndexOf('-');
if (firstDashIndex == -1)
{
return string.Empty; // 如果没有找到第一个'-'，则返回空字符串
}
int secondDashIndex = input.IndexOf('-', firstDashIndex + 1);
if (secondDashIndex == -1)
{
return input;
}
else
{
return input.Substring(0, secondDashIndex);
}
}
/// <summary> /// <summary>
/// 单灯 一个库位对应一个硬件 /// 单灯 一个库位对应一个硬件
/// </summary> /// </summary>
@ -42,7 +61,12 @@ namespace WCS.BLL.Services.Service
Message = "操作失败：没有需要控制的库位", Message = "操作失败：没有需要控制的库位",
}; };
} }
//瓦斯分院库位数与灯不匹配所以进行如下操作
//处理传入的库位
for (int i = 0; i < request.StoreCodes.Count; i++)
{
request.StoreCodes[i] = ExtractUntilSecondDashCorrect(request.StoreCodes[i]);
}
//库位编码去重 //库位编码去重
var storeCodes = request.StoreCodes.Distinct() var storeCodes = request.StoreCodes.Distinct()
@ -135,7 +159,7 @@ namespace WCS.BLL.Services.Service
{ {
try try
{ {
tcpClient.Send(sendData,0,sendData.Length); tcpClient.Send(sendData, 0, sendData.Length);
Logs.Write("【单灯单独控制】发送指令" + BitConverter.ToString(sendData)); Logs.Write("【单灯单独控制】发送指令" + BitConverter.ToString(sendData));
} }
catch (Exception ex) catch (Exception ex)

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

@ -49,22 +49,22 @@ namespace WCS.Model.ApiModel.MXL4
/// <summary> /// <summary>
/// 物料编码 /// 物料编码
/// </summary> /// </summary>
public string MatCode { get; set; } public string MatCode { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 物料名称 /// 物料名称
/// </summary> /// </summary>
public string MatName { get; set; } public string MatName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 物料规格 /// 物料规格
/// </summary> /// </summary>
public string MatSpec { get; set; } public string MatSpec { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 物料批次 /// 物料批次
/// </summary> /// </summary>
public string MatBatch { get; set; } public string MatBatch { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 物料SN /// 物料SN