From 9872a308f774e86edfba76a508f463eeca0a6858 Mon Sep 17 00:00:00 2001 From: zgf Date: Fri, 2 Feb 2024 09:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HHWMS.Web/Areas/Api/IWCSController.cs | 4 ++- .../Receipt/Views/ReceiptSLIn/Index.cshtml | 2 +- .../Shipment/Controllers/ShipOutController.cs | 26 ++++++++++++------- .../Areas/Shipment/Views/ShipOut/Index.cshtml | 21 +++++++++++++-- .../System/Controllers/jobs/SendWcsJob.cs | 2 +- .../System/Controllers/jobs/SendWmsJob.cs | 8 +++--- 6 files changed, 45 insertions(+), 18 deletions(-) diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index f9bd6a6..3cb24b7 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -96,7 +96,9 @@ namespace HHWMS.Web { var taskno = response.TaskId.Split("-")[0]; //wcs 任务反馈 - var task = _unitwork.Find(x => x.TaskNo.Equals(taskno) && x.Status != TaskStatusEnum.完成).Include(x => x.TaskDetails).FirstOrDefault(); + var task = _unitwork.Find(x => x.TaskNo.Equals(taskno) + && x.Status != TaskStatusEnum.完成) + .Include(x => x.TaskDetails).FirstOrDefault(); if (task != null) { diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptSLIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptSLIn/Index.cshtml index a36c441..1e1b426 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptSLIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptSLIn/Index.cshtml @@ -328,7 +328,7 @@ rows.splice(index, 1); }, handleEdit(index, row) { - console.log(index, row, this.bindingData); + // console.log(index, row, this.bindingData); if (row.qty < row.bindQty) { this.$message({ message: "数量不能大于剩余绑定数量!" + row.qty, diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs index c451758..3f7c2fd 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs @@ -54,7 +54,8 @@ public class ShipOutController : BaseController // 判断箱号是否合理 if (box != null) { - var inv = _unitWork.Find(x => x.LocationCode.Equals(code)); + var inv = _unitWork.Find(x => x.LocationCode.Equals(code) + && x.TaskStatus == InventoryTaskStatus.任务中); return JsonMore(inv); } @@ -102,19 +103,23 @@ public class ShipOutController : BaseController shipment.Status = ShipStatusEnum.拣货完成; shipment.UpdateTime = DateTime.Now; shipment.UpdateBy = Wtm.LoginUserInfo.ITCode; + _unitWork.Update(shipment); - - if (!shipment.ShipmentHeader.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.拣货完成)) + var header = _unitWork.Find(x => x.ID.Equals(shipment.ShipmentHeaderId)) + .Include(x => x.ShipmentDetails) + .FirstOrDefault(); + + if (!header.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.拣货完成)) { - shipment.ShipmentHeader.FirstStatus = ShipStatusEnum.拣货完成; + header.FirstStatus = ShipStatusEnum.拣货完成; } else { - shipment.ShipmentHeader.FirstStatus = ShipStatusEnum.拣货中; + header.FirstStatus = ShipStatusEnum.拣货中; } - shipment.UpdateBy = Wtm.LoginUserInfo.ITCode; - shipment.UpdateTime = DateTime.Now; - _unitWork.Update(shipment); + header.UpdateTime = DateTime.Now; + header.UpdateBy = Wtm.LoginUserInfo.ITCode; + _unitWork.Update(header); var inv = _unitWork.FindSingle(x => x.UniqueCode.Equals(uniqueCode) && x.LocationCode == station); if (inv != null) @@ -203,7 +208,7 @@ public class ShipOutController : BaseController _unitWork.Update(Sation); } } - + Wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: JsonConvert.SerializeObject(request), result: "success"); tran.Commit(); return JsonMore(null); @@ -253,7 +258,8 @@ public class ShipOutController : BaseController return JsonMore(null, 500, $"{boxCode}站台没有料箱,无法入库!"); } //判断是否拣货完成 - if (_unitWork.IsExit(x => x.LocationCode.Equals(station.Code))) + if (_unitWork.IsExit(x => x.LocationCode.Equals(station.Code) + && x.TaskStatus == InventoryTaskStatus.任务中)) { return JsonMore(null, 500, $"站台{boxCode}存在未拣货物料,无法回库!"); } diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml index 940b4c2..31c642d 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml @@ -208,10 +208,19 @@ && _this.form.code.startsWith("C")) { _this.showBack = true; } - _this.$refs['form'].resetFields(); + if (_this.form.code == "uniqueCode") { + _this.form.code = ""; + } + // 清空下面表单 不清空code + _this.form.uniqueCode = ""; + _this.form.materialCode = ""; + _this.form.materialSpec = ""; + _this.form.batch = ""; + _this.form.qty = ""; + // _this.$refs['form'].resetFields(); } else { _this.$message({ - message: "提交失败!", + message: "提交失败!"+json.Msg, type: "warning", duration: "10000", }); @@ -238,6 +247,14 @@ }); return; } + if (_this.invTable.length > 0) { + _this.$message({ + message: "存在未拣货库存,不能创建回库任务!", + type: "error", + duration: "1000", + }); + return; + } this.$confirm('确定执行回库动作?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs index 51d0890..cd60e37 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs @@ -119,7 +119,7 @@ namespace HHWMS.Web { task.ErrorMsg += $"任务下发失败:{ex.Message}"; } - if (task.TaskDetails.Count(x => x.Status == TaskStatusEnum.待下发) == 0 && (task.TaskType == TaskTypeEnum.盘料入库 || task.TaskType == TaskTypeEnum.盘料出库)) + if (task.TaskDetails.Count(x => x.Status <= TaskStatusEnum.待下发) == 0 && (task.TaskType == TaskTypeEnum.盘料入库 || task.TaskType == TaskTypeEnum.盘料出库)) { task.Status = TaskStatusEnum.已下发; } diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs index a1cad50..725233d 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs @@ -173,8 +173,10 @@ namespace HHWMS.Web var gLoc = _unitwork.Find(x => x.ContainerCode == item.Key && x.Row == location.Row && x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault(); - var cTask = _unitwork.Find(x => x.ContainerCode == item.Key - && x.TaskType == TaskTypeEnum.盘料盒出库).FirstOrDefault(); + var cTask = _unitwork.Find(x => + x.ContainerCode.Equals(item.Key) + && x.TaskType == TaskTypeEnum.盘料盒出库 + ).FirstOrDefault(); //查找料塔工位 T var tLoc = _unitwork.Find(x => x.Row == row && x.Type.Equals(LocationTypeEnum.料塔)) @@ -289,7 +291,7 @@ namespace HHWMS.Web _unitwork.Update(tLoc); _unitwork.Update(containerTask); } - else if (tLoc != null) + else { task.ZoneCode = ZoneCodeEnum.盘料库; task.TaskNo = _unitwork.GetSerialNumber("pout", 4);