diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/LibraryController.cs b/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/LibraryController.cs index b1d9c85..5380a00 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/LibraryController.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/LibraryController.cs @@ -57,7 +57,11 @@ namespace ICSSoft.WebAPI.Controllers return result; } - + /// + /// 移库 + /// + /// + /// [HttpPost] [Route("api/TransferLibrary/Update")] public HttpResponseMessage LibraryUpdate([FromBody] object JsonData) diff --git a/WMS-BS/NFine.Application/WMS/BlitemApp.cs b/WMS-BS/NFine.Application/WMS/BlitemApp.cs index 411b4f7..8b2982f 100644 --- a/WMS-BS/NFine.Application/WMS/BlitemApp.cs +++ b/WMS-BS/NFine.Application/WMS/BlitemApp.cs @@ -25,8 +25,7 @@ namespace NFine.Application.WMS #region [SQL] string sql = @"SELECT ID, CheckCode, SelectLevel, Status, Quantity, Amount, MUSER, MUSERName, MTIME, WorkPoint -FROM - dbo.ICSCheck"; + FROM dbo.ICSCheck"; sql += " WHERE 1=1"; sql = string.Format(sql, DbHelper.GetErpIp(), DbHelper.GetErpName()); #endregion @@ -35,16 +34,16 @@ FROM { if (!string.IsNullOrWhiteSpace(queryParam["POCode"].ToString())) { - sql += " and a.CheckCode like '%" + queryParam["POCode"].ToString() + "%' "; + sql += " and CheckCode like '%" + queryParam["POCode"].ToString() + "%' "; } } if (NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode != "admin") { - sql += " and a.WorkPoint='" + NFine.Code.OperatorProvider.Provider.GetCurrent().Location + "'"; + sql += " and WorkPoint='" + NFine.Code.OperatorProvider.Provider.GetCurrent().Location + "'"; } if (NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode == "Vendor") { - sql += " and a.VenCode='" + NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode + "'"; + sql += " and VenCode='" + NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode + "'"; } return Repository().FindTablePageBySql(sql.ToString(), parameter.ToArray(), ref jqgridparam); } diff --git a/WMS-BS/NFine.Web/Areas/WMS/Controllers/BlitemController.cs b/WMS-BS/NFine.Web/Areas/WMS/Controllers/BlitemController.cs index 10d80b0..bfa8b0e 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Controllers/BlitemController.cs +++ b/WMS-BS/NFine.Web/Areas/WMS/Controllers/BlitemController.cs @@ -35,6 +35,12 @@ namespace NFine.Web.Areas.WMS.Controllers return View(); } + /// + /// 盘点单查询接口 + /// + /// + /// + /// [HttpGet] [HandlerAjaxOnly] public ActionResult GetGridJson(Pagination pagination, string queryJson) @@ -136,6 +142,11 @@ namespace NFine.Web.Areas.WMS.Controllers return Content(dt.ToJson()); } + /// + /// 生成盘点计划 + /// + /// + /// [HttpPost] [HandlerAjaxOnly]