Skip to content

P
PropertyEdu
Commit 46ecb9ca authored by liudong1993's avatar liudong1993
Browse files
Options

1采购功能新增 财务单据分批制单

parent f3148700
Expand all Show whitespace changes
Inline Side-by-side
Showing with 517 additions and 71 deletions
Property.Model/Entity/Property/RB_Property_Procurement.cs
View file @ 46ecb9ca
...@@ -70,7 +70,7 @@ namespace Property.Model.Entity ...@@ -70,7 +70,7 @@ namespace Property.Model.Entity
/// <summary> /// <summary>
/// 财务单据id /// 财务单据id
/// </summary> /// </summary>
public int FinanceId { get; set; } public string FinanceId { get; set; }
/// <summary> /// <summary>
/// 供应商id /// 供应商id
...@@ -97,5 +97,10 @@ namespace Property.Model.Entity ...@@ -97,5 +97,10 @@ namespace Property.Model.Entity
/// </summary> /// </summary>
public int BuyingRequisitionId { get; set; } public int BuyingRequisitionId { get; set; }
/// <summary>
/// 财务制单金额
/// </summary>
public decimal FinanceMoney { get; set; }
} }
} }
\ No newline at end of file
Property.Model/Entity/Property/RB_Property_ProcurementDetail.cs
View file @ 46ecb9ca
...@@ -86,5 +86,10 @@ namespace Property.Model.Entity ...@@ -86,5 +86,10 @@ namespace Property.Model.Entity
/// 审核中的入库数量 /// 审核中的入库数量
/// </summary> /// </summary>
public int AuditStokcInNum { get; set; } public int AuditStokcInNum { get; set; }
/// <summary>
/// 财务制单金额
/// </summary>
public decimal FinanceMoney { get; set; }
} }
} }
\ No newline at end of file
Property.Model/Entity/Supplies/RB_Supplies_Procurement.cs
View file @ 46ecb9ca
...@@ -79,7 +79,7 @@ namespace Property.Model.Entity ...@@ -79,7 +79,7 @@ namespace Property.Model.Entity
/// <summary> /// <summary>
/// 财务单据id /// 财务单据id
/// </summary> /// </summary>
public int FinanceId { get; set; } public string FinanceId { get; set; }
/// <summary> /// <summary>
/// 供应商id /// 供应商id
...@@ -106,5 +106,10 @@ namespace Property.Model.Entity ...@@ -106,5 +106,10 @@ namespace Property.Model.Entity
/// </summary> /// </summary>
public int BuyingRequisitionId { get; set; } public int BuyingRequisitionId { get; set; }
/// <summary>
/// 财务制单总金额
/// </summary>
public decimal FinanceMoney { get; set; }
} }
} }
\ No newline at end of file
Property.Model/Entity/Supplies/RB_Supplies_ProcurementDetail.cs
View file @ 46ecb9ca
...@@ -72,5 +72,10 @@ namespace Property.Model.Entity ...@@ -72,5 +72,10 @@ namespace Property.Model.Entity
/// </summary> /// </summary>
public int AuditStokcInNum { get; set; } public int AuditStokcInNum { get; set; }
/// <summary>
/// 已制单金额
/// </summary>
public decimal FinanceMoney { get; set; }
} }
} }
\ No newline at end of file
Property.Model/Extend/Property/RB_Property_Stockin_Extend.cs
View file @ 46ecb9ca
...@@ -31,7 +31,7 @@ namespace Property.Model.Extend ...@@ -31,7 +31,7 @@ namespace Property.Model.Extend
/// <summary> /// <summary>
/// 财务单据id /// 财务单据id
/// </summary> /// </summary>
public int FinanceId { get; set; } public string FinanceId { get; set; }
/// <summary> /// <summary>
/// 审核类型 1通过 2拒绝 /// 审核类型 1通过 2拒绝
......
Property.Model/Extend/Supplies/RB_Supplies_StockIn_Extend.cs
View file @ 46ecb9ca
...@@ -93,6 +93,12 @@ namespace Property.Model.Extend ...@@ -93,6 +93,12 @@ namespace Property.Model.Extend
/// 财务单据id /// 财务单据id
/// </summary> /// </summary>
public int? FinanceId { get; set; } public int? FinanceId { get; set; }
/// <summary>
/// 财务单据ids
/// </summary>
public string FinanceIds { get; set; }
/// <summary> /// <summary>
/// 入库审核人 /// 入库审核人
/// </summary> /// </summary>
......
Property.Modele.FixedAssets/PropertyModule.cs
View file @ 46ecb9ca
...@@ -4607,6 +4607,9 @@ namespace Property.Module.FixedAssets ...@@ -4607,6 +4607,9 @@ namespace Property.Module.FixedAssets
demodel.SupplierName = supplierModel.Name; demodel.SupplierName = supplierModel.Name;
demodel.TotalNumber = demodel.DetailList.Sum(x => x.Number); demodel.TotalNumber = demodel.DetailList.Sum(x => x.Number);
demodel.TotalCostMoney = demodel.DetailList.Sum(x => x.CostMoney * x.Number); demodel.TotalCostMoney = demodel.DetailList.Sum(x => x.CostMoney * x.Number);
if (demodel.TotalCostMoney < demodel.FinanceMoney) {
return ApiResult.Failed("财务制单总金额有误");
}
demodel.StockInStatus = 1; demodel.StockInStatus = 1;
int ProcurementId = property_ProcurementRepository.Insert(demodel); int ProcurementId = property_ProcurementRepository.Insert(demodel);
if (ProcurementId > 0) { if (ProcurementId > 0) {
...@@ -4627,13 +4630,28 @@ namespace Property.Module.FixedAssets ...@@ -4627,13 +4630,28 @@ namespace Property.Module.FixedAssets
RB_Branch_Id = demodel.RB_Branch_Id, RB_Branch_Id = demodel.RB_Branch_Id,
RB_Group_Id = demodel.RB_Group_Id, RB_Group_Id = demodel.RB_Group_Id,
Status = 0, Status = 0,
StockInNum = 0 StockInNum = 0,
FinanceMoney = item.FinanceMoney
}); });
} }
//再生成财务单据 //再生成财务单据
#region 生成财务单据 #region 生成财务单据
var detailList = new List<object>(); var detailList = new List<object>();
foreach (var item in demodel.DetailList) { foreach (var item in demodel.DetailList) {
if (item.FinanceMoney < (item.CostMoney * item.Number))
{
//付首款的情况 数量=1 备注写数量
detailList.Add(new
{
configModel.CostTypeId,
Number = 1,
OriginalMoney = item.FinanceMoney,
UnitPrice = item.FinanceMoney,
Remark = item.PropertyName + " " + item.BrandName + " " + item.CategoryName + " 首付单(采购数量" + item.Number + "、采购总额" + item.CostMoney * item.Number + ")"
});
}
else
{
detailList.Add(new detailList.Add(new
{ {
configModel.CostTypeId, configModel.CostTypeId,
...@@ -4643,6 +4661,7 @@ namespace Property.Module.FixedAssets ...@@ -4643,6 +4661,7 @@ namespace Property.Module.FixedAssets
Remark = item.PropertyName + " " + item.BrandName + " " + item.CategoryName Remark = item.PropertyName + " " + item.BrandName + " " + item.CategoryName
}); });
} }
}
var financeObj = new var financeObj = new
{ {
...@@ -4651,7 +4670,7 @@ namespace Property.Module.FixedAssets ...@@ -4651,7 +4670,7 @@ namespace Property.Module.FixedAssets
ClientType = 10, ClientType = 10,
ClientID = clientModel.ID, ClientID = clientModel.ID,
configModel.CurrencyId, configModel.CurrencyId,
WBMoney = demodel.TotalCostMoney, WBMoney = demodel.FinanceMoney,
RB_Branch_Id = demodel.SchoolId, RB_Branch_Id = demodel.SchoolId,
PayDate = DateTime.Now.ToString("yyyy-MM-dd"), PayDate = DateTime.Now.ToString("yyyy-MM-dd"),
TemplateId = configModel.TempleteId, TemplateId = configModel.TempleteId,
...@@ -4750,6 +4769,131 @@ namespace Property.Module.FixedAssets ...@@ -4750,6 +4769,131 @@ namespace Property.Module.FixedAssets
return ApiResult.Failed(); return ApiResult.Failed();
} }
/// <summary>
/// 采购单追加财务单据
/// </summary>
/// <param name="demodel"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public string SetPropertyProcurementFinanceNext(RB_Property_Procurement_Extend demodel, UserInfo userInfo)
{
var pmodel = property_ProcurementRepository.GetEntity(demodel.Id);
if (pmodel == null) { return "采购单不存在"; }
var configModel = finance_ConfigRepository.GetList(new RB_Finance_Config_ViewModel() { Group_Id = userInfo.RB_Group_id, Type = FinanceConfigTypeEnum.AssetPurchase }).FirstOrDefault();
if (configModel == null) { return "未配置费用/流程信息，请联系管理员"; }
//查询供应商
var supplierModel = property_SupplierRepository.GetEntity(pmodel.SupplierId);
if (supplierModel == null || supplierModel.ClientID <= 0)
{
return "供应商不存在/供应商未绑定账户信息";
}
var clientModel = clientBankAccountRepository.GetEntity(supplierModel.ClientID);
if (clientModel == null)
{
return "账户信息不存在";
}
var pdlist = property_ProcurementDetailRepository.GetList(new RB_Property_ProcurementDetail_Extend() { RB_Group_Id = userInfo.RB_Group_id, ProcurementId = demodel.Id });
//验证可制单金额
foreach (var item in demodel.DetailList) {
var pdModel = pdlist.Where(x => x.Id == item.Id).FirstOrDefault();
if (pdModel == null) { return "采购明细Id有误"; }
if (pdModel.Number * pdModel.CostMoney < pdModel.FinanceMoney + item.FinanceMoney) { return "制单金额大于商品实际金额，请核实后再试"; }
item.Number = pdModel.Number;
item.CostMoney = pdModel.CostMoney;
}
decimal NowFinanceMoney = demodel.DetailList.Sum(x => x.FinanceMoney);
#region 生成财务单据
var detailList = new List<object>();
foreach (var item in demodel.DetailList)
{
detailList.Add(new
{
configModel.CostTypeId,
Number = 1,
OriginalMoney = item.FinanceMoney,
UnitPrice = item.FinanceMoney,
Remark = item.PropertyName + " " + item.BrandName + " " + item.CategoryName + " 尾款单(采购数量" + item.Number + "、采购总额" + item.CostMoney * item.Number + ")"
});
}
var financeObj = new
{
pmodel.CreateBy,
demodel.IsPublic,
ClientType = 10,
ClientID = clientModel.ID,
configModel.CurrencyId,
WBMoney = NowFinanceMoney,
RB_Branch_Id = pmodel.SchoolId,
PayDate = DateTime.Now.ToString("yyyy-MM-dd"),
TemplateId = configModel.TempleteId,
OrderSource = 17,
OtherType = 31,
Remark = DateTime.Now.ToString("yyyy年MM月dd日") + "生成财务单据",
detailList,
RB_Depart_Id = userInfo.RB_Department_Id,
ReFinanceId = pmodel.Id,
FinanceType = 2,
RB_Group_Id = userInfo.RB_Group_id,
RB_CreateByName = userInfo.emName,
RB_DepartName = userInfo.DepartName,
RB_BranchName = schoolRepository.GetEntity(pmodel.SchoolId)?.SName ?? "",
RB_GroupName = userInfo.GroupName
};
string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
var resultInfo = new
{
msg = sign,
};
string apiResult = HttpHelper.HttpPost(Config.PaymentFinanceApi, JsonHelper.Serialize(resultInfo), "");
JObject parmsJob = JObject.Parse(apiResult);
string resultCode = parmsJob.GetStringValue("resultCode");
int frid = parmsJob.GetInt("data", 0);
#endregion
#region 更新采购单制单金额
if (resultCode == "1" && frid > 0)
{
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Property_Procurement.FinanceMoney),pmodel.FinanceMoney + NowFinanceMoney},
{ nameof(RB_Property_Procurement.FinanceId),pmodel.FinanceId +","+ frid},
{ nameof(RB_Property_Procurement.Remark), pmodel.Remark + "," + frid},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Property_Procurement.Id),
FiledValue=demodel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
property_ProcurementRepository.Update(keyValues1, wheres1);
//更新采购明细已制单金额
foreach (var item in demodel.DetailList) {
var pdModel = pdlist.Where(x => x.Id == item.Id).FirstOrDefault();
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Property_ProcurementDetail_Extend.FinanceMoney),pdModel.FinanceMoney + item.FinanceMoney}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName= nameof(RB_Property_ProcurementDetail_Extend.Id),
FiledValue= item.Id,
OperatorEnum=OperatorEnum.Equal
}
};
property_ProcurementDetailRepository.Update(keyValues, wheres);
}
return "";
}
else
{
return "生成财务单据失败，请联系管理员";
}
#endregion
}
/// <summary> /// <summary>
/// 获取账户列表 /// 获取账户列表
/// </summary> /// </summary>
...@@ -5550,7 +5694,7 @@ namespace Property.Module.FixedAssets ...@@ -5550,7 +5694,7 @@ namespace Property.Module.FixedAssets
#endregion #endregion
#region 采购 #region 采购
dmodel.FinanceId = property_ProcurementRepository.GetEntity(dmodel.ProcurementId)?.FinanceId ?? 0; dmodel.FinanceId = property_ProcurementRepository.GetEntity(dmodel.ProcurementId)?.FinanceId ?? "";
#endregion #endregion
dmodel.VoucherList = new List<VoucherModel>(); dmodel.VoucherList = new List<VoucherModel>();
......
Property.Modele.FixedAssets/WorkFlowModule.cs
View file @ 46ecb9ca
...@@ -349,10 +349,7 @@ namespace Property.Module.FixedAssets ...@@ -349,10 +349,7 @@ namespace Property.Module.FixedAssets
if (newList != null && newList.Count > 0) if (newList != null && newList.Count > 0)
{ {
//制单人 //制单人
var AuditEmIds = new List<int> var AuditEmIds = new List<int>{ };
{
CreateBy
};
#region 判断是否有已审核的人，有的话直接跳过 #region 判断是否有已审核的人，有的话直接跳过
if (true) if (true)
{ {
...@@ -1249,10 +1246,10 @@ namespace Property.Module.FixedAssets ...@@ -1249,10 +1246,10 @@ namespace Property.Module.FixedAssets
} }
} }
else { else {
if (usemodel.CreateBy == userInfo.EmployeeId) //if (usemodel.CreateBy == userInfo.EmployeeId)
{ //{
return ApiResult.Failed("单据操作人不能审核，请转交审核"); // return ApiResult.Failed("单据操作人不能审核，请转交审核");
} //}
SignImage = ""; SignImage = "";
} }
...@@ -1734,10 +1731,10 @@ namespace Property.Module.FixedAssets ...@@ -1734,10 +1731,10 @@ namespace Property.Module.FixedAssets
} }
else else
{ {
if (usemodel.CreateBy == userInfo.EmployeeId) //if (usemodel.CreateBy == userInfo.EmployeeId)
{ //{
return ApiResult.Failed("单据操作人不能审核，请转交审核"); // return ApiResult.Failed("单据操作人不能审核，请转交审核");
} //}
SignImage = ""; SignImage = "";
} }
...@@ -2513,10 +2510,10 @@ namespace Property.Module.FixedAssets ...@@ -2513,10 +2510,10 @@ namespace Property.Module.FixedAssets
{ {
bool financeFlag = false; bool financeFlag = false;
var model = ToAuditFlow?.FirstOrDefault(); var model = ToAuditFlow?.FirstOrDefault();
if (usemodel.CreateBy == userInfo.EmployeeId) //if (usemodel.CreateBy == userInfo.EmployeeId)
{ //{
return ApiResult.Failed("单据操作人不能审核，请转交审核"); // return ApiResult.Failed("单据操作人不能审核，请转交审核");
} //}
var RecordList = aurList.Where(x => x.AuditId == model.Id).ToList(); var RecordList = aurList.Where(x => x.AuditId == model.Id).ToList();
if (model.AuditWay == WFTAuditWayEnum.Countersign) if (model.AuditWay == WFTAuditWayEnum.Countersign)
...@@ -2892,10 +2889,10 @@ namespace Property.Module.FixedAssets ...@@ -2892,10 +2889,10 @@ namespace Property.Module.FixedAssets
else//同时创建下一步审核 复制审核人到审核关联表 创建审核记录表 else//同时创建下一步审核 复制审核人到审核关联表 创建审核记录表
{ {
var model = ToAuditFlow?.FirstOrDefault(); var model = ToAuditFlow?.FirstOrDefault();
if (usemodel.CreateBy == userInfo.EmployeeId) //if (usemodel.CreateBy == userInfo.EmployeeId)
{ //{
return ApiResult.Failed("单据操作人不能审核，请转交审核"); // return ApiResult.Failed("单据操作人不能审核，请转交审核");
} //}
var RecordList = aurList.Where(x => x.AuditId == model.Id).ToList(); var RecordList = aurList.Where(x => x.AuditId == model.Id).ToList();
...@@ -3578,10 +3575,10 @@ namespace Property.Module.FixedAssets ...@@ -3578,10 +3575,10 @@ namespace Property.Module.FixedAssets
} }
else else
{ {
if (usemodel.CreateBy == userInfo.EmployeeId) //if (usemodel.CreateBy == userInfo.EmployeeId)
{ //{
return ApiResult.Failed("单据操作人不能审核，请转交审核"); // return ApiResult.Failed("单据操作人不能审核，请转交审核");
} //}
SignImage = ""; SignImage = "";
} }
...@@ -3907,10 +3904,10 @@ namespace Property.Module.FixedAssets ...@@ -3907,10 +3904,10 @@ namespace Property.Module.FixedAssets
} }
else else
{ {
if (usemodel.CreateBy == userInfo.EmployeeId) //if (usemodel.CreateBy == userInfo.EmployeeId)
{ //{
return ApiResult.Failed("单据操作人不能审核，请转交审核"); // return ApiResult.Failed("单据操作人不能审核，请转交审核");
} //}
SignImage = ""; SignImage = "";
} }
...@@ -4550,10 +4547,10 @@ namespace Property.Module.FixedAssets ...@@ -4550,10 +4547,10 @@ namespace Property.Module.FixedAssets
} }
else else
{ {
if (usemodel.CreateBy == userInfo.EmployeeId) //if (usemodel.CreateBy == userInfo.EmployeeId)
{ //{
return ApiResult.Failed("单据操作人不能审核，请转交审核"); // return ApiResult.Failed("单据操作人不能审核，请转交审核");
} //}
SignImage = ""; SignImage = "";
} }
...@@ -4998,10 +4995,10 @@ namespace Property.Module.FixedAssets ...@@ -4998,10 +4995,10 @@ namespace Property.Module.FixedAssets
} }
else else
{ {
if (usemodel.CreateBy == userInfo.EmployeeId) //if (usemodel.CreateBy == userInfo.EmployeeId)
{ //{
return ApiResult.Failed("单据操作人不能审核，请转交审核"); // return ApiResult.Failed("单据操作人不能审核，请转交审核");
} //}
SignImage = ""; SignImage = "";
} }
...@@ -5637,10 +5634,10 @@ namespace Property.Module.FixedAssets ...@@ -5637,10 +5634,10 @@ namespace Property.Module.FixedAssets
} }
else else
{ {
if (usemodel.CreateBy == userInfo.EmployeeId) //if (usemodel.CreateBy == userInfo.EmployeeId)
{ //{
return ApiResult.Failed("单据操作人不能审核，请转交审核"); // return ApiResult.Failed("单据操作人不能审核，请转交审核");
} //}
SignImage = ""; SignImage = "";
} }
...@@ -6127,10 +6124,10 @@ namespace Property.Module.FixedAssets ...@@ -6127,10 +6124,10 @@ namespace Property.Module.FixedAssets
} }
else else
{ {
if (usemodel.CreateBy == userInfo.EmployeeId) //if (usemodel.CreateBy == userInfo.EmployeeId)
{ //{
return ApiResult.Failed("单据操作人不能审核，请转交审核"); // return ApiResult.Failed("单据操作人不能审核，请转交审核");
} //}
SignImage = ""; SignImage = "";
} }
......
Property.Repository/Supplies/RB_Supplies_StockInRepository.cs
View file @ 46ecb9ca
...@@ -65,7 +65,7 @@ namespace Property.Repository ...@@ -65,7 +65,7 @@ namespace Property.Repository
where += " and ss." + nameof(RB_Supplies_StockIn_Extend.StockInState) + "=" + (int)dmodel.StockInState; where += " and ss." + nameof(RB_Supplies_StockIn_Extend.StockInState) + "=" + (int)dmodel.StockInState;
} }
string sql = $@" select ss.*,sw.Name as WareHouseName,p.FinanceId from RB_Supplies_StockIn ss string sql = $@" select ss.*,sw.Name as WareHouseName,p.FinanceId as FinanceIds from RB_Supplies_StockIn ss
left join rb_supplies_warehouse sw on ss.WarehouseId=sw.Id left join rb_supplies_warehouse sw on ss.WarehouseId=sw.Id
left join rb_supplies_stockindetail ssd on ss.Id=ssd.StockInId left join rb_supplies_stockindetail ssd on ss.Id=ssd.StockInId
left join rb_supplies_material sm on ssd.SuppliesId=sm.Id left join rb_supplies_material sm on ssd.SuppliesId=sm.Id
......
Property.WebApi/Controllers/Property/PropertyController.cs
View file @ 46ecb9ca
...@@ -803,7 +803,8 @@ namespace Property.WebApi.Controllers.User ...@@ -803,7 +803,8 @@ namespace Property.WebApi.Controllers.User
x.OpenBankName, x.OpenBankName,
x.AccountHolder, x.AccountHolder,
x.AccountAlias, x.AccountAlias,
x.CardNum x.CardNum,
x.ClientID
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
...@@ -5428,6 +5429,7 @@ namespace Property.WebApi.Controllers.User ...@@ -5428,6 +5429,7 @@ namespace Property.WebApi.Controllers.User
x.StockInStatus, x.StockInStatus,
x.SchoolId, x.SchoolId,
x.SchoolName, x.SchoolName,
x.FinanceMoney,
DetailList = x.DetailList.Select(z => new DetailList = x.DetailList.Select(z => new
{ {
z.Id, z.Id,
...@@ -5439,7 +5441,8 @@ namespace Property.WebApi.Controllers.User ...@@ -5439,7 +5441,8 @@ namespace Property.WebApi.Controllers.User
z.CostMoney, z.CostMoney,
z.StockInNum, z.StockInNum,
z.PropertyId, z.PropertyId,
z.AuditStokcInNum z.AuditStokcInNum,
z.FinanceMoney
}) })
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
...@@ -5508,9 +5511,15 @@ namespace Property.WebApi.Controllers.User ...@@ -5508,9 +5511,15 @@ namespace Property.WebApi.Controllers.User
if (demodel.SchoolId < 0) { if (demodel.SchoolId < 0) {
return ApiResult.ParamIsNull("请选择校区id"); return ApiResult.ParamIsNull("请选择校区id");
} }
if (demodel.FinanceMoney <= 0) {
return ApiResult.ParamIsNull("请输入财务制单金额");
}
if (demodel.DetailList == null || !demodel.DetailList.Any()) { if (demodel.DetailList == null || !demodel.DetailList.Any()) {
return ApiResult.ParamIsNull("请输入资产信息"); return ApiResult.ParamIsNull("请输入资产信息");
} }
if (demodel.FinanceMoney != demodel.DetailList.Sum(x => x.FinanceMoney)) {
return ApiResult.ParamIsNull("制单总金额与资产明细制单金额不符");
}
foreach (var item in demodel.DetailList) { foreach (var item in demodel.DetailList) {
if (string.IsNullOrEmpty(item.PropertyName)) { if (string.IsNullOrEmpty(item.PropertyName)) {
return ApiResult.ParamIsNull("资产名称不能为空"); return ApiResult.ParamIsNull("资产名称不能为空");
...@@ -5539,6 +5548,56 @@ namespace Property.WebApi.Controllers.User ...@@ -5539,6 +5548,56 @@ namespace Property.WebApi.Controllers.User
return propertyModule.SetPropertyProcurementInfo(demodel, userInfo); return propertyModule.SetPropertyProcurementInfo(demodel, userInfo);
} }
/// <summary>
/// 采购单继续补充财务单据尾款
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetPropertyProcurementFinanceNext() {
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
RB_Property_Procurement_Extend demodel = JsonConvert.DeserializeObject<RB_Property_Procurement_Extend>(requestParm.msg.ToString());
if (demodel.Id <= 0)
{
return ApiResult.ParamIsNull("请传递采购单id");
}
if (demodel.DetailList == null || !demodel.DetailList.Any())
{
return ApiResult.ParamIsNull("请输入资产信息");
}
if (!demodel.DetailList.Where(x => x.FinanceMoney > 0).Any()) {
return ApiResult.ParamIsNull("请输入需制单财务单据金额");
}
demodel.DetailList = demodel.DetailList.Where(x => x.FinanceMoney > 0).ToList();
foreach (var item in demodel.DetailList)
{
if (item.Id <= 0) {
return ApiResult.ParamIsNull("请传递商品Id");
}
if (string.IsNullOrEmpty(item.PropertyName))
{
return ApiResult.ParamIsNull("资产名称不能为空");
}
if (string.IsNullOrEmpty(item.BrandName))
{
return ApiResult.ParamIsNull("品牌名称不能为空");
}
if (string.IsNullOrEmpty(item.CategoryName))
{
return ApiResult.ParamIsNull("分类名称不能为空");
}
}
string msg = propertyModule.SetPropertyProcurementFinanceNext(demodel, userInfo);
if (msg == "")
{
return ApiResult.Success();
}
else {
return ApiResult.Failed(msg);
}
}
/// <summary> /// <summary>
/// 资产采购入库 /// 资产采购入库
/// </summary> /// </summary>
......
Property.WebApi/Controllers/Property/SuppliesController.cs
View file @ 46ecb9ca
...@@ -338,6 +338,7 @@ namespace Property.WebApi.Controllers.User ...@@ -338,6 +338,7 @@ namespace Property.WebApi.Controllers.User
x.Money, x.Money,
x.SupplierName, x.SupplierName,
x.FinanceId, x.FinanceId,
x.FinanceIds,
x.AuditDescription, x.AuditDescription,
x.ProcurementId, x.ProcurementId,
x.AuditRemark, x.AuditRemark,
...@@ -3228,6 +3229,7 @@ namespace Property.WebApi.Controllers.User ...@@ -3228,6 +3229,7 @@ namespace Property.WebApi.Controllers.User
x.SchoolName, x.SchoolName,
x.WareHouseId, x.WareHouseId,
x.WareHouseName, x.WareHouseName,
x.FinanceMoney,
DetailList = x.DetailList.Select(z => new DetailList = x.DetailList.Select(z => new
{ {
z.Id, z.Id,
...@@ -3240,7 +3242,8 @@ namespace Property.WebApi.Controllers.User ...@@ -3240,7 +3242,8 @@ namespace Property.WebApi.Controllers.User
z.StockInNum, z.StockInNum,
z.AuditStokcInNum, z.AuditStokcInNum,
z.SuppliesNum, z.SuppliesNum,
z.Units z.Units,
z.FinanceMoney
}) })
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
...@@ -3322,10 +3325,18 @@ namespace Property.WebApi.Controllers.User ...@@ -3322,10 +3325,18 @@ namespace Property.WebApi.Controllers.User
{ {
return ApiResult.ParamIsNull("请选择仓库"); return ApiResult.ParamIsNull("请选择仓库");
} }
if (demodel.FinanceMoney <= 0)
{
return ApiResult.ParamIsNull("请输入财务制单金额");
}
if (demodel.DetailList == null || !demodel.DetailList.Any()) if (demodel.DetailList == null || !demodel.DetailList.Any())
{ {
return ApiResult.ParamIsNull("请选择耗材信息"); return ApiResult.ParamIsNull("请选择耗材信息");
} }
if (demodel.FinanceMoney != demodel.DetailList.Sum(x => x.FinanceMoney))
{
return ApiResult.ParamIsNull("制单总金额与资产明细制单金额不符");
}
foreach (var item in demodel.DetailList) foreach (var item in demodel.DetailList)
{ {
if (item.MaterialId <= 0) if (item.MaterialId <= 0)
...@@ -3348,6 +3359,50 @@ namespace Property.WebApi.Controllers.User ...@@ -3348,6 +3359,50 @@ namespace Property.WebApi.Controllers.User
return suppliesModule.SetSuppliesProcurementInfo(demodel, userInfo); return suppliesModule.SetSuppliesProcurementInfo(demodel, userInfo);
} }
/// <summary>
/// 采购单继续补充财务单据尾款
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetSuppliesProcurementFinanceNext() {
var requestParm = GetRequestParm();
UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(requestParm.uid);
RB_Supplies_Procurement_Extend demodel = JsonConvert.DeserializeObject<RB_Supplies_Procurement_Extend>(requestParm.msg.ToString());
if (demodel.Id <= 0)
{
return ApiResult.ParamIsNull("请传递采购单id");
}
if (demodel.DetailList == null || !demodel.DetailList.Any())
{
return ApiResult.ParamIsNull("请选择耗材信息");
}
if (!demodel.DetailList.Where(x => x.FinanceMoney > 0).Any())
{
return ApiResult.ParamIsNull("请输入需制单财务单据金额");
}
demodel.DetailList = demodel.DetailList.Where(x => x.FinanceMoney > 0).ToList();
foreach (var item in demodel.DetailList)
{
if (item.Id <= 0)
{
return ApiResult.ParamIsNull("请传递采购单明细id");
}
if (item.Number <= 0)
{
return ApiResult.ParamIsNull("数量不能小于0");
}
}
string msg = suppliesModule.SetSuppliesProcurementFinanceNext(demodel, userInfo);
if (msg == "")
{
return ApiResult.Success();
}
else {
return ApiResult.Failed(msg);
}
}
/// <summary> /// <summary>
/// 耗材采购入库 /// 耗材采购入库
/// </summary> /// </summary>
...@@ -3520,6 +3575,7 @@ namespace Property.WebApi.Controllers.User ...@@ -3520,6 +3575,7 @@ namespace Property.WebApi.Controllers.User
model.Money, model.Money,
model.SupplierName, model.SupplierName,
model.FinanceId, model.FinanceId,
model.FinanceIds,
model.AuditDescription, model.AuditDescription,
model.TemplateName, model.TemplateName,
model.AuditRemark, model.AuditRemark,
......
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