Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 1 year ago
parent
commit
fca9494895
  1. 8
      anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue
  2. 4
      anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue
  3. 28
      anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue
  4. 2
      yxt-as-ui/src/api/Common/Upload.js
  5. 2
      yxt-as-ui/src/api/goods/unit.js
  6. 26
      yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue
  7. 4
      yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
  8. 84
      yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue
  9. 2
      yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue
  10. 4
      yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue
  11. 38
      yxt-as-ui/src/views/goods/brands/brandsAdd.vue
  12. 1085
      yxt-as-ui/src/views/goods/goods/goodsAdd.vue
  13. 976
      yxt-as-ui/src/views/goods/goods/goodsInfo.vue
  14. 6
      yxt-as-ui/src/views/goods/goods/index.vue
  15. 4
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java
  16. 78
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierBank/BaseSupplierBankService.java
  17. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java
  18. 18
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java
  19. 6
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java
  20. 23
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java
  21. 89
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillInvoiceRest.java
  22. 89
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasePayRest.java
  23. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java
  24. 33
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java
  25. 34
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
  26. 34
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
  27. 35
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
  28. 49
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
  29. 50
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
  30. 30
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
  31. 38
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java
  32. 115
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
  33. 34
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java
  34. 5
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java
  35. 5
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java
  36. 5
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java
  37. 5
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java
  38. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java
  39. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java
  40. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java
  41. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java
  42. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java
  43. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java
  44. 81
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoice.java
  45. 82
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDetailsVo.java
  46. 82
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDto.java
  47. 64
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java
  48. 13
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml
  49. 81
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceQuery.java
  50. 106
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java
  51. 82
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceVo.java
  52. 80
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePay.java
  53. 82
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java
  54. 83
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java
  55. 64
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java
  56. 13
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml
  57. 79
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayQuery.java
  58. 127
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java
  59. 81
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayVo.java
  60. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java
  61. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java
  62. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java
  63. 7
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java
  64. 11
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java
  65. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java

8
anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue

@ -206,7 +206,7 @@
<el-col :span="24">
<div class="span-sty">选择挂靠运输公司</div>
<el-form-item>
<el-select v-model="formobj.accCompName" class="addinputInfo" filterable clearable placeholder="" @change="changeBusiness">
<el-select v-model="formobj.accCompName" class="addinputInfo" style="width: 40%" filterable clearable placeholder="" @change="changeBusiness">
<el-option v-for="item in business_list" :key="item.taxpayerNo" :label="item.businessName" :value="item.businessName"/>
</el-select>
</el-form-item>
@ -215,14 +215,12 @@
<el-row>
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>挂靠公司名称</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="formobj.accCompName" clearable placeholder=""/>
</el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.accCompName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>统一社会信用代码</div>
<el-form-item>
<el-input class="addinputInfo" style="width: 30%" v-model="formobj.accCompRegistNum" clearable placeholder=""/>
<el-input class="addinputInfo" style="width: 50%" v-model="formobj.accCompRegistNum" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>

4
anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue

@ -70,7 +70,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="资方合同号" align="center" width="180">
<el-table-column label="资方合同号" align="center" min-width="180">
<template slot-scope="scope">
<el-input v-model.trim="scope.row.bankContractNo" clearable placeholder=""/>
</template>
@ -101,7 +101,7 @@
<span>{{ scope.row.customerName }}</span>
</template>
</el-table-column>
<el-table-column label="消贷合同编号" align="center" min-width="120">
<el-table-column label="消贷合同编号" align="center" width="180">
<template slot-scope="scope">
<span>{{ scope.row.loanContractNo }}</span>
</template>

28
anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue

