yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 5 months ago
parent
5d64e1925d b28c1b5df8
commit
beb6b3fcb7
14 changed files with 271 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  2. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
  3. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java
  4. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java
  5. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  6. 28
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  7. 30
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  8. 36
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  9. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
  10. 15
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java
  11. 14
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplydetail/AsBillSettelApplyDetail.java
  12. 18
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplysitem/AsBillSettelApplySitem.java
  13. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyMapper.xml
  14. 137
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java

8
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
View File

@ -71,6 +71,14 @@ public interface FinKingDeeFeign {
@ResponseBody
ResultBean<String> draftOtherReceivableBill(@RequestBody @Valid OtherReceivable otherReceivable);
//---------------------- 返利凭证 ---------------------------------
@ApiOperation("保存单车返利预提凭证")
@PostMapping("/saveRebatePrepareVoucher")
@ResponseBody
ResultBean<String> saveRebatePrepareVoucher(@RequestBody @Valid GeneralVoucher voucher);
//---------------------- 返利凭证 ---------------------------------
@ApiOperation("保存凭证的接口")
@PostMapping("/saveVoucher")
@ResponseBody

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
View File

@ -28,6 +28,7 @@ import com.yxt.anrui.fin.api.kingdee.voucher.PaymentVoucher;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.common.core.result.ResultBean;
import javax.validation.Valid;
import java.util.List;
public class FinKingDeeFeignFallBack
@ -47,6 +48,11 @@ implements FinKingDeeFeign{
return null;
}
@Override
public ResultBean<String> saveRebatePrepareVoucher(@Valid GeneralVoucher voucher) {
return null;
}
@Override
public ResultBean<String> saveVoucher(Voucher voucher) {
return null;

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java
View File

@ -47,6 +47,10 @@ public class GeneralVoucher {
@ApiModelProperty("金额")
@NotBlank(message = "金额不能为空")
public BigDecimal amount;
@ApiModelProperty("核算维度厂商（供应商）")
public String manufacturer;
@ApiModelProperty("核算维度物料")
public String material;
@ApiModelProperty("备注")
public String remarks;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java
View File

@ -39,6 +39,10 @@ public class Voucher {
public String dimensionCustom;
@ApiModelProperty("核算维度银行账号")
public String bankAccount;
@ApiModelProperty("核算维度厂商（供应商）")
public String manufacturer;
@ApiModelProperty("核算维度物料")
public String material;
@ApiModelProperty("核算维度银行")
public String bank;
@ApiModelProperty("借方金额")

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
View File

@ -194,4 +194,8 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
List<String> selectSids(String busVehSid);
IPage<AsFinCollectionConfirmationVo> asListPagess(IPage<FinCollectionConfirmation> page, @Param(Constants.WRAPPER) QueryWrapper<FinCollectionConfirmation> qw);
String selCurrentReceivableMoneyForWXD(@Param("wxdSid") String wxdSid);
void update4asWxdState(@Param("wxdSid") String wxdSid);
}

28
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
View File

@ -183,6 +183,11 @@
where contractNo = #{contractNo}
and VIN = #{temporaryNo}
</update>
<update id="update4asWxdState">
update yxt_4sas.as_busrepair_bill
set settleState = 1,isOutFactory = 1
where sid = #{wxdSid}
</update>
<select id="selectCollectionMoney" resultType="java.lang.String">
select sum(subscriptionMoney)
@ -503,4 +508,27 @@
</where>
order by id desc
</select>
<select id="selCurrentReceivableMoneyForWXD" resultType="java.lang.String">
select IFNULL(SUM(currentReceivableMoney),0) as currentReceivableMoneySum from
(SELECT
d.reveivableMoney - IFNULL(((
SELECT
SUM( IFNULL( se.subscriptionMoney, 0 ) )
FROM
fin_selected_receivables_detailed AS se
WHERE
se.receivablesSid = d.sid
AND se.auditState != '2' and se.auditState != '4'
)),
0
) AS currentReceivableMoney,
d.reveivableMoney,
d.sid,
d.contractSid
FROM
fin_uncollected_receivables_detailed AS d
) furd
WHERE furd.contractSid = #{wxdSid}
</select>
</mapper>

30
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -227,6 +227,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private LoanSettleApplyFeign loanSettleApplyFeign;
@Autowired
private AsBusrepairBillFeign asBusrepairBillFeign;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -1972,6 +1973,28 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
confirmation.setConfirmDate(DateUtil.today());
confirmation.setConfirmNameSid(userSid);
baseMapper.updateById(confirmation);
//----认款完毕后设置维修单状态 是否可出厂，是否结清款
List<FinSelectedReceivablesDetailedVo> receivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 3);
if (receivablesDetailedVos.size() > 0) {
receivablesDetailedVos.stream().forEach(v -> {
//已选款项明细sid
String selectSid = v.getSid();
//应收未收款项明细sid
String receivablesSid = v.getReceivablesSid();
FinUncollectedReceivablesDetailed u = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid);
if (null != u) {
String wxdSid = u.getContractSid(); //维修单sid
String yingshou = baseMapper.selCurrentReceivableMoneyForWXD(wxdSid); //查询该应收单是否有应收未收;
if (StringUtils.isNotBlank(yingshou)) {
BigDecimal ys = new BigDecimal(yingshou);
if (ys.compareTo(BigDecimal.ZERO) == 0) {
//没有应收款，修改维修单状态
baseMapper.update4asWxdState(wxdSid);
}
}
}
});
}
return rb.success().setMsg("款项确认成功");
}
@ -3398,7 +3421,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String vinNo = "";
if (StringUtils.isNotBlank(finSelectedReceivablesDetailedVo.getVIN())) {
if (finSelectedReceivablesDetailedVo.getVIN().length() > 7) {
vinNo = finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8);
vinNo = finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8);
} else {
vinNo = finSelectedReceivablesDetailedVo.getVIN();
}
@ -3416,7 +3439,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String vinAndVehMark = "";
if (StringUtils.isNotBlank(vinNo)) {
if (StringUtils.isNotBlank(vehMark)) {
vinAndVehMark = vinNo +"/" +vehMark;
vinAndVehMark = vinNo + "/" + vehMark;
} else {
vinAndVehMark = vinNo;
}
@ -5996,7 +6019,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isNotBlank(query.getCollectionMoney())) {
qw.eq("collectionMoney", query.getCollectionMoney());
}
qw.eq("source","03");
qw.eq("source", "03");
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
IPage<AsFinCollectionConfirmationVo> pagging = baseMapper.asListPagess(page, qw);
PagerVo<AsFinCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null);
@ -6004,5 +6027,4 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}

