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

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
b8a3aefb84 7be35a8782
commit
0499d3ad92
12 changed files with 115 additions and 139 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. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java
  2. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
  3. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  4. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue
  5. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue
  6. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
  7. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue
  8. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue
  9. 221
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  10. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java
  11. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  12. 6
      anrui-system-ui/src/views/flow/doneList.vue

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java
View File

@ -65,9 +65,9 @@ public class DictCommonEnum {
*/
@Getter
public static enum costType {
CG_TYPE("001", "排产"),
CG_TYPE("001", "厂家采购"),
WC_TYPE("002", "外采"),
MD_TYPE("003", "买断"),
// MD_TYPE("001", "厂家车款"),
DJ_TYPE("005", "订金"),
;
private final String code;

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
View File

@ -555,8 +555,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
finPaymentrecordDto.setAccountsReceive(Integer.valueOf(v.getPayAccount()));
finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode());
finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());
finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.MD_TYPE.getCode());
finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.MD_TYPE.getRemarks());
finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.CG_TYPE.getCode());
finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.CG_TYPE.getRemarks());
finPaymentrecordDto.setReceiveBank(v.getBank());
finPaymentrecordDto.setReceiveBankAccount(v.getReceivingAccount());
finPaymentrecordDto.setReceiveCompany(v.getAccountName());

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
View File

@ -695,6 +695,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
return rb.setMsg("采购数量不能为空");
}
num = Integer.parseInt(dto.getArrangeNumber());
busSalesOrder.setPurchaseSystemName("");
busSalesOrder.setPurchaseSystemSid("");
busSalesOrderService.updateById(busSalesOrder);
}
//新增或更新价格信息中的台数及单台销售指导价
BigDecimal bigDecimalPrice = new BigDecimal(dto.getGuildPrice());

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue
View File

@ -22,7 +22,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.concatNo }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">制单日期</div>
<div class="span-sty">发起日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
</el-col>
</el-row>

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue
View File

@ -22,7 +22,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.concatNo }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">制单日期</div>
<div class="span-sty">发起日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
</el-col>
</el-row>

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
View File

@ -22,7 +22,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.concatNo }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">制单日期</div>
<div class="span-sty">发起日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
</el-col>
</el-row>

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue
View File

@ -20,7 +20,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.concatNo }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">制单日期</div>
<div class="span-sty">发起日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
</el-col>
</el-row>

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue
View File

@ -20,7 +20,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.concatNo }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">制单日期</div>
<div class="span-sty">发起日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
</el-col>
</el-row>

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

@ -452,26 +452,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//认款日期默认为当天的日期
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
//添加已选车架号为临时状态
/* BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
if ("车款".equals(v.getReceivablesName())) {
baseVehicleTempstateDto.setTempKey("001");
baseVehicleTempstateDto.setTempValue("车款");
}
if ("订金".equals(v.getReceivablesName())) {
baseVehicleTempstateDto.setTempKey("002");
baseVehicleTempstateDto.setTempValue("订金");
}
baseVehicleTempstateDto.setBusSid(finalSid);
//根据合同编号和车架号查询该合同的车辆sid
ResultBean<String> resultBean = busSalesOrderFeign.getVinSidByConSid(v.getContractNo(), v.getVIN());
if (resultBean.getSuccess()) {
baseVehicleTempstateDto.setVehSid(resultBean.getData());
}
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);*/
//应收未收减去相应的认款
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
@ -787,7 +767,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
if ("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())) {
//收款银行账号
finCollectionConfirmation.setCollectionBankNum(StringUtils.deleteWhitespace(dto.getCollectionBankNum()));
finCollectionConfirmation.setCollectionBankNum(dto.getCollectionBankNum());
finCollectionConfirmation.setCollectionBankNumKey(dto.getCollectionBankNumKey());
//收款银行名称
finCollectionConfirmation.setReceivingName(dto.getReceivingName());
@ -1178,7 +1158,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
* @param userSid
* @return
*/
public ResultBean cashierConfirm(String sid, String userSid) {
public ResultBean cashierConfirm111(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) {
@ -1273,7 +1253,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
}
@ -1293,7 +1273,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//项目类别key、value
@ -1339,7 +1319,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
@ -1402,7 +1382,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
}
@ -1422,7 +1402,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//项目类别key、value
@ -1468,7 +1448,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
@ -1531,7 +1511,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
}
@ -1549,7 +1529,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//项目类别key、value
@ -1591,7 +1571,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
//项目类别key、value
@ -1638,7 +1618,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
//项目类别key、value
@ -1689,7 +1669,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
@ -1737,7 +1717,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
//项目类别key、value
@ -1796,7 +1776,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途:订金
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
//项目类别key、value
@ -1945,7 +1925,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
//备份
public ResultBean cashierConfirm1(String sid, String userSid) {
public ResultBean cashierConfirm(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) {
@ -2018,7 +1998,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
one = true;
}
fullPaymentPushCar(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1, freceivebillentry, one, orgCode);
carSize = fullPaymentPushCar(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1, freceivebillentry, one, orgCode);
}
//全款推送车款（首付款及费用）
if (finSelectedReceivablesDetailedVos1_1_1.size() > 0) {
@ -2031,7 +2011,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
one = true;
}
fullPaymentPushCarFirst(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1_1, freceivebillentry, one, orgCode);
carSize = fullPaymentPushCarFirst(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1_1, freceivebillentry, one, orgCode);
}
//全款推送订金
@ -2045,7 +2025,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
one = true;
}
fullPaymentPushDeposit(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos2, freceivebillentry, one, orgCode);
carSize = fullPaymentPushDeposit(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos2, freceivebillentry, one, orgCode);
}
//担保贷款推送车款
@ -2059,7 +2039,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
one = true;
}
loanPushCar(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1, freceivebillentry, one, orgCode);
carSize = loanPushCar(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1, freceivebillentry, one, orgCode);
}
//担保贷款推送车款（首付款及费用）
if (finSelectedReceivablesDetailedVos1_1_2.size() > 0) {
@ -2072,7 +2052,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 1) {
one = true;
}
loanPushCarFirst(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1_2, freceivebillentry, one, orgCode);
carSize = loanPushCarFirst(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1_2, freceivebillentry, one, orgCode);
}
//担保贷款推送订金
if (finSelectedReceivablesDetailedVos2_1.size() > 0) {
@ -2085,7 +2065,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
one = true;
}
loanPushDeposit(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos2_1, freceivebillentry, one, orgCode);
carSize = loanPushDeposit(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos2_1, freceivebillentry, one, orgCode);
}
//简易订单-订金收取
@ -2119,7 +2099,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途:订金
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
//项目类别key、value
@ -2354,8 +2334,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
}
@ -2375,8 +2354,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//项目类别key、value
@ -2423,8 +2401,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
@ -2489,8 +2466,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
}
@ -2510,8 +2486,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//项目类别key、value
@ -2558,8 +2533,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
@ -2625,9 +2599,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
}
@ -2646,9 +2618,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//项目类别key、value
@ -2692,8 +2662,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
//项目类别key、value
@ -2745,7 +2714,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
//项目类别key、value
@ -2800,9 +2769,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
@ -2856,10 +2823,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
@ -2920,8 +2884,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途:订金
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
// freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
//项目类别key、value
@ -3138,13 +3101,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
//全款推送车款
public void fullPaymentPushCar(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int fullPaymentPushCar(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
//推送全款车款
//查询该收款单的所有已选明细：车款-待审核-全款
@ -3181,7 +3144,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vv.getReceivablesSid();
}
@ -3201,7 +3164,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//项目类别key、value
@ -3221,16 +3184,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//全款推送车款（首付款）
public void fullPaymentPushCarFirst(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int fullPaymentPushCarFirst(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
//查询该收款单的所有已选明细：首付款及费用-待审核-全款
List<FinSelectedReceivablesDetailedVo> voListv =
@ -3266,7 +3230,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vv.getReceivablesSid();
}
@ -3286,7 +3250,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//项目类别key、value
@ -3301,22 +3265,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (one) {
arReceivebill.setFBillNo(confirmation.getBillNo());
} else {
carSize = i + 1;
carSize = carSize + 1;
arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
}
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//全款推送订金
public void fullPaymentPushDeposit(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int fullPaymentPushDeposit(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
//查询该收款单的所有已选明细：首付款及费用-待审核-全款
List<FinSelectedReceivablesDetailedVo> voListv =
@ -3351,7 +3316,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
}
@ -3369,7 +3334,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//项目类别key、value
@ -3379,21 +3344,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (one) {
arReceivebill.setFBillNo(confirmation.getBillNo());
} else {
carSize = i + 1;
carSize = carSize + 1;
arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
}
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//担保贷款推送车款
public void loanPushCar(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int loanPushCar(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos1_1.size(); i++) {
@ -3418,7 +3384,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
//项目类别key、value
@ -3440,16 +3406,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//担保贷款推送车款（首付款）
public void loanPushCarFirst(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_2,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int loanPushCarFirst(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_2,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos1_1_2.size(); i++) {
@ -3474,7 +3441,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
//项目类别key、value
@ -3496,16 +3463,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//担保贷款推送订金
public void loanPushDeposit(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int loanPushDeposit(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos2_1.size(); i++) {
@ -3530,7 +3498,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//收款用途
freceivebillentry.setFPURPOSEIDKey("002");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(StringUtils.deleteWhitespace(confirmation.getCollectionBankNum()));
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
//项目类别key、value
@ -3547,6 +3515,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
private BdCustomer createBdCustomer1(String useOrgSid, String name, String contractNo, String collSid, String vinNo) {

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java
View File

@ -118,6 +118,7 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
if (StringUtils.isBlank(sid)) {
FinManufacturerBank finManufacturerBank = new FinManufacturerBank();
BeanUtil.copyProperties(dto, finManufacturerBank, "sid");
finManufacturerBank.setBankAccount(StringUtils.deleteWhitespace(dto.getBankAccount()));
//查询该分公司下是否已有该账户
int count = baseMapper.selectCountByAccount(dto.getBankAccount(), dto.getUseOrgSid());
if (count > 0) {
@ -152,11 +153,12 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
if (finManufacturerBank == null) {
return rb.setMsg("该账户不存在");
}
int count = baseMapper.selectCountByAccount1(dto.getBankAccount(), dto.getUseOrgSid(), sid);
int count = baseMapper.selectCountByAccount1(StringUtils.deleteWhitespace(dto.getBankAccount()), dto.getUseOrgSid(), sid);
if (count > 0) {
return rb.setMsg("该公司已存在该银行账号的数据");
}
BeanUtil.copyProperties(dto, finManufacturerBank);
finManufacturerBank.setBankAccount(StringUtils.deleteWhitespace(dto.getBankAccount()));
baseMapper.updateById(finManufacturerBank);
List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData();
if (data != null){

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
View File

@ -389,7 +389,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
厂家采购订金:005定金；厂家采购车款:车辆功能（厂家销售/回款通路）。
"外采订金:005定金
外采车款:002外采"*/
if (!"厂家车款".equals(finPaymentrecord.getCostTypeValue())) {
if (!"厂家采购".equals(finPaymentrecord.getCostTypeValue())) {
apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getCostTypeKey());
apPayBill.setF_PAEZ_AssistantType("payCostType");
} else {

6
anrui-system-ui/src/views/flow/doneList.vue
View File

@ -403,12 +403,14 @@ export default {
url: 'api/' + this.dialogList.stopUrl,
data: this.dialogList,
headers: { 'token': getStorage() }
}).then(function(res) {
if (res.success) {
}).then((response) => {
if (response.data.success) {
this.breakProcessVisible = false
this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.getList()
}
}).catch(() => {
console.log('操作失败')
})
// breakProcess(this.dialogList).then((resp) => {
// if (resp.success) {

Write Preview
Loading…
Cancel
Save