Browse Source

调整盘点单查询接口

master
lilili 2 years ago
parent
commit
1b10de959c
  1. 6
      ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/LibraryController.cs
  2. 9
      WMS-BS/NFine.Application/WMS/BlitemApp.cs
  3. 11
      WMS-BS/NFine.Web/Areas/WMS/Controllers/BlitemController.cs

6
ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/LibraryController.cs

@ -57,7 +57,11 @@ namespace ICSSoft.WebAPI.Controllers
return result; return result;
} }
/// <summary>
/// 移库
/// </summary>
/// <param name="JsonData"></param>
/// <returns></returns>
[HttpPost] [HttpPost]
[Route("api/TransferLibrary/Update")] [Route("api/TransferLibrary/Update")]
public HttpResponseMessage LibraryUpdate([FromBody] object JsonData) public HttpResponseMessage LibraryUpdate([FromBody] object JsonData)

9
WMS-BS/NFine.Application/WMS/BlitemApp.cs

@ -25,8 +25,7 @@ namespace NFine.Application.WMS
#region [SQL] #region [SQL]
string sql = @"SELECT ID, CheckCode, SelectLevel, Status, Quantity, Amount, MUSER, MUSERName, MTIME, WorkPoint string sql = @"SELECT ID, CheckCode, SelectLevel, Status, Quantity, Amount, MUSER, MUSERName, MTIME, WorkPoint
FROM
dbo.ICSCheck";
FROM dbo.ICSCheck";
sql += " WHERE 1=1"; sql += " WHERE 1=1";
sql = string.Format(sql, DbHelper.GetErpIp(), DbHelper.GetErpName()); sql = string.Format(sql, DbHelper.GetErpIp(), DbHelper.GetErpName());
#endregion #endregion
@ -35,16 +34,16 @@ FROM
{ {
if (!string.IsNullOrWhiteSpace(queryParam["POCode"].ToString())) 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") 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") 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); return Repository().FindTablePageBySql(sql.ToString(), parameter.ToArray(), ref jqgridparam);
} }

11
WMS-BS/NFine.Web/Areas/WMS/Controllers/BlitemController.cs

@ -35,6 +35,12 @@ namespace NFine.Web.Areas.WMS.Controllers
return View(); return View();
} }
/// <summary>
/// 盘点单查询接口
/// </summary>
/// <param name="pagination"></param>
/// <param name="queryJson"></param>
/// <returns></returns>
[HttpGet] [HttpGet]
[HandlerAjaxOnly] [HandlerAjaxOnly]
public ActionResult GetGridJson(Pagination pagination, string queryJson) public ActionResult GetGridJson(Pagination pagination, string queryJson)
@ -136,6 +142,11 @@ namespace NFine.Web.Areas.WMS.Controllers
return Content(dt.ToJson()); return Content(dt.ToJson());
} }
/// <summary>
/// 生成盘点计划
/// </summary>
/// <param name="Parameter"></param>
/// <returns></returns>
[HttpPost] [HttpPost]
[HandlerAjaxOnly] [HandlerAjaxOnly]

Loading…
Cancel
Save