36
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
View File

@ -230,6 +230,42 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
return otherReceivableBillService.otherReceivableBillService(otherReceivable);
}
@Override
public ResultBean<String> saveRebatePrepareVoucher(@Valid GeneralVoucher voucher) {
ResultBean rb = ResultBean.fireFail();
Voucher newVoucher = new Voucher();
List<Voucher.VoucherResultDetailDto> resultDetails = new ArrayList<>();
if (StringUtils.isNotBlank(voucher.getUseOrgCode())) {
newVoucher.setAccountBook(voucher.getUseOrgCode());
newVoucher.setVoucherNo(voucher.getUseOrgCode());
}
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
if (!voucherDetails.isEmpty()) {
for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
dto1.setSummary(voucherDetail.getTimeFlag() + "月单车返利预提预留费用");
dto2.setSummary(voucherDetail.getTimeFlag() + "月单车返利预提预留费用");
if (voucherDetail.getSceneCode().equals("上年")) {
dto1.setSubjectNo("1161.02.15");
} else if (voucherDetail.getSceneCode().equals("本年")) {
dto1.setSubjectNo("1161.01.15");
}
dto2.setSubjectNo("2181.07.00");
dto1.setDimensionDept(voucherDetail.getDeptCode());
dto1.setManufacturer(voucherDetail.getManufacturer());
dto2.setDimensionCustom(voucherDetail.getCustomerCode());
dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
resultDetails.add(dto1);
resultDetails.add(dto2);
}
newVoucher.setResultDetails(resultDetails);
}
log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
return voucherService.saveVoucher(newVoucher);
}
@Override
public ResultBean<String> saveVoucher(Voucher voucher) {
log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(voucher));

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
View File

