From 1fa11ab2354f79f2712f2140b677dbe8a1912422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=8D=E5=B0=94?= <1499044551@qq.com> Date: Wed, 13 Sep 2023 10:39:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9WCS=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E9=80=BB=E8=BE=91=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=9B=98=E6=96=99=E5=85=A5=E5=BA=93=E6=89=AB=E6=8F=8F=E6=96=99?= =?UTF-8?q?=E7=AE=B1=E5=8F=B7=E5=8D=A0=E7=94=A8=E7=AB=99=E5=8F=B0=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9B=98=E6=96=99=E5=BA=93?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=85=A5=E5=BA=93=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E5=90=AF=E5=8A=A8=E5=85=A5=E5=BA=93=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0=E7=9B=98=E6=96=99=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=AD=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9B=98?= =?UTF-8?q?=E6=96=99=E5=87=BA=E5=BA=93=E6=96=99=E5=A1=94=E5=8F=96=E6=96=99?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=88=9B=E5=BB=BA=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=86=E8=A7=A3=E5=AE=9A=E6=97=B6=E5=99=A8?= =?UTF-8?q?=EF=BC=8C=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=99=A8=E6=B7=BB=E5=8A=A0=E7=9B=98=E6=96=99=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HHWMS.Web/Areas/Api/IWCSController.cs | 61 +++++- .../Controllers/ReceiptInController.cs | 46 ++++- .../ReceiptInOperationController.cs | 52 ++--- .../Controllers/ReceiptSLInController.cs | 18 +- .../Receipt/Views/ReceiptIn/Index.cshtml | 89 +++++++-- .../Views/ReceiptInOperation/Index.cshtml | 49 ++--- .../Shipment/Controllers/ShipOutController.cs | 18 +- .../Areas/Shipment/Views/ShipOut/Index.cshtml | 4 +- .../System/Controllers/jobs/SendWcsJob.cs | 177 ++++++++++++++---- .../System/Controllers/jobs/SendWmsJob.cs | 156 +++++++++++++++ HHWMS.Web/appsettings.json | 2 +- 11 files changed, 536 insertions(+), 136 deletions(-) create mode 100644 HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index 04be275..676fa0b 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -88,6 +88,7 @@ namespace HHWMS.Web { tasktolocatioin.Status = LocationStatus.空容器; } + tasktolocatioin.ContainerCode = task.ContainerCode; _unitwork.Update(tasktolocatioin); _unitwork.BatchUpdate(x => x.ContainerCode.Equals(task.ContainerCode), @@ -107,6 +108,7 @@ namespace HHWMS.Web task.Status = TaskStatusEnum.完成; taskfromlocatioin.Status = LocationStatus.空仓位; + taskfromlocatioin.ContainerCode = ""; _unitwork.Update(taskfromlocatioin); tasktolocatioin.Status = LocationStatus.有货; @@ -172,12 +174,19 @@ namespace HHWMS.Web if (task.Station == "1") { // 下发盘料出库 - var plcTask = _unitwork.FindSingle(x => x.TaskType.Equals(TaskTypeEnum.盘料出库) - && x.ContainerCode.Equals(task.ContainerCode)); - if (plcTask != null) + var plrTask = _unitwork.Find(x => x.TaskType.Equals(TaskTypeEnum.盘料出库) + && x.ContainerCode.Contains(task.ContainerCode)) + .Include(x => x.TaskDetails).FirstOrDefault(); + if (plrTask != null) { - plcTask.Status = TaskStatusEnum.待下发; - _unitwork.Update(plcTask); + var details = plrTask.TaskDetails.Where(x => x.ContainerCode.Equals(task.ContainerCode)); + foreach (var detail in details) + { + detail.Status = TaskStatusEnum.待下发; + detail.UpdateTime = DateTime.Now; + } + plrTask.Status = TaskStatusEnum.待下发; + _unitwork.Update(plrTask); } } else if (task.Station == "2") @@ -189,9 +198,12 @@ namespace HHWMS.Web if (plrTask != null) { plrTask.Status = TaskStatusEnum.待下发; - + // 更新目的仓位 + var to = _unitwork.FindSingle(x => x.ContiguousCode == task.ToLocation + && x.Type.Equals(LocationTypeEnum.机械臂工位))?.Code; + plrTask.ToLocation = to; // 更新明细为待下发 - var details = task.TaskDetails.Where(x => x.ContainerCode.Equals(task.ContainerCode)); + var details = plrTask.TaskDetails.Where(x => x.ContainerCode.Equals(task.ContainerCode)); foreach(var item in details) { @@ -204,14 +216,27 @@ namespace HHWMS.Web break; case TaskTypeEnum.盘料入库: var ll = response.TaskId.Split("-")[1]; + //更新库存数据 + var taskdetail = task.TaskDetails.First(x => x.FromLocation == ll); + var invIn = _unitwork.Find(n => n.UniqueCode == taskdetail.UniqueCode + && n.LocationCode == task.FromLocation + && n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault(); + if (invIn != null) + { + invIn.ContainerCode = task.ContainerCode; + invIn.LocationCode = task.ContainerCode; + invIn.Lot = taskdetail.ToLocation; + _unitwork.Update(invIn); + } task.TaskDetails.First(x => x.FromLocation == ll).Status = TaskStatusEnum.完成; var containerCode = task.TaskDetails.First(x => x.FromLocation == ll).ContainerCode; // 查询料塔 是否还有 此料盒 已下发,未完成的盘料入库任务 有不操作,没有 创建料盒入库任务 if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成 && x.ContainerCode.Equals(containerCode))) { + var station = _unitwork.Find(x => x.Code == task.ContainerCode).FirstOrDefault(); // 创建料盒入库任务 // 查找回库的任务起点, - var fromLocation = _unitwork.FindSingle(x => x.Code.Equals(task.FromLocation)).ContiguousCode; + var fromLocation = _unitwork.FindSingle(x => x.Code.Equals(task.ToLocation)).ContiguousCode; newTask.ZoneCode = "L"; newTask.TaskNo = _unitwork.GetSerialNumber("in", 4); newTask.TaskType = TaskTypeEnum.盘料盒入库; @@ -220,6 +245,9 @@ namespace HHWMS.Web newTask.ToLocation = containerCode; newTask.Status = TaskStatusEnum.待下发; _unitwork.Add(newTask); + //更新料塔占用 + station.ContainerCode = ""; + _unitwork.Update(station); } // 查询料塔 是否还有已下发,未完成的盘料入库任务 if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成)) @@ -230,7 +258,20 @@ namespace HHWMS.Web break; case TaskTypeEnum.盘料出库: var lll = response.TaskId.Split("-")[1]; - task.TaskDetails.First(x => x.FromLocation == lll).Status = TaskStatusEnum.完成; + var taskde = task.TaskDetails.First(x => x.FromLocation == lll); + taskde.Status = TaskStatusEnum.完成; + //更新物料在料塔上的位置 + var tolocation = _unitwork.Find(n => n.Code == task.ToLocation).FirstOrDefault(); + var inv = _unitwork.Find(n => n.UniqueCode == taskde.UniqueCode + && n.ContainerCode == task.ContainerCode + && n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault(); + if (inv != null) + { + inv.ContainerCode = tolocation.ContainerCode; + inv.LocationCode = task.ToLocation; + inv.Lot = taskde.ToLocation; + _unitwork.Update(inv); + } // 查询工位 是否还有已下发,未完成的盘料出库任务 有不操作,没有 创建料盒入库任务 if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成)) { @@ -238,7 +279,7 @@ namespace HHWMS.Web // 查找回库的任务起点, var fromLocation = _unitwork.FindSingle(x => x.Code.Equals(task.FromLocation)).ContiguousCode; // 下发盘料盒回库任务,回原位 - newTask.ZoneCode = "L"; + newTask.ZoneCode = ZoneCodeEnum.盘料库; newTask.TaskNo = _unitwork.GetSerialNumber("in", 4); newTask.TaskType = TaskTypeEnum.盘料盒入库; newTask.ContainerCode = task.ContainerCode; diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index 96bc7f0..53742aa 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -53,6 +53,41 @@ namespace HHWMS.Web.Controllers return JsonMore(null); } } + + /// + /// 盘料入库扫描料箱号 + /// + /// + /// + [HttpPost] + public ActionResult ScanBox(string boxCode) + { + // 判断任务重复 + if (_unitWork.IsExit(x => x.ZoneCode.Equals(ZoneCodeEnum.盘料库) && x.ContainerCode.Equals(boxCode))) + { + return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!"); + }; + // 判断箱号是否合理 + var box = _unitWork.FindSingle(x => x.Code.Equals(boxCode)); + if (box != null) + { + if (string.IsNullOrEmpty(box.ContainerCode)) + { + box.ContainerCode = boxCode; + _unitWork.Update(box); + } + else + { + return JsonMore(null, 500, $"{boxCode}已经被其他任务占用,无法入库!"); + } + return JsonMore(null); + } + else + { + return JsonMore(null, 500, $"{boxCode}不正确!"); + } + } + /// /// 入库盘料绑定操作 /// @@ -73,11 +108,7 @@ namespace HHWMS.Web.Controllers //var receipt = _unitWork.FindSingle(x => x.UniqueCode == item.UniqueCode); if (receipt != null) { - if (receipt.Status == ReceiptStatusEnum.收完) continue; - receipt.CompletedQty += item.BindQty; - } - if (receipt.CompletedQty == receipt.Qty) - { + receipt.CompletedQty = receipt.Qty; receipt.Status = ReceiptStatusEnum.收完; if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完)) { @@ -85,14 +116,15 @@ namespace HHWMS.Web.Controllers _unitWork.Update(header); } } + _unitWork.Update(receipt); // 新建库存 var inventory = new Inventory { ZoneCode = ZoneCodeEnum.盘料库, UniqueCode = item.UniqueCode, - Flag = item.Index, + Flag = item.Size, Qty = receipt.Qty, - Lot = item.Size.ToString(), + Lot = item.Index.ToString(), ContainerCode = item.BoxCode, TaskStatus = InventoryTaskStatus.任务中 }; diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInOperationController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInOperationController.cs index afcaeda..c042f61 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInOperationController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInOperationController.cs @@ -35,36 +35,36 @@ public class ReceiptInOperationController : BaseController /// /// [HttpPost] - public ActionResult InOperation(List data) + public ActionResult InOperation(string boxCode) { // 创建盘料入库任务 - foreach(var inData in data) + // 查找已绑定库存,没有,跳过 + var invList = _unitWork.Find(x => x.ContainerCode.Equals(boxCode)) + .ToList(); + if (invList.Count == 0) { - // 查找已绑定库存,没有,跳过 - var invList = _unitWork.Find(x => x.ContainerCode.Equals(inData.BoxName)) - .ToList(); - if (invList.Count == 0) continue; - var task = new TaskHeader - { - TaskNo = _unitWork.GetSerialNumber("pin", 4), - TaskType = TaskTypeEnum.盘料入库, - Status = TaskStatusEnum.待下发, - FromLocation = inData.Station == "1" ? "L01": "L02", - TaskDetails = new List(), - }; - foreach(var item in invList) - { - var detail = new TaskDetail - { - UniqueCode = item.UniqueCode, - FromLocation = item.Lot, - Status = TaskStatusEnum.新建, - CreateTime = DateTime.Now - }; - task.TaskDetails.Add(detail); - } - _unitWork.Add(task); + return JsonMore(null, 500, $"站台{boxCode}没有绑定数据,请正确操作!"); } + var task = new TaskHeader + { + TaskNo = _unitWork.GetSerialNumber("pin", 4), + TaskType = TaskTypeEnum.盘料入库, + Status = TaskStatusEnum.待下发, + FromLocation = boxCode, + TaskDetails = new List(), + }; + foreach(var item in invList) + { + var detail = new TaskDetail + { + UniqueCode = item.UniqueCode, + FromLocation = item.Lot, + Status = TaskStatusEnum.新建, + CreateTime = DateTime.Now + }; + task.TaskDetails.Add(detail); + } + _unitWork.Add(task); return JsonMore(null); } diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs index 167cc24..e12fdb2 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Reflection.Emit; using HHWMS.Web.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -63,11 +64,15 @@ public class ReceiptSLInController : BaseController ContainerCode = box.ContainerCode, FromLocation = box.Code, ToLocation = toLocation, - Status = TaskStatusEnum.新建, + Status = TaskStatusEnum.待下发, CreateTime = DateTime.Now, CreateBy = Wtm.LoginUserInfo.ITCode }; _unitWork.Add(task); + + //更新起点仓位状态 + box.Status = LocationStatus.任务锁; + _unitWork.Update(box); return JsonMore(null); } @@ -175,7 +180,8 @@ public class ReceiptSLInController : BaseController public ActionResult BoxBack(string boxCode, bool isFull) { // 判断任务重复 - if(!_unitWork.IsExit(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库) && x.ContainerCode.Equals(boxCode))){ + if (_unitWork.IsExit(x => x.ZoneCode.Equals(ZoneCodeEnum.散料库) && x.ContainerCode.Equals(boxCode))) + { return JsonMore(null, 500, $"库内已存在{boxCode}的任务,请勿重复操作!"); }; // 判断箱号是否合理 @@ -188,10 +194,8 @@ public class ReceiptSLInController : BaseController } else { - // 查找目标库位 - var toLocation = _unitWork.FindSingle(x => x.Status.Equals(LocationStatus.空仓位) - && x.Type.Equals(LocationTypeEnum.散料库位) - && x.Row.Equals(box.Row)); + // 查找目标库位,托盘回原库位 + var toLocation = _unitWork.FindSingle(x => x.Code.Equals(boxCode)); if (toLocation != null) { @@ -204,7 +208,7 @@ public class ReceiptSLInController : BaseController ContainerCode = boxCode, FromLocation = box.Code, ToLocation = toLocation.Code, - Status = TaskStatusEnum.新建, + Status = TaskStatusEnum.待下发, CreateBy = Wtm.LoginUserInfo.ITCode, CreateTime = DateTime.Now }; diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index 7184abe..84cf15f 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -63,6 +63,7 @@ 绑定 重置 + 启动入库 @@ -75,12 +76,12 @@ data() { var validatePass = (rule, value, callback) => { if (value === '') { - callback(new Error('请输入周转箱编码')); + callback(new Error('请输入工位编码')); } - else if (value == 'M00000001' || value == 'M00000002' || value == 'E00000001' || value == 'E00000002') { + else if (value == 'L01' || value == 'L02') { callback(); } else { - callback(new Error('请输入正确周转箱编码')); + callback(new Error('请输入正确工位编码')); } }; @@ -123,6 +124,7 @@ sizeFormatter(row) { return row.size + 'mm'; }, + //绑定单据 onSubmit() { var _this = this; @@ -154,6 +156,35 @@ } }); }, + // 启动入库 + inOperation() { + var _this = this; + console.log(_this); + $.ajax({ + type: "post", + dataType: "json", + data: { data: this.form.boxCode }, + url: "/receipt/ReceiptInOperation/InOperation", + success: function (json) { + if (json.Code == 200) { + _this.$message({ + message: "启动成功!", + type: "success", + }); + } + else{ + _this.$message({ + message: "启动入库失败!" + json.Msg, + type: "warning", + duration: "10000", + }); + } + }, + error: function (json) { + alert("加载失败"); + } + }); + }, resetForm(formName) { this.$refs[formName].resetFields(); this.form.boxSize = []; @@ -196,29 +227,55 @@ }, // 扫描周转箱 scanBox(data) { - this.form.size = ''; - this.form.boxSize = []; - if (data == "M00000001" || data == "M00000002") { - this.form.boxSize = [{ label: "8mm", value: "8" }] - this.form.size = this.form.boxSize[0].value; - this.dataIndex = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]; + var _this = this; + _this.form.size = ''; + _this.form.boxSize = []; + if (data == "L02") { + _this.form.boxSize = [{ label: "8mm", value: "8" }] + _this.form.size = _this.form.boxSize[0].value; + _this.dataIndex = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]; } - else if (data == "E00000001" || data == "E00000002") { - this.form.boxSize = [{ label: "10mm", value: "10" }, { label: "16mm", value: "16" }, { label: "24mm", value: "24" }]; - this.dataIndex = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]; + else if (data == "L01") { + _this.form.boxSize = [{ label: "10mm", value: "10" }, { label: "16mm", value: "16" }, { label: "24mm", value: "24" }]; + _this.dataIndex = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]; } else { - this.$message({ + _this.$message({ message: '输入周转箱编码不正确!', type: 'warning' }); return; } + $.ajax({ + type: "post", + dataType: "json", + data: { boxCode: data }, + url: "/receipt/ReceiptIn/ScanBox", + success: function (json) { + if (json.Code != 200) { + _this.$message({ + message: "扫描失败!" + json.Msg, + type: "warning", + duration: "10000", + }); + } + else { + _this.$refs.uniqueCode.focus(); + } + }, + error: function (json) { + _this.$message({ + message: "扫描失败!", + type: "error", + duration: "10000", + }); + }, + }); // 重新扫描箱号后,待绑定列表清空 - this.bindingData = []; - this.changeselect(this.value); + _this.bindingData = []; + _this.changeselect(_this.value); - this.$refs.uniqueCode.focus(); + _this.$refs.uniqueCode.focus(); }, // 选择尺寸后 changeSize() { diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptInOperation/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptInOperation/Index.cshtml index cf53e9c..47e44aa 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptInOperation/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptInOperation/Index.cshtml @@ -8,13 +8,7 @@ - - +
@@ -28,26 +22,17 @@ el: "#opapp", data() { return { - station: [ - { - label: 'left', - value: 1, - }, - { - label: 'right', - value: 3, - }, - - ], // 表格数据 tableData: [ { - boxName: 'M00000001', - station: '', + boxName: 'L01', + label: '左侧', + station: '3', }, { - boxName: 'E00000001', - station: '', + boxName: 'L02', + label: '右侧', + station: '1', }, ], selectData: [] @@ -70,6 +55,7 @@ }, methods: { handleSelectionChange(val) { + console.log(22); val.forEach(row => { if (row.station == '') { this.$refs.multipleTable.toggleRowSelection(row); @@ -97,19 +83,22 @@ }, // 启动入库 inOperation() { + console.log(this.tableData) var _this = this; - if (_this.selectData = []) { - this.$message({ - message: "必须一行!", - type: "warning", - duration: "5000", - }); - return; + for (var i = 0; i < _this.tableData.length; i++) { + if (_this.tableData[i].station == null || _this.tableData[i].station == "") { + this.$message({ + message: "必须全部选择!", + type: "warning", + duration: "5000", + }); + return; + } } $.ajax({ type: "post", dataType: "json", - data: { data: _this.selectData }, + data: { data: _this.tableData }, url: "/receipt/ReceiptInOperation/InOperation", success: function (json) { if (json.Code == 200) { diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs index 062276b..ff87646 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs @@ -81,17 +81,27 @@ public class ShipOutController : BaseController } [HttpPost] - public ActionResult Pick(string uniqueCode, decimal qty) + public ActionResult Pick(string uniqueCode, decimal qty,string station) { - var inv = _unitWork.FindSingle(x => x.UniqueCode.Equals(uniqueCode)); + var inv = _unitWork.FindSingle(x => x.UniqueCode.Equals(uniqueCode) && x.LocationCode == station); if (inv != null) { - // 删除库存,扣账,记录库存交易 todo + // 删除库存,扣账,记录库存交易 todo,根据站台查询是否还有未拣货的物料,如果没有就清空站台占用 _unitWork.Delete(inv); + List list = _unitWork.Find(x => x.LocationCode == station).ToList(); + if (list.Count() == 0) + { + var Sation = _unitWork.Find(x => x.Code == station).FirstOrDefault(); + if (Sation != null) + { + Sation.ContainerCode = ""; + _unitWork.Update(Sation); + } + } return JsonMore(inv); } - return JsonMore(null, 500, $"{uniqueCode}不存在!"); + return JsonMore(null, 500, $"站台{station}上的{uniqueCode}不存在!"); } /// diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml index d754891..bb7958e 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml @@ -109,7 +109,7 @@ this.form.batch = data.Batch; this.form.qty = data.Qty; }, - // 扫描 + // 扫描料塔站台号 scanCode(data) { var _this = this; if (_this.type == "") { @@ -170,7 +170,7 @@ $.ajax({ type: "post", dataType: "json", - data: { uniqueCode: _this.form.uniqueCode, qty: _this.form.qty }, + data: { uniqueCode: _this.form.uniqueCode, qty: _this.form.qty, station: _this.form.code }, url: "/shipment/ShipOut/Pick", success: function (json) { if (json.Code == 200) { diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs index c39e519..70fc004 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; @@ -23,40 +24,97 @@ namespace HHWMS.Web { var _unitwork = new UnitWork(Wtm); - var task = _unitwork.Find(x =>x.Status > TaskStatusEnum.新建 && x.Status <= TaskStatusEnum.已下发) + var tasks = _unitwork.Find(x =>x.Status > TaskStatusEnum.新建 && x.Status <= TaskStatusEnum.已下发) .Include(x => x.TaskDetails) - .FirstOrDefault(); - if (task != null) { - - if (task.TaskType == TaskTypeEnum.盘料入库) + .ToList(); + foreach (var task in tasks) + { + if (task != null) { - GenTask(task, _unitwork); - } - var taskList = CreateWCSTask(task, _unitwork); - foreach (var item in taskList) - { - task.ErrorMsg += JsonConvert.SerializeObject(item); - // 调用wcs任务下发接口 - try + var count = 0; + if (task.TaskType == TaskTypeEnum.盘料入库) { - //var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data; - //if (res.Success) - //{ - // task.TaskDetails.Where(x => x.UniqueCode.Equals(item.ObjId)).First().Status = TaskStatusEnum.已下发; - //} - Task.Delay(500); + GenTask(task, _unitwork); + //子任务为新建的盘料入库任务不需要下发给WCS + count = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建).Count(); } - catch(Exception ex) + if (task.TaskType == TaskTypeEnum.盘料出库) { - task.ErrorMsg += ex.Message; + OutGenTask(task, _unitwork); + //子任务为新建的盘料入库任务不需要下发给WCS + count = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建).Count(); } - if(task.TaskDetails.Count(x => x.Status == TaskStatusEnum.新建) == 0) + if (count == 0) { - task.Status = TaskStatusEnum.已下发; + var taskList = CreateWCSTask(task, _unitwork); + foreach (var item in taskList) + { + task.ErrorMsg += JsonConvert.SerializeObject(item); + // 调用wcs任务下发接口 + try + { + var res = Wtm.CallAPI>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data; + if (res.Success) + { + Location LocStation = new Location(); + Location location = new Location(); + switch (task.TaskType) + { + //根据任务类型不同,更新任务状态与库位状态 + case TaskTypeEnum.盘料盒入库: + case TaskTypeEnum.散料盒入库: + LocStation = _unitwork.FindSingle(x => x.Code.Equals(task.FromLocation)); + location = _unitwork.FindSingle(x => x.Code.Equals(task.ToLocation)); + LocStation.ContainerCode = ""; + location.ContainerCode = task.ContainerCode; + task.Status = TaskStatusEnum.已下发; + _unitwork.Update(LocStation); + _unitwork.Update(location); + break; + case TaskTypeEnum.盘料盒出库: + case TaskTypeEnum.散料盒出库: + LocStation = _unitwork.FindSingle(x => x.Code.Equals(task.ToLocation)); + location = _unitwork.FindSingle(x => x.Code.Equals(task.FromLocation)); + LocStation.ContainerCode = task.ContainerCode; + location.ContainerCode = ""; + task.Status = TaskStatusEnum.已下发; + _unitwork.Update(LocStation); + _unitwork.Update(location); + break; + //不带盒的更新明细任务状态 + case TaskTypeEnum.盘料入库: + case TaskTypeEnum.盘料出库: + task.TaskDetails.Where(x => x.UniqueCode.Equals(item.ObjId)).First().Status = TaskStatusEnum.已下发; + break; + + default: + break; + } + + } + else + { + task.ErrorMsg += ",任务下发失败,失败原因:"+ res.Msg; + _unitwork.Update(task); + continue; + } + //Task.Delay(500); + } + catch (Exception ex) + { + task.ErrorMsg += ex.Message; + } + if (task.TaskDetails.Count(x => x.Status == TaskStatusEnum.新建) == 0 && (task.TaskType == TaskTypeEnum.盘料入库 || task.TaskType == TaskTypeEnum.盘料出库)) + { + task.Status = TaskStatusEnum.已下发; + } + _unitwork.Update(task); + } } - _unitwork.Update(task); + } } + #region 更新时间 @@ -78,7 +136,7 @@ namespace HHWMS.Web return Task.CompletedTask; } /// - /// 生成任务 + /// 根据盘料入库生成盘料盒出库任务 /// public void GenTask(TaskHeader task, UnitWork _unitwork) { @@ -89,24 +147,25 @@ namespace HHWMS.Web // 查找可用站台 var station = _unitwork.FindSingle(x => x.Type.Equals(LocationTypeEnum.堆垛机工位) && x.Status != LocationStatus.任务锁); - if (station != null) + if (station != null && count > 0) { - var container = _unitwork.Find(x => x.Row == station.Row - && x.Length == 23 + var container = _unitwork.Find(x => x.Row == station.Row && x.ZoneCode == LocationTypeEnum.盘料库位 && (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器)) - .OrderByDescending(x => x.Length - x.Width).FirstOrDefault(); + .OrderByDescending(x => x.Length).FirstOrDefault(); if(container != null) { var newTask = new TaskHeader(); - newTask.ZoneCode = "L"; - newTask.TaskNo = _unitwork.GetSerialNumber("in", 4); + newTask.ZoneCode = ZoneCodeEnum.盘料库; + newTask.TaskNo = _unitwork.GetSerialNumber("out", 4); newTask.TaskType = TaskTypeEnum.盘料盒出库; newTask.ContainerCode = container.Code; newTask.FromLocation = container.Code; newTask.ToLocation = station.Code; newTask.Status = TaskStatusEnum.待下发; + newTask.Station = "2"; _unitwork.Add(newTask); + task.ContainerCode = container.ContainerCode; // 更新库位 container.Status = LocationStatus.任务锁; _unitwork.Update(container); @@ -133,6 +192,57 @@ namespace HHWMS.Web } } } + + /// + /// 根据盘料出库生成盘料盒出库任务 + /// + public void OutGenTask(TaskHeader task, UnitWork _unitwork) + { + //查找料塔工位 + var to = _unitwork.Find(x => string.IsNullOrEmpty(x.ContainerCode) + && x.Code == task.ToLocation).FirstOrDefault(); + if (string.IsNullOrEmpty(task.FromLocation) && to != null) + { + var details = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建); + //根据盘料出库的托盘创建盘料盒出库任务 + var container = _unitwork.Find(n => n.ContainerCode == task.ContainerCode).FirstOrDefault(); + var station = _unitwork.FindSingle(x => x.Type.Equals(LocationTypeEnum.堆垛机工位) && x.Row == container.Row); + if (container != null) + { + var newTask = new TaskHeader(); + newTask.ZoneCode = ZoneCodeEnum.盘料库; + newTask.TaskNo = _unitwork.GetSerialNumber("out", 4); + newTask.TaskType = TaskTypeEnum.盘料盒出库; + newTask.ContainerCode = container.Code; + newTask.FromLocation = container.Code; + newTask.ToLocation = station.Code; + newTask.Status = TaskStatusEnum.待下发; + newTask.Station = "1"; + _unitwork.Add(newTask); + + var from = _unitwork.FindSingle(x => x.ContiguousCode == station.Code + && x.Type.Equals(LocationTypeEnum.机械臂工位))?.Code; + task.FromLocation = from; + //更新任务明细对应在料塔的位置 + var Invcount = 0; + foreach (var detail in details) + { + detail.ToLocation = (Invcount + 1).ToString(); + Invcount = Invcount + 1; + detail.Lot = $"{Convert.ToInt32(container.Length)}-{task.ToLocation}"; + } + var fromstation = _unitwork.Find(n => n.ContiguousCode == station.Code && n.Type.Equals(LocationTypeEnum.机械臂工位)).FirstOrDefault(); + if (fromstation != null) + { + task.FromLocation = fromstation.Code; + } + _unitwork.Update(task); + + } + } + + + } /// /// 创建WCS任务 /// @@ -141,9 +251,10 @@ namespace HHWMS.Web var taskInfoList = new List(); if (task != null) { + var locationList = _unitwork.Find(x => task.FromLocation.Equals(x.Code) || task.ToLocation.Equals(x.Code)).ToList(); - var begin = locationList.First(x => x.Code.Equals(task.FromLocation)); - var end = locationList.First(x => x.Code.Equals(task.ToLocation)); + var begin = locationList.FirstOrDefault(x => x.Code.Equals(task.FromLocation)); + var end = locationList.FirstOrDefault(x => x.Code.Equals(task.ToLocation)); // 根据不同任务类型 创建任务 switch (task.TaskType) { diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs new file mode 100644 index 0000000..4ebcb1f --- /dev/null +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs @@ -0,0 +1,156 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; +using HHWMS.Web.Models; +using Microsoft.EntityFrameworkCore; +using Newtonsoft.Json; +using Quartz; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Support.Quartz; +using static HHWMS.Web.Controllers.ReceiptInOperationController; + +namespace HHWMS.Web +{ + //[QuartzRepeat(10,10, true, 30)] + //出库单据分解,为每个出库物料创建出库明细,状态为新建,通过唯一码绑定任务与库存 + [PersistJobDataAfterExecution] + [DisallowConcurrentExecution] + public class SendWmsJob : WtmJob + { + public override Task Execute(IJobExecutionContext context) + { + try + { + var _unitwork = new UnitWork(Wtm); + + var Shipments = _unitwork.Find(x =>x.FirstStatus == ShipStatusEnum.分配中) + .Include(x => x.ShipmentDetails) + .ToList(); + var shipments = Shipments.Take(5).ToList(); + + foreach (var shipment in shipments) + { + List ShiInventorys = new List(); + var ShipmentDetails = shipment.ShipmentDetails.Where(x => x.Status.Equals(ShipStatusEnum.新建)).ToList(); + foreach (var ShipmentDetail in ShipmentDetails) + { + var inventory = _unitwork.Find(x => x.UniqueCode == ShipmentDetail.UniqueCode + && x.ZoneCode == ZoneCodeEnum.盘料库 + && x.TaskStatus == InventoryTaskStatus.无任务).FirstOrDefault(); + if (inventory == null) + { + continue; + } + inventory.SourceCode = ShipmentDetail.ID.ToString(); + _unitwork.Update(inventory); + //更新单据子表状态 + ShiInventorys.Add(inventory); + } + //出库库存通过托盘号分组 + var Inventorys = ShiInventorys.GroupBy(x => x.ContainerCode).ToList(); + foreach (var item in Inventorys) + { + var task = new TaskHeader(); + task.TaskDetails = new List(); + var Inventory = item.FirstOrDefault(); + var location = _unitwork.Find(x => x.ContainerCode == Inventory.ContainerCode + && x.Status != LocationStatus.空仓位 + && x.Status != LocationStatus.空容器).FirstOrDefault(); + //查询仓位表是否符合 + if (location != null) + { + //查找料塔工位 + var to = _unitwork.Find(x => string.IsNullOrEmpty(x.ContainerCode) + && x.Row == (Inventory.Flag == 8 ? 1 : 3) + && x.Type.Equals(LocationTypeEnum.料塔)).FirstOrDefault(); + //查询料塔是否为空 + if (to == null) + { + continue; + } + task.TaskNo = _unitwork.GetSerialNumber("pout", 4); + task.TaskType = TaskTypeEnum.盘料出库; + task.Status = TaskStatusEnum.待下发; + task.ContainerCode = Inventory.ContainerCode; + task.ToLocation = to.Code; + task.ZoneCode = ZoneCodeEnum.盘料库; + foreach (var inventory in item) + { + var detail = new TaskDetail + { + UniqueCode = inventory.UniqueCode, + FromLocation = inventory.Lot, + Status = TaskStatusEnum.新建, + ContainerCode = inventory.ContainerCode, + CreateTime = DateTime.Now + }; + task.TaskDetails.Add(detail); + } + _unitwork.Add(task); + //更新库位状态 + var container = _unitwork.Find(x => x.ContainerCode == Inventory.ContainerCode).FirstOrDefault(); + if (container != null) + { + container.Status = LocationStatus.任务锁; + _unitwork.Update(container); + } + + to.ContainerCode = to.Code; + _unitwork.Update(to); + //更新库存状态 + var invs = _unitwork.Find(x => x.ContainerCode == Inventory.ContainerCode).ToList(); + if (invs.Count() > 0) + { + foreach (var inv in invs) + { + inv.TaskStatus = InventoryTaskStatus.任务中; + _unitwork.Update(inv); + } + } + //更新单据主表状态 + foreach (var inventory in item) + { + var shipmentdetail = shipment.ShipmentDetails.Where(x => x.ID == int.Parse(inventory.SourceCode)).FirstOrDefault(); + if (shipmentdetail != null) + { + shipmentdetail.Status = ShipStatusEnum.分配完成; + } + } + + if (!shipment.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.分配完成)) + { + shipment.FirstStatus = ShipStatusEnum.分配完成; + _unitwork.Update(shipment); + } + } + else + { + continue; + } + } + } + + + #region 更新时间 + + var job = _unitwork.FindSingle(x => x.JobName == context.JobDetail.Key.Name); + if (job != null) + { + job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.FireTimeUtc.DateTime, TimeZoneInfo.Local); + // 只执行一次 没有下次执行时间 + if (context.NextFireTimeUtc != null) + { + job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc(context.NextFireTimeUtc.Value.DateTime, TimeZoneInfo.Local); + } + _unitwork.Update(job); + } + Wtm.DoLog("出库分解", ActionLogTypesEnum.Job, "SendWmsJob"); + #endregion 更新时间 + } + catch { } + return Task.CompletedTask; + } + } +} diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 7d3b449..5078053 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -105,7 +105,7 @@ "Address": "https://api.github.com" }, "WCS": { - "Address": "http://192.168.10.101:1111/api/WcsWebApi/" + "Address": "http://10.18.97.193:1111/api/WcsWebApi/" } }, "AppSettings": {