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 1 week ago
parent
d03656a539 8dddcf07c2
commit
e090860046
33 changed files with 714 additions and 697 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-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java
  2. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml
  3. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  4. 658
      anrui-base/anrui-base-biz/src/main/resources/ftl/tctz.ftl
  5. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java
  6. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
  7. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java
  8. 118
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
  9. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml
  10. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
  11. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java
  12. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
  13. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  14. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java
  15. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  16. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml
  17. 0
      anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl
  18. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnPdfVo.java
  19. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml
  20. 11
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
  21. 466
      anrui-scm/anrui-scm-biz/src/main/resources/ftl/cgtk.ftl
  22. 2
      yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java
  23. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml
  24. 24
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java
  25. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.java
  26. 10
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.xml
  27. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailService.java
  28. 4
      yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
  29. 7
      yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java
  30. 27
      工作内容需要的文档/单据模板/放款差额模板/放款差额.docx
  31. 47
      工作内容需要的文档/单据模板/调车调账模板/分公司调车调账.docx
  32. 43
      工作内容需要的文档/单据模板/采购退库模板/采购退库.docx

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java
View File

@ -33,16 +33,14 @@ import lombok.Data;
public class BaseAccadjPdfVo implements Vo {
private Integer id;
@ApiModelProperty("车型")
@ApiModelProperty("车型/常用配置")
private String model;
@ApiModelProperty("常用配置")
private String config;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("库存地点")
private String address;
private String dd;
@ApiModelProperty("内销价格")
private String price;
private String jg;
@ApiModelProperty("运费")
private String yf;
@ApiModelProperty("运费承担方")

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml
View File

@ -42,6 +42,9 @@
UPDATE base_accadj_apply
SET nodeState=#{nodeState}
, nodeSid=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -1217,11 +1217,10 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
BaseAccadjPdfVo baseAccadjPdfVo = new BaseAccadjPdfVo();
baseAccadjPdfVo.setId(i);
i = i + 1;
baseAccadjPdfVo.setModel(baseInternalPurchaseVehicle.getVehicleAlias());
baseAccadjPdfVo.setConfig(baseInternalPurchaseVehicle.getConfigName());
baseAccadjPdfVo.setVinNo(baseInternalPurchaseVehicle.getVinNo());
baseAccadjPdfVo.setAddress(baseInternalPurchaseVehicle.getInventoryLocationName());
baseAccadjPdfVo.setPrice(baseInternalPurchaseVehicle.getWitPinMoney());
baseAccadjPdfVo.setModel(baseInternalPurchaseVehicle.getVehicleAlias() + "/" + baseInternalPurchaseVehicle.getConfigName());
baseAccadjPdfVo.setVinNo(baseInternalPurchaseVehicle.getVinNo().substring(baseInternalPurchaseVehicle.getVinNo().length() - 8));
baseAccadjPdfVo.setDd(baseInternalPurchaseVehicle.getInventoryLocationName());
baseAccadjPdfVo.setJg(baseInternalPurchaseVehicle.getWitPinMoney());
baseAccadjPdfVo.setYf(baseInternalPurchaseVehicle.getFreight());
baseAccadjPdfVo.setCdf(baseInternalPurchaseVehicle.getFreightUndertakerName());
baseAccadjPdfVo.setRemarks(baseInternalPurchaseVehicle.getRemarks());

658
anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/tctz.ftl → anrui-base/anrui-base-biz/src/main/resources/ftl/tctz.ftl
View File

File diff suppressed because it is too large

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java
View File

@ -92,4 +92,6 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper<BusSalesOr
ReturnPushVo selectByVinSid(String vehSid);
List<ReturnPushVo> selectByBillNo(String billNo);
List<ReturnPushVo> selectGcSzByBillNo(@Param("billNo") String billNo,@Param("vinSid") String vinSid);
}

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml
View File

@ -35,6 +35,9 @@
UPDATE bus_sales_order_return_veh_apply
SET nodeState=#{nodeState}
, nodeSid=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
@ -91,4 +94,11 @@
left join anrui_base.base_vehicle_out_apply ba on ba.sid = bo.mainSid
where bo.materialTypeKey = '001' and ba.billNo = #{billNo} order by bo.id asc
</select>
<select id="selectGcSzByBillNo" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.ReturnPushVo">
SELECT ba.billNo,bo.materialCode,bo.typeKey
FROM anrui_base.base_vehicle_out bo
left join anrui_base.base_vehicle_out_apply ba on ba.sid = bo.mainSid
where bo.materialTypeKey != '001' and ba.billNo = #{billNo} and bo.vinSid = #{vinSid} order by bo.id asc
</select>
</mapper>

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java
View File