@ -96,11 +96,21 @@ public class VoucherService extends FinKingDeeService {
} else {
m.put("FF100003", "");
}
if (StringUtils.isNotBlank(c.getManufacturer())) {
m.put("FFLEX4", c.getManufacturer());
} else {
m.put("FFLEX4", "");
}
if (StringUtils.isNotBlank(c.getDimensionCustom())) {
m.put("FFLEX6", c.getDimensionCustom());
} else {
m.put("FFLEX6", "");
}
if (StringUtils.isNotBlank(c.getMaterial())) {
m.put("FFLEX8", c.getMaterial());
} else {
m.put("FFLEX8", "");
}
if (StringUtils.isNotBlank(c.getBankAccount())) {
m.put("FF100002", c.getBankAccount());
} else {

15
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java
View File

@ -26,10 +26,7 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -114,4 +111,14 @@ public class ScmCollectionRebateWithApplyFeignFallback implements ScmCollectionR
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null;
}
@Override
public ResultBean delegate(ScmCollectionRebateWithApplyDelegateQuery delegateQuery) {
return null;
}
@Override
public ResultBean assignTask(ScmCollectionRebateWithApplyDelegateQuery delegateQuery) {
return null;
}
}

14
yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplydetail/AsBillSettelApplyDetail.java
View File

