Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 8 months ago
parent
commit
75d8e13524
  1. 8
      anrui-riskcenter-ui/src/api/settle/settle.js
  2. 4
      anrui-riskcenter-ui/src/views/settle/settleAdd.vue
  3. 16
      anrui-riskcenter-ui/src/views/settle/settleInfo.vue
  4. 4
      anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue
  5. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankDto.java
  6. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankInitVo.java
  7. 78
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBank.java
  8. 79
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankDetailsVo.java
  9. 79
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankDto.java
  10. 63
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeign.java
  11. 56
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeignFallback.java
  12. 77
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankQuery.java
  13. 79
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankVo.java
  14. 59
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java
  15. 9
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java
  16. 62
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankMapper.java
  17. 10
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankMapper.xml
  18. 73
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankRest.java
  19. 84
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankService.java
  20. 8
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java
  21. 10
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackDetailRest.java
  22. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java
  23. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
  24. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
  25. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java
  26. 24
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
  27. 10
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
  28. 23
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
  29. 10
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java
  30. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java
  31. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java
  32. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java
  33. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java
  34. 15
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml
  35. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java
  36. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java
  37. 31
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
  38. 61
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
  39. 9
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillUseOrgSidVo.java
  40. 7
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
  41. 12
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
  42. 24
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/PmsPurchasebackDetailFeign.java

8
anrui-riskcenter-ui/src/api/settle/settle.js

