diff --git a/WCS.BLL/DbModels/Task/CurrentTask.cs b/WCS.BLL/DbModels/Task/CurrentTask.cs
index 6924eb5..51ee2a4 100644
--- a/WCS.BLL/DbModels/Task/CurrentTask.cs
+++ b/WCS.BLL/DbModels/Task/CurrentTask.cs
@@ -78,7 +78,7 @@ namespace WCS.BLL.DbModels
public Guid Guid { get; set; }
///
- /// 任务模式:入库模式 = 0, 出库模式 = 1, 盘点模式 = 2
+ /// 任务模式:入库模式 = 1, 出库模式 = 2, 盘点模式 = 3
///
[SugarColumn(ColumnName = "task_mode", IsNullable = false, ColumnDescription = "任务模式:入库模式 = 0, 出库模式 = 1, 盘点模式 = 2")]
public TaskModeEnum TaskMode { get; set; }
diff --git a/WCS.BLL/HardWare/MXL4Shelf.cs b/WCS.BLL/HardWare/MXL4Shelf.cs
index 9a286a9..c750af5 100644
--- a/WCS.BLL/HardWare/MXL4Shelf.cs
+++ b/WCS.BLL/HardWare/MXL4Shelf.cs
@@ -559,6 +559,7 @@ namespace WCS.BLL.HardWare
MatBatch = task.MatBatch,
MatSN = task.MatSN,
CreateTime = task.CreateTime,
+ Qty = task.Qty,
FinishQty = finishQty,
FinishTime = DateTime.Now,
};
@@ -617,6 +618,7 @@ namespace WCS.BLL.HardWare
MatBatch = task.MatBatch,
MatSN = task.MatSN,
CreateTime = task.CreateTime,
+ Qty= task.Qty,
FinishQty = finishQty,
FinishTime = DateTime.Now,
};
@@ -675,6 +677,7 @@ namespace WCS.BLL.HardWare
MatBatch = task.MatBatch,
MatSN = task.MatSN,
CreateTime = task.CreateTime,
+ Qty = task.Qty,
FinishQty = finishQty,
FinishTime = DateTime.Now,
};
diff --git a/WCS.BLL/Manager/MKYBackgroundThread.cs b/WCS.BLL/Manager/MKYBackgroundThread.cs
index f5fe68d..694bd70 100644
--- a/WCS.BLL/Manager/MKYBackgroundThread.cs
+++ b/WCS.BLL/Manager/MKYBackgroundThread.cs
@@ -75,8 +75,8 @@ namespace WCS.BLL.Manager
matSN = finishedTask.MatSN,
orderNumber = finishedTask.OrderNumber,
orderType = (int)finishedTask.TaskMode,
- storeCode = finishedTask.StoreCode,
- qty = finishedTask.Qty,
+ storeCode = finishedTask.ModuleCode,
+ qty = finishedTask.FinishQty,
};
var result = ApiHelp.GetDataFromHttp(@"http://10.41.235.10:18989/ztwcs/stockBillBack", request, "POST", true);
if (result != null && (result.code == 200))
diff --git a/WCS.BLL/Services/Service/MXL4Service.cs b/WCS.BLL/Services/Service/MXL4Service.cs
index 3f96439..407a558 100644
--- a/WCS.BLL/Services/Service/MXL4Service.cs
+++ b/WCS.BLL/Services/Service/MXL4Service.cs
@@ -104,7 +104,7 @@ namespace WCS.BLL.Services.Service
ButtonColor = DbModels.Task.ButtonColorEnum.绿色,
MatCode = orderDetail.MatCode,
MatName = orderDetail.MatName,
- MatSpec = orderDetail.MatSpec,
+ MatSpec = string.IsNullOrEmpty(orderDetail.MatSpec) ? "-" : orderDetail.MatSpec,
MatBatch = orderDetail.MatBatch,
MatSN = orderDetail.MatSN,
Qty = orderDetail.Qty
diff --git a/WCS.Model/ApiModel/MXL4/SysOrderMXL4Request.cs b/WCS.Model/ApiModel/MXL4/SysOrderMXL4Request.cs
index 1b4b554..b225bd9 100644
--- a/WCS.Model/ApiModel/MXL4/SysOrderMXL4Request.cs
+++ b/WCS.Model/ApiModel/MXL4/SysOrderMXL4Request.cs
@@ -49,22 +49,22 @@ namespace WCS.Model.ApiModel.MXL4
///
/// 物料编码
///
- public string MatCode { get; set; } = string.Empty;
+ public string MatCode { get; set; } = "-";
///
/// 物料名称
///
- public string MatName { get; set; } = string.Empty;
+ public string MatName { get; set; } = "-";
///
/// 物料规格
///
- public string MatSpec { get; set; } = string.Empty;
+ public string MatSpec { get; set; } = "-";
///
/// 物料批次
///
- public string MatBatch { get; set; } = string.Empty;
+ public string MatBatch { get; set; } = "-";
///
/// 物料SN
diff --git a/WCS.Model/ApiModel/MXL4/TaskEnum.cs b/WCS.Model/ApiModel/MXL4/TaskEnum.cs
index bf5437e..28200ca 100644
--- a/WCS.Model/ApiModel/MXL4/TaskEnum.cs
+++ b/WCS.Model/ApiModel/MXL4/TaskEnum.cs
@@ -22,9 +22,9 @@ namespace WCS.BLL.DbModels.Task
public enum TaskModeEnum
{
- 入库模式 = 0,
- 出库模式 = 1,
- 盘点模式 = 2,
- 待机模式 = 3
+ 入库模式 = 1,
+ 出库模式 = 2,
+ 盘点模式 = 3,
+ 待机模式 = 0
}
}