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 17:17:45 +08:00
parent de682b3884
commit 04b5e04300
6 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WCS.BLL/DbModels/Task/CurrentTask.cs
View File

@ -78,7 +78,7 @@ namespace WCS.BLL.DbModels
public Guid Guid { get; set; } public Guid Guid { get; set; }
/// <summary> /// <summary>
/// 任务模式：入库模式 = 0, 出库模式 = 1, 盘点模式 = 2 /// 任务模式：入库模式 = 1, 出库模式 = 2, 盘点模式 = 3
/// </summary> /// </summary>
[SugarColumn(ColumnName = "task_mode", IsNullable = false, ColumnDescription = "任务模式：入库模式 = 0, 出库模式 = 1, 盘点模式 = 2")] [SugarColumn(ColumnName = "task_mode", IsNullable = false, ColumnDescription = "任务模式：入库模式 = 0, 出库模式 = 1, 盘点模式 = 2")]
public TaskModeEnum TaskMode { get; set; } public TaskModeEnum TaskMode { get; set; }

3
WCS.BLL/HardWare/MXL4Shelf.cs
View File

@ -559,6 +559,7 @@ namespace WCS.BLL.HardWare
MatBatch = task.MatBatch, MatBatch = task.MatBatch,
MatSN = task.MatSN, MatSN = task.MatSN,
CreateTime = task.CreateTime, CreateTime = task.CreateTime,
Qty = task.Qty,
FinishQty = finishQty, FinishQty = finishQty,
FinishTime = DateTime.Now, FinishTime = DateTime.Now,
}; };
@ -617,6 +618,7 @@ namespace WCS.BLL.HardWare
MatBatch = task.MatBatch, MatBatch = task.MatBatch,
MatSN = task.MatSN, MatSN = task.MatSN,
CreateTime = task.CreateTime, CreateTime = task.CreateTime,
Qty= task.Qty,
FinishQty = finishQty, FinishQty = finishQty,
FinishTime = DateTime.Now, FinishTime = DateTime.Now,
}; };
@ -675,6 +677,7 @@ namespace WCS.BLL.HardWare
MatBatch = task.MatBatch, MatBatch = task.MatBatch,
MatSN = task.MatSN, MatSN = task.MatSN,
CreateTime = task.CreateTime, CreateTime = task.CreateTime,
Qty = task.Qty,
FinishQty = finishQty, FinishQty = finishQty,
FinishTime = DateTime.Now, FinishTime = DateTime.Now,
}; };

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

@ -75,8 +75,8 @@ namespace WCS.BLL.Manager
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.ModuleCode,
qty = finishedTask.Qty, qty = finishedTask.FinishQty,
}; };
var result = ApiHelp.GetDataFromHttp<SysOrderResponse>(@"http://10.41.235.10:18989/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))

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

@ -104,7 +104,7 @@ namespace WCS.BLL.Services.Service
ButtonColor = DbModels.Task.ButtonColorEnum.绿色, ButtonColor = DbModels.Task.ButtonColorEnum.绿色,
MatCode = orderDetail.MatCode, MatCode = orderDetail.MatCode,
MatName = orderDetail.MatName, MatName = orderDetail.MatName,
MatSpec = orderDetail.MatSpec, MatSpec = string.IsNullOrEmpty(orderDetail.MatSpec) ? "-" : orderDetail.MatSpec,
MatBatch = orderDetail.MatBatch, MatBatch = orderDetail.MatBatch,
MatSN = orderDetail.MatSN, MatSN = orderDetail.MatSN,
Qty = orderDetail.Qty Qty = orderDetail.Qty

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; } = string.Empty; public string MatCode { get; set; } = "-";
/// <summary> /// <summary>
/// 物料名称 /// 物料名称
/// </summary> /// </summary>
public string MatName { get; set; } = string.Empty; public string MatName { get; set; } = "-";
/// <summary> /// <summary>
/// 物料规格 /// 物料规格
/// </summary> /// </summary>
public string MatSpec { get; set; } = string.Empty; public string MatSpec { get; set; } = "-";
/// <summary> /// <summary>
/// 物料批次 /// 物料批次
/// </summary> /// </summary>
public string MatBatch { get; set; } = string.Empty; public string MatBatch { get; set; } = "-";
/// <summary> /// <summary>
/// 物料SN /// 物料SN

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

@ -22,9 +22,9 @@ namespace WCS.BLL.DbModels.Task
public enum TaskModeEnum public enum TaskModeEnum
{ {
入库模式 = 0, 入库模式 = 1,
出库模式 = 1, 出库模式 = 2,
盘点模式 = 2, 盘点模式 = 3,
待机模式 = 3 待机模式 = 0
} }
} }