diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs index e5a4027..00ef48d 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs @@ -132,6 +132,11 @@ namespace HHWMS.Web.Controllers [ActionDescription("Sys.Create")] public ActionResult CreateDetails(ReceiptDetailVM vm) { + var header = _unitwork.FindSingle(x => x.ID == vm.Entity.ReceiptHeaderId); + if(header.FirstStatus != ReceiptStatusEnum.新建) + { + return FFResult().Alert("主单据不是新建状态,不能新建明细!"); + } var plList = vm.Entity.MaterialCode.Split("\n"); var slList = vm.Entity.Lot.Split("\n"); var detailList = new List(); @@ -169,7 +174,7 @@ namespace HHWMS.Web.Controllers } // 判断唯一码是否已在库内 - var reDetailList = _unitwork.Find(x => 1 == 1) + var reDetailList = _unitwork.Find(x => x.Status == ReceiptStatusEnum.新建) .Select(x => x.UniqueCode) .ToList(); if (reDetailList.Intersect(detailList.Select(x => x.UniqueCode)).Count() > 0) diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml index dabe794..1a88190 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml @@ -83,7 +83,7 @@ var app = new Vue({ var _this = this; var qty = _this.form.qty; if (qty == "") - qty = _this.qtyPlaceholder; + qty = parseInt(_this.qtyPlaceholder); // 提交已绑定数据 $.ajax({ type: "post", @@ -98,7 +98,7 @@ var app = new Vue({ var isExit = _this.tableData.findIndex(function (value) { return value.UniqueCode == _this.form.uniqueCode; }); - _this.tableData[isExit].Qty = _this.form.qty + _this.tableData[isExit].Qty = qty; _this.$refs['form'].resetFields(); _this.qtyPlaceholder = "数量"; _this.$refs.uniqueCode.focus(); diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs index ebaab07..51d0890 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs @@ -205,7 +205,10 @@ namespace HHWMS.Web && x.Type == LocationTypeEnum.盘料库位 && (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器) && x.Length == Length && !x.IsStop) - .OrderByDescending(x => x.Length - x.Width).FirstOrDefault(); + .OrderByDescending(x => x.Length - x.Width) + .ThenBy(x => x.Layer) + .ThenByDescending(x => x.Line) + .FirstOrDefault(); if (Length == 23 && container == null && station.Row == 3) { station = _unitwork.Find(x => x.Type.Equals(LocationTypeEnum.堆垛机工位) diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs index c281841..cc1a4bb 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using System.Threading.Tasks; using HHWMS.Web.Models; using Quartz; @@ -18,9 +19,16 @@ namespace HHWMS.Web try { var _unitwork = new UnitWork(Wtm); - //var sql = $"DELETE FROM {this.Wtm.DC.GetTableName()} WHERE Expiration<'{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")}'"; - //this.Wtm.DC.RunSQL(sql); - Wtm.DoLog("清理过期的token", ActionLogTypesEnum.Job, "TestJob"); + if (_unitwork.IsExit(x => x.FirstStatus == ReceiptStatusEnum.收完)) + { + _unitwork.BatchDelete(x => x.FirstStatus == ReceiptStatusEnum.收完); + } + + if (_unitwork.IsExit(x => x.FirstStatus == ShipStatusEnum.拣货完成)) + { + _unitwork.BatchDelete(x => x.FirstStatus == ShipStatusEnum.拣货完成); + } + Wtm.DoLog("清理过期单据", ActionLogTypesEnum.Job, "TestJob"); #region 更新时间 var job = _unitwork.FindSingle(x => x.JobName == context.JobDetail.Key.Name); diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 64f4382..170fe01 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -27,18 +27,18 @@ // "Value": "Server=127.0.0.1;Port=3306;Database=8357wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", // "DBType": "mysql" //} - //{ - // "Key": "default", - // "Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True", - // "DbContext": "DataContext", - // "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle - //} { "Key": "default", - "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True", + "Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True", "DbContext": "DataContext", "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle } + //{ + // "Key": "default", + // "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True", + // "DbContext": "DataContext", + // "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle + //} ], "CookiePre": "HHWMS", //cookie前缀 "IsQuickDebug": true, //是否启用debug模式