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

Merge remote-tracking branch 'origin/master'

zhanglei
God 1 year ago
parent
31a728bcfe ace8ec18c8
commit
557d0aafc5
6 changed files with 115 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js
  2. 37
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue
  3. 87
      doc/databases/统计报表更新.sql
  4. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
  5. 1
      yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java
  6. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java

11
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js
View File

@ -171,6 +171,17 @@ export function createPdfByCustomer(data) {
})
}
// 客户账单明细--导出
export function exportExcel(data) {
return request({
url: '/fin/finuncollectedreceivablesdetailed/exportExcel',
method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型
data: data,
headers: { 'Content-Type': 'application/json' }
})
}
// 收款款项确认
export function ctskd(data) {
return request({

37
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue
View File

@ -122,7 +122,7 @@
</template>
<script>
import { createPdfByCustomer, customerBillDetailedListPage} from '@/api/anruifinmanagement/paymentConfirmation.js'
import { createPdfByCustomer, customerBillDetailedListPage, exportExcel } from '@/api/anruifinmanagement/paymentConfirmation.js'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
@ -140,6 +140,13 @@ export default {
isSearchShow: false,
btndisabled: false,
btnList: [
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'doExport',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
@ -202,6 +209,9 @@ export default {
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doExport':
this.doExport()
break
case 'doClose':
this.doClose()
break
@ -260,6 +270,31 @@ export default {
}
this.getList()
},
doExport() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
exportExcel(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '客户账单明细' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
handleDownLoad(row) {
createPdfByCustomer({ detailedSid: row.sid, createBySid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success && resp.data !== null) {

87
doc/databases/统计报表更新.sql
View File

@ -348,7 +348,7 @@ BEGIN
left join anrui_base.base_vehicle_state bs on bs.busSid = bov.sid
WHERE bo.nodeState = '已办结'
AND (bs.busState = '602' or bs.busState = '501' or bs.busState = '502' or
bs.busState = '503' or bs.busState = '601' or bs.busState = '602')
bs.busState = '503' or bs.busState = '601')
and bo.useOrgSid = a.useOrgSid
and bm.modelSid = a.modelSid
and bm.modelConfigSid = a.modelConfigSid
@ -367,19 +367,60 @@ BEGIN
and bs.busSid is null
and bo.contractNo = a.contractNo) as ssscount
FROM (
SELECT count(bov.id) AS scount,
bo.useOrgSid,
bm.modelSid,
bm.modelConfigSid,
bo.contractNo
FROM anrui_buscenter.bus_sales_order_vehicle bov
LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
WHERE bo.nodeState = '已办结'
GROUP BY bo.useOrgSid,
bm.modelSid,
bm.modelConfigSid,
bo.contractNo
select sum(scount) as scount,
d.useOrgSid,
d.modelSid,
d.modelConfigSid,
d.contractNo
from (SELECT count(bov.id) AS scount,
bo.useOrgSid,
bm.modelSid,
bm.modelConfigSid,
bo.contractNo
FROM anrui_buscenter.bus_sales_order_vehicle bov
LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
WHERE bo.nodeState = '已办结'
and bo.type = 1
and length(bov.linkSid) > 0
GROUP BY bo.useOrgSid,
bm.modelSid,
bm.modelConfigSid,
bo.contractNo
union all
SELECT bp.quantity as scount,
bo.useOrgSid,
bm.modelSid,
bm.modelConfigSid,
bo.contractNo
from anrui_buscenter.bus_sales_order bo
LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
left join anrui_buscenter.bus_sales_order_price bp on bp.salesOrderSid = bo.sid
WHERE bo.nodeState = '已办结'
and bo.type = 2
GROUP BY bo.useOrgSid,
bm.modelSid,
bm.modelConfigSid,
bo.contractNo
union all
SELECT bp.quantity as scount,
bo.useOrgSid,
bm.modelSid,
bm.modelConfigSid,
bo.contractNo
from anrui_buscenter.bus_sales_order bo
LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
left join anrui_buscenter.bus_sales_order_price bp on bp.salesOrderSid = bo.sid
WHERE bo.nodeState = '已办结'
and bo.type = 3
GROUP BY bo.useOrgSid,
bm.modelSid,
bm.modelConfigSid,
bo.contractNo) d
group by d.useOrgSid,
d.modelSid,
d.modelConfigSid,
d.contractNo
) a) b) c
group by c.useOrgSid, c.modelSid, c.modelConfigSid
) AS s ON r.useOrgSid = s.useOrgSid
@ -396,7 +437,7 @@ BEGIN
left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
where bv.salesDate like concat('%', CURDATE(), '%')
and bvoa.saleTypeKey = '001'
and bvoa.saleTypeKey = '001' and bvo.isDelete = 0
and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
length(bvo.materialTypeValue) = 0)
group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@ -414,7 +455,7 @@ BEGIN
left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
where bv.salesDate like concat('%', CURDATE(), '%')
and bvoa.saleTypeKey = '002'
and bvoa.saleTypeKey = '002' and bvo.isDelete = 0
and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
length(bvo.materialTypeValue) = 0)
group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@ -439,7 +480,7 @@ BEGIN
left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y-%m'), '%')
and bvoa.saleTypeKey = '001'
and bvoa.saleTypeKey = '001' and bvo.isDelete = 0
and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
length(bvo.materialTypeValue) = 0)
group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@ -457,7 +498,7 @@ BEGIN
left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y-%m'), '%')
and bvoa.saleTypeKey = '002'
and bvoa.saleTypeKey = '002' and bvo.isDelete = 0
and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
length(bvo.materialTypeValue) = 0)
group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@ -482,7 +523,7 @@ BEGIN
left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y'), '%')
and bvoa.saleTypeKey = '001'
and bvoa.saleTypeKey = '001' and bvo.isDelete = 0
and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
length(bvo.materialTypeValue) = 0)
group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@ -500,7 +541,7 @@ BEGIN
left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y'), '%')
and bvoa.saleTypeKey = '002'
and bvoa.saleTypeKey = '002' and bvo.isDelete = 0
and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
length(bvo.materialTypeValue) = 0)
group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@ -1099,7 +1140,8 @@ BEGIN
WHERE bo.payTypeKey = 2
and ss.busVinSid is null
AND bbv.vehicleState = '0002'
and bo.nodeState = '已办结' and bo.contractNo NOT LIKE '%2023%'
and bo.nodeState = '已办结'
and bo.contractNo NOT LIKE '%2023%'
GROUP BY bv.sid,
bo.useOrgSid,
bm.modelSid,
@ -1210,7 +1252,8 @@ BEGIN
WHERE bo.payTypeKey = 2
and ss.busVinSid is null
AND bbv.vehicleState = '0002'
and bo.nodeState = '已办结' and bo.contractNo NOT LIKE '%2023%'
and bo.nodeState = '已办结'
and bo.contractNo NOT LIKE '%2023%'
GROUP BY bv.sid,
bo.useOrgSid,
bm.modelSid,

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
View File

@ -233,7 +233,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
bv.setFormVariables(variables);
if (r == 1) {
//ToDo:流程定义id
bv.setModelId("");
bv.setModelId(ProcDefEnum.ASBUSCLAIMINVOICEBILL.getProDefId());
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg());

1
yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java
View File

@ -11,6 +11,7 @@ public enum ProcDefEnum {
ASOLDPARTRETURNAPPLY("旧件返厂申请", "process_6de5c2r8:1:10640004"),
ASOLDPARTHANDLEAPPLY("旧件处理申请", "process_sshks74p:1:10887504"),
REVERSESETTLEAPPLY("工单反结算申请", "process_g3r02po8:1:10975004"),
ASBUSCLAIMINVOICEBILL("索赔单开票申请", "process_33p7rz6h:1:11297504"),
;

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java
View File

@ -219,7 +219,7 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
QueryWrapper<BaseGoodsSku> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getOrgSid())) {
qw.eq("spu.useOrgSid", query.getOrgSid());
qw.eq("spu.createOrgSid", query.getOrgSid());
}
//商品名称
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {

Write Preview
Loading…
Cancel
Save