@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.*;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.*;
import com.yxt.anrui.fin.api.kingdee.push.SalOutStockPushSalReturnStock;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.core.query.PagerQuery;
@ -143,5 +144,11 @@ public class BusSalesOrderReturnVehApplyRest implements BusSalesOrderReturnVehAp
return busSalesOrderReturnVehApplyService.listPageByOrderSid(orderSid);
}
@GetMapping("/getPush")
@ResponseBody
public SalOutStockPushSalReturnStock getPush(){
return busSalesOrderReturnVehApplyService.getPush();
}
}

118
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
View File

@ -711,22 +711,58 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
if (returnPushVo != null) {
salesReturnDetailDto.setFMaterialId(returnPushVo.getMaterialCode());
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo());
if("002".equals(returnPushVo.getTypeKey())){//贷款车
if ("002".equals(returnPushVo.getTypeKey())) {//贷款车
int j = 1;
List<ReturnPushVo> returnPushVoList = baseMapper.selectByBillNo(returnPushVo.getBillNo());
returnPushVoList.removeAll(Collections.singleton(null));
if(!returnPushVoList.isEmpty()){
if (!returnPushVoList.isEmpty()) {
for (int k = 0; k < returnPushVoList.size(); k++) {
ReturnPushVo l = returnPushVoList.get(k);
if(l.getMaterialCode().equals(returnPushVo.getMaterialCode())){
if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) {
String temporaryNumZc = String.format("%02d", j);
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo()+ "-"+temporaryNumZc);
j++;
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
j++;
}
ReturnPushVo returnPushVo1 = returnPushVos.get(m);
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode());
String temporaryNumGcOrSz = String.format("%02d", j);
salesReturnDetailDto1.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz);
salesReturnDetailDtoList.add(salesReturnDetailDto1);
}
break;
} else {
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
j++;
}
}
}
j++;
}
}
}else{
int x = 1;
String temporaryNumGcOrSz = String.format("%02d", x);
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
ReturnPushVo returnPushVo1 = returnPushVos.get(m);
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode());
salesReturnDetailDto1.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz);
salesReturnDetailDtoList.add(salesReturnDetailDto1);
}
}
salesReturnDetailDtoList.add(salesReturnDetailDto);
}
@ -778,8 +814,6 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
scmVehRebateFeign.delByVehSid2(vehSid, busSalesOrderReturnVehApply.getUseOrgSid(), "029");
}
//------------------------修改车辆持久状态--------------------------
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderReturnVehDetailsVo.getBusVinSid());
@ -1469,4 +1503,74 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
return "/template/" + dateStr + "/" + pdfName;
}
public SalOutStockPushSalReturnStock getPush() {
String vehSid = "408ce772-472c-47da-87f4-6701975b2260";
SalOutStockPushSalReturnStock salOutStockPushSalReturnStock = new SalOutStockPushSalReturnStock();
List<SalOutStockPushSalReturnStock.SalesReturnDetailDto> salesReturnDetailDtoList = new ArrayList<>();
//对已经出库的车推送销售退货单----------2025-04-03
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
ReturnPushVo returnPushVo = baseMapper.selectByVinSid(vehSid);
if (returnPushVo != null) {
salesReturnDetailDto.setFMaterialId(returnPushVo.getMaterialCode());
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo());
if ("002".equals(returnPushVo.getTypeKey())) {//贷款车
int j = 1;
List<ReturnPushVo> returnPushVoList = baseMapper.selectByBillNo(returnPushVo.getBillNo());
returnPushVoList.removeAll(Collections.singleton(null));
if (!returnPushVoList.isEmpty()) {
for (int k = 0; k < returnPushVoList.size(); k++) {
ReturnPushVo l = returnPushVoList.get(k);
if (l.getMaterialCode().equals(returnPushVo.getMaterialCode())) {
String temporaryNumZc = String.format("%02d", j);
salesReturnDetailDto.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumZc);
List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
j++;
}
ReturnPushVo returnPushVo1 = returnPushVos.get(m);
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode());
String temporaryNumGcOrSz = String.format("%02d", j);
salesReturnDetailDto1.setBillNo(returnPushVo.getBillNo() + "-" + temporaryNumGcOrSz);
salesReturnDetailDtoList.add(salesReturnDetailDto1);
}
break;
} else {
List<ReturnPushVo> returnPushVos = baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
if (m == 0) {
j++;
}
}
}
j++;
}
}
}else{
int x = 1;
String temporaryNumGcOrSz = String.format("%02d", x);
List<ReturnPushVo> returnPushVos =baseMapper.selectGcSzByBillNo(returnPushVo.getBillNo(),vehSid);
returnPushVos.removeAll(Collections.singleton(null));
for (int m = 0; m < returnPushVos.size(); m++) {
ReturnPushVo returnPushVo1 = returnPushVos.get(m);
SalOutStockPushSalReturnStock.SalesReturnDetailDto salesReturnDetailDto1 = new SalOutStockPushSalReturnStock.SalesReturnDetailDto();
salesReturnDetailDto1.setFMaterialId(returnPushVo1.getMaterialCode());
salesReturnDetailDto1.setBillNo(returnPushVo1.getBillNo() + "-" + temporaryNumGcOrSz);
salesReturnDetailDtoList.add(salesReturnDetailDto1);
}
}
salesReturnDetailDtoList.add(salesReturnDetailDto);
}
salOutStockPushSalReturnStock.setStockDtoList(salesReturnDetailDtoList);
return salOutStockPushSalReturnStock;
}
}

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml
View File

@ -40,6 +40,9 @@
<update id="updateFlowFiled">
UPDATE bus_valcust_filing
SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
View File

@ -159,4 +159,8 @@ public interface FinUncollectedReceivablesDetailedFeign {
@ApiOperation("根据维修工单sid查询应收金额之和")
@PostMapping("/selYsByBillSid")
ResultBean<BigDecimal> selYsByBillSid(@RequestParam("billSid") String billSid);
@ApiOperation("应收调差更新")
@PostMapping("/diffUncollected")
ResultBean diffUncollected(@RequestParam("diffMoney")String diffMoney,@RequestParam("busSid")String busSid,@RequestParam("type")String type);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java
View File

@ -184,4 +184,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
return null;
}
@Override
public ResultBean diffUncollected(String diffMoney, String busSid, String type) {
return null;
}
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
View File

@ -145,4 +145,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
List<CustomerBillSummaryExportVo> selexportCustomerBillExcelDetails(@Param("contractNo") String contractNo);
List<AsDetailsOfReceivablesAndUncollectedItemsVo> asListAll(@Param(Constants.WRAPPER) QueryWrapper<FinUncollectedReceivablesDetailed> qw);
FinUncollectedReceivablesDetailed selectByBusSid(@Param("busSid") String busSid,@Param("type") String type);
}

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
View File

@ -1088,4 +1088,9 @@ select * from
${ew.sqlSegment}
</where>
</select>
<select id="selectByBusSid"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed">
select * from fin_uncollected_receivables_detailed where contractSid = #{busSid} and receivablesName = #{type}
</select>
</mapper>

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java
View File

@ -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<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {

14
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
View File

@ -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();
}
}

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml
View File

@ -7,6 +7,9 @@
<if test="taskDefKey != null and taskDefKey != ''">
, nodeId=#{taskDefKey}
</if>
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>

0
anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/fkce.ftl → anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl
View File

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnPdfVo.java
View File