@ -266,25 +266,27 @@ export default {
},
toEdit() {
if (this.sids.length === 1) {
if (this.multipleSelection[0].handleBtn) {
this.viewState = 2
this.$refs['divAdd'].showEdit(this.sids[0])
} else {
this.$message({ showClose: true, type: 'error', message: '该记录资方合同号为空或已生成还款计划表且已存在还款记录' })
// if (this.multipleSelection[0].handleBtn) {
// this.viewState = 2
// this.$refs['divAdd'].showEdit(this.sids[0])
// } else {
// this.$message({ showClose: true, type: 'error', message: '' })
// }
if (this.state_list.length > 0) {
for (var i = 0; i < this.state_list.length; i++) {
if (this.state_list[i] === '是') {
this.$message({ showClose: true, type: 'error', message: '请选择是否已生成还款计划表状态为否的记录进行操作' })
return
}
}
}
this.viewState = 2
this.$refs['divAdd'].showEdit(this.sids[0])
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
},
downloadRepaymentPlan() {
if (this.state_list.length > 0) {
for (var i = 0; i < this.state_list.length; i++) {
if (this.state_list[i] === '是') {
this.$message({ showClose: true, type: 'error', message: '请选择是否已生成还款计划表状态为否的记录进行操作' })
return
}
}
}
if (this.sids.length > 0) {
req.createRepaymentVoucher(this.sids).then((res) => {
if (res.success) {

2
yxt-as-ui/src/api/Common/Upload.js

@ -1,4 +1,4 @@
import request from '@/utils/request'
// 上传图片
export const uploadFile = '/api/riskcenter/file/upload'
export const uploadFile = '/api/portal/file/upload'

2
yxt-as-ui/src/api/goods/unit.js

@ -46,7 +46,7 @@ export default {
// 初始化
initUnits: function(data) {
return request({
url: '/base/basegoodsunit/initialization/' + data,
url: '/yxtbase/apiadmin/base/basegoodsunit/initialization/' + data,
method: 'get'
});
},

26
yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue

@ -12,22 +12,22 @@
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="12">
<div class="span-sty">开户银行</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankName" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>开户银行</div>
<el-form-item prop="bankName"><el-input class="addinputInfo addinputw" v-model="formobj.bankName" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">银行账号</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>银行账号</div>
<el-form-item prop="bankAccount"><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">账号名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.accountName" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>账号名称</div>
<el-form-item prop="accountName"><el-input class="addinputInfo addinputw" v-model="formobj.accountName" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">账号类型</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>账号类型</div>
<el-form-item prop="dueBankKey">
<el-select v-model="formobj.dueBankKey" class="addinputInfo" placeholder="" @change="dueBankChange">
<el-option v-for="item in dueBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
@ -91,7 +91,12 @@ export default {
currency: ''
},
index: '',
rules: {}
rules: {
bankName: [{ required: true, message: '开户银行不能为空', trigger: 'blur' }],
bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }],
accountName: [{ required: true, message: '账号名称不能为空', trigger: 'blur' }],
dueBankKey: [{ required: true, message: '账号类型不能为空', trigger: 'change' }]
}
}
},
methods: {
@ -163,4 +168,7 @@ export default {
.addinputInfo {
margin-left: 130px !important;
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
</style>

4
yxt-as-ui/src/views/basicinformation/supplier/supplier.vue

@ -30,7 +30,7 @@
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">销售开单列表</div>
<div class="tit">供应商列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
@ -212,7 +212,7 @@ export default {
contactName: ''
}
}
this.init()
this.getList()
},
toAdd() {
this.viewState = 2

84
yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue

@ -13,30 +13,30 @@
<div class="title">基本信息</div>
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">供应商名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierName" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商名称</div>
<el-form-item prop="supplierName"><el-input class="addinputInfo addinputw" v-model="formobj.supplierName" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">供应商简称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商简称</div>
<el-form-item prop="supplierPY"><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">供应商编码</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商编码</div>
<el-form-item prop="supplierCode"><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">供应商类型</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商类型</div>
<el-form-item prop="supplierTypeSid">
<el-select class="addinputInfo" v-model="formobj.supplierTypeSid" filterable placeholder="" @change="supplierTypeChange">
<el-option v-for="item in supplierType_list" :key="item.sid" :label="item.supplierTypeName" :value="item.sid"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">供应商电话</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.contactTelePhone" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>供应商电话</div>
<el-form-item prop="contactTelePhone"><el-input class="addinputInfo addinputw" v-model="formobj.contactTelePhone" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">传真</div>
@ -48,14 +48,14 @@
<div class="span-sty">详细地址</div>
<el-form-item>
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<el-select v-model="formobj.provinceSid" filterable placeholder="请选择省" style="width:160px" @change="provinceChange">
<el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.sid"/>
<el-select v-model="formobj.province" filterable clearable placeholder="请选择省" style="width:160px" @change="provinceChange">
<el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
<el-select v-model="formobj.citySid" filterable placeholder="请选择市" style="width:160px" @change="cityChange">
<el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.sid"/>
<el-select v-model="formobj.city" filterable placeholder="请选择市" style="width:160px" @change="cityChange">
<el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
<el-select v-model="formobj.countySid" filterable placeholder="请选择县" style="width:160px" @change="countyChange">
<el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.sid"/>
<el-select v-model="formobj.county" filterable placeholder="请选择县" style="width:160px" @change="countyChange">
<el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
<el-input style="width: 30%" v-model="formobj.address" clearable placeholder=""/>
</div>
@ -90,8 +90,8 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">开票公司名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.billingCompanyName" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>开票公司名称</div>
<el-form-item prop="billingCompanyName"><el-input class="addinputInfo addinputw" v-model="formobj.billingCompanyName" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">税号</div>
@ -108,16 +108,16 @@
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchaser" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开票类型</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>开票类型</div>
<el-form-item prop="billingTypeValue">
<el-select class="addinputInfo" v-model="formobj.billingTypeValue" filterable placeholder="" @change="billingTypeChange">
<el-option v-for="item in billingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">税率</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
<div class="span-sty"><span class="icon">*</span>税率</div>
<el-form-item prop="taxRate"><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<el-row>
@ -212,12 +212,21 @@ export default {
remarks: '',
pmsSupplierBankList: []
},
rules: {}
rules: {
supplierName: [{ required: true, message: '供应商名称不能为空', trigger: 'blur' }],
supplierPY: [{ required: true, message: '供应商简称不能为空', trigger: 'blur' }],
supplierCode: [{ required: true, message: '供应商编码不能为空', trigger: 'blur' }],
supplierTypeSid: [{ required: true, message: '供应商类型不能为空', trigger: 'change' }],
contactTelePhone: [{ required: true, message: '供应商电话不能为空', trigger: 'blur' }],
billingCompanyName: [{ required: true, message: '开票公司名称不能为空', trigger: 'blur' }],
billingTypeValue: [{ required: true, message: '开票类型不能为空', trigger: 'change' }],
taxRate: [{ required: true, message: '税率不能为空', trigger: 'blur' }]
}
}
},
methods: {
init() {
typeValues({ type: 'billingType' }).then((res) => {
typeValues({ type: 'accountType' }).then((res) => {
if (res.success) {
this.billingType_list = res.data
}
@ -258,10 +267,18 @@ export default {
}
},
provinceChange(value) {
const choose = this.province_list.filter((item) => item.sid === value)
const choose = this.province_list.filter((item) => item.name === value)
if (choose !== null && choose.length > 0) {
this.formobj.province = choose[0].name
this.getCity(value)
this.formobj.provinceSid = choose[0].sid
this.getCity(this.formobj.provinceSid)
} else {
this.formobj.provinceSid = ''
this.formobj.citySid = ''
this.formobj.city = ''
this.city_list = []
this.formobj.county = ''
this.formobj.countySid = ''
this.county_list = []
}
},
getCity(val) {
@ -272,10 +289,10 @@ export default {
})
},
cityChange(value) {
const choose = this.city_list.filter((item) => item.sid === value)
const choose = this.city_list.filter((item) => item.name === value)
if (choose !== null && choose.length > 0) {
this.formobj.city = choose[0].name
this.getCounty(value)
this.formobj.citySid = choose[0].sid
this.getCounty(this.formobj.citySid)
}
},
getCounty(val) {
@ -286,9 +303,9 @@ export default {
})
},
countyChange(value) {
const choose = this.county_list.filter((item) => item.sid === value)
const choose = this.county_list.filter((item) => item.name === value)
if (choose !== null && choose.length > 0) {
this.formobj.county = choose[0].name
this.formobj.countySid = choose[0].sid
}
},
showAdd() {
@ -437,6 +454,9 @@ export default {
margin-left: 120px !important;
width: calc(100% - 115px);
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.titleOne {
padding: 7px;
display: flex;

2
yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue

@ -41,7 +41,7 @@
<el-row>
<el-col :span="24">
<div class="span-sty">详细地址</div>
<el-form-item><span class="addinputInfo">{{ formobj.address }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.province }}{{ formobj.city }}{{ formobj.county }}{{ formobj.address }}</span></el-form-item>
</el-col>
</el-row>
<el-row>

4
yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue

@ -54,11 +54,11 @@
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty">供应商类型</div>
<div class="span-sty"><span class="icon">*</span>供应商类型</div>
<el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeName" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">供应商编码</div>
<div class="span-sty"><span class="icon">*</span>供应商编码</div>
<el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeCode" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>

38
yxt-as-ui/src/views/goods/brands/brandsAdd.vue

@ -3,7 +3,7 @@
<div class="tab-header webtop">
<!-- 标题 -->
<div>品信息</div>
<div>信息</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
@ -54,11 +54,11 @@
</div> -->
<div class="item" style="margin-bottom: 100px;margin-top: 100px;">
<span class="item_text">品牌Logo</span>
<!-- <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
<!-- <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
-->
<upload-img ref="uploadImg" class="item_input" v-model="formobj.image" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" />
<upload-img ref="uploadImg" class="item_input" v-model="imgList" :limit="1" bucket="map"
:upload-data="{ type: '0001' }" :class="{ hide: hideUploadBtn }" @change="backData" />
</div>
@ -98,8 +98,8 @@
// this.initData()
},
methods: {
backData(value) {
console.log('backData》》》》', value)
backData(value){
console.log('imgList', this.imgList)
if (this.imgList.length > 0) {
@ -107,25 +107,13 @@
} else {
this.formobj.image = ''
}
this.hideUploadBtn = this.imgList.length != 0
console.log('this.hideUploadBtn', this.hideUploadBtn)
},
backData2(value) {
console.log('backData2》》》》', value)
console.log('imgList2', this.imgList2)
if (this.imgList2.length > 0) {
this.formobj.bigPic = this.imgList2[0].url
} else {
this.formobj.bigPic = ''
}
this.hideUploadBtn2 = this.imgList2.length != 0
console.log('this.hideUploadBtn2', this.hideUploadBtn2)
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
req.saveBrands(this.formobj)
.then(resp => {
if (resp.success) {
@ -144,9 +132,7 @@
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.imgList2 = []
this.hideUploadBtn = true
this.hideUploadBtn2 = true
this.formobj = {
sid: '',
brandName: '',
@ -159,9 +145,7 @@
},
showAdd() {
console.log("this.imgList", this.imgList)
console.log("this.imgList2", this.imgList2)
this.hideUploadBtn = this.imgList.length != 0
this.hideUploadBtn2 = this.imgList2.length != 0
},
showEdit(row) {
req.initBrands(row.sid)
@ -169,26 +153,18 @@
if (resp.success) {
this.formobj = resp.data
this.imgList = []
this.imgList2 = []
if (resp.data.image != '') {
this.imgList.push({
url: resp.data.image
})
}
if (resp.data.bigPic != '') {
this.imgList2.push({
url: resp.data.bigPic
})
}
this.hideUploadBtn = this.imgList.length != 0
this.hideUploadBtn2 = this.imgList2.length != 0
}
})
.catch(e => {
this.formobj = row
this.imgList = []
this.imgList2 = []
})
},

1085
yxt-as-ui/src/views/goods/goods/goodsAdd.vue

File diff suppressed because it is too large

976
yxt-as-ui/src/views/goods/goods/goodsInfo.vue

File diff suppressed because it is too large

6
yxt-as-ui/src/views/goods/goods/index.vue

@ -67,7 +67,7 @@
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<!-- 详情部分组件 -->
<divInfo v-show="viewState == 4" ref="divinfo" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
</div>
</template>
@ -230,8 +230,8 @@
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
toRelevancyInfo(row) {
const tip = '请确认是否删除所选品牌?'

4
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java

@ -66,9 +66,7 @@ public class BaseSupplierTypeRest {
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseSupplierTypeDto dto){
ResultBean rb = ResultBean.fireFail();
baseSupplierTypeService.saveOrUpdateDto(dto);
return rb.success();
return baseSupplierTypeService.saveOrUpdateDto(dto);
}
@ApiOperation("根据sid批量删除")

78
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierBank/BaseSupplierBankService.java

@ -54,52 +54,38 @@ import java.util.List;
@Service
public class BaseSupplierBankService extends MybatisBaseService<BaseSupplierBankMapper, BaseSupplierBank> {
public PagerVo<BaseSupplierBankVo> listPageVo(PagerQuery<BaseSupplierBankQuery> pq) {
BaseSupplierBankQuery query = pq.getParams();
QueryWrapper<BaseSupplierBank> qw = new QueryWrapper<>();
IPage<BaseSupplierBank> page = PagerUtil.queryToPage(pq);
IPage<BaseSupplierBankVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseSupplierBankVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BaseSupplierBankDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(BaseSupplierBankDto dto){
BaseSupplierBank entity = new BaseSupplierBank();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(BaseSupplierBankDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
BaseSupplierBank entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BaseSupplierBankDetailsVo fetchDetailsVoBySid(String sid){
BaseSupplierBank entity = fetchBySid(sid);
BaseSupplierBankDetailsVo vo = new BaseSupplierBankDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public PagerVo<BaseSupplierBankVo> listPageVo(PagerQuery<BaseSupplierBankQuery> pq) {
BaseSupplierBankQuery query = pq.getParams();
QueryWrapper<BaseSupplierBank> qw = new QueryWrapper<>();
IPage<BaseSupplierBank> page = PagerUtil.queryToPage(pq);
IPage<BaseSupplierBankVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseSupplierBankVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public int deleteBySupplierSid(String supplierSid) {
return baseMapper.deleteBySupplierSid(supplierSid);
}
public void saveOrUpdateDto(BaseSupplierBankDto dto) {
this.insertByDto(dto);
return;
}
public List<BaseSupplierBankDetailsVo> selectBySupplierSid(String supplierSid) {
return baseMapper.selectBySupplierSid(supplierSid);
}
public void insertByDto(BaseSupplierBankDto dto) {
BaseSupplierBank entity = new BaseSupplierBank();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public BaseSupplierBankDetailsVo fetchDetailsVoBySid(String sid) {
BaseSupplierBank entity = fetchBySid(sid);
BaseSupplierBankDetailsVo vo = new BaseSupplierBankDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public int deleteBySupplierSid(String supplierSid) {
return baseMapper.deleteBySupplierSid(supplierSid);
}
public List<BaseSupplierBankDetailsVo> selectBySupplierSid(String supplierSid) {
return baseMapper.selectBySupplierSid(supplierSid);
}
}

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java

@ -56,6 +56,8 @@ public class BaseSupplierInfoDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("编码")
private String supplierCode; // 编码
@ApiModelProperty("供应商名称")

18
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java

@ -97,9 +97,6 @@ public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfo
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<BaseSupplierBankDto> baseSupplierBankDtoList = dto.getBaseSupplierBankList();
if (baseSupplierBankDtoList == null || baseSupplierBankDtoList.size() == 0){
return rb.setMsg("开户行信息不能为空");
}
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) {
@ -109,19 +106,10 @@ public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfo
return rb.success();
}
this.updateByDto(dto);
baseSupplierBankService.deleteBySupplierSid(dtoSid);
for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) {
String bankSid = baseSupplierBankDto.getSid();
if(StringUtils.isNotBlank(bankSid)){
BaseSupplierBank baseSupplierBank = baseSupplierBankService.fetchBySid(bankSid);
BeanUtil.copyProperties(baseSupplierBankDto,baseSupplierBank,"sid");
baseSupplierBank.setSupplierSid(dtoSid);
baseSupplierBankService.updateById(baseSupplierBank);
}else{
BaseSupplierBank baseSupplierBank = new BaseSupplierBank();
BeanUtil.copyProperties(baseSupplierBankDto,baseSupplierBank,"sid");
baseSupplierBank.setSupplierSid(dtoSid);
baseSupplierBankService.insert(baseSupplierBank);
}
baseSupplierBankDto.setSupplierSid(dtoSid);
baseSupplierBankService.saveOrUpdateDto(baseSupplierBankDto);
}
return rb.success();
}

6
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java

@ -57,4 +57,10 @@ public interface BaseSupplierTypeMapper extends BaseMapper<BaseSupplierType> {
@Select("select * from base_supplier_type")
List<BaseSupplierTypeVo> selectListVo();
@Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND createOrgSid = #{createOrgSid}")
int checkSaveCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("createOrgSid") String createOrgSid);
@Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND createOrgSid = #{createOrgSid} AND sid != #{dtoSid}")
int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("createOrgSid") String createOrgSid,@Param("dtoSid") String dtoSid);
}

23
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -60,13 +61,25 @@ public class BaseSupplierTypeService extends MybatisBaseService<BaseSupplierType
return p;
}
public void saveOrUpdateDto(BaseSupplierTypeDto dto){
public ResultBean saveOrUpdateDto(BaseSupplierTypeDto dto){
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
String supplierTypeCode = dto.getSupplierTypeCode();
String createOrgSid = dto.getCreateOrgSid();
if (StringUtils.isBlank(dtoSid)) {
int i = baseMapper.checkSaveCode(supplierTypeCode,createOrgSid);
if (i > 0){
return rb.setMsg("新增编码已存在,请重新输入");
}
this.insertByDto(dto);
return rb.success();
}
int i = baseMapper.checkUpdateCode(supplierTypeCode,createOrgSid,dtoSid);
if (i > 0){
return rb.setMsg("修改编码已存在,请重新输入");
}
this.updateByDto(dto);
return rb.success();
}
public void insertByDto(BaseSupplierTypeDto dto){

89
yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillInvoiceRest.java

@ -0,0 +1,89 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.apiadmin.pms;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.pms.biz.pms.pmspurchasebillinvoice.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceFeignFallback.java <br/>
* Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceRest <br/>
* Description: 采购单-发票. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "采购单-发票")
@RestController
@RequestMapping("v1/pmspurchasebillinvoice")
public class PmsPurchaseBillInvoiceRest {
@Autowired
private PmsPurchaseBillInvoiceService pmsPurchaseBillInvoiceService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<PmsPurchaseBillInvoiceVo>> listPage(@RequestBody PagerQuery<PmsPurchaseBillInvoiceQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<PmsPurchaseBillInvoiceVo> pv = pmsPurchaseBillInvoiceService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody PmsPurchaseBillInvoiceDto dto){
ResultBean rb = ResultBean.fireFail();
pmsPurchaseBillInvoiceService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
pmsPurchaseBillInvoiceService.delBySids(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<PmsPurchaseBillInvoiceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
PmsPurchaseBillInvoiceDetailsVo vo = pmsPurchaseBillInvoiceService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

89
yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasePayRest.java

@ -0,0 +1,89 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.apiadmin.pms;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.pms.biz.pms.pmspurchasepay.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayFeignFallback.java <br/>
* Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayRest <br/>
* Description: 付款说明. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "付款说明")
@RestController
@RequestMapping("v1/pmspurchasepay")
public class PmsPurchasePayRest {
@Autowired
private PmsPurchasePayService pmsPurchasePayService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<PmsPurchasePayVo>> listPage(@RequestBody PagerQuery<PmsPurchasePayQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<PmsPurchasePayVo> pv = pmsPurchasePayService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody PmsPurchasePayDto dto){
ResultBean rb = ResultBean.fireFail();
pmsPurchasePayService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
pmsPurchasePayService.delBySids(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<PmsPurchasePayDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
PmsPurchasePayDetailsVo vo = pmsPurchasePayService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

4
yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java

@ -68,9 +68,7 @@ public class PmsSupplierTypeRest {
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody PmsSupplierTypeDto dto){
ResultBean rb = ResultBean.fireFail();
baseSupplierTypeService.saveOrUpdateDto(dto);
return rb.success();
return baseSupplierTypeService.saveOrUpdateDto(dto);
}
@ApiOperation("根据sid批量删除")

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

@ -26,12 +26,14 @@
package com.yxt.pms.biz.pms.pmspurchasebackbill;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: yxt-pms(采购) <br/>
@ -74,9 +76,32 @@ public class PmsPurchasebackBill extends BaseEntity {
private String arrearsState;
@ApiModelProperty("单据状态")
private String documentState;
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
}

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

@ -26,6 +26,7 @@
package com.yxt.pms.biz.pms.pmspurchasebackbill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo;
@ -35,6 +36,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
@ -78,10 +80,34 @@ public class PmsPurchasebackBillDetailsVo implements Vo {
private String deductBillNo; // 抵扣单号
@ApiModelProperty("转入预付款")
private BigDecimal toPrepayment; // 转入预付款
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("采购退货单明细")
private List<PmsPurchasebackDetailDetailsVo> pmsPurchasebackDetailList;
}

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

@ -26,6 +26,7 @@
package com.yxt.pms.biz.pms.pmspurchasebackbill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto;
@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
@ -77,10 +79,34 @@ public class PmsPurchasebackBillDto implements Dto {
private String deductBillNo; // 抵扣单号
@ApiModelProperty("转入预付款")
private BigDecimal toPrepayment; // 转入预付款
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("采购退货单明细")
private List<PmsPurchasebackDetailDto> pmsPurchasebackDetailList;

35
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java

@ -66,6 +66,18 @@ public class PmsPurchaseBill extends BaseEntity {
private String purchaseTypeKey;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因key")
private String purchaseReasonKey;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式key")
private String payTypeKey;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("供应商名称")
@ -88,9 +100,32 @@ public class PmsPurchaseBill extends BaseEntity {
private BigDecimal discountAmount;
@ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
}

49
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java

@ -33,6 +33,9 @@ import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo;
import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto;
import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDetailsVo;
import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto;
import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDetailsVo;
import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -76,6 +79,18 @@ public class PmsPurchaseBillDetailsVo implements Vo {
private String purchaseTypeKey;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因key")
private String purchaseReasonKey;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式key")
private String payTypeKey;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("供应商名称")
@ -98,12 +113,38 @@ public class PmsPurchaseBillDetailsVo implements Vo {
private BigDecimal discountAmount;
@ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("创建组织sid")
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("付款信息")
private PmsPurchasePayDetailsVo purchasePay;
@ApiModelProperty("发票信息")
private PmsPurchaseBillInvoiceDto purchaseBillInvoice;
@ApiModelProperty("采购单商品明细")
private List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailList;
@ApiModelProperty("采购单扩展")
private PmsPurchaseBillExtendDetailsVo pmsPurchaseBillExtend;
}

50
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java

@ -31,6 +31,8 @@ import com.yxt.common.core.dto.Dto;
import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto;
import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto;
import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -74,7 +76,19 @@ public class PmsPurchaseBillDto implements Dto {
private String purchaseTypeKey;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("供应商sid")
@ApiModelProperty("采购原因key")
private String purchaseReasonKey;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式key")
private String payTypeKey;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("供应商名称")
private String supplierName;
@ -96,12 +110,38 @@ public class PmsPurchaseBillDto implements Dto {
private BigDecimal discountAmount;
@ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("创建组织sid")
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("付款信息")
private PmsPurchasePayDto purchasePay;
@ApiModelProperty("发票信息")
private PmsPurchaseBillInvoiceDto purchaseBillInvoice;
@ApiModelProperty("采购单商品明细")
private List<PmsPurchaseBillDetailDto> pmsPurchaseBillDetailList;
@ApiModelProperty("采购单扩展")
private PmsPurchaseBillExtendDto pmsPurchaseBillExtend;
}

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

@ -5,19 +5,25 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillVo">
SELECT
pb.sid,
pb.billNo,
pb.createTime,
pb.createByName,
pb.supplierName,
pb.supplierPhone,
pb.storekeeperName,
IF(pb.settleState = 0, '未结算', '已结算') AS settleState,
pbs.settleTime
ppb.`sid`,
ppb.`nodeState`,
ppb.`createOrgName`,
ppb.`deptName`,
ppb.`createTime`,
ppb.`finishTime`,
ppb.`purchaseTypeValue`,
ppb.`purchaseReasonValue`,
ppb.`payTypeValue`,
ppb.`supplierName`,
IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing,
COUNT(ppbd.`amount`) AS amount,
ppb.`payableAmount`
FROM
pms_purchase_bill pb
LEFT JOIN pms_purchase_bill_settle pbs
ON pbs.`billSid` = pb.`sid`
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>

38
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java

@ -26,6 +26,7 @@
package com.yxt.pms.biz.pms.pmspurchasebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: yxt-pms(采购) <br/>
@ -51,22 +53,30 @@ import java.math.BigDecimal;
@ApiModel(value = "采购单 查询条件", description = "采购单 查询条件")
public class PmsPurchaseBillQuery implements Query {
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("创建开始日期")
private String createStartTime;
@ApiModelProperty("创建结束日期")
private String createEndTime;
@ApiModelProperty("门店sid")
private String createOrgSid;
@ApiModelProperty("票据类型key")
private String billTypeKey;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("结算状态(0未结算,1已结算)")
private String settleState;
@ApiModelProperty("欠款状态(0欠款,1未欠款)")
private String arrearsState;
@ApiModelProperty("单据状态(0未作废,1已作废)")
private String documentState;
@ApiModelProperty("其他查询条件")
private String otherQuery;
@ApiModelProperty("办结开始日期")
private String finishStartTime;
@ApiModelProperty("办结结束日期")
private String finishEndTime;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("是否需要开发票(是1,否0)")
private String isInvoicing;
}

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

@ -35,6 +35,10 @@ import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailService;
import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDetailsVo;
import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendService;
import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto;
import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService;
import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -67,36 +71,49 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
@Autowired
private PmsPurchaseBillDetailService pmsPurchaseBillDetailService;
@Autowired
private PmsPurchaseBillExtendService pmsPurchaseBillExtendService;
private PmsPurchaseBillInvoiceService pmsPurchaseBillInvoiceService;
@Autowired
private PmsPurchasePayService pmsPurchasePayService;
public PagerVo<PmsPurchaseBillVo> listPageVo(PagerQuery<PmsPurchaseBillQuery> pq) {
PmsPurchaseBillQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBill> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCreateOrgSid())){
qw.eq("pb.createOrgSid",query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getCreateOrgName())){
qw.like("ppb.createOrgSid",query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getDeptName())){
qw.like("ppb.deptName",query.getDeptName());
}
if (StringUtils.isNotBlank(query.getBillTypeKey())){
qw.eq("pb.billTypeKey",query.getBillTypeKey());
if (StringUtils.isNotBlank(query.getCreateByName())){
qw.like("ppb.createByName",query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getSupplierSid())){
qw.eq("pb.supplierSid",query.getSupplierSid());
if (StringUtils.isNotBlank(query.getBillNo())){
qw.like("ppb.billNo",query.getBillNo());
}
if (StringUtils.isNotBlank(query.getSettleState())){
qw.eq("pb.settleState",query.getSettleState());
if (StringUtils.isNotBlank(query.getPurchaseTypeValue())){
qw.like("ppb.purchaseTypeValue",query.getPurchaseTypeValue());
}
if (StringUtils.isNotBlank(query.getArrearsState())){
qw.eq("pb.arrearsState",query.getArrearsState());
if (StringUtils.isNotBlank(query.getPurchaseReasonValue())){
qw.like("ppb.purchaseReasonValue",query.getPurchaseReasonValue());
}
if (StringUtils.isNotBlank(query.getDocumentState())){
qw.eq("pb.documentState",query.getDocumentState());
if (StringUtils.isNotBlank(query.getPayTypeValue())){
qw.like("ppb.payTypeValue",query.getPayTypeValue());
}
if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("pb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("pb.remarks",query.getOtherQuery()));
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 (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
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')"
);
IPage<PmsPurchaseBill> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseBillVo> pagging = baseMapper.selectPageVo(page, qw);
@ -106,27 +123,33 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
public String saveOrUpdateDto(PmsPurchaseBillDto dto){
String dtoSid = dto.getSid();
PmsPurchasePayDto purchasePay = dto.getPurchasePay();
PmsPurchaseBillInvoiceDto purchaseBillInvoice = dto.getPurchaseBillInvoice();
List<PmsPurchaseBillDetailDto> pmsPurchaseBillDetailList = dto.getPmsPurchaseBillDetailList();
PmsPurchaseBillExtendDto pmsPurchaseBillExtend = dto.getPmsPurchaseBillExtend();
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
purchasePay.setBillSid(sid);
pmsPurchasePayService.saveOrUpdateDto(purchasePay);
purchaseBillInvoice.setBillSid(sid);
pmsPurchaseBillInvoiceService.saveOrUpdateDto(purchaseBillInvoice);
for (PmsPurchaseBillDetailDto pmsPurchaseBillDetailDto : pmsPurchaseBillDetailList) {
pmsPurchaseBillDetailDto.setBillSid(sid);
pmsPurchaseBillDetailService.saveOrUpdateDto(pmsPurchaseBillDetailDto);
}
pmsPurchaseBillExtend.setPurchaseBillSid(sid);
pmsPurchaseBillExtendService.saveOrUpdateDto(pmsPurchaseBillExtend);
return sid;
}
this.updateByDto(dto);
pmsPurchaseBillDetailService.delByMainSid(dtoSid);
pmsPurchaseBillExtendService.delByMainSid(dtoSid);
pmsPurchasePayService.delByMainSid(dtoSid);
pmsPurchaseBillInvoiceService.delByMainSid(dtoSid);
purchasePay.setBillSid(dtoSid);
pmsPurchasePayService.saveOrUpdateDto(purchasePay);
purchaseBillInvoice.setBillSid(dtoSid);
pmsPurchaseBillInvoiceService.saveOrUpdateDto(purchaseBillInvoice);
for (PmsPurchaseBillDetailDto pmsPurchaseBillDetailDto : pmsPurchaseBillDetailList) {
pmsPurchaseBillDetailDto.setBillSid(dtoSid);
pmsPurchaseBillDetailService.saveOrUpdateDto(pmsPurchaseBillDetailDto);
}
pmsPurchaseBillExtend.setPurchaseBillSid(dtoSid);
pmsPurchaseBillExtendService.saveOrUpdateDto(pmsPurchaseBillExtend);
return dtoSid;
}
@ -153,8 +176,6 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
BeanUtil.copyProperties(entity, vo);
List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(sid);
vo.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos);
PmsPurchaseBillExtendDetailsVo pmsPurchaseBillExtendDetailsVo = pmsPurchaseBillExtendService.selByMainSid(sid);
vo.setPmsPurchaseBillExtend(pmsPurchaseBillExtendDetailsVo);
return vo;
}
@ -162,7 +183,6 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
delBySids(sids);
for (String sid : sids) {
pmsPurchaseBillDetailService.delByMainSid(sid);
pmsPurchaseBillExtendService.delByMainSid(sid);
}
}
@ -173,31 +193,42 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
public List<PmsPurchaseBillExportVo> listExcel(PmsPurchaseBillQuery query) {
QueryWrapper<PmsPurchaseBillExportVo> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getCreateOrgSid())){
qw.eq("pb.createOrgSid",query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getCreateOrgName())){
qw.like("ppb.createOrgSid",query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getBillTypeKey())){
qw.eq("pb.billTypeKey",query.getBillTypeKey());
if (StringUtils.isNotBlank(query.getDeptName())){
qw.like("ppb.deptName",query.getDeptName());
}
if (StringUtils.isNotBlank(query.getSupplierSid())){
qw.eq("pb.supplierSid",query.getSupplierSid());
if (StringUtils.isNotBlank(query.getCreateByName())){
qw.like("ppb.createByName",query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getSettleState())){
qw.eq("pb.settleState",query.getSettleState());
if (StringUtils.isNotBlank(query.getBillNo())){
qw.like("ppb.billNo",query.getBillNo());
}
if (StringUtils.isNotBlank(query.getArrearsState())){
qw.eq("pb.arrearsState",query.getArrearsState());
if (StringUtils.isNotBlank(query.getPurchaseTypeValue())){
qw.like("ppb.purchaseTypeValue",query.getPurchaseTypeValue());
}
if (StringUtils.isNotBlank(query.getDocumentState())){
qw.eq("pb.documentState",query.getDocumentState());
if (StringUtils.isNotBlank(query.getPurchaseReasonValue())){
qw.like("ppb.purchaseReasonValue",query.getPurchaseReasonValue());
}
if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("pb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("pb.remarks",query.getOtherQuery()));
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 (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
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')"
);
}
List<PmsPurchaseBillExportVo> exportVoList = baseMapper.exportList(qw);

34
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java

@ -55,22 +55,32 @@ public class PmsPurchaseBillVo implements Vo {
private String sid; // sid
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("单据编号")
private String billNo;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("制单人姓名")
private String createByName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("供应商联系电话")
private String supplierPhone;
@ApiModelProperty("库管员姓名")
private String storekeeperName;
@ApiModelProperty("结算标志")
private String settleState;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("结算时间")
private Date settleTime;
@ApiModelProperty("是否需要开发票(是1,否0)")
private String isInvoicing;
@ApiModelProperty("采购金额合计")
private BigDecimal amountCount;
@ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
}

5
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java

@ -92,9 +92,4 @@ public class PmsPurchaseBillDetail extends BaseEntity {
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("销售单价")
private BigDecimal salesPrice; // 销售单价
@ApiModelProperty("最低零售价")
private BigDecimal minimumSalesPrice; // 最低零售价
}

5
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java

@ -91,9 +91,4 @@ public class PmsPurchaseBillDetailDetailsVo implements Vo {
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("销售单价")
private BigDecimal salesPrice; // 销售单价
@ApiModelProperty("最低零售价")
private BigDecimal minimumSalesPrice; // 最低零售价
}

5
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java

@ -91,9 +91,4 @@ public class PmsPurchaseBillDetailDto implements Dto {
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("销售单价")
private BigDecimal salesPrice; // 销售单价
@ApiModelProperty("最低零售价")
private BigDecimal minimumSalesPrice; // 最低零售价
}

5
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java

@ -91,9 +91,4 @@ public class PmsPurchaseBillDetailQuery implements Query {
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("销售单价")
private BigDecimal salesPrice; // 销售单价
@ApiModelProperty("最低零售价")
private BigDecimal minimumSalesPrice; // 最低零售价
}

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java

@ -93,9 +93,5 @@ public class PmsPurchaseBillDetailVo implements Vo {
private BigDecimal taxPrice; // 含税价
@ApiModelProperty("采购金额")
private BigDecimal amount; // 采购金额
@ApiModelProperty("销售单价")
private BigDecimal salesPrice; // 销售单价
@ApiModelProperty("最低零售价")
private BigDecimal minimumSalesPrice; // 最低零售价
}

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java

@ -64,8 +64,6 @@ public class PmsPurchaseBillExtend extends BaseEntity {
private String priceStrategy; // 进价不同时的价格策略(加权平均、分别计价)
@ApiModelProperty("临时加价率")
private Integer tempMarkupRate; // 临时加价率
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount; // 误差调整金额
@ApiModelProperty("发货人姓名")
private String shipperName; // 发货人姓名
@ApiModelProperty("发货人手机")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java

@ -65,8 +65,6 @@ public class PmsPurchaseBillExtendDetailsVo implements Vo {
private String priceStrategy; // 进价不同时的价格策略(加权平均、分别计价)
@ApiModelProperty("临时加价率")
private Integer tempMarkupRate; // 临时加价率
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount; // 误差调整金额
@ApiModelProperty("发货人姓名")
private String shipperName; // 发货人姓名
@ApiModelProperty("发货人手机")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java

@ -65,8 +65,6 @@ public class PmsPurchaseBillExtendDto implements Dto {
private String priceStrategy; // 进价不同时的价格策略(加权平均、分别计价)
@ApiModelProperty("临时加价率")
private Integer tempMarkupRate; // 临时加价率
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount; // 误差调整金额
@ApiModelProperty("发货人姓名")
private String shipperName; // 发货人姓名
@ApiModelProperty("发货人手机")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java

@ -63,8 +63,6 @@ public class PmsPurchaseBillExtendQuery implements Query {
private String priceStrategy; // 进价不同时的价格策略(加权平均、分别计价)
@ApiModelProperty("临时加价率")
private Integer tempMarkupRate; // 临时加价率
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount; // 误差调整金额
@ApiModelProperty("发货人姓名")
private String shipperName; // 发货人姓名
@ApiModelProperty("发货人手机")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java

@ -65,8 +65,6 @@ public class PmsPurchaseBillExtendVo implements Vo {
private String priceStrategy; // 进价不同时的价格策略(加权平均、分别计价)
@ApiModelProperty("临时加价率")
private Integer tempMarkupRate; // 临时加价率
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount; // 误差调整金额
@ApiModelProperty("发货人姓名")
private String shipperName; // 发货人姓名
@ApiModelProperty("发货人手机")

81
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoice.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoice.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoice <br/>
* Description: 采购单-发票. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票", description = "采购单-发票")
@TableName("pms_purchase_bill_invoice")
public class PmsPurchaseBillInvoice extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private Integer isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDate; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

82
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDetailsVo.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo <br/>
* Description: 采购单-发票 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 视图数据详情", description = "采购单-发票 视图数据详情")
public class PmsPurchaseBillInvoiceDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private Integer isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDate; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

82
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDto.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.yxt.common.core.dto.Dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceDto.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto <br/>
* Description: 采购单-发票 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 数据传输对象", description = "采购单-发票 数据传输对象")
public class PmsPurchaseBillInvoiceDto implements Dto {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private Integer isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDate; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

64
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java

@ -0,0 +1,64 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
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 org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceMapper.java <br/>
* Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceMapper <br/>
* Description: 采购单-发票. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface PmsPurchaseBillInvoiceMapper extends BaseMapper<PmsPurchaseBillInvoice> {
IPage<PmsPurchaseBillInvoiceVo> selectPageVo(IPage<PmsPurchaseBillInvoice> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchaseBillInvoice> qw);
List<PmsPurchaseBillInvoiceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsPurchaseBillInvoice> qw);
@Select("select * from pms_purchase_bill_invoice")
List<PmsPurchaseBillInvoiceVo> selectListVo();
@Delete("delete from pms_purchase_bill_invoice where billSid = #{dtoSid}")
void delByMainSid(String dtoSid);
}

13
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml

@ -0,0 +1,13 @@
<?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.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo">
SELECT * FROM pms_purchase_bill_invoice <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo">
SELECT * FROM pms_purchase_bill_invoice <where> ${ew.sqlSegment} </where>
</select>
</mapper>

81
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceQuery.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceQuery.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceQuery <br/>
* Description: 采购单-发票 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 查询条件", description = "采购单-发票 查询条件")
public class PmsPurchaseBillInvoiceQuery implements Query {
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private Integer isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDateStart; // 开票日期
private Date invoiceDateEnd; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

106
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java

@ -0,0 +1,106 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
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.vo.PagerVo;
import org.springframework.stereotype.Service;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceService.java <br/>
* Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService <br/>
* Description: 采购单-发票 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchaseBillInvoiceMapper, PmsPurchaseBillInvoice> {
private QueryWrapper<PmsPurchaseBillInvoice> createQueryWrapper(PmsPurchaseBillInvoiceQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<PmsPurchaseBillInvoice> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<PmsPurchaseBillInvoiceVo> listPageVo(PagerQuery<PmsPurchaseBillInvoiceQuery> pq) {
PmsPurchaseBillInvoiceQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBillInvoice> qw = createQueryWrapper(query);
IPage<PmsPurchaseBillInvoice> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseBillInvoiceVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsPurchaseBillInvoiceVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(PmsPurchaseBillInvoiceDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(PmsPurchaseBillInvoiceDto dto){
PmsPurchaseBillInvoice entity = new PmsPurchaseBillInvoice();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(PmsPurchaseBillInvoiceDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
PmsPurchaseBillInvoice entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public PmsPurchaseBillInvoiceDetailsVo fetchDetailsVoBySid(String sid){
PmsPurchaseBillInvoice entity = fetchBySid(sid);
PmsPurchaseBillInvoiceDetailsVo vo = new PmsPurchaseBillInvoiceDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
}

82
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceVo.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo <br/>
* Description: 采购单-发票 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 视图数据对象", description = "采购单-发票 视图数据对象")
public class PmsPurchaseBillInvoiceVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否需要开发票(是1,否0)")
private Integer isInvoicing; // 是否需要开发票(是1,否0)
@ApiModelProperty("票据类型key")
private String billTypeKey; // 票据类型key
@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
@ApiModelProperty("开票名称")
private String invoicingName; // 开票名称
@ApiModelProperty("税号")
private String taxpayerNo; // 税号
@ApiModelProperty("发票代码")
private String invoiceCode; // 发票代码
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票日期")
private Date invoiceDate; // 开票日期
@ApiModelProperty("发票金额")
private BigDecimal invoiceAmount; // 发票金额
@ApiModelProperty("税率")
private BigDecimal taxRate; // 税率
}

80
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePay.java

@ -0,0 +1,80 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
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;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePay.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePay <br/>
* Description: 付款说明. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明", description = "付款说明")
@TableName("pms_purchase_pay")
public class PmsPurchasePay extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
@ApiModelProperty("附件")
private String filePath; // 附件
}

82
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java

@ -0,0 +1,82 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayVo <br/>
* Description: 付款说明 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明 视图数据详情", description = "付款说明 视图数据详情")
public class PmsPurchasePayDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
@ApiModelProperty("附件")
private List<String> filePaths; // 附件
}

83
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java

@ -0,0 +1,83 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayDto.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayDto <br/>
* Description: 付款说明 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明 数据传输对象", description = "付款说明 数据传输对象")
public class PmsPurchasePayDto implements Dto {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
@ApiModelProperty("附件")
private List<String> filePaths = new ArrayList<>(); // 附件
}

64
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java

@ -0,0 +1,64 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
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 org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayMapper.java <br/>
* Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayMapper <br/>
* Description: 付款说明. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface PmsPurchasePayMapper extends BaseMapper<PmsPurchasePay> {
IPage<PmsPurchasePayVo> selectPageVo(IPage<PmsPurchasePay> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchasePay> qw);
List<PmsPurchasePayVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsPurchasePay> qw);
@Select("select * from pms_purchase_pay")
List<PmsPurchasePayVo> selectListVo();
@Delete("delete from pms_purchase_pay where billSid = #{dtoSid}")
void delByMainSid(String dtoSid);
}

13
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml

@ -0,0 +1,13 @@
<?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.pms.biz.pms.pmspurchasepay.PmsPurchasePayMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayVo">
SELECT * FROM pms_purchase_pay <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayVo">
SELECT * FROM pms_purchase_pay <where> ${ew.sqlSegment} </where>
</select>
</mapper>

79
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayQuery.java

@ -0,0 +1,79 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayQuery.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayQuery <br/>
* Description: 付款说明 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明 查询条件", description = "付款说明 查询条件")
public class PmsPurchasePayQuery implements Query {
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
@ApiModelProperty("附件")
private String filePath; // 附件
}

127
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java

@ -0,0 +1,127 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.config.component.FileUploadComponent;
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.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayService.java <br/>
* Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayService <br/>
* Description: 付款说明 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapper, PmsPurchasePay> {
@Autowired
private FileUploadComponent fileUploadComponent;
private QueryWrapper<PmsPurchasePay> createQueryWrapper(PmsPurchasePayQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<PmsPurchasePay> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<PmsPurchasePayVo> listPageVo(PagerQuery<PmsPurchasePayQuery> pq) {
PmsPurchasePayQuery query = pq.getParams();
QueryWrapper<PmsPurchasePay> qw = createQueryWrapper(query);
IPage<PmsPurchasePay> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchasePayVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsPurchasePayVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(PmsPurchasePayDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(PmsPurchasePayDto dto){
PmsPurchasePay entity = new PmsPurchasePay();
BeanUtil.copyProperties(dto, entity, "id", "sid");
List<String> filePaths = dto.getFilePaths();
String url = "";
for (String filePath : filePaths) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
url = url + filePath + ",";
}
entity.setFilePath(url);
baseMapper.insert(entity);
}
public void updateByDto(PmsPurchasePayDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
PmsPurchasePay entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
List<String> filePaths = dto.getFilePaths();
String url = "";
for (String filePath : filePaths) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
url = url + filePath + ",";
}
entity.setFilePath(url);
baseMapper.updateById(entity);
}
public PmsPurchasePayDetailsVo fetchDetailsVoBySid(String sid){
PmsPurchasePay entity = fetchBySid(sid);
PmsPurchasePayDetailsVo vo = new PmsPurchasePayDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
}

81
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayVo.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.pms.biz.pms.pmspurchasepay;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasePayVo.java <br/>
* Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayVo <br/>
* Description: 付款说明 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-06 15:43:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "付款说明 视图数据对象", description = "付款说明 视图数据对象")
public class PmsPurchasePayVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("是否先付货款 0否,1是")
private String isFirstPay; // 是否先付货款 0否,1是
@ApiModelProperty("订金")
private BigDecimal deposit; // 订金
@ApiModelProperty("货款")
private BigDecimal goodsMoney; // 货款
@ApiModelProperty("收款账户")
private String accountName; // 收款账户
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("收款账号")
private String bankAccount; // 收款账号
@ApiModelProperty("其他费用名称")
private String otherAmountName; // 其他费用名称
@ApiModelProperty("其他费用金额")
private BigDecimal otherAmount; // 其他费用金额
@ApiModelProperty("付款备注")
private String payRemark; // 付款备注
@ApiModelProperty("附件")
private String filePath; // 附件
}

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java

@ -54,6 +54,8 @@ public class PmsSupplierInfoDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("编码")
private String supplierCode; // 编码
@ApiModelProperty("供应商名称")

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java

@ -55,6 +55,8 @@ public class PmsSupplierInfoDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("编码")
private String supplierCode; // 编码
@ApiModelProperty("供应商名称")

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java

@ -89,6 +89,10 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
qw.eq("isDelete",0);
IPage<PmsSupplierInfo> page = PagerUtil.queryToPage(pq);
IPage<PmsSupplierInfoVo> pagging = baseMapper.selectPageVo(page, qw);
List<PmsSupplierInfoVo> records = pagging.getRecords();
for (PmsSupplierInfoVo record : records) {
record.setAddress(record.getProvince() + record.getCity() + record.getCounty() + record.getAddress());
}
PagerVo<PmsSupplierInfoVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}

7
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java

@ -62,4 +62,11 @@ public class PmsSupplierInfoVo implements Vo {
private String contactName;
@ApiModelProperty("手机")
private String contactMobile;
@ApiModelProperty("省")
private String province;
@ApiModelProperty("市")
private String city;
@ApiModelProperty("县")
private String county;
}

11
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java

@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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.pms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo;
@ -83,7 +84,8 @@ public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMa
return p;
}
public void saveOrUpdateDto(PmsSupplierTypeDto dto) {
public ResultBean saveOrUpdateDto(PmsSupplierTypeDto dto) {
ResultBean rb = ResultBean.fireFail();
String orgPath = dto.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
@ -92,8 +94,11 @@ public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMa
dto.setUseOrgSid(createOrgSid);
BaseSupplierTypeDto baseSupplierTypeDto = new BaseSupplierTypeDto();
BeanUtil.copyProperties(dto,baseSupplierTypeDto);
baseSupplierTypeFeign.save(baseSupplierTypeDto);
return;
ResultBean resultBean = baseSupplierTypeFeign.save(baseSupplierTypeDto);
if (resultBean.getSuccess()) {
return rb.success();
}
return rb.setMsg(resultBean.getMsg());
}
public void del(String[] sids) {

2
yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java

@ -55,6 +55,8 @@ public class BaseSupplierInfoDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("编码")
private String supplierCode; // 编码
@ApiModelProperty("供应商名称")

Loading…
Cancel
Save