@ -51,6 +51,14 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
// 确认客户结清
confirmAtn: function(data) {
return request({
url: '/riskcenter/v1/LoanSettleApply/confirmAtn',
method: 'post',
params: data
})
},
// 销售订单 -- 金融方案初始化
selectDetailss: function(data) {
return request({

4
anrui-riskcenter-ui/src/views/settle/settleAdd.vue

@ -151,7 +151,7 @@
<div class="span-sty">其他应收说明</div>
<el-form-item>
<span v-if="formobj.showHg" class="addinputInfo">{{ formobj.loanSettleBankCostVo.otherReceivableRemarks }}</span>
<el-input v-else class="addinputInfo addinputw" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.otherReceivableRemarks" clearable placeholder=""/>
<el-input v-else class="addinputInfo addinputw" v-model="formobj.loanSettleBankCostVo.otherReceivableRemarks" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>
@ -239,7 +239,7 @@
<div class="span-sty">其他费用说明</div>
<el-form-item>
<span v-if="formobj.showHg" class="addinputInfo">{{ formobj.loanSettleCompanyCostVo.otherCostRemarks }}</span>
<el-input v-else class="addinputInfo addinputw" @keyup.native="UpNumber" v-model="formobj.loanSettleCompanyCostVo.otherCostRemarks" clearable placeholder=""/>
<el-input v-else class="addinputInfo addinputw" v-model="formobj.loanSettleCompanyCostVo.otherCostRemarks" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>

16
anrui-riskcenter-ui/src/views/settle/settleInfo.vue

@ -4,6 +4,7 @@
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" v-if="settleVisible" size="small" @click="settleByConfirm()">确认客户结清</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -267,6 +268,7 @@ export default {
viewState: 1,
tableKey: 1,
index: 0,
settleVisible: false, //
formobj: {
bankContractNo: '',
bankName: '',
@ -345,6 +347,12 @@ export default {
req.fetchBySid({ busVinSid: '', orgPath: '', sid: row.sid, userSid: '' }).then((res) => {
if (res.success) {
this.formobj = res.data
// 0
if (row.nodeState === '已办结' && parseFloat(this.formobj.loanSettleCompanyReductionVo.amountTo) > 0) {
this.settleVisible = true
} else {
this.settleVisible = false
}
if (this.formobj.loanSettleBankCostVo.filesList.length > 0) {
const aa = []
this.formobj.loanSettleBankCostVo.filesList.forEach((e) => {
@ -379,6 +387,13 @@ export default {
resetState() {
this.viewState = 1
},
settleByConfirm() {
req.confirmAtn({ sid: this.formobj.sid }).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' })
}
})
},
handleReturn() {
this.formobj = {
bankContractNo: '',
@ -446,6 +461,7 @@ export default {
vehMark: '',
vinNo: ''
}
this.settleVisible = false
this.$emit('doback')
}
}

4
anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue

@ -150,7 +150,7 @@
<div class="span-sty">其他应收说明</div>
<el-form-item>
<span v-if="formobj.showHg" class="addinputInfo">{{ formobj.loanSettleBankCostVo.otherReceivableRemarks }}</span>
<el-input v-else class="addinputInfo addinputw" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.otherReceivableRemarks" clearable placeholder=""/>
<el-input v-else class="addinputInfo addinputw" v-model="formobj.loanSettleBankCostVo.otherReceivableRemarks" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>
@ -238,7 +238,7 @@
<div class="span-sty">其他费用说明</div>
<el-form-item>
<span v-if="formobj.showHg" class="addinputInfo">{{ formobj.loanSettleCompanyCostVo.otherCostRemarks }}</span>
<el-input v-else class="addinputInfo addinputw" @keyup.native="UpNumber" v-model="formobj.loanSettleCompanyCostVo.otherCostRemarks" clearable placeholder=""/>
<el-input v-else class="addinputInfo addinputw" v-model="formobj.loanSettleCompanyCostVo.otherCostRemarks" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankDto.java

@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.api.loanfinbank;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -58,4 +59,7 @@ public class LoanFinBankDto implements Dto {
private String orgSidPath;
private List<String> finBankFiles = new ArrayList<>();
private String reAdvances;
@ApiModelProperty("资方开户行信息")
private List<LoanFinOpenBankDto> loanFinOpenBankList;
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankInitVo.java

@ -1,6 +1,8 @@
package com.yxt.anrui.riskcenter.api.loanfinbank;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -47,4 +49,7 @@ public class LoanFinBankInitVo implements Vo {
// @ApiModelProperty("使用组织全路径")
// private String orgSidPath;
private String reAdvances;
@ApiModelProperty("资方开户行信息")
private List<LoanFinOpenBankDetailsVo> loanFinOpenBankList;
}

78
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBank.java

@ -0,0 +1,78 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanfinopenbank;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-risk(资方开户行) <br/>
* File: LoanFinOpenBank.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank <br/>
* Description: 资方开户行信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-20 09:19:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "资方开户行信息", description = "资方开户行信息")
@TableName("loan_fin_open_bank")
public class LoanFinOpenBank extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("资方sid")
private String bankSid; // 资方sid
@ApiModelProperty("国家")
private String country; // 国家
@ApiModelProperty("开户银行")
private String depositBank; // 开户银行
@ApiModelProperty("银行账号")
private String bankAccount; // 银行账号
@ApiModelProperty("账户名称")
private String accountName; // 账户名称
@ApiModelProperty("账户类型key")
private String dueBankKey; // 账户类型key
@ApiModelProperty("账户类型value")
private String dueBankValue; // 账户类型value
@ApiModelProperty("银行网点")
private String bankingOutlets; // 银行网点
@ApiModelProperty("开户行地址")
private String bankAddress; // 开户行地址
@ApiModelProperty("联行号")
private String paymentLines; // 联行号
@ApiModelProperty("银行代码")
private String swiftCode; // 银行代码
@ApiModelProperty("币种")
private String currency; // 币种
}

79
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankDetailsVo.java

@ -0,0 +1,79 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanfinopenbank;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-risk(资方开户行) <br/>
* File: LoanFinOpenBankVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo <br/>
* Description: 资方开户行信息 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-20 09:19:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "资方开户行信息 视图数据详情", description = "资方开户行信息 视图数据详情")
public class LoanFinOpenBankDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("资方sid")
private String bankSid; // 资方sid
@ApiModelProperty("国家")
private String country; // 国家
@ApiModelProperty("开户银行")
private String depositBank; // 开户银行
@ApiModelProperty("银行账号")
private String bankAccount; // 银行账号
@ApiModelProperty("账户名称")
private String accountName; // 账户名称
@ApiModelProperty("账户类型key")
private String dueBankKey; // 账户类型key
@ApiModelProperty("账户类型value")
private String dueBankValue; // 账户类型value
@ApiModelProperty("银行网点")
private String bankingOutlets; // 银行网点
@ApiModelProperty("开户行地址")
private String bankAddress; // 开户行地址
@ApiModelProperty("联行号")
private String paymentLines; // 联行号
@ApiModelProperty("银行代码")
private String swiftCode; // 银行代码
@ApiModelProperty("币种")
private String currency; // 币种
}

79
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankDto.java

@ -0,0 +1,79 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanfinopenbank;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-risk(资方开户行) <br/>
* File: LoanFinOpenBankDto.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto <br/>
* Description: 资方开户行信息 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-20 09:19:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "资方开户行信息 数据传输对象", description = "资方开户行信息 数据传输对象")
public class LoanFinOpenBankDto implements Dto {
private String sid; // sid
@ApiModelProperty("资方sid")
private String bankSid; // 资方sid
@ApiModelProperty("国家")
private String country; // 国家
@ApiModelProperty("开户银行")
private String depositBank; // 开户银行
@ApiModelProperty("银行账号")
private String bankAccount; // 银行账号
@ApiModelProperty("账户名称")
private String accountName; // 账户名称
@ApiModelProperty("账户类型key")
private String dueBankKey; // 账户类型key
@ApiModelProperty("账户类型value")
private String dueBankValue; // 账户类型value
@ApiModelProperty("银行网点")
private String bankingOutlets; // 银行网点
@ApiModelProperty("开户行地址")
private String bankAddress; // 开户行地址
@ApiModelProperty("联行号")
private String paymentLines; // 联行号
@ApiModelProperty("银行代码")
private String swiftCode; // 银行代码
@ApiModelProperty("币种")
private String currency; // 币种
}

63
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeign.java

@ -0,0 +1,63 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanfinopenbank;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-risk(资方开户行) <br/>
* File: LoanFinOpenBankFeign.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeign <br/>
* Description: 资方开户行信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-20 09:19:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "资方开户行信息")
@FeignClient(
contextId = "anrui-risk-LoanFinOpenBank",
name = "anrui-risk",
path = "v1/loanfinopenbank",
fallback = LoanFinOpenBankFeignFallback.class)
public interface LoanFinOpenBankFeign {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<LoanFinOpenBankDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
}

56
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeignFallback.java

@ -0,0 +1,56 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanfinopenbank;
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 java.util.List;
/**
* Project: anrui-risk(资方开户行) <br/>
* File: LoanFinOpenBankFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeignFallback <br/>
* Description: 资方开户行信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-20 09:19:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class LoanFinOpenBankFeignFallback implements LoanFinOpenBankFeign {
@Override
public ResultBean<LoanFinOpenBankDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-risk/loanfinopenbank/fetchDetailsBySid无法访问");
}
}

77
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankQuery.java

@ -0,0 +1,77 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanfinopenbank;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-risk(资方开户行) <br/>
* File: LoanFinOpenBankQuery.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankQuery <br/>
* Description: 资方开户行信息 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-20 09:19:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "资方开户行信息 查询条件", description = "资方开户行信息 查询条件")
public class LoanFinOpenBankQuery implements Query {
@ApiModelProperty("资方sid")
private String bankSid; // 资方sid
@ApiModelProperty("国家")
private String country; // 国家
@ApiModelProperty("开户银行")
private String depositBank; // 开户银行
@ApiModelProperty("银行账号")
private String bankAccount; // 银行账号
@ApiModelProperty("账户名称")
private String accountName; // 账户名称
@ApiModelProperty("账户类型key")
private String dueBankKey; // 账户类型key
@ApiModelProperty("账户类型value")
private String dueBankValue; // 账户类型value
@ApiModelProperty("银行网点")
private String bankingOutlets; // 银行网点
@ApiModelProperty("开户行地址")
private String bankAddress; // 开户行地址
@ApiModelProperty("联行号")
private String paymentLines; // 联行号
@ApiModelProperty("银行代码")
private String swiftCode; // 银行代码
@ApiModelProperty("币种")
private String currency; // 币种
}

79
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankVo.java

@ -0,0 +1,79 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanfinopenbank;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-risk(资方开户行) <br/>
* File: LoanFinOpenBankVo.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo <br/>
* Description: 资方开户行信息 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-20 09:19:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "资方开户行信息 视图数据对象", description = "资方开户行信息 视图数据对象")
public class LoanFinOpenBankVo implements Vo {
private String sid; // sid
@ApiModelProperty("资方sid")
private String bankSid; // 资方sid
@ApiModelProperty("国家")
private String country; // 国家
@ApiModelProperty("开户银行")
private String depositBank; // 开户银行
@ApiModelProperty("银行账号")
private String bankAccount; // 银行账号
@ApiModelProperty("账户名称")
private String accountName; // 账户名称
@ApiModelProperty("账户类型key")
private String dueBankKey; // 账户类型key
@ApiModelProperty("账户类型value")
private String dueBankValue; // 账户类型value
@ApiModelProperty("银行网点")
private String bankingOutlets; // 银行网点
@ApiModelProperty("开户行地址")
private String bankAddress; // 开户行地址
@ApiModelProperty("联行号")
private String paymentLines; // 联行号
@ApiModelProperty("银行代码")
private String swiftCode; // 银行代码
@ApiModelProperty("币种")
private String currency; // 币种
}

59
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java

@ -1,9 +1,16 @@
package com.yxt.anrui.riskcenter.biz.loanfinbank;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankDto;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanfinbank.*;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankService;
import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery;
@ -22,6 +29,7 @@ import java.net.URLEncoder;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* Project: anrui-base(安瑞基础信息模块) <br/>
@ -49,6 +57,8 @@ public class LoanFinBankRest implements LoanFinBankFeign {
private LoanFinPolicyService loanFinPolicyService;
@Autowired
private LoanFileService loanFileService;
@Autowired
private LoanFinOpenBankService loanFinOpenBankService;
@Override
public ResultBean<PagerVo<LoanFinBankVo>> listPage(PagerQuery<LoanFinBankQuery> pq) {
@ -62,6 +72,7 @@ public class LoanFinBankRest implements LoanFinBankFeign {
public ResultBean save(LoanFinBankDto dto) {
ResultBean rb = ResultBean.fireFail();
String manageName = dto.getBankName();
List<LoanFinOpenBankDto> loanFinOpenBankDtoList = dto.getLoanFinOpenBankList();
if (StringUtils.isNotBlank(dto.getSid())) {
String sid = dto.getSid();
LoanFinBank baseFinBank = loanFinBankService.fetchBySid(sid);
@ -76,6 +87,26 @@ public class LoanFinBankRest implements LoanFinBankFeign {
if (i == 0) {
return ResultBean.fireFail().setMessage("修改失败");
}
//修改资方开户行信息
List<String> stringList = loanFinOpenBankDtoList.stream().map(v->v.getSid()).collect(Collectors.toList());
List<LoanFinOpenBankDetailsVo> loanFinOpenBankDetailsVos = loanFinOpenBankService.selectByManSid(sid);
if (loanFinOpenBankDtoList.size() > 0) {
for (LoanFinOpenBankDto finOpenBankDto : loanFinOpenBankDtoList) {
ResultBean resultBean1 = saveLoanFinOpenBankDto(finOpenBankDto, sid);
if (!resultBean1.getCode().equals("200")) {
return resultBean1;
}
}
}
if(!loanFinOpenBankDetailsVos.isEmpty()){
List<String> stringList1 = loanFinOpenBankDetailsVos.stream().map(v->v.getSid()).collect(Collectors.toList());
stringList.removeAll(Collections.singleton(null));
for (int j = 0; j < stringList1.size(); j++) {
if(!stringList.contains(stringList1.get(j))){
loanFinOpenBankService.updateBySidIsDeletes(stringList1.get(j));
}
}
}
//删除附件表中关于该linkSid的文件
loanFileService.deleteByLinkSid(sid);
List<String> finBankFiles = dto.getFinBankFiles();
@ -89,11 +120,37 @@ public class LoanFinBankRest implements LoanFinBankFeign {
if (count > 0) {
return ResultBean.fireFail().setMsg("添加失败,资方名称已存在");
}
loanFinBankService.saveOrUpdateDto(dto);
String sid = loanFinBankService.saveOrUpdateDto(dto);
//保存资方开户行信息
if (loanFinOpenBankDtoList.size() > 0) {
for (LoanFinOpenBankDto finOpenBankDto : loanFinOpenBankDtoList) {
ResultBean resultBean1 = saveLoanFinOpenBankDto(finOpenBankDto, sid);
if (!resultBean1.getCode().equals("200")) {
return resultBean1;
}
}
}
return rb.success().setMessage("添加成功");
}
}
private ResultBean saveLoanFinOpenBankDto(LoanFinOpenBankDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();
String openBankSid = dto.getSid();
if(StringUtils.isNotBlank(openBankSid)){
LoanFinOpenBank loanFinOpenBank = loanFinOpenBankService.fetchBySid(openBankSid);
BeanUtil.copyProperties(dto,loanFinOpenBank,"sid");
loanFinOpenBank.setBankSid(sid);
loanFinOpenBankService.updateById(loanFinOpenBank);
}else{
LoanFinOpenBank loanFinOpenBank = new LoanFinOpenBank();
BeanUtil.copyProperties(dto,loanFinOpenBank,"sid");
loanFinOpenBank.setBankSid(sid);
loanFinOpenBankService.insert(loanFinOpenBank);
}
return rb.success().setMsg("保存成功");
}
@Override
public ResultBean update(LoanFinBankDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();

9
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java

@ -11,10 +11,12 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanfinbank.*;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation;
import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationQuery;
import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationVo;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -59,6 +61,8 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
private LoanFileService loanFileService;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private LoanFinOpenBankService loanFinOpenBankService;
public PagerVo<LoanFinBank> listPage(PagerQuery<LoanFinBankQuery> pq) {
LoanFinBankQuery query = pq.getParams();
@ -152,7 +156,7 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
return p;
}
public void saveOrUpdateDto(LoanFinBankDto dto) {
public String saveOrUpdateDto(LoanFinBankDto dto) {
LoanFinBank entity = new LoanFinBank();
if (StringUtils.isNotBlank(dto.getCreateOrgSid())) {
String useOrgSid = dto.getCreateOrgSid();
@ -176,6 +180,7 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
if (!finBankFiles.isEmpty()) {
loanFileService.saveAll(entity.getSid(), finBankFiles, LoanFileEnum.FIN_BANK.getAttachType());
}
return entity.getSid();
}
public LoanFinBankVo fetchByIdVo(String id) {
@ -304,6 +309,8 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
collect(Collectors.toList());
vo.setFinBankFiles(finBankFiles);
}
List<LoanFinOpenBankDetailsVo> loanFinOpenBankDetailsVos = loanFinOpenBankService.selectByManSid(sid);
vo.setLoanFinOpenBankList(loanFinOpenBankDetailsVos);
return rb.success().setData(vo);
}

62
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankMapper.java

@ -0,0 +1,62 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.biz.loanfinopenbank;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo;
import java.util.List;
/**
* Project: anrui-risk(资方开户行) <br/>
* File: LoanFinOpenBankMapper.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankMapper <br/>
* Description: 资方开户行信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-20 09:19:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface LoanFinOpenBankMapper extends BaseMapper<LoanFinOpenBank> {
@Select("select * from loan_fin_open_bank where bankSid = #{sid} AND isDelete = 0")
List<LoanFinOpenBankDetailsVo> selectByManSid(String sid);
void updateBySidIsDeletes(String s);
}

10
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankMapper.xml

@ -0,0 +1,10 @@
<?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.riskcenter.biz.loanfinopenbank.LoanFinOpenBankMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<update id="updateBySidIsDeletes">
UPDATE loan_fin_open_bank
SET isDelete = 1 where sid = #{s}
</update>
</mapper>

73
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankRest.java

@ -0,0 +1,73 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.biz.loanfinopenbank;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankQuery;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeign;
/**
* Project: anrui-risk(资方开户行) <br/>
* File: LoanFinOpenBankFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankRest <br/>
* Description: 资方开户行信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-20 09:19:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "资方开户行信息")
@RestController("com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankRest")
@RequestMapping("v1/loanfinopenbank")
public class LoanFinOpenBankRest implements LoanFinOpenBankFeign {
@Autowired
private LoanFinOpenBankService loanFinOpenBankService;
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<LoanFinOpenBankDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
LoanFinOpenBankDetailsVo vo = loanFinOpenBankService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

84
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankService.java

@ -0,0 +1,84 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.biz.loanfinopenbank;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankQuery;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeign;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-risk(资方开户行) <br/>
* File: LoanFinOpenBankService.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankService <br/>
* Description: 资方开户行信息 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-20 09:19:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class LoanFinOpenBankService extends MybatisBaseService<LoanFinOpenBankMapper, LoanFinOpenBank> {
public void insertByDto(LoanFinOpenBankDto dto){
LoanFinOpenBank entity = new LoanFinOpenBank();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public LoanFinOpenBankDetailsVo fetchDetailsVoBySid(String sid){
LoanFinOpenBank entity = fetchBySid(sid);
LoanFinOpenBankDetailsVo vo = new LoanFinOpenBankDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<LoanFinOpenBankDetailsVo> selectByManSid(String sid) {
return baseMapper.selectByManSid(sid);
}
public void updateBySidIsDeletes(String s) {
baseMapper.updateBySidIsDeletes(s);
}
}

8
yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java

@ -75,14 +75,6 @@ public class PmsPurchaseBillRest {
return rb.success().setData(pv);
}
@ApiOperation("选择原单")
@PostMapping("/choiceBillListPage")
public ResultBean<PagerVo<PmsPurchaseChoiceBillVo>> choiceBillListPage(@RequestBody PagerQuery<PmsPurchaseChoiceBillQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<PmsPurchaseChoiceBillVo> pv = pmsPurchaseBillService.choiceBillListPage(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean<String> save(@RequestBody PmsPurchaseBillDto dto){

10
yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackDetailRest.java

@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "采购退货单据明细")
@RestController
@RequestMapping("/apiadmin/pms/pmspurchasebackdetail")
@RequestMapping("v1/pmspurchasebackdetail")
public class PmsPurchasebackDetailRest {
@Autowired
@ -86,4 +86,12 @@ public class PmsPurchasebackDetailRest {
PmsPurchasebackDetailDetailsVo vo = pmsPurchasebackDetailService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("根据商品sid查询已退数量")
@GetMapping("/selNumByGoodSid/{sid}")
public ResultBean<String> selNumByGoodSid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
String num = pmsPurchasebackDetailService.selNumByGoodSid(sid);
return rb.success().setData(num);
}
}

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java

@ -56,10 +56,6 @@ public class PmsPurchasebackBill extends BaseEntity {
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("来源单sid(采购单sid)")
private String sourceBillSid; // 来源单sid(采购单sid)
@ApiModelProperty("来源单编号")
private String sourceBillNo; // 来源单编号
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("退误差调整金额")

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java

@ -71,10 +71,6 @@ public class PmsPurchasebackBillDetailsVo implements Vo {
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("来源单sid(采购单sid)")
private String sourceBillSid; // 来源单sid(采购单sid)
@ApiModelProperty("来源单编号")
private String sourceBillNo; // 来源单编号
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("退误差调整金额")

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java

@ -63,10 +63,6 @@ public class PmsPurchasebackBillDto implements Dto {
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("来源单sid(采购单sid)")
private String sourceBillSid; // 来源单sid(采购单sid)
@ApiModelProperty("来源单编号")
private String sourceBillNo; // 来源单编号
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("退误差调整金额")

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java

@ -60,9 +60,5 @@ public interface PmsPurchasebackBillMapper extends BaseMapper<PmsPurchasebackBil
int updateFlowFiled(Map<String, Object> map);
int checkNodeStateBySourceBillSid(String sourceBillSid);
BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid);
int selectBySid(String join);
}

24
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml

@ -14,17 +14,10 @@
ppb.`deptName`,
ppb.createTime,
ppb.`finishTime`,
pb.billNo AS sourceBillNo,
pb.`payTypeValue`,
pb.`purchaseReasonValue`,
pb.`purchaseTypeValue`,
pb.supplierName,
SUM(ppd.backAmount) AS backAmountCount,
ppb.receivableAmount
FROM
pms_purchaseback_bill ppb
LEFT JOIN pms_purchase_bill pb
ON ppb.`sourceBillSid` = pb.`sid`
LEFT JOIN pms_purchaseback_detail ppd
ON ppb.`sid` = ppd.`billSid`
LEFT JOIN anrui_portal.sys_organization as s ON ppb.deptSid = s.sid
@ -57,23 +50,6 @@
WHERE sid=#{sid}
</update>
<select id="checkNodeStateBySourceBillSid" resultType="int">
SELECT COUNT(*)
FROM pms_purchaseback_bill
WHERE sourceBillSid = #{sourceBillSid}
AND nodeState != '已办结'
AND nodeState != '终止'
</select>
<select id="checkPayableAmountBySourceBillSid" resultType="java.math.BigDecimal">
SELECT payableAmount
FROM pms_purchaseback_bill
WHERE sourceBillSid = #{sourceBillSid}
AND nodeState = '已办结'
ORDER BY createTime DESC
LIMIT 1
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM pms_purchaseback_bill

10
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java

@ -67,16 +67,6 @@ public class PmsPurchasebackBillQuery implements Query {
private String finishStartTime;
@ApiModelProperty("办结结束日期")
private String finishEndTime;
@ApiModelProperty("来源单编号")
private String sourceBillNo;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("组织全路径")
private String orgPath;

23
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java

@ -156,21 +156,6 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("ppb.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getSourceBillNo())) {
qw.like("pb.billNo", query.getSourceBillNo());
}
if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) {
qw.like("pb.purchaseTypeValue", query.getPurchaseTypeValue());
}
if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) {
qw.like("pb.purchaseReasonValue", query.getPurchaseReasonValue());
}
if (StringUtils.isNotBlank(query.getPayTypeValue())) {
qw.like("pb.payTypeValue", query.getPayTypeValue());
}
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("pb.supplierName", query.getSupplierName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@ -202,10 +187,6 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
dto.setCreateOrgSid(useOrgSid);
dto.setCreateOrgName(organizationVo.getName());
if (StringUtils.isBlank(dtoSid)) {
int i = baseMapper.checkNodeStateBySourceBillSid(dto.getSourceBillSid());
if (i > 0){
return rb.setMsg(dto.getSourceBillNo() + "存在待提交或审批中的申请");
}
//生成单据编号
String billNo = "";
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
@ -570,8 +551,4 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
flowFeign.delegate(delegateQuery);
return rb.success();
}
public BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid) {
return baseMapper.checkPayableAmountBySourceBillSid(sourceBillSid);
}
}

10
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java

@ -69,16 +69,6 @@ public class PmsPurchasebackBillVo implements Vo {
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime;
@ApiModelProperty("来源单编号")
private String sourceBillNo;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("退货金额")
private String backAmountCount;
@ApiModelProperty("应收金额")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java

@ -56,6 +56,8 @@ public class PmsPurchasebackDetail extends BaseEntity {
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品ID")
private String goodsID;
@ApiModelProperty("商品基础信息Sid")
private String goodsSpuSid; // 商品基础信息Sid
@ApiModelProperty("商品名称")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java

@ -57,6 +57,8 @@ public class PmsPurchasebackDetailDetailsVo implements Vo {
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品ID")
private String goodsID;
@ApiModelProperty("商品基础信息Sid")
private String goodsSpuSid; // 商品基础信息Sid
@ApiModelProperty("商品名称")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java

@ -57,6 +57,8 @@ public class PmsPurchasebackDetailDto implements Dto {
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品ID")
private String goodsID;
@ApiModelProperty("商品基础信息Sid")
private String goodsSpuSid; // 商品基础信息Sid
@ApiModelProperty("商品名称")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java

@ -61,5 +61,5 @@ public interface PmsPurchasebackDetailMapper extends BaseMapper<PmsPurchasebackD
@Select("select * from pms_purchaseback_detail where billSid = #{billSid}")
List<PmsPurchasebackDetailDetailsVo> selByMainSid(String billSid);
BigDecimal checkReturnedCount(@Param("goodsSkuSid") String goodsSkuSid,@Param("sourceBillSid") String sourceBillSid);
String selNumByGoodSid(String sid);
}

15
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml

@ -7,15 +7,14 @@
SELECT * FROM pms_purchaseback_detail <where> ${ew.sqlSegment} </where>
</select>
<select id="checkReturnedCount" resultType="java.math.BigDecimal">
<select id="selNumByGoodSid" resultType="java.lang.String">
SELECT
IFNULL(SUM(ppd.backCount), 0)
IFNULL(SUM(pd.backCount),0)
FROM
pms_purchaseback_detail ppd
LEFT JOIN pms_purchaseback_bill ppb
ON ppd.`billSid` = ppb.sid
WHERE ppd.goodsSkuSid = #{goodsSkuSid}
AND ppb.`sourceBillSid` = #{sourceBillSid}
AND ppb.`nodeState` = '已办结'
pms_purchaseback_detail pd
LEFT JOIN pms_purchaseback_bill pb
ON pd.`billSid` = pb.`sid`
WHERE pd.goodsSpuSid = #{sid}
AND pb.nodeState = '已办结'
</select>
</mapper>

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java

@ -89,7 +89,7 @@ public class PmsPurchasebackDetailService extends MybatisBaseService<PmsPurchase
return baseMapper.selByMainSid(billSid);
}
public BigDecimal checkReturnedCount(String goodsSkuSid,String sourceBillSid) {
return baseMapper.checkReturnedCount(goodsSkuSid,sourceBillSid);
public String selNumByGoodSid(String sid) {
return baseMapper.selNumByGoodSid(sid);
}
}

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java

@ -56,8 +56,6 @@ public interface PmsPurchaseBillMapper extends BaseMapper<PmsPurchaseBill> {
IPage<PmsPurchaseBillVo> selectPageVo(IPage<PmsPurchaseBill> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchaseBill> qw);
IPage<PmsPurchaseChoiceBillVo> choiceBillListPage(IPage<PmsPurchaseBill> page, @Param(Constants.WRAPPER) QueryWrapper<PmsPurchaseBill> qw);
String selectNum(String billNo);
int updateFlowFiled(Map<String, Object> map);

31
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml

@ -32,37 +32,6 @@
<where> ${ew.sqlSegment} </where>
</select>
<select id="choiceBillListPage" resultType="com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseChoiceBillVo">
SELECT
ppb.`sid`,
ppb.`createOrgName`,
ppb.`deptName`,
ppb.`finishTime`,
ppb.billNo,
ppb.`createTime`,
ppb.`purchaserName`,
ppb.`purchaseTypeValue`,
ppb.`purchaseReasonValue`,
ppb.`payTypeValue`,
ppb.`supplierName`,
IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing,
ppbi.billType,
ppbi.taxRate,
ppb.`remarks`,
SUM(ppbd.`amount`) AS amountCount,
ppb.freight,
ppb.discountAmount,
ppb.errorAmount,
ppb.`payableAmount`
FROM
pms_purchase_bill ppb
LEFT JOIN pms_purchase_bill_invoice ppbi
ON ppbi.`billSid` = ppb.`sid`
LEFT JOIN pms_purchase_bill_detail ppbd
ON ppbd.`billSid` = ppb.`sid`
<where> ${ew.sqlSegment} </where>
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT (billNo, 4)
from pms_purchase_bill

61
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@ -213,67 +213,6 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
return p;
}
public PagerVo<PmsPurchaseChoiceBillVo> choiceBillListPage(PagerQuery<PmsPurchaseChoiceBillQuery> pq) {
PmsPurchaseChoiceBillQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBill> qw = new QueryWrapper<>();
qw.eq("ppb.createOrgSid", query.getCreateOrgSid());
qw.eq("ppb.nodeState", "已办结");
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("ppb.createOrgName", query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getDeptName())) {
qw.like("ppb.deptName", query.getDeptName());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("ppb.createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("ppb.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) {
qw.like("ppb.purchaseTypeValue", query.getPurchaseTypeValue());
}
if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) {
qw.like("ppb.purchaseReasonValue", query.getPurchaseReasonValue());
}
if (StringUtils.isNotBlank(query.getPayTypeValue())) {
qw.like("ppb.payTypeValue", query.getPayTypeValue());
}
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("ppb.supplierName", query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getIsInvoicing())) {
qw.eq("ppbi.isInvoicing", query.getIsInvoicing());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String finishStartTime = query.getFinishStartTime();
String finishEndTime = query.getFinishEndTime();
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
);
qw.groupBy("ppb.sid");
IPage<PmsPurchaseBill> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseChoiceBillVo> pagging = baseMapper.choiceBillListPage(page, qw);
for (PmsPurchaseChoiceBillVo record : pagging.getRecords()) {
BigDecimal money = pmsPurchasebackBillService.checkPayableAmountBySourceBillSid(record.getSid());
if (money != null) {
record.setPayableAmount(money);
}
List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(record.getSid());
for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) {
BigDecimal returnedCount = pmsPurchasebackDetailService.checkReturnedCount(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid(), record.getSid());
pmsPurchaseBillDetailDetailsVo.setReturnedCount(returnedCount);
}
record.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos);
}
PagerVo<PmsPurchaseChoiceBillVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public String saveOrUpdateDto(PmsPurchaseBillDto dto) {
String dtoSid = dto.getSid();
PmsPurchasePayDto purchasePay = dto.getPurchasePay();

9
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillUseOrgSidVo.java

@ -18,7 +18,7 @@ public class WmsInventoryBillUseOrgSidVo implements Vo {
@ApiModelProperty("商品ID")
private String goodsID;
@ApiModelProperty("商品基础信息sid")
private String goodSpuSid;
private String goodsSpuSid;
@ApiModelProperty("商品名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
@ -47,6 +47,8 @@ public class WmsInventoryBillUseOrgSidVo implements Vo {
private String warehouseRackSid;
@ApiModelProperty("库位编码")
private String warehouseRackCode;
@ApiModelProperty("采购订单sid")
private String manufactorBillSid;
@ApiModelProperty("厂家订单号")
private String manufactorBillNo;
@ApiModelProperty("厂家sid")
@ -57,4 +59,9 @@ public class WmsInventoryBillUseOrgSidVo implements Vo {
private String supplierSid;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("已退数量")
private BigDecimal returnedCount;
@ApiModelProperty("采购金额")
private BigDecimal amount;
}

7
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@ -371,10 +371,11 @@
resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryBillUseOrgSidVo">
SELECT
w.*,
p.supplierSid,
p.supplierName,
w.billObjSid AS supplierSid,
w.billObjName AS supplierName,
wa.sid AS warehouseAreaSid,
wa.`areaName` AS warehouseArea
wa.`areaName` AS warehouseArea,
p.sid AS manufactorBillSid
FROM wms_inventory w
LEFT JOIN yxt_pms.pms_purchase_bill p
ON w.manufactorBillNo = p.manufacturersOrderNumber

12
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@ -20,6 +20,7 @@ import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill;
import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
import com.yxt.wms.feign.pms.PmsPurchasebackDetailFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
@ -37,8 +38,6 @@ import java.util.*;
@Service
public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper, WmsInventory> {
@Autowired
private WmsInventoryBillService wmsInventoryBillService;
@Resource
private BaseGoodsSkuFeign baseGoodsSkuFeign;
@Autowired
@ -46,6 +45,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private PmsPurchasebackDetailFeign pmsPurchasebackDetailFeign;
@Autowired
private WmsWarehouseRackService wmsWarehouseRackService;
public PagerVo<WmsInventoryVo> listPage(PagerQuery<WmsInventoryQuery> pq) {
@ -589,7 +590,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
qw.like("w.warehouseRackCode", query.getWarehouseRackCode());
}
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("p.supplierName", query.getSupplierName());
qw.like("w.billObjName", query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getManufacturerName())) {
qw.like("w.manufacturerName", query.getManufacturerName());
@ -603,6 +604,11 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
qw.apply("w.count > 0");
IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryBillUseOrgSidVo> pagging = baseMapper.selInvenGoodsByUseOrgSid(page, qw);
for (WmsInventoryBillUseOrgSidVo record : pagging.getRecords()) {
String num = pmsPurchasebackDetailFeign.selNumByGoodSid(record.getGoodsSpuSid()).getData();
record.setReturnedCount(new BigDecimal(num));
record.setAmount(record.getCount().multiply(record.getCost()));
}
PagerVo<WmsInventoryBillUseOrgSidVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}

24
yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/PmsPurchasebackDetailFeign.java

@ -0,0 +1,24 @@
package com.yxt.wms.feign.pms;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
/**
* @description:
* @author: dimengzhe
* @date: 2024/3/20
**/
@FeignClient(
contextId = "yxt-pms-PmsPurchasebackDetail",
name = "yxt-pms",
path = "v1/pmspurchasebackdetail"
)
public interface PmsPurchasebackDetailFeign {
@ApiOperation("根据商品sid查询已退数量")
@GetMapping("/selNumByGoodSid/{sid}")
public ResultBean<String> selNumByGoodSid(@PathVariable("sid") String sid);
}
Loading…
Cancel
Save