|
@@ -1520,6 +1520,16 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
|
|
public String payMoney(WarehousingOrder warehousingOrder) {
|
|
public String payMoney(WarehousingOrder warehousingOrder) {
|
|
List<WarehousingOrder> warehousingOrderList = warehousingOrder.getWarehousingOrderList();
|
|
List<WarehousingOrder> warehousingOrderList = warehousingOrder.getWarehousingOrderList();
|
|
if (!CollectionUtils.isEmpty(warehousingOrderList)) {
|
|
if (!CollectionUtils.isEmpty(warehousingOrderList)) {
|
|
|
|
+ String createUserId="";
|
|
|
|
+ CommonStaff commonStaff = staffService.selectOne(new EntityWrapper<CommonStaff>()
|
|
|
|
+ .eq("staff_name", warehousingOrderList.get(0).getRequestPerson())
|
|
|
|
+ .eq("comp_id", warehousingOrderList.get(0).getCompId()));
|
|
|
|
+ if (commonStaff!=null){
|
|
|
|
+ createUserId=commonStaff.getStaffId();
|
|
|
|
+ }
|
|
|
|
+ else{
|
|
|
|
+ createUserId=AuthSecurityUtils.getCurrentUserId();
|
|
|
|
+ }
|
|
//付款多条
|
|
//付款多条
|
|
if ("0".equals(warehousingOrder.getFlag())) {
|
|
if ("0".equals(warehousingOrder.getFlag())) {
|
|
for (WarehousingOrder warehousingOrder1 : warehousingOrderList) {
|
|
for (WarehousingOrder warehousingOrder1 : warehousingOrderList) {
|
|
@@ -1559,6 +1569,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
|
|
expenseInfo.setExpensesPurpose("1");
|
|
expenseInfo.setExpensesPurpose("1");
|
|
expenseInfo.setContractNo(warehousingOrder2.getContractNo());
|
|
expenseInfo.setContractNo(warehousingOrder2.getContractNo());
|
|
expenseInfo.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
|
|
expenseInfo.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
|
|
|
|
+ expenseInfo.setCreateUserId(createUserId);
|
|
|
|
+ expenseInfo.setAddressUrl(warehousingOrder1.getAddressUrl());
|
|
expenseInfoService.insert(expenseInfo);
|
|
expenseInfoService.insert(expenseInfo);
|
|
//全部付款
|
|
//全部付款
|
|
warehousingOrder1.setAmountNotPayable(warehousingOrder1.getAmountNotPayable() - warehousingOrder1.getRequestFunds());
|
|
warehousingOrder1.setAmountNotPayable(warehousingOrder1.getAmountNotPayable() - warehousingOrder1.getRequestFunds());
|
|
@@ -1668,6 +1680,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
|
|
expenseInfo.setContractNo(warehousingOrder1.getContractNo());
|
|
expenseInfo.setContractNo(warehousingOrder1.getContractNo());
|
|
expenseInfo.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
|
|
expenseInfo.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
|
|
expenseInfo.setUnallocatedAmount(0d);
|
|
expenseInfo.setUnallocatedAmount(0d);
|
|
|
|
+ expenseInfo.setCreateUserId(createUserId);
|
|
expenseInfoService.insert(expenseInfo);
|
|
expenseInfoService.insert(expenseInfo);
|
|
// 先删除任务
|
|
// 先删除任务
|
|
noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "WAREHOUSING-ORDER-APPROVE",
|
|
noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "WAREHOUSING-ORDER-APPROVE",
|