Skip to content

P
Property
Commit f856eef1 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/liudong1993/property

parents 65bbae6a ef351fa1
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 74 deletions
Property.Modele.FixedAssets/SuppliesModule.cs
View file @ f856eef1
......@@ -2101,6 +2101,17 @@ namespace Property.Module.FixedAssets
return list;
}
/// <summary>
/// 根据条件获取盘点列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Supplies_Check_Extend> GetSuppliesCheckList(RB_Supplies_Check_Extend dmodel)
{
return supplies_CheckRepository.GetList(dmodel);
}
/// <summary>
/// 新增修改盘点单
/// </summary>
......
Property.Repository/Supplies/RB_Supplies_CheckRepository.cs
View file @ f856eef1
......@@ -56,6 +56,20 @@ namespace Property.Repository
{
where += " and " + nameof(RB_Supplies_Check_Extend.BranchId) + "=" + dmodel.BranchId;
}
if (!string.IsNullOrWhiteSpace(dmodel.Periods))
{
where += " and " + nameof(RB_Supplies_Check_Extend.Periods) + " like '%" + dmodel.Periods + "%'";
}
if (dmodel.StartDate.HasValue)
{
where += $" and nameof(RB_Supplies_Check_Extend.StartDate) >={dmodel.StartDate} ";
}
if (dmodel.EndDate.HasValue)
{
where += $" and nameof(RB_Supplies_Check_Extend.StartDate) <={dmodel.EndDate} ";
}
if (!string.IsNullOrWhiteSpace(dmodel.Periods))
{
where += " and " + nameof(RB_Supplies_Check_Extend.Periods) + " like '%" + dmodel.Periods + "%'";
......@@ -64,6 +78,10 @@ namespace Property.Repository
{
where += " and " + nameof(RB_Supplies_Check_Extend.WarehouseId) + "=" + dmodel.WarehouseId;
}
if (dmodel.CheckState.HasValue && dmodel.CheckState > 0)
{
where += " and " + nameof(RB_Supplies_Check_Extend.CheckState) + "=" + (int)dmodel.CheckState;
}
string sql = $@" select * from RB_Supplies_Check {where} order by Id desc";
return Get<RB_Supplies_Check_Extend>(sql).ToList();
}
......
Property.WebApi/Controllers/Mall/WarehouseOutController.cs
View file @ f856eef1
......@@ -226,6 +226,13 @@ namespace Property.WebApi.Controllers.Mall
return ApiResult.Failed("请选择您要出库的商品");
}
//判断当前仓库是否在盘点中2020-07-28 Add By:W
var suppliesCheckList = suppliesModule.GetSuppliesCheckList(new RB_Supplies_Check_Extend { RB_Group_Id = userInfo.RB_Group_id, StartDate = System.DateTime.Now, EndDate = System.DateTime.Now, WarehouseId = applyModel.WarehouseId , CheckState =REBORN.Common.Enum.SuppliesCheckStatusEnum.InTheInventory });
if (suppliesCheckList != null && suppliesCheckList.Any())
{
return ApiResult.ParamIsNull("仓库盘点中，不能出库");
}
//查询之前的申请信息
var oldModel = warehouseOutModule.GetApplyEntity(applyModel.ID).RefMapperTo<RB_WarehouseOut_Apply_Extend>();
if (oldModel != null)
......
Property.WebApi/Controllers/Property/SuppliesController.cs
View file @ f856eef1
......@@ -64,11 +64,13 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMaterialInfo() {
public ApiResult GetMaterialInfo()
{
var requestParm = GetRequestParm();
JObject parms = JObject.Parse(requestParm.msg.ToString());
int MaterialId = parms.GetInt("MaterialId", 0);
if (MaterialId <= 0) {
if (MaterialId <= 0)
{
return ApiResult.ParamIsNull();
}
......@@ -132,7 +134,7 @@ namespace Property.WebApi.Controllers.User
demodel.CreateDate = DateTime.Now;
demodel.UpdateBy = userInfo.EmployeeId;
demodel.UpdateDate = DateTime.Now;
bool flag = suppliesModule.SetMaterialInfo(demodel);
bool flag = suppliesModule.SetMaterialInfo(demodel);
if (flag)
{
return ApiResult.Success();
......@@ -175,7 +177,8 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetWareHousePageList() {
public ApiResult GetWareHousePageList()
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
......@@ -200,9 +203,10 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetWareHouseList() {
public ApiResult GetWareHouseList()
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
RB_Supplies_WareHouse_Extend demodel = JsonConvert.DeserializeObject<RB_Supplies_WareHouse_Extend>(requestParm.msg.ToString());
demodel.MallBaseId = requestParm.MallBaseId;
demodel.TenantId = requestParm.TenantId;
......@@ -222,7 +226,8 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetWareHouseInfo() {
public ApiResult SetWareHouseInfo()
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
RB_Supplies_WareHouse_Extend demodel = JsonConvert.DeserializeObject<RB_Supplies_WareHouse_Extend>(requestParm.msg.ToString());
......@@ -298,15 +303,16 @@ namespace Property.WebApi.Controllers.User
{
x.Id,
x.StockInState,
StockInStateStr=x.StockInState.GetEnumName(),
StockInDate= x.StockInDate.HasValue?x.StockInDate.Value.ToString("yyyy-MM-dd"):"",
StockInStateStr = x.StockInState.GetEnumName(),
StockInDate = x.StockInDate.HasValue ? x.StockInDate.Value.ToString("yyyy-MM-dd") : "",
x.StockInNum,
x.WareHouseName,
x.WarehouseId,
x.Remark,
x.Money,
x.SupplierName,
DetailList=x.DetailList.Select(z=>new {
DetailList = x.DetailList.Select(z => new
{
z.Id,
z.CategoryName,
z.UnitPrice,
......@@ -367,7 +373,8 @@ namespace Property.WebApi.Controllers.User
foreach (var item in list)
{
Num = 1;
foreach (var citem in item.DetailList) {
foreach (var citem in item.DetailList)
{
int Count = item.DetailList.Count();
if (Num == 1)
{
......@@ -390,7 +397,8 @@ namespace Property.WebApi.Controllers.User
};
slist.Add(datarow);
}
else {
else
{
ExcelDataSource datarow = new ExcelDataSource()
{
ExcelRows = new List<ExcelColumn>(30) {
......@@ -409,7 +417,7 @@ namespace Property.WebApi.Controllers.User
}
};
slist.Add(datarow);
}
}
Num++;
}
}
......@@ -432,42 +440,60 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetStockInInfo() {
public ApiResult SetStockInInfo()
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
RB_Supplies_StockIn_Extend demodel = JsonConvert.DeserializeObject<RB_Supplies_StockIn_Extend>(requestParm.msg.ToString());
if (demodel.WarehouseId<=0)
if (demodel.WarehouseId <= 0)
{
return ApiResult.ParamIsNull("请选择仓库");
}
if (demodel.DetailList == null || !demodel.DetailList.Any()) {
if (demodel.DetailList == null || !demodel.DetailList.Any())
{
return ApiResult.ParamIsNull("请选择物料");
}
if (!demodel.StockInDate.HasValue) {
if (!demodel.StockInDate.HasValue)
{
return ApiResult.ParamIsNull("请输入入库日期");
}
foreach (var item in demodel.DetailList) {
if (item.SuppliesId <= 0) {
foreach (var item in demodel.DetailList)
{
if (item.SuppliesId <= 0)
{
return ApiResult.ParamIsNull("请传递正确的物料id");
}
if (!item.Money.HasValue) {
if (!item.Money.HasValue)
{
return ApiResult.ParamIsNull("请输入入库金额");
}
if (item.Number <= 0) {
if (item.Number <= 0)
{
return ApiResult.ParamIsNull("请输入入库数量");
}
}
//判断当前仓库是否在盘点中2020-07-28 Add By:W
var suppliesCheckList = suppliesModule.GetSuppliesCheckList(new RB_Supplies_Check_Extend { RB_Group_Id = userInfo.RB_Group_id, StartDate = System.DateTime.Now, EndDate = System.DateTime.Now, WarehouseId = demodel.WarehouseId ?? 0, CheckState = REBORN.Common.Enum.SuppliesCheckStatusEnum.InTheInventory });
if (suppliesCheckList != null && suppliesCheckList.Any())
{
return ApiResult.ParamIsNull("仓库盘点中，不能入库");
}
if (demodel.DetailList.Any())
{
var slist = demodel.DetailList.Select(x => x.SuppliesId).Distinct().ToList();
foreach (var item in slist) {
if (demodel.DetailList.Where(x => x.SuppliesId == item).Count() > 1) {
foreach (var item in slist)
{
if (demodel.DetailList.Where(x => x.SuppliesId == item).Count() > 1)
{
return ApiResult.Failed("每种耗材只能选择一个");
}
}
}
else {
else
{
return ApiResult.Failed("请选择耗材");
}
......@@ -495,7 +521,8 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelStockInInfo() {
public ApiResult DelStockInInfo()
{
RequestParm requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
JObject parms = JObject.Parse(requestParm.msg.ToString());
......@@ -574,7 +601,8 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult RecoverStockInInfo() {
public ApiResult RecoverStockInInfo()
{
RequestParm requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
JObject parms = JObject.Parse(requestParm.msg.ToString());
......@@ -584,11 +612,13 @@ namespace Property.WebApi.Controllers.User
return ApiResult.ParamIsNull("请传递参数id");
}
//判断状态 是否是待入库
var model= suppliesModule.GetStockInInfo(StockInId);
if (model.Status == 1) {
var model = suppliesModule.GetStockInInfo(StockInId);
if (model.Status == 1)
{
return ApiResult.Failed("入库单已被删除，无法恢复");
}
if (model.StockInState != REBORN.Common.Enum.StockInStatusEnum.StockInWarting) {
if (model.StockInState != REBORN.Common.Enum.StockInStatusEnum.StockInWarting)
{
return ApiResult.Failed("入库单已完成，无法修改");
}
......@@ -608,7 +638,8 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStockOutPageList() {
public ApiResult GetStockOutPageList()
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
......@@ -644,7 +675,7 @@ namespace Property.WebApi.Controllers.User
z.InventoryNum,
z.GoodsSpecificationList,
z.GoodsCategoryList
}),
}),
UpdateBy = (CacheManager.User.UserReidsCache.GetEmployee(x.UpdateBy)?.EmName ?? ""),
UpdateDate = x.UpdateDate.Value.ToString("yyyy-MM-dd")
});
......@@ -769,7 +800,8 @@ namespace Property.WebApi.Controllers.User
{
return ApiResult.ParamIsNull("请输入入库日期");
}
if (demodel.EmployeeId <= 0) {
if (demodel.EmployeeId <= 0)
{
return ApiResult.ParamIsNull("请选择领用人");
}
foreach (var item in demodel.DetailList)
......@@ -777,12 +809,18 @@ namespace Property.WebApi.Controllers.User
if (item.SuppliesId <= 0)
{
return ApiResult.ParamIsNull("请传递正确的物料id");
}
}
if (item.Number <= 0)
{
return ApiResult.ParamIsNull("请输入入库数量");
}
}
//判断当前仓库是否在盘点中2020-07-28 Add By:W
var suppliesCheckList = suppliesModule.GetSuppliesCheckList(new RB_Supplies_Check_Extend { RB_Group_Id = userInfo.RB_Group_id, StartDate = System.DateTime.Now, EndDate = System.DateTime.Now, WarehouseId = demodel.WarehouseId ?? 0, CheckState = REBORN.Common.Enum.SuppliesCheckStatusEnum.InTheInventory });
if (suppliesCheckList != null && suppliesCheckList.Any())
{
return ApiResult.ParamIsNull("仓库盘点中，不能出库");
}
if (demodel.DetailList.Any())
{
var slist = demodel.DetailList.Select(x => x.SuppliesId).Distinct().ToList();
......@@ -1043,7 +1081,8 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetRecipientsQueryPageList() {
public ApiResult GetRecipientsQueryPageList()
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
......@@ -1069,9 +1108,11 @@ namespace Property.WebApi.Controllers.User
x.GoodsCategoryList,
StockOutDate = x.StockOutDate.Value.ToString("yyyy-MM-dd")
});
return ApiResult.Success("", new {
return ApiResult.Success("", new
{
pagelist,
Total=new {
Total = new
{
Total.Number,
Total.Money
}
......@@ -1179,9 +1220,9 @@ namespace Property.WebApi.Controllers.User
{
x.Id,
x.BranchId,
BranchName = x.BranchId==-1?"通用": CacheManager.User.BranchReidsCache.GetBranch(x.BranchId)?.BName ?? "",
BranchName = x.BranchId == -1 ? "通用" : CacheManager.User.BranchReidsCache.GetBranch(x.BranchId)?.BName ?? "",
x.Enabled,
WeekdayList = x.WeekdayList.OrderBy(x=>x.Id).Select(x => new
WeekdayList = x.WeekdayList.OrderBy(x => x.Id).Select(x => new
{
x.Id,
x.ApplyforId,
......@@ -1214,25 +1255,33 @@ namespace Property.WebApi.Controllers.User
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
RB_Supplies_Applyfor_Extend demodel = JsonConvert.DeserializeObject<RB_Supplies_Applyfor_Extend>(requestParm.msg.ToString());
if ((demodel.BranchId ?? -1) < -1) {
if ((demodel.BranchId ?? -1) < -1)
{
return ApiResult.ParamIsNull("请选择公司别");
}
if (demodel.WeekdayList == null || !demodel.WeekdayList.Any()) {
if (demodel.WeekdayList == null || !demodel.WeekdayList.Any())
{
return ApiResult.ParamIsNull("请选择工作日");
}
foreach (var item in demodel.WeekdayList) {
if (string.IsNullOrEmpty(item.Weekday)) {
foreach (var item in demodel.WeekdayList)
{
if (string.IsNullOrEmpty(item.Weekday))
{
return ApiResult.ParamIsNull("工作日设置有误");
}
if (string.IsNullOrEmpty(item.StartTime)) {
if (string.IsNullOrEmpty(item.StartTime))
{
return ApiResult.ParamIsNull("工作日时间设置有误");
}
if (string.IsNullOrEmpty(item.EndTime)){
if (string.IsNullOrEmpty(item.EndTime))
{
return ApiResult.ParamIsNull("工作日时间设置有误");
}
}
if (demodel.SpecialList != null && demodel.SpecialList.Any()) {
foreach (var item in demodel.SpecialList) {
if (demodel.SpecialList != null && demodel.SpecialList.Any())
{
foreach (var item in demodel.SpecialList)
{
if (!item.Date.HasValue)
{
return ApiResult.ParamIsNull("请选择特殊日期");
......@@ -1249,7 +1298,8 @@ namespace Property.WebApi.Controllers.User
}
//验证公司别是否重复
if (suppliesModule.ValidateBranch(demodel, userInfo)) {
if (suppliesModule.ValidateBranch(demodel, userInfo))
{
return ApiResult.Failed("该公司已存在记录，无法新增");
}
......@@ -1265,7 +1315,8 @@ namespace Property.WebApi.Controllers.User
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed();
}
}
......@@ -1275,12 +1326,14 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetApplyForStatus() {
public ApiResult SetApplyForStatus()
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
JObject parms = JObject.Parse(requestParm.msg.ToString());
int ApplyforId = parms.GetInt("ApplyforId", 0);
if (ApplyforId == 0) {
if (ApplyforId == 0)
{
return ApiResult.Failed("请传递id");
}
......@@ -1304,13 +1357,14 @@ namespace Property.WebApi.Controllers.User
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
var Model = suppliesModule.GetApplyForInfo(userInfo);
if (Model.Id == -1)
{
return ApiResult.Success("", new { Status = 1, Model = "" });
}
else {
else
{
return ApiResult.Success("", new
{
Status = 2,
......@@ -1318,14 +1372,14 @@ namespace Property.WebApi.Controllers.User
{
Model.Id,
Model.BranchId,
BranchName = Model.BranchId==-1?"通用": CacheManager.User.BranchReidsCache.GetBranch(Model.BranchId)?.BName ?? "",
WeekdayList = Model.WeekdayList.OrderBy(x=>x.Id).Select(x => new
BranchName = Model.BranchId == -1 ? "通用" : CacheManager.User.BranchReidsCache.GetBranch(Model.BranchId)?.BName ?? "",
WeekdayList = Model.WeekdayList.OrderBy(x => x.Id).Select(x => new
{
x.Weekday,
x.StartTime,
x.EndTime
}),
SpecialList = Model.SpecialList.OrderBy(x=>x.Date).Select(x => new
SpecialList = Model.SpecialList.OrderBy(x => x.Date).Select(x => new
{
Date = x.Date.Value.ToString("yyyy-MM-dd"),
x.StartTime,
......@@ -1353,7 +1407,8 @@ namespace Property.WebApi.Controllers.User
}
else
{
if (Model.SpecialList != null && Model.SpecialList.Any()) {
if (Model.SpecialList != null && Model.SpecialList.Any())
{
var smodel = Model.SpecialList.Where(x => x.Date == Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"))).FirstOrDefault();
if (smodel != null)
{
......@@ -1363,16 +1418,18 @@ namespace Property.WebApi.Controllers.User
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed();
}
}
}
int Week = (int)DateTime.Now.DayOfWeek;
string WeekDay = "";
switch (Week) {
switch (Week)
{
case 0:
WeekDay = "周日";break;
WeekDay = "周日"; break;
case 1:
WeekDay = "周一"; break;
case 2:
......@@ -1387,7 +1444,8 @@ namespace Property.WebApi.Controllers.User
WeekDay = "周六"; break;
}
var wmodel = Model.WeekdayList.Where(x => x.Weekday == WeekDay).FirstOrDefault();
if (wmodel == null) {
if (wmodel == null)
{
return ApiResult.Failed();
}
wmodel.StartTime = DateTime.Now.ToString("yyyy-MM-dd") + " " + wmodel.StartTime;
......@@ -1396,7 +1454,8 @@ namespace Property.WebApi.Controllers.User
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed();
}
......@@ -1558,17 +1617,19 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetProcurementGoodsInfo() {
public ApiResult GetProcurementGoodsInfo()
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
JObject parms = JObject.Parse(requestParm.msg.ToString());
string Code = parms.GetStringValue("Code");
int WareHouseId = parms.GetInt("WareHouseId", 0);
int WareHouseId = parms.GetInt("WareHouseId", 0);
if (string.IsNullOrEmpty(Code))
{
return ApiResult.ParamIsNull("请传递参数");
}
if (WareHouseId <= 0) {
if (WareHouseId <= 0)
{
return ApiResult.ParamIsNull("请传递仓库id");
}
......@@ -1634,13 +1695,16 @@ namespace Property.WebApi.Controllers.User
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
RB_Supplies_Check_Extend demodel = JsonConvert.DeserializeObject<RB_Supplies_Check_Extend>(requestParm.msg.ToString());
if ((demodel.WarehouseId ?? 0) <= 0) {
if ((demodel.WarehouseId ?? 0) <= 0)
{
return ApiResult.Failed("请选择仓库");
}
if (!demodel.StartDate.HasValue) {
if (!demodel.StartDate.HasValue)
{
return ApiResult.ParamIsNull("请选择开始时间");
}
if (!demodel.EndDate.HasValue) {
if (!demodel.EndDate.HasValue)
{
return ApiResult.ParamIsNull("请选择结束时间");
}
......@@ -1680,10 +1744,12 @@ namespace Property.WebApi.Controllers.User
}
var cmodel = suppliesModule.GetSuppliesCheck(CheckId);
if (cmodel == null) {
if (cmodel == null)
{
return ApiResult.Failed("盘点单不存在");
}
if (cmodel.CheckState != REBORN.Common.Enum.SuppliesCheckStatusEnum.InTheInventory) {
if (cmodel.CheckState != REBORN.Common.Enum.SuppliesCheckStatusEnum.InTheInventory)
{
return ApiResult.Failed("盘点单无法取消");
}
......@@ -1777,7 +1843,8 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetSuppliesCheckDetailPageList() {
public ApiResult GetSuppliesCheckDetailPageList()
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
......@@ -1814,7 +1881,8 @@ namespace Property.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetSuppliesCheckDetailReality() {
public ApiResult SetSuppliesCheckDetailReality()
{
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
JObject parms = JObject.Parse(requestParm.msg.ToString());
......@@ -1827,12 +1895,15 @@ namespace Property.WebApi.Controllers.User
{
return ApiResult.ParamIsNull("请传递参数id");
}
if (Type == 1 && Reality < 0) {
if (Type == 1 && Reality < 0)
{
return ApiResult.ParamIsNull("请传递实际数量");
}
List<string> ImagesList = new List<string>();
if (Type == 2) {
if (string.IsNullOrEmpty(ImageList)) {
if (Type == 2)
{
if (string.IsNullOrEmpty(ImageList))
{
return ApiResult.ParamIsNull("请上传图片");
}
ImagesList = JsonConvert.DeserializeObject<List<string>>(ImageList);
......
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