diff --git a/WCS.BLL/DbModels/ShelfInfo.cs b/WCS.BLL/DbModels/ShelfInfo.cs index e084e94..2a40365 100644 --- a/WCS.BLL/DbModels/ShelfInfo.cs +++ b/WCS.BLL/DbModels/ShelfInfo.cs @@ -21,7 +21,7 @@ namespace WCS.DAL.DbModels /// /// 货架编码;货架一般按照报警灯来区分 一个报警灯指示的是一个货架 /// - [SugarColumn(ColumnName = "shelf_code", Length = 50, IsNullable = false, ColumnDescription = "货架编码;货架一般按照报警灯来区分 一个报警灯指示的是一个货架")] + [SugarColumn(ColumnName = "shelf_code", Length = 64, IsNullable = false, ColumnDescription = "货架编码;货架一般按照报警灯来区分 一个报警灯指示的是一个货架")] public string ShelfCode { get; set; } /// @@ -33,7 +33,7 @@ namespace WCS.DAL.DbModels /// /// 货架类型名称 /// - [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; } /// diff --git a/WCS.BLL/Manager/MKYBackgroundThread.cs b/WCS.BLL/Manager/MKYBackgroundThread.cs index 6513378..f5fe68d 100644 --- a/WCS.BLL/Manager/MKYBackgroundThread.cs +++ b/WCS.BLL/Manager/MKYBackgroundThread.cs @@ -64,58 +64,22 @@ namespace WCS.BLL.Manager var finishedTask = finsishedTaks[i]; try { - //////上传单据 - ////#region 上传单据 - ////var request = new SysOrderRequest() - ////{ - //// guid = finishedTask.Guid.ToString(), - //// itemNo = finishedTask.ItemNo, - //// matCode = finishedTask.MatCode, - //// matBatch = finishedTask.MatBatch, - //// matSN = finishedTask.MatSN, - //// orderNumber = finishedTask.OrderNumber, - //// orderType = (int)finishedTask.TaskMode, - //// storeCode = finishedTask.StoreCode, - //// qty = finishedTask.Qty, - ////}; - ////var result = ApiHelp.GetDataFromHttp(@"http://172.16.129.8:8989/ztwcs/stockBillBack", request, "POST", true); - ////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) + //上传单据 + #region 上传单据 + var request = new SysOrderRequest() + { + guid = finishedTask.Guid.ToString(), + itemNo = finishedTask.ItemNo, + matCode = finishedTask.MatCode, + matBatch = finishedTask.MatBatch, + matSN = finishedTask.MatSN, + orderNumber = finishedTask.OrderNumber, + orderType = (int)finishedTask.TaskMode, + storeCode = finishedTask.StoreCode, + qty = finishedTask.Qty, + }; + var result = ApiHelp.GetDataFromHttp(@"http://10.41.235.10:18989/ztwcs/stockBillBack", request, "POST", true); + if (result != null && (result.code == 200)) { //上传成功 var uploadedTask = new UploadededTask() @@ -146,6 +110,74 @@ namespace WCS.BLL.Manager DbHelp.db.Insertable(uploadedTask).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) diff --git a/WCS.BLL/Services/Service/MXL4Service.cs b/WCS.BLL/Services/Service/MXL4Service.cs index 79e66a8..3f96439 100644 --- a/WCS.BLL/Services/Service/MXL4Service.cs +++ b/WCS.BLL/Services/Service/MXL4Service.cs @@ -51,7 +51,7 @@ namespace WCS.BLL.Services.Service storeCodeList.RemoveAll(t => storeCodesInDB.Contains(t)); return new ResponseCommon { - Code = 200, + Code = 201, Message = $"操作失败：库位【{string.Join(",", storeCodeList)}】不存在！", }; } @@ -67,7 +67,7 @@ namespace WCS.BLL.Services.Service var task = currenTasksNotThisMode.First(); return new ResponseCommon { - Code = 200, + Code = 201, Message = $"操作失败：库位【{task.StoreCode}】当前在{task.TaskMode}！", }; } @@ -106,6 +106,7 @@ namespace WCS.BLL.Services.Service MatName = orderDetail.MatName, MatSpec = orderDetail.MatSpec, MatBatch = orderDetail.MatBatch, + MatSN = orderDetail.MatSN, Qty = orderDetail.Qty }; tasks.Add(task); @@ -136,7 +137,7 @@ namespace WCS.BLL.Services.Service { return new ResponseCommon { - Code = 200, + Code = 201, Message = "操作失败：" + ex.Message, }; @@ -162,7 +163,7 @@ namespace WCS.BLL.Services.Service storeCodeList.RemoveAll(t => storeCodesInDB.Contains(t)); return new ResponseCommon { - Code = 200, + Code = 201, Message = $"操作失败：库位【{string.Join(",", storeCodeList)}】不存在！", }; } @@ -208,7 +209,7 @@ namespace WCS.BLL.Services.Service { return new ResponseCommon { - Code = 200, + Code = 201, Message = "操作失败：" + ex.Message, }; } @@ -236,7 +237,7 @@ namespace WCS.BLL.Services.Service { return new ResponseCommon { - Code = 200, + Code = 201, Message = "操作失败：" + ex.Message, }; } diff --git a/WCS.BLL/Services/Service/SingleLightService.cs b/WCS.BLL/Services/Service/SingleLightService.cs index 9b6d7f0..46bf66a 100644 --- a/WCS.BLL/Services/Service/SingleLightService.cs +++ b/WCS.BLL/Services/Service/SingleLightService.cs @@ -24,6 +24,25 @@ namespace WCS.BLL.Services.Service { 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); + } + } + /// /// 单灯 一个库位对应一个硬件 /// @@ -42,7 +61,12 @@ namespace WCS.BLL.Services.Service Message = "操作失败：没有需要控制的库位", }; } - + //瓦斯分院库位数与灯不匹配所以进行如下操作 + //处理传入的库位 + for (int i = 0; i < request.StoreCodes.Count; i++) + { + request.StoreCodes[i] = ExtractUntilSecondDashCorrect(request.StoreCodes[i]); + } //库位编码去重 var storeCodes = request.StoreCodes.Distinct() @@ -135,7 +159,7 @@ namespace WCS.BLL.Services.Service { try { - tcpClient.Send(sendData,0,sendData.Length); + tcpClient.Send(sendData, 0, sendData.Length); Logs.Write("【单灯单独控制】发送指令" + BitConverter.ToString(sendData)); } catch (Exception ex) diff --git a/WCS.Model/ApiModel/MXL4/SysOrderMXL4Request.cs b/WCS.Model/ApiModel/MXL4/SysOrderMXL4Request.cs index 7d9ea43..1b4b554 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; } + public string MatCode { get; set; } = string.Empty; /// /// 物料名称 /// - public string MatName { get; set; } + public string MatName { get; set; } = string.Empty; /// /// 物料规格 /// - public string MatSpec { get; set; } + public string MatSpec { get; set; } = string.Empty; /// /// 物料批次 /// - public string MatBatch { get; set; } + public string MatBatch { get; set; } = string.Empty; /// /// 物料SN