From 40910c92ad8e124023a397e95c1e21e03a1f003e Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 18 Apr 2025 09:39:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=A4=96=E5=B7=A5=E5=8D=95=E5=BA=94?= =?UTF-8?q?=E6=94=B6=E8=B0=83=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...inUncollectedReceivablesDetailedFeign.java | 4 +++ ...ectedReceivablesDetailedFeignFallback.java | 5 +++ ...nUncollectedReceivablesDetailedMapper.java | 2 ++ ...inUncollectedReceivablesDetailedMapper.xml | 5 +++ ...FinUncollectedReceivablesDetailedRest.java | 5 +++ ...UncollectedReceivablesDetailedService.java | 14 ++++++++ .../java/com/yxt/anrui/as/AsApplication.java | 2 +- .../AsBusrepairInventorybillDetailMapper.xml | 4 +-- .../asbwdiffapply/AsBwdiffapplyService.java | 34 ++++++++++++++++--- .../AsBwdiffapplyDetailMapper.java | 2 ++ .../AsBwdiffapplyDetailMapper.xml | 10 ++++-- .../AsBwdiffapplyDetailService.java | 4 +++ ...inUncollectedReceivablesDetailedFeign.java | 4 +++ ...ectedReceivablesDetailedFeignFallback.java | 7 +++- 14 files changed, 91 insertions(+), 11 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index 4cfa4bcb69..d8e7539729 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -159,4 +159,8 @@ public interface FinUncollectedReceivablesDetailedFeign { @ApiOperation("根据维修工单sid查询应收金额之和") @PostMapping("/selYsByBillSid") ResultBean selYsByBillSid(@RequestParam("billSid") String billSid); + + @ApiOperation("应收调差更新") + @PostMapping("/diffUncollected") + ResultBean diffUncollected(@RequestParam("diffMoney")String diffMoney,@RequestParam("busSid")String busSid,@RequestParam("type")String type); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index c7b0dc0c4e..1988f36cd3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java @@ -184,4 +184,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll return null; } + @Override + public ResultBean diffUncollected(String diffMoney, String busSid, String type) { + return null; + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index c129460c21..2f33a4f3c7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -145,4 +145,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper selexportCustomerBillExcelDetails(@Param("contractNo") String contractNo); List asListAll(@Param(Constants.WRAPPER) QueryWrapper qw); + + FinUncollectedReceivablesDetailed selectByBusSid(@Param("busSid") String busSid,@Param("type") String type); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 97928b7920..f39c24cff4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -1088,4 +1088,9 @@ select * from ${ew.sqlSegment} + + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index 6ef5071b57..6f9ac9e1b0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -224,6 +224,11 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece return finUncollectedReceivablesDetailedService.selYsByBillSid(billSid); } + @Override + public ResultBean diffUncollected(String diffMoney, String busSid, String type) { + return finUncollectedReceivablesDetailedService.diffUncollected(diffMoney,busSid,type); + } + @Override public ResultBean> selectByContractNo(String contractNo) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index d72bfef44e..6f71a79e1d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -1432,4 +1432,18 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } + public ResultBean diffUncollected(String diffMoney, String busSid, String type) { + ResultBean rb = ResultBean.fireFail(); + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = baseMapper.selectByBusSid(busSid,type); + if(finUncollectedReceivablesDetailed != null){ + BigDecimal curr = finUncollectedReceivablesDetailed.getCurrentReceivableMoney(); + String receableMoney = finUncollectedReceivablesDetailed.getReveivableMoney(); + curr = curr.add(new BigDecimal(diffMoney)); + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(curr); + receableMoney = new BigDecimal(receableMoney).add(new BigDecimal(diffMoney)).toString(); + finUncollectedReceivablesDetailed.setReveivableMoney(receableMoney); + baseMapper.updateById(finUncollectedReceivablesDetailed); + } + return rb.success(); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java b/yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java index 2a8ac6a6cc..3cbe689c90 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java @@ -13,7 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.common.base.config", "com.yxt.anrui.as" }) -@EnableFeignClients(basePackages = {"com.yxt.*.*"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.as.feign"}) public class AsApplication { public static void main(String[] args) { SpringApplication.run(AsApplication.class, args); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml index 4bedccabe4..15e439ac0f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml @@ -78,12 +78,12 @@ d.manufacturerName, d.goodsSkuOwnSpec, d.unit, - d.warehouseSid, + d.count FROM as_busrepair_inventorybill_detail AS d diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java index bc61584757..f66cf1bbf8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java @@ -37,6 +37,7 @@ import com.yxt.anrui.as.api.asbusclaimcheckapply.AsBusclaimCheckApply; import com.yxt.anrui.as.api.asbusclaimcheckapply.flowable.*; import com.yxt.anrui.as.api.asbwdiffapply.*; import com.yxt.anrui.as.api.asbwdiffapply.flowable.*; +import com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetail; import com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetailDetailsVo; import com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetailDto; import com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetailFile; @@ -44,6 +45,7 @@ import com.yxt.anrui.as.biz.asappendix.AsAppendixService; import com.yxt.anrui.as.biz.asbwdiffapplydetail.AsBwdiffapplyDetailService; import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.file.AsFileEnum; +import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables; import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign; import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum; @@ -116,6 +118,8 @@ public class AsBwdiffapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { AsBwdiffapplyQuery query = pq.getParams(); @@ -186,7 +190,7 @@ public class AsBwdiffapplyService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - + public String saveOrUpdateDto(AsBwdiffapplyDto dto){ String dtoSid = dto.getSid(); List fileList = dto.getFileList(); @@ -259,7 +263,7 @@ public class AsBwdiffapplyService extends MybatisBaseService bwdiffapplyDetailsList = asBwdiffapplyDetailService.selectByMainSid(businessSid); + bwdiffapplyDetailsList.removeAll(Collections.singleton(null)); + if(!bwdiffapplyDetailsList.isEmpty()){ + for (int i = 0; i < bwdiffapplyDetailsList.size(); i++) { + AsBwdiffapplyDetail asBwdiffapplyDetail = bwdiffapplyDetailsList.get(i); + String sourceBillSid = asBwdiffapplyDetail.getSourceBillSid(); + if(asBwdiffapplyDetail.getDiffHourAmount() != null){ + ResultBean resultBean1 =finUncollectedReceivablesDetailedFeign.diffUncollected(asBwdiffapplyDetail.getDiffHourAmount().toString(),sourceBillSid,"工时费"); + } + if(asBwdiffapplyDetail.getDiffGoodsAmount() != null){ + ResultBean resultBean1 =finUncollectedReceivablesDetailedFeign.diffUncollected(asBwdiffapplyDetail.getDiffGoodsAmount().toString(),sourceBillSid,"材料费"); + } + if(asBwdiffapplyDetail.getDiffOtherAmount() != null){ + ResultBean resultBean1 =finUncollectedReceivablesDetailedFeign.diffUncollected(asBwdiffapplyDetail.getDiffOtherAmount().toString(),sourceBillSid,"其他费用"); + } + + } + } + + } else { //极光推送 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.java index 838a1d37b9..d91484d33e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.java @@ -59,4 +59,6 @@ public interface AsBwdiffapplyDetailMapper extends BaseMapper fetchByMainSid(String mainSid); + + List selectByMainSid(@Param("mainSid") String businessSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.xml index ce6e9e5c65..1bd2cb221b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.xml @@ -1,6 +1,12 @@ - - + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailService.java index 594c90601f..8cbafa0f42 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailService.java @@ -97,4 +97,8 @@ public class AsBwdiffapplyDetailService extends MybatisBaseService fetchByMainSid(String mainSid) { return baseMapper.fetchByMainSid(mainSid); } + + public List selectByMainSid(String businessSid) { + return baseMapper.selectByMainSid(businessSid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index 71225e6e16..7659d61fb0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -65,4 +65,8 @@ public interface FinUncollectedReceivablesDetailedFeign { @ApiOperation("根据维修工单sid查询应收金额之和") @PostMapping("/selYsByBillSid") ResultBean selYsByBillSid(@RequestParam("billSid") String billSid); + + @ApiOperation("应收调差更新") + @PostMapping("/diffUncollected") + ResultBean diffUncollected(@RequestParam("diffMoney")String diffMoney,@RequestParam("busSid")String busSid,@RequestParam("type")String type); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index 60f9681db3..2cdf97fdb0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java @@ -29,6 +29,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; @@ -46,7 +47,6 @@ import java.util.List; * @version 1.0 * @since 1.0 */ -@Component public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncollectedReceivablesDetailedFeign { @@ -60,4 +60,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll public ResultBean selYsByBillSid(String billSid) { return null; } + + @Override + public ResultBean diffUncollected(String diffMoney, String busSid, String type) { + return null; + } }