@ -37,14 +37,12 @@ public class ScmVehicleReturnPdfVo implements Vo {
private String vinNo;
@ApiModelProperty("车辆入库价")
private String rkj;
@ApiModelProperty("车型")
@ApiModelProperty("车型/配置")
private String model;
@ApiModelProperty("常用配置")
private String config;
@ApiModelProperty("退库费用")
private String fy;
@ApiModelProperty("费用说明")
private String fysm;
private String sm;
@ApiModelProperty("入库日期")
private String rkrq;
private String rk;
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml
View File

@ -27,6 +27,9 @@
UPDATE scm_vehicle_return
SET nodeState=#{nodeState}
, taskDefKey=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>

11
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
View File

@ -928,13 +928,12 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
ScmVehicleReturnPdfVo scmVehicleReturnPdfVo = new ScmVehicleReturnPdfVo();
scmVehicleReturnPdfVo.setId(i);
i = i + 1;
scmVehicleReturnPdfVo.setVinNo(scmVehicleReturnDetailssVo.getVinNo());
scmVehicleReturnPdfVo.setVinNo(scmVehicleReturnDetailssVo.getVinNo().substring(scmVehicleReturnDetailssVo.getVinNo().length() - 8));
scmVehicleReturnPdfVo.setRkj(scmVehicleReturnDetailssVo.getReturnStockCost().toString());
scmVehicleReturnPdfVo.setModel(scmVehicleReturnDetailssVo.getModelName());
scmVehicleReturnPdfVo.setConfig(scmVehicleReturnDetailssVo.getConfigName());
scmVehicleReturnPdfVo.setModel(scmVehicleReturnDetailssVo.getModelName() + "/" + scmVehicleReturnDetailssVo.getConfigName());
scmVehicleReturnPdfVo.setFy(scmVehicleReturnDetailssVo.getReturnStockCost().toString());
scmVehicleReturnPdfVo.setFysm(scmVehicleReturnDetailssVo.getCostRemarks());
scmVehicleReturnPdfVo.setRkrq(scmVehicleReturnDetailssVo.getInboundDate());
scmVehicleReturnPdfVo.setSm(scmVehicleReturnDetailssVo.getCostRemarks());
scmVehicleReturnPdfVo.setRk(scmVehicleReturnDetailssVo.getInboundDate());
scmVehicleReturnPdfVos.add(scmVehicleReturnPdfVo);
}
dataMap.put("wlList", scmVehicleReturnPdfVos);
@ -942,7 +941,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
dataMap.put("fy", scmVehicleReturn.getMoney());
dataMap.put("remarks", scmVehicleReturn.getRemarks());
//获取审批记录
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignSp.flowRecordAndComment(scmVehicleReturn.getProcDefId(), "1").getData();
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignSp.flowRecordAndComment(scmVehicleReturn.getInstanceId(), "1").getData();
List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
if (flowTask.getFlowableRecordVo() != null) {

466
anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/cgtk.ftl → anrui-scm/anrui-scm-biz/src/main/resources/ftl/cgtk.ftl
View File

File diff suppressed because it is too large

2
yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java
View File

@ -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);

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml
View File

@ -78,12 +78,12 @@
d.manufacturerName,
d.goodsSkuOwnSpec,
d.unit,
d.warehouseSid,
<!-- d.warehouseSid,
d.warehouseName,
wa.sid AS warehouseAreaSid,
wa.areaName AS warehouseAreaName,
d.warehouseRackSid,
d.warehouseRackCode,
d.warehouseRackCode,-->
d.count
FROM
as_busrepair_inventorybill_detail AS d

24
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java
View File

@ -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<AsBwdiffapplyMapper
private AsBwdiffapplyDetailService asBwdiffapplyDetailService;
@Autowired
private SysUserRoleFeign sysUserRoleFeign;
@Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
public PagerVo<AsBwdiffapplyVo> listPageVo(PagerQuery<AsBwdiffapplyQuery> pq) {
AsBwdiffapplyQuery query = pq.getParams();
@ -456,6 +460,26 @@ public class AsBwdiffapplyService extends MybatisBaseService<AsBwdiffapplyMapper
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<AsBwdiffapplyDetail> 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 {
//极光推送

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.java
View File

@ -59,4 +59,6 @@ public interface AsBwdiffapplyDetailMapper extends BaseMapper<AsBwdiffapplyDetai
@Select("select * from as_bwdiffapply_detail where mainSid = #{mainSid}")
List<AsBwdiffapplyDetailDetailsVo> fetchByMainSid(String mainSid);
List<AsBwdiffapplyDetail> selectByMainSid(@Param("mainSid") String businessSid);
}

10
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailMapper.xml
View File

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.as.biz.asbwdiffapplydetail.AsBwdiffapplyDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectByMainSid" resultType="com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetail">
select *
from as_bwdiffapply_detail
where mainSid = #{mainSid}
</select>
</mapper>

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapplydetail/AsBwdiffapplyDetailService.java
View File

@ -97,4 +97,8 @@ public class AsBwdiffapplyDetailService extends MybatisBaseService<AsBwdiffapply
public List<AsBwdiffapplyDetailDetailsVo> fetchByMainSid(String mainSid) {
return baseMapper.fetchByMainSid(mainSid);
}
public List<AsBwdiffapplyDetail> selectByMainSid(String businessSid) {
return baseMapper.selectByMainSid(businessSid);
}
}