@ -23,29 +23,29 @@ public class AsBillSettelApplyDetail extends BaseEntity {
@ApiModelProperty("出/退库数量")
private String count;
@ApiModelProperty("销售价（元）")
private String price;
private BigDecimal price;
//折扣（0-10，0免费，10不打折）
private String discount;
private Integer discount;
/**
* 优惠金额
*/
private String discountAmount;
private BigDecimal discountAmount;
/**
* 成本
*/
private String goodsCost;
private BigDecimal goodsCost;
/**
* 利润额，结算金额 - 成本
*/
private String goodsPrint;
private BigDecimal goodsPrint;
/**
* 应收金额，销售价 * 数量
*/
private String goodsReceivableAmount;
private BigDecimal goodsReceivableAmount;
/**
* 结算金额，应收金额 - 优惠金额
*/
private String goodsSettleAmount;
private BigDecimal goodsSettleAmount;
/**
* 图号
*/

18
yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplysitem/AsBillSettelApplySitem.java
View File

@ -24,15 +24,15 @@ public class AsBillSettelApplySitem extends BaseEntity {
/**
* 优惠金额
*/
private String discountAmount;
private BigDecimal discountAmount;
/**
* 工时单价
*/
private String hourPrice;
private BigDecimal hourPrice;
/**
* 工时数
*/
private String hours;
private BigDecimal hours;
/**
* 备注
*/
@ -49,22 +49,22 @@ public class AsBillSettelApplySitem extends BaseEntity {
/**
* 成本
*/
private String sitemCost;
private BigDecimal sitemCost;
/**
* 利润额，结算金额 - 成本
*/
private String sitemPrint;
private BigDecimal sitemPrint;
/**
* 应收合计，销售价
*/
private String sitemReceivableAmount;
private BigDecimal sitemReceivableAmount;
/**
* 结算金额，应收金额 - 优惠金额
*/
private String sitemSettleAmount;
private String price;
private BigDecimal sitemSettleAmount;
private BigDecimal price;
@ApiModelProperty("折扣（0-10，0免费，10不打折）")
private String discount;
private Integer discount;
private String repairerName;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyMapper.xml
View File

@ -57,7 +57,7 @@
count(*)
FROM
as_bill_settel_apply AS a
WHERE a.sourceSid = #{sourceSid} and a.nodeState != '终止' and a.nodeState != '发起申请' AND
WHERE a.sourceSid = #{sourceSid} and a.nodeState != '待提交' and a.nodeState != '终止' and a.nodeState != '发起申请' AND
(SELECT IFNULL(count(*),0) FROM as_busrepair_bill_reverse_settle as r WHERE r.sourceSid = #{sourceSid} AND r.nodeState = '已办结') = 0
</select>
<select id="selSalesCount" resultType="java.lang.Integer">

137
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java
View File

@ -818,14 +818,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -833,6 +836,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -873,14 +877,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -888,6 +895,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -1103,8 +1111,27 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
billNode.setNodeCode("6");
asBusrepairBillNodeService.insert(billNode);
}
if (null != settelApply.getHourAmount()) {
if (settelApply.getHourAmount().compareTo(BigDecimal.ZERO) > 0) {
BigDecimal settleHourAmount = BigDecimal.ZERO;
BigDecimal settleGoodsAmount = BigDecimal.ZERO;
List<AsBillSettelApplySitem> sitemList = asBillSettelApplySitemService.fetchByBillSid(sid);
if (!sitemList.isEmpty()) {
for (AsBillSettelApplySitem sitem : sitemList) {
if (null != sitem.getSitemSettleAmount()) {
settleHourAmount = sitem.getSitemSettleAmount().add(settleHourAmount);
}
}
}
List<AsBillSettelApplyDetail> goodsList = asBillSettelApplyDetailService.fetchByBillSid(sid);
if (!goodsList.isEmpty()) {
for (AsBillSettelApplyDetail g : goodsList) {
if (null != g.getGoodsSettleAmount()) {
settleGoodsAmount = g.getGoodsSettleAmount().add(settleGoodsAmount);
}
}
}
if (settleHourAmount.compareTo(BigDecimal.ZERO) > 0) {
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName());
finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid());
@ -1125,15 +1152,15 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath());
finUncollectedReceivablesDetailedDto.setReceivablesName("工时费");
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((settelApply.getHourAmount()).toString());
finUncollectedReceivablesDetailedDto.setReveivableMoney((settelApply.getHourAmount()).toString());
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(settleHourAmount.toString());
finUncollectedReceivablesDetailedDto.setReveivableMoney(settleHourAmount.toString());
finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName());
finUncollectedReceivablesDetailedDto.setKxState("01");
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
}
}
if (null != settelApply.getGoodsAmount()) {
if (settelApply.getGoodsAmount().compareTo(BigDecimal.ZERO) > 0) {
if (settleGoodsAmount.compareTo(BigDecimal.ZERO) > 0) {
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName());
finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid());
@ -1154,13 +1181,13 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath());
finUncollectedReceivablesDetailedDto.setReceivablesName("材料费");
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((settelApply.getGoodsAmount()).toString());
finUncollectedReceivablesDetailedDto.setReveivableMoney((settelApply.getGoodsAmount()).toString());
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(settleGoodsAmount.toString());
finUncollectedReceivablesDetailedDto.setReveivableMoney(settleGoodsAmount.toString());
finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName());
finUncollectedReceivablesDetailedDto.setKxState("01");
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
}
}
if (settelApply.getAddAmount().compareTo(BigDecimal.ZERO) > 0) {
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName());
@ -1234,14 +1261,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -1249,6 +1279,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -1289,14 +1320,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -1304,6 +1338,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -1467,8 +1502,26 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
billNode.setNodeCode("6");
asBusrepairBillNodeService.insert(billNode);
}
if (null != settelApply.getHourAmount()) {
if (settelApply.getHourAmount().compareTo(BigDecimal.ZERO) > 0) {
BigDecimal settleHourAmount = BigDecimal.ZERO;
BigDecimal settleGoodsAmount = BigDecimal.ZERO;
List<AsBillSettelApplySitem> sitemList = asBillSettelApplySitemService.fetchByBillSid(businessSid);
if (!sitemList.isEmpty()) {
for (AsBillSettelApplySitem sitem : sitemList) {
if (null != sitem.getSitemSettleAmount()) {
settleHourAmount = sitem.getSitemSettleAmount().add(settleHourAmount);
}
}
}
List<AsBillSettelApplyDetail> goodsList = asBillSettelApplyDetailService.fetchByBillSid(businessSid);
if (!goodsList.isEmpty()) {
for (AsBillSettelApplyDetail g : goodsList) {
if (null != g.getGoodsSettleAmount()) {
settleGoodsAmount = g.getGoodsSettleAmount().add(settleGoodsAmount);
}
}
}
if (settleHourAmount.compareTo(BigDecimal.ZERO) > 0) {
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName());
finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid());
@ -1489,15 +1542,15 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath());
finUncollectedReceivablesDetailedDto.setReceivablesName("工时费");
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((settelApply.getHourAmount()).toString());
finUncollectedReceivablesDetailedDto.setReveivableMoney((settelApply.getHourAmount()).toString());
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(settleHourAmount.toString());
finUncollectedReceivablesDetailedDto.setReveivableMoney(settleHourAmount.toString());
finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName());
finUncollectedReceivablesDetailedDto.setKxState("01");
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
}
}
if (null != settelApply.getGoodsAmount()) {
if (settelApply.getGoodsAmount().compareTo(BigDecimal.ZERO) > 0) {
if (settleGoodsAmount.compareTo(BigDecimal.ZERO) > 0) {
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName());
finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid());
@ -1518,13 +1571,13 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid());
finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath());
finUncollectedReceivablesDetailedDto.setReceivablesName("材料费");
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((settelApply.getGoodsAmount()).toString());
finUncollectedReceivablesDetailedDto.setReveivableMoney((settelApply.getGoodsAmount()).toString());
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(settleGoodsAmount.toString());
finUncollectedReceivablesDetailedDto.setReveivableMoney(settleGoodsAmount.toString());
finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName());
finUncollectedReceivablesDetailedDto.setKxState("01");
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
}
}
if (settelApply.getAddAmount().compareTo(BigDecimal.ZERO) > 0) {
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName());
@ -1617,14 +1670,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -1632,6 +1688,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -1672,14 +1729,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -1687,6 +1747,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -1789,14 +1850,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -1804,6 +1868,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -1844,14 +1909,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -1859,6 +1927,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -1977,14 +2046,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -1992,6 +2064,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -2032,14 +2105,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("前台主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -2047,6 +2123,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -2912,14 +2989,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("配件主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -2927,6 +3007,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -3064,14 +3145,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("配件主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -3079,6 +3163,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -3215,14 +3300,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("配件主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -3230,6 +3318,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -3332,14 +3421,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("配件主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -3347,6 +3439,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
@ -3465,14 +3558,17 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f1 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("配件主管审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
boolean f2 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);
boolean f3 = sysFlowPowerFeign.flowPermissions(flowNodeQuery);
flowNodeQuery.setType(1);
flowNodeQuery.setNodeNames("自有二级站长审批");
flowNodeQuery.setParameter("优惠金额");
flowNodeQuery.setValue(discountAmountC);
@ -3480,6 +3576,7 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
if (f1 || f2 || f3 || f4) {
discount = true;
}
flowNodeQuery.setType(0);
flowNodeQuery.setNodeNames("站长审批");
flowNodeQuery.setParameter("销售价折扣");
flowNodeQuery.setValue(discountC);

Write Preview
Loading…
Cancel
Save