diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java index 26d88e93fe..015262ecef 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java @@ -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("运费承担方") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml index 3ca55072ef..518d8c5817 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml @@ -42,6 +42,9 @@ UPDATE base_accadj_apply SET nodeState=#{nodeState} , nodeSid=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index ec4878403c..41e24c37b9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -1217,11 +1217,10 @@ public class BaseAccadjApplyService extends MybatisBaseService10745413@qq.com 10745413@qq.com 2 - 1 - 2025-04-17T06:38:00Z - 2025-04-17T08:52:00Z - 2025-04-17T08:52:00Z + 0 + 2025-04-18T03:06:00Z + 2025-04-18T03:16:00Z + 2025-04-18T03:16:00Z 1 - 139 - 410 - 68 - 78 - 471 + 159 + 357 + 44 + 51 + 465 16 @@ -1111,7 +1111,7 @@ - + @@ -1124,7 +1124,7 @@ - + @@ -1139,7 +1139,7 @@ - + @@ -1152,7 +1152,7 @@ - + @@ -1181,77 +1181,93 @@ + + - + + + + + + + + + - + + + + + + - + - - - - - - - - - - - - - + + + - + + + + + + - - - - - + + + + + + + + + + + - + - - + + - - + + @@ -1295,16 +1311,16 @@ - + - - + + - - + + @@ -1345,7 +1361,7 @@ - + @@ -1386,8 +1402,8 @@ - - + + @@ -1428,8 +1444,8 @@ - - + + @@ -1469,8 +1485,8 @@ - - + + @@ -1511,7 +1527,7 @@ - + @@ -1551,16 +1567,16 @@ - + - - + + - - + + @@ -1601,7 +1617,7 @@ - + @@ -1642,8 +1658,8 @@ - - + + @@ -1684,8 +1700,8 @@ - - + + @@ -1725,8 +1741,8 @@ - - + + @@ -1767,7 +1783,7 @@ - + @@ -1807,15 +1823,16 @@ - + - - + + + @@ -1866,7 +1883,7 @@ - + @@ -1897,8 +1914,7 @@ - - + @@ -1907,7 +1923,7 @@ - + @@ -1939,8 +1955,8 @@ - - + + @@ -1949,7 +1965,7 @@ - + @@ -1980,7 +1996,7 @@ - + @@ -2022,8 +2038,8 @@ - - + + @@ -2062,16 +2078,16 @@ - + - - + + - - + + @@ -2080,7 +2096,7 @@ - + @@ -2110,15 +2126,15 @@ - + - - + + - + @@ -2127,9 +2143,9 @@ - + - @@ -2159,8 +2175,8 @@ - - + + @@ -2169,9 +2185,9 @@ - + - @@ -2197,28 +2213,7 @@ 车型 - - - - - - - - - - - - - - - - - - - - - + @@ -2227,7 +2222,8 @@ - + / + @@ -2243,7 +2239,8 @@ - + + @@ -2252,9 +2249,9 @@ - + - @@ -2284,8 +2281,8 @@ - - + + @@ -2294,9 +2291,9 @@ - + - @@ -2326,8 +2323,8 @@ - - + + @@ -2336,9 +2333,9 @@ - + - @@ -2368,8 +2365,8 @@ - - + + @@ -2378,9 +2375,9 @@ - + - @@ -2410,7 +2407,7 @@ - + @@ -2420,9 +2417,9 @@ - + - @@ -2452,7 +2449,8 @@ - + + @@ -2461,9 +2459,9 @@ - + - @@ -2493,15 +2491,15 @@ <#list wlList as wl> - + - - + + - + @@ -2510,13 +2508,13 @@ - + - + - + @@ -2542,8 +2540,8 @@ - - + + @@ -2552,13 +2550,13 @@ - + - + - + @@ -2569,7 +2567,7 @@ - + @@ -2584,47 +2582,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.config!} - - - - - - + + @@ -2633,13 +2592,13 @@ - + - + - + @@ -2649,7 +2608,7 @@ - + @@ -2663,8 +2622,8 @@ - - + + @@ -2673,13 +2632,13 @@ - + - + - + @@ -2689,7 +2648,7 @@ - + @@ -2697,14 +2656,14 @@ - ${wl.address!} + ${wl.dd!} - - + + @@ -2713,13 +2672,13 @@ - + - + - + @@ -2729,7 +2688,7 @@ - + @@ -2737,14 +2696,14 @@ - ${wl.price!} + ${wl.jg!} - - + + @@ -2753,13 +2712,13 @@ - + - + - + @@ -2769,7 +2728,7 @@ - + @@ -2783,7 +2742,7 @@ - + @@ -2793,13 +2752,13 @@ - + - + - + @@ -2809,7 +2768,7 @@ - + @@ -2823,7 +2782,8 @@ - + + @@ -2832,13 +2792,13 @@ - + - + - + @@ -2862,16 +2822,17 @@ - + - - + + + @@ -2883,11 +2844,11 @@ + wsp:rsidP="001B1DD5"> - + @@ -2914,8 +2875,8 @@ <#if (lc_index==0)> - - + + @@ -2923,7 +2884,7 @@ - + @@ -2951,6 +2912,21 @@ ${lc.name!} + + + + + + + + + + + sss + + + @@ -2982,15 +2958,15 @@ - - + + - + @@ -3027,16 +3003,17 @@ <#list lcList as lc> <#if (lc_index>0)> - + - - + + + @@ -3048,11 +3025,11 @@ + wsp:rsidP="001B1DD5"> - + @@ -3067,8 +3044,8 @@ - - + + @@ -3078,7 +3055,7 @@ - + @@ -3106,6 +3083,21 @@ ${lc.name!} + + + + + + + + + + + sss + + + @@ -3137,8 +3129,8 @@ - - + + @@ -3148,7 +3140,7 @@ w:color="auto"/> - + @@ -3183,43 +3175,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3231,7 +3193,7 @@ - @@ -3261,8 +3223,8 @@ - - + + @@ -3272,7 +3234,7 @@ - @@ -3301,96 +3263,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -3401,7 +3275,7 @@ - @@ -3431,8 +3305,8 @@ - - + + @@ -3443,7 +3317,7 @@ - @@ -3472,7 +3346,7 @@ - + @@ -3483,7 +3357,7 @@ - @@ -3512,7 +3386,7 @@ - @@ -3537,9 +3411,9 @@ - - - + + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java index 2a330757e2..9302630474 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java @@ -92,4 +92,6 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper selectByBillNo(String billNo); + + List selectGcSzByBillNo(@Param("billNo") String billNo,@Param("vinSid") String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml index 8f3a358115..dde812d78c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml @@ -35,6 +35,9 @@ UPDATE bus_sales_order_return_veh_apply SET nodeState=#{nodeState} , nodeSid=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} @@ -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 + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java index a7a758ca1f..9f8a30e1fb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java @@ -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(); + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index fa7f5c31f0..845b365ee1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java @@ -711,22 +711,58 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService 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 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 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 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 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 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 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 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 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; + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml index f3bf2b0b96..9f311fc92b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml @@ -40,6 +40,9 @@ UPDATE bus_valcust_filing SET nodeState=#{nodeState}, nodeId=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} 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/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml index 475f2e2b69..5bde53117c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml @@ -7,6 +7,9 @@ , nodeId=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/fkce.ftl b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl similarity index 100% rename from anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/fkce.ftl rename to anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnPdfVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnPdfVo.java index d919851cec..15c153a153 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnPdfVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnPdfVo.java @@ -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; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml index 70815e0695..8734c2304f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml @@ -27,6 +27,9 @@ UPDATE scm_vehicle_return SET nodeState=#{nodeState} , taskDefKey=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index c889a7769c..ff3bab89e8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -928,13 +928,12 @@ public class ScmVehicleReturnService extends MybatisBaseService flowRecordVo = flowableFeignSp.flowRecordAndComment(scmVehicleReturn.getProcDefId(), "1").getData(); + List flowRecordVo = flowableFeignSp.flowRecordAndComment(scmVehicleReturn.getInstanceId(), "1").getData(); List finPaymentrecordSourceLCVos = new ArrayList<>(); for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { if (flowTask.getFlowableRecordVo() != null) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/cgtk.ftl b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/cgtk.ftl similarity index 91% rename from anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/cgtk.ftl rename to anrui-scm/anrui-scm-biz/src/main/resources/ftl/cgtk.ftl index bde0d6a710..8c3f2b2bc6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/cgtk.ftl +++ b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/cgtk.ftl @@ -29,17 +29,17 @@ 10745413@qq.com 10745413@qq.com - 3 - 0 - 2025-04-17T09:03:00Z - 2025-04-17T09:04:00Z - 2025-04-17T09:04:00Z + 2 + 1 + 2025-04-18T01:23:00Z + 2025-04-18T01:29:00Z + 2025-04-18T01:29:00Z 1 - 123 - 365 - 52 - 60 - 428 + 144 + 317 + 35 + 41 + 420 16 @@ -1101,7 +1101,6 @@ - @@ -1112,7 +1111,7 @@ - + @@ -1125,7 +1124,7 @@ - + @@ -1140,7 +1139,7 @@ - + @@ -1153,7 +1152,7 @@ - + @@ -1184,36 +1183,52 @@ + + + + + + + + + + - - + + + + + + + + @@ -1221,35 +1236,38 @@ - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + @@ -1293,13 +1311,13 @@ - + - + @@ -1341,8 +1359,8 @@ - - + + @@ -1382,8 +1400,8 @@ - - + + @@ -1424,8 +1442,8 @@ - - + + @@ -1465,8 +1483,8 @@ - - + + @@ -1518,7 +1536,7 @@ - + @@ -1558,13 +1576,13 @@ - + - + @@ -1606,8 +1624,8 @@ - - + + @@ -1647,8 +1665,8 @@ - - + + @@ -1689,8 +1707,8 @@ - - + + @@ -1730,8 +1748,8 @@ - - + + @@ -1772,7 +1790,7 @@ - + @@ -1812,14 +1830,14 @@ - + - - + + @@ -1828,7 +1846,7 @@ - + @@ -1860,8 +1878,8 @@ - - + + @@ -1870,7 +1888,7 @@ - + @@ -1911,14 +1929,14 @@ - + - - + + @@ -1927,7 +1945,7 @@ - + @@ -1959,8 +1977,8 @@ - - + + @@ -1969,7 +1987,7 @@ - + @@ -2000,8 +2018,8 @@ - - + + @@ -2010,7 +2028,7 @@ - + @@ -2042,8 +2060,8 @@ - - + + @@ -2052,7 +2070,7 @@ - + @@ -2093,14 +2111,14 @@ - + - - + + @@ -2109,7 +2127,7 @@ - + @@ -2139,13 +2157,13 @@ - + - + @@ -2154,9 +2172,9 @@ - + - @@ -2171,7 +2189,7 @@ - + @@ -2186,7 +2204,7 @@ - + @@ -2196,9 +2214,9 @@ - + - @@ -2213,7 +2231,7 @@ - + @@ -2228,7 +2246,7 @@ - + @@ -2238,9 +2256,9 @@ - + - @@ -2255,7 +2273,7 @@ - + @@ -2270,8 +2288,8 @@ - - + + @@ -2280,51 +2298,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - 车型 - - - - - - - - - - - - - - - - + - @@ -2339,7 +2315,7 @@ - + @@ -2348,13 +2324,13 @@ - 常用配置 + 车型/常用配置 - + @@ -2364,9 +2340,9 @@ - + - @@ -2381,7 +2357,7 @@ - + @@ -2396,7 +2372,7 @@ - + @@ -2406,9 +2382,9 @@ - + - @@ -2423,7 +2399,7 @@ - + @@ -2438,7 +2414,7 @@ - + @@ -2447,9 +2423,9 @@ - + - @@ -2464,7 +2440,7 @@ - + @@ -2479,13 +2455,13 @@ <#list wlList as wl> - + - + @@ -2494,13 +2470,13 @@ - + - + - + @@ -2526,7 +2502,7 @@ - + @@ -2536,13 +2512,13 @@ - + - + - + @@ -2568,7 +2544,7 @@ - + @@ -2578,13 +2554,13 @@ - + - + - + @@ -2610,8 +2586,8 @@ - - + + @@ -2620,13 +2596,13 @@ - + - + - + @@ -2652,49 +2628,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.config!} - - - - - - + @@ -2704,13 +2638,13 @@ - + - + - + @@ -2736,7 +2670,7 @@ - + @@ -2746,13 +2680,13 @@ - + - + - + @@ -2772,13 +2706,13 @@ - ${wl.fysm!} + ${wl.sm!} - + @@ -2787,13 +2721,13 @@ - + - + - + @@ -2813,21 +2747,21 @@ - ${wl.rkrq!} + ${wl.rk!} - + - + - + @@ -2870,8 +2804,8 @@ <#if (lc_index==0)> - - + + @@ -2879,7 +2813,7 @@ - + @@ -2938,15 +2872,15 @@ - - + + - + @@ -2983,15 +2917,15 @@ <#list lcList as lc> <#if (lc_index>0)> - + - + - + @@ -3022,8 +2956,8 @@ - - + + @@ -3033,7 +2967,7 @@ - + @@ -3092,8 +3026,8 @@ - - + + @@ -3103,7 +3037,7 @@ w:color="auto"/> - + @@ -3138,14 +3072,14 @@ - + - - + + @@ -3184,8 +3118,8 @@ - - + + @@ -3221,8 +3155,8 @@ - - + + @@ -3259,8 +3193,8 @@ - - + + @@ -3303,9 +3237,9 @@ - - - + + 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; + } } diff --git a/工作内容需要的文档/单据模板/放款差额模板/放款差额.docx b/工作内容需要的文档/单据模板/放款差额模板/放款差额.docx index 11360309bc..0fed2216c5 100644 --- a/工作内容需要的文档/单据模板/放款差额模板/放款差额.docx +++ b/工作内容需要的文档/单据模板/放款差额模板/放款差额.docx @@ -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!} diff --git a/工作内容需要的文档/单据模板/调车调账模板/分公司调车调账.docx b/工作内容需要的文档/单据模板/调车调账模板/分公司调车调账.docx new file mode 100644 index 0000000000..c4a2c1c651 --- /dev/null +++ b/工作内容需要的文档/单据模板/调车调账模板/分公司调车调账.docx @@ -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!} + + + diff --git a/工作内容需要的文档/单据模板/采购退库模板/采购退库.docx b/工作内容需要的文档/单据模板/采购退库模板/采购退库.docx new file mode 100644 index 0000000000..3191de254b --- /dev/null +++ b/工作内容需要的文档/单据模板/采购退库模板/采购退库.docx @@ -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!} +