4
yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
View File

@ -65,4 +65,8 @@ public interface FinUncollectedReceivablesDetailedFeign {
@ApiOperation("根据维修工单sid查询应收金额之和")
@PostMapping("/selYsByBillSid")
ResultBean<BigDecimal> selYsByBillSid(@RequestParam("billSid") String billSid);
@ApiOperation("应收调差更新")
@PostMapping("/diffUncollected")
ResultBean diffUncollected(@RequestParam("diffMoney")String diffMoney,@RequestParam("busSid")String busSid,@RequestParam("type")String type);
}

7
yxt-as/src/main/java/com/yxt/anrui/as/feign/fin/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java
View File

@ -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<BigDecimal> selYsByBillSid(String billSid) {
return null;
}
@Override
public ResultBean diffUncollected(String diffMoney, String busSid, String type) {
return null;
}
}

27
工作内容需要的文档/单据模板/放款差额模板/放款差额.docx
View File

@ -11,11 +11,12 @@ ${createTime!}
${finishTime!}
审批编号：
${billNo!}
资方
${zf!}
贷款人
${dkr!}
备注
${remarks!}
序号
资方
贷款人
${bz!}
车架号
放款金额
主产品厂家贴息
@ -23,9 +24,6 @@ ${remarks!}
固定贷款保证金
意外险
应放
实放
差额
@ -41,9 +39,6 @@ ${remarks!}
已收
实际
差额
${wl.id!}
${wl.zf!}
${wl.dkr!}
${wl.vinNo!}
${wl.yf1!}
${wl.sf2!}
@ -54,12 +49,12 @@ ${remarks!}
${wl.yj7!}
${wl.sj8!}
${wl.ce9!}
${wl.yj10!}
${wl.sj11!}
${wl.ce12!}
${wl.ys13!}
${wl.sj14!}
${wl.ce15!}
${wl.gd1!}
${wl.gd2!}
${wl.gd3!}
${wl.yw1!}
${wl.yw2!}
${wl.yw3!}
审批流程
${lc.name!}
${lc.comment!}

47
工作内容需要的文档/单据模板/调车调账模板/分公司调车调账.docx
View File

@ -0,0 +1,47 @@
分公司间调账申请
分公司：
${orgName!}
创建部门：
${deptName!}
创建人：
${createName!}
创建日期：
${createTime!}
办结日期：
${finishTime!}
审批编号：
${billNo}
调账类型
${type!}
调出分公司
${dc!}
调入分公司
${dr!}
申请车辆列表
序号
车型/常用配置
车架号
库存地点
内销价格
运费
运费承担方
备注
${!}
${wl.model!}
${wl.v!}
${wl.d!}
${wl.jg!}
${wl.yf!}
${wl.cdf!}
${wl.remarks!}
审批流程
${lc.name!}sss
${lc.comment!}
${lc.spsj!}
下载人：
${downName!}
下载日期：
${downTime!}

43
工作内容需要的文档/单据模板/采购退库模板/采购退库.docx
View File

@ -0,0 +1,43 @@
车辆采购退库申请
分公司：
${orgName!}
创建部门：
${deptName!}
创建人：
${createName!}
创建日期：
${createTime!}
办结日期：
${finishTime!}
审批编号：
${billNo!}
退库原因
${yy!}　
退库费用
${fy!}
备注
${remarks!}　
车辆列表
序号
车架号
车辆入库价
车型/常用配置
退库费用
费用说明
入库日期
${!}
${wl.v!}
${wl.rkj!}
${wl.model!}
${wl.fy!}
${wl.sm!}
${wl.rk!}
审批流程：
${lc.name!}
${lc.comment!}
${lc.spsj!}
下载人：
${downName!}
下载时间：
${downTime!}
Write Preview
Loading…
Cancel
Save