Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
PropertyEdu
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liudong1993
PropertyEdu
Commits
46ecb9ca
Commit
46ecb9ca
authored
Sep 16, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1采购功能新增 财务单据分批制单
parent
f3148700
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
517 additions
and
71 deletions
+517
-71
RB_Property_Procurement.cs
Property.Model/Entity/Property/RB_Property_Procurement.cs
+6
-1
RB_Property_ProcurementDetail.cs
...ty.Model/Entity/Property/RB_Property_ProcurementDetail.cs
+5
-0
RB_Supplies_Procurement.cs
Property.Model/Entity/Supplies/RB_Supplies_Procurement.cs
+6
-1
RB_Supplies_ProcurementDetail.cs
...ty.Model/Entity/Supplies/RB_Supplies_ProcurementDetail.cs
+5
-0
RB_Property_Stockin_Extend.cs
Property.Model/Extend/Property/RB_Property_Stockin_Extend.cs
+1
-1
RB_Supplies_StockIn_Extend.cs
Property.Model/Extend/Supplies/RB_Supplies_StockIn_Extend.cs
+6
-0
PropertyModule.cs
Property.Modele.FixedAssets/PropertyModule.cs
+154
-10
SuppliesModule.cs
Property.Modele.FixedAssets/SuppliesModule.cs
+174
-10
WorkFlowModule.cs
Property.Modele.FixedAssets/WorkFlowModule.cs
+41
-44
RB_Supplies_StockInRepository.cs
...erty.Repository/Supplies/RB_Supplies_StockInRepository.cs
+1
-1
PropertyController.cs
Property.WebApi/Controllers/Property/PropertyController.cs
+61
-2
SuppliesController.cs
Property.WebApi/Controllers/Property/SuppliesController.cs
+57
-1
No files found.
Property.Model/Entity/Property/RB_Property_Procurement.cs
View file @
46ecb9ca
...
...
@@ -70,7 +70,7 @@ namespace Property.Model.Entity
/// <summary>
/// 财务单据id
/// </summary>
public
int
FinanceId
{
get
;
set
;
}
public
string
FinanceId
{
get
;
set
;
}
/// <summary>
/// 供应商id
...
...
@@ -97,5 +97,10 @@ namespace Property.Model.Entity
/// </summary>
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
/// 审核中的入库数量
/// </summary>
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
/// <summary>
/// 财务单据id
/// </summary>
public
int
FinanceId
{
get
;
set
;
}
public
string
FinanceId
{
get
;
set
;
}
/// <summary>
/// 供应商id
...
...
@@ -106,5 +106,10 @@ namespace Property.Model.Entity
/// </summary>
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
/// </summary>
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
/// <summary>
/// 财务单据id
/// </summary>
public
int
FinanceId
{
get
;
set
;
}
public
string
FinanceId
{
get
;
set
;
}
/// <summary>
/// 审核类型 1通过 2拒绝
...
...
Property.Model/Extend/Supplies/RB_Supplies_StockIn_Extend.cs
View file @
46ecb9ca
...
...
@@ -93,6 +93,12 @@ namespace Property.Model.Extend
/// 财务单据id
/// </summary>
public
int
?
FinanceId
{
get
;
set
;
}
/// <summary>
/// 财务单据ids
/// </summary>
public
string
FinanceIds
{
get
;
set
;
}
/// <summary>
/// 入库审核人
/// </summary>
...
...
Property.Modele.FixedAssets/PropertyModule.cs
View file @
46ecb9ca
This diff is collapsed.
Click to expand it.
Property.Modele.FixedAssets/SuppliesModule.cs
View file @
46ecb9ca
This diff is collapsed.
Click to expand it.
Property.Modele.FixedAssets/WorkFlowModule.cs
View file @
46ecb9ca
...
...
@@ -349,10 +349,7 @@ namespace Property.Module.FixedAssets
if
(
newList
!=
null
&&
newList
.
Count
>
0
)
{
//制单人
var
AuditEmIds
=
new
List
<
int
>
{
CreateBy
};
var
AuditEmIds
=
new
List
<
int
>{
};
#
region
判断是否有已审核的人,有的话直接跳过
if
(
true
)
{
...
...
@@ -1249,10 +1246,10 @@ namespace Property.Module.FixedAssets
}
}
else
{
if
(
usemodel
.
CreateBy
==
userInfo
.
EmployeeId
)
{
return
ApiResult
.
Failed
(
"单据操作人不能审核,请转交审核"
);
}
//
if (usemodel.CreateBy == userInfo.EmployeeId)
//
{
//
return ApiResult.Failed("单据操作人不能审核,请转交审核");
//
}
SignImage
=
""
;
}
...
...
@@ -1734,10 +1731,10 @@ namespace Property.Module.FixedAssets
}
else
{
if
(
usemodel
.
CreateBy
==
userInfo
.
EmployeeId
)
{
return
ApiResult
.
Failed
(
"单据操作人不能审核,请转交审核"
);
}
//
if (usemodel.CreateBy == userInfo.EmployeeId)
//
{
//
return ApiResult.Failed("单据操作人不能审核,请转交审核");
//
}
SignImage
=
""
;
}
...
...
@@ -2513,10 +2510,10 @@ namespace Property.Module.FixedAssets
{
bool
financeFlag
=
false
;
var
model
=
ToAuditFlow
?.
FirstOrDefault
();
if
(
usemodel
.
CreateBy
==
userInfo
.
EmployeeId
)
{
return
ApiResult
.
Failed
(
"单据操作人不能审核,请转交审核"
);
}
//
if (usemodel.CreateBy == userInfo.EmployeeId)
//
{
//
return ApiResult.Failed("单据操作人不能审核,请转交审核");
//
}
var
RecordList
=
aurList
.
Where
(
x
=>
x
.
AuditId
==
model
.
Id
).
ToList
();
if
(
model
.
AuditWay
==
WFTAuditWayEnum
.
Countersign
)
...
...
@@ -2892,10 +2889,10 @@ namespace Property.Module.FixedAssets
else
//同时创建下一步审核 复制审核人到审核关联表 创建审核记录表
{
var
model
=
ToAuditFlow
?.
FirstOrDefault
();
if
(
usemodel
.
CreateBy
==
userInfo
.
EmployeeId
)
{
return
ApiResult
.
Failed
(
"单据操作人不能审核,请转交审核"
);
}
//
if (usemodel.CreateBy == userInfo.EmployeeId)
//
{
//
return ApiResult.Failed("单据操作人不能审核,请转交审核");
//
}
var
RecordList
=
aurList
.
Where
(
x
=>
x
.
AuditId
==
model
.
Id
).
ToList
();
...
...
@@ -3578,10 +3575,10 @@ namespace Property.Module.FixedAssets
}
else
{
if
(
usemodel
.
CreateBy
==
userInfo
.
EmployeeId
)
{
return
ApiResult
.
Failed
(
"单据操作人不能审核,请转交审核"
);
}
//
if (usemodel.CreateBy == userInfo.EmployeeId)
//
{
//
return ApiResult.Failed("单据操作人不能审核,请转交审核");
//
}
SignImage
=
""
;
}
...
...
@@ -3907,10 +3904,10 @@ namespace Property.Module.FixedAssets
}
else
{
if
(
usemodel
.
CreateBy
==
userInfo
.
EmployeeId
)
{
return
ApiResult
.
Failed
(
"单据操作人不能审核,请转交审核"
);
}
//
if (usemodel.CreateBy == userInfo.EmployeeId)
//
{
//
return ApiResult.Failed("单据操作人不能审核,请转交审核");
//
}
SignImage
=
""
;
}
...
...
@@ -4550,10 +4547,10 @@ namespace Property.Module.FixedAssets
}
else
{
if
(
usemodel
.
CreateBy
==
userInfo
.
EmployeeId
)
{
return
ApiResult
.
Failed
(
"单据操作人不能审核,请转交审核"
);
}
//
if (usemodel.CreateBy == userInfo.EmployeeId)
//
{
//
return ApiResult.Failed("单据操作人不能审核,请转交审核");
//
}
SignImage
=
""
;
}
...
...
@@ -4998,10 +4995,10 @@ namespace Property.Module.FixedAssets
}
else
{
if
(
usemodel
.
CreateBy
==
userInfo
.
EmployeeId
)
{
return
ApiResult
.
Failed
(
"单据操作人不能审核,请转交审核"
);
}
//
if (usemodel.CreateBy == userInfo.EmployeeId)
//
{
//
return ApiResult.Failed("单据操作人不能审核,请转交审核");
//
}
SignImage
=
""
;
}
...
...
@@ -5637,10 +5634,10 @@ namespace Property.Module.FixedAssets
}
else
{
if
(
usemodel
.
CreateBy
==
userInfo
.
EmployeeId
)
{
return
ApiResult
.
Failed
(
"单据操作人不能审核,请转交审核"
);
}
//
if (usemodel.CreateBy == userInfo.EmployeeId)
//
{
//
return ApiResult.Failed("单据操作人不能审核,请转交审核");
//
}
SignImage
=
""
;
}
...
...
@@ -6127,10 +6124,10 @@ namespace Property.Module.FixedAssets
}
else
{
if
(
usemodel
.
CreateBy
==
userInfo
.
EmployeeId
)
{
return
ApiResult
.
Failed
(
"单据操作人不能审核,请转交审核"
);
}
//
if (usemodel.CreateBy == userInfo.EmployeeId)
//
{
//
return ApiResult.Failed("单据操作人不能审核,请转交审核");
//
}
SignImage
=
""
;
}
...
...
Property.Repository/Supplies/RB_Supplies_StockInRepository.cs
View file @
46ecb9ca
...
...
@@ -65,7 +65,7 @@ namespace Property.Repository
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_stockindetail ssd on ss.Id=ssd.StockInId
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
x
.
OpenBankName
,
x
.
AccountHolder
,
x
.
AccountAlias
,
x
.
CardNum
x
.
CardNum
,
x
.
ClientID
});
return
ApiResult
.
Success
(
""
,
pagelist
);
}
...
...
@@ -5428,6 +5429,7 @@ namespace Property.WebApi.Controllers.User
x
.
StockInStatus
,
x
.
SchoolId
,
x
.
SchoolName
,
x
.
FinanceMoney
,
DetailList
=
x
.
DetailList
.
Select
(
z
=>
new
{
z
.
Id
,
...
...
@@ -5439,7 +5441,8 @@ namespace Property.WebApi.Controllers.User
z
.
CostMoney
,
z
.
StockInNum
,
z
.
PropertyId
,
z
.
AuditStokcInNum
z
.
AuditStokcInNum
,
z
.
FinanceMoney
})
});
return
ApiResult
.
Success
(
""
,
pagelist
);
...
...
@@ -5508,9 +5511,15 @@ namespace Property.WebApi.Controllers.User
if
(
demodel
.
SchoolId
<
0
)
{
return
ApiResult
.
ParamIsNull
(
"请选择校区id"
);
}
if
(
demodel
.
FinanceMoney
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请输入财务制单金额"
);
}
if
(
demodel
.
DetailList
==
null
||
!
demodel
.
DetailList
.
Any
())
{
return
ApiResult
.
ParamIsNull
(
"请输入资产信息"
);
}
if
(
demodel
.
FinanceMoney
!=
demodel
.
DetailList
.
Sum
(
x
=>
x
.
FinanceMoney
))
{
return
ApiResult
.
ParamIsNull
(
"制单总金额与资产明细制单金额不符"
);
}
foreach
(
var
item
in
demodel
.
DetailList
)
{
if
(
string
.
IsNullOrEmpty
(
item
.
PropertyName
))
{
return
ApiResult
.
ParamIsNull
(
"资产名称不能为空"
);
...
...
@@ -5539,6 +5548,56 @@ namespace Property.WebApi.Controllers.User
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>
...
...
Property.WebApi/Controllers/Property/SuppliesController.cs
View file @
46ecb9ca
...
...
@@ -338,6 +338,7 @@ namespace Property.WebApi.Controllers.User
x
.
Money
,
x
.
SupplierName
,
x
.
FinanceId
,
x
.
FinanceIds
,
x
.
AuditDescription
,
x
.
ProcurementId
,
x
.
AuditRemark
,
...
...
@@ -3228,6 +3229,7 @@ namespace Property.WebApi.Controllers.User
x
.
SchoolName
,
x
.
WareHouseId
,
x
.
WareHouseName
,
x
.
FinanceMoney
,
DetailList
=
x
.
DetailList
.
Select
(
z
=>
new
{
z
.
Id
,
...
...
@@ -3240,7 +3242,8 @@ namespace Property.WebApi.Controllers.User
z
.
StockInNum
,
z
.
AuditStokcInNum
,
z
.
SuppliesNum
,
z
.
Units
z
.
Units
,
z
.
FinanceMoney
})
});
return
ApiResult
.
Success
(
""
,
pagelist
);
...
...
@@ -3322,10 +3325,18 @@ namespace Property.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请选择仓库"
);
}
if
(
demodel
.
FinanceMoney
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请输入财务制单金额"
);
}
if
(
demodel
.
DetailList
==
null
||
!
demodel
.
DetailList
.
Any
())
{
return
ApiResult
.
ParamIsNull
(
"请选择耗材信息"
);
}
if
(
demodel
.
FinanceMoney
!=
demodel
.
DetailList
.
Sum
(
x
=>
x
.
FinanceMoney
))
{
return
ApiResult
.
ParamIsNull
(
"制单总金额与资产明细制单金额不符"
);
}
foreach
(
var
item
in
demodel
.
DetailList
)
{
if
(
item
.
MaterialId
<=
0
)
...
...
@@ -3348,6 +3359,50 @@ namespace Property.WebApi.Controllers.User
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>
...
...
@@ -3520,6 +3575,7 @@ namespace Property.WebApi.Controllers.User
model
.
Money
,
model
.
SupplierName
,
model
.
FinanceId
,
model
.
FinanceIds
,
model
.
AuditDescription
,
model
.
TemplateName
,
model
.
AuditRemark
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment