diff --git a/WCS.BLL/Manager/MKYBackgroundThread.cs b/WCS.BLL/Manager/MKYBackgroundThread.cs index 9e695c0..b066f4d 100644 --- a/WCS.BLL/Manager/MKYBackgroundThread.cs +++ b/WCS.BLL/Manager/MKYBackgroundThread.cs @@ -108,7 +108,7 @@ namespace WCS.BLL.Manager orderNumber = finishedTask.OrderNumber, orderType = (int)finishedTask.TaskMode, storeCode = finishedTask.ModuleCode, - qty = finishedTask.FinishQty, + 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 1441a8c..4aa3790 100644 --- a/WCS.BLL/Services/Service/MXL4Service.cs +++ b/WCS.BLL/Services/Service/MXL4Service.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using System.Xml.Xsl; using TouchSocket.Core; using WCS.BLL.DbModels; +using WCS.BLL.DbModels.Task; using WCS.BLL.HardWare; using WCS.BLL.Manager; using WCS.BLL.Services.IService; @@ -82,6 +83,36 @@ namespace WCS.BLL.Services.Service list.RemoveAll(l => l == t); }); + var buttonColor = ButtonColorEnum.绿色; + //转换颜色 + switch (request.Corlor) + { + case "红": + buttonColor = ButtonColorEnum.红色; + break; + case "绿": + buttonColor = ButtonColorEnum.绿色; + break; + case "黄": + buttonColor = ButtonColorEnum.黄色; + break; + case "蓝": + buttonColor = ButtonColorEnum.蓝色; + break; + case "紫": + buttonColor = ButtonColorEnum.紫色; + break; + case "青": + buttonColor = ButtonColorEnum.青色; + break; + case "白": + buttonColor = ButtonColorEnum.白色; + break; + default: + break; + } + + var tasks = new List(); //生成任务数据 foreach (var orderDetail in request.List) @@ -101,7 +132,7 @@ namespace WCS.BLL.Services.Service TaskMode = request.OrderType, OrderNumber = request.OrderNumber, TaskID = taskId, - ButtonColor = DbModels.Task.ButtonColorEnum.绿色, + ButtonColor = buttonColor, MatCode = orderDetail.MatCode, MatName = orderDetail.MatName, MatSpec = string.IsNullOrEmpty(orderDetail.MatSpec) ? "-" : orderDetail.MatSpec,