Commit 4397f863 authored by liudong1993's avatar liudong1993

1

parent 27e3eb04
......@@ -2252,7 +2252,11 @@ namespace Property.Module.FixedAssets
/// <returns></returns>
public RB_Supplies_Check_Extend GetSuppliesCheck(int Id)
{
return supplies_CheckRepository.GetEntity<RB_Supplies_Check_Extend>(Id);
var model = supplies_CheckRepository.GetEntity<RB_Supplies_Check_Extend>(Id);
if (model != null) {
model.WarehouseName = supplies_WareHouseRepository.GetEntity(model.WarehouseId ?? 0)?.Name ?? "";
}
return model;
}
/// <summary>
......
......@@ -1686,6 +1686,34 @@ namespace Property.WebApi.Controllers.User
return ApiResult.Success("", list.Select(x => new { Id = x.Value, Name = x.Key }));
}
/// <summary>
/// 获取盘点单详情
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetSuppliesCheckModel() {
RequestParm requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
JObject parms = JObject.Parse(requestParm.msg.ToString());
int CheckId = parms.GetInt("CheckId", 0);
if (CheckId <= 0)
{
return ApiResult.ParamIsNull("请传递参数id");
}
var cmodel = suppliesModule.GetSuppliesCheck(CheckId);
return ApiResult.Success("",new {
cmodel.Id,
cmodel.Periods,
cmodel.WarehouseName,
cmodel.WarehouseId,
StartDate = cmodel.StartDate.HasValue ? cmodel.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
EndDate = cmodel.EndDate.HasValue ? cmodel.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
cmodel.CheckState,
});
}
/// <summary>
/// 新增修改盘点单
/// </summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment