Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 1 month ago
parent
commit
86646170ec
  1. 6
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
  2. 3
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
  3. 18
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue
  4. 1
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationInfo.vue
  5. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml
  6. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  7. 2
      yxt-as-ui/src/views/storage/deliveryNotice/index.vue
  8. 2
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
  9. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

6
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@ -445,7 +445,6 @@ export default {
paymentBtn: false, // -- --
paymentInformation: { //
index: '',
liquidationPayment: '', //
list: []
}
}
@ -698,20 +697,18 @@ export default {
this.paymentVisible = true
this.paymentBtn = true
this.paymentInformation.index = index
this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
},
handleLookPayment(row, index) {
this.paymentVisible = true
this.paymentBtn = false
this.paymentInformation.inde = index
this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
},
paymentAdd() {
this.paymentVisible = false
this.viewState = 3
this.$refs['divPaymentInformation'].showAdd(this.formobj.useOrgSid, this.paymentInformation.liquidationPayment)
this.$refs['divPaymentInformation'].showAdd(this.formobj.useOrgSid)
},
backInformation(value) {
this.viewState = 1
@ -765,7 +762,6 @@ export default {
this.paymentBtn = false
this.paymentInformation = {
index: '',
liquidationPayment: '',
list: []
}
},

3
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue

@ -287,7 +287,6 @@ export default {
paymentVisible: false, // --
paymentInformation: { //
index: '',
liquidationPayment: '', //
list: []
}
}
@ -317,7 +316,6 @@ export default {
handleLookPayment(row, index) {
this.paymentVisible = true
this.paymentInformation.inde = index
this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
},
resetStateByInformation() {
@ -333,7 +331,6 @@ export default {
this.paymentVisible = false
this.paymentInformation = {
index: '',
liquidationPayment: '',
list: []
}
},

18
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue

@ -1,4 +1,4 @@
<temp<template>
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
@ -61,7 +61,7 @@
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>后期是否有平仓付款</div>
<el-form-item prop="isPay">
<el-radio-group class="addinputInfo" v-model="formobj.isPay">
<el-radio-group class="addinputInfo" disabled v-model="formobj.isPay">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
@ -80,7 +80,6 @@
<el-button size="mini" type="danger" @click="toDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="costTitleValue" label="平仓款名称" align="center" />
<el-table-column label="期数" align="center">
<template slot-scope="scope">
<el-input @keyup.native="scope.row.period = getNumber(scope.row.period, 2)" v-model="scope.row.period" clearable placeholder="" />
@ -153,7 +152,7 @@
<script>
import req from '@/api/anruifinmanagement/payment'
import {getTypeValueList, typeValues} from '@/api/jichuxinxi/dictcommons'
import { getTypeValueList, typeValues } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'PaymentInformationAdd',
@ -167,7 +166,6 @@ export default {
payment_list: [],
receiveCompany_list: [],
businessType_list: [],
liquidationPayment: '', //
formobj: {
sid: '', // sid
costTitleKey: '', //
@ -222,13 +220,12 @@ export default {
}
})
},
showAdd(useOrgSid, liquidationPayment) {
showAdd(useOrgSid) {
this.viewTitle = '【新增】付款信息'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
this.liquidationPayment = liquidationPayment
this.temp.useOrgSid = useOrgSid
this.selectByUseOrgSid(useOrgSid)
},
@ -269,8 +266,14 @@ export default {
const choose = this.payment_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.paymentTypeKey = choose[0].dictKey
if (value === '银行保证金') {
this.formobj.isPay = '1'
} else {
this.formobj.isPay = '0'
}
} else {
this.formobj.paymentTypeKey = ''
this.formobj.isPay = ''
}
},
receiveCompanyChange(value) {
@ -311,7 +314,6 @@ export default {
this.formobj.finPaymentapplyDetailsBelowEveList.push({
sid: '', // sid
costTitleKey: '', //
costTitleValue: this.liquidationPayment, //
detailSid: '', // sid
openDate: '', //
period: '', //

1
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationInfo.vue

@ -53,7 +53,6 @@
<div class="title">平仓信息</div>
<el-table :key="tableKey" :data="formobj.finPaymentapplyDetailsBelowEveList" :index="index" border style="width: 100%">
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="costTitleValue" label="平仓款名称" align="center" />
<el-table-column prop="period" label="期数" align="center" />
<el-table-column prop="exePayDate" label="平仓付款日期" align="center" />
<el-table-column prop="exePayPrice" label="平仓付款金额" align="center" />

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml

@ -104,7 +104,8 @@
fp.isSales,
fp.isSettle,
fp.useOrgSid,
fp.orgSidPath
fp.orgSidPath,
fp.isManageSp
from fin_paymentapply fp
where fp.sid = #{sid}
</select>

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@ -32,8 +32,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
@ -636,6 +634,9 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
//ToDo:到出纳记录
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
finPaymentapply = fetchBySid(bv.getBusinessSid());
finPaymentapply.setFinishTime(new Date());
baseMapper.updateById(finPaymentapply);//更新办结日期
FinPaymentapplyDetailsVo vo = fetchDetailsVoBySid(bv.getBusinessSid());
FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
finPaymentrecordDto.setCreateBySid(finPaymentapply.getCreateBySid());

2
yxt-as-ui/src/views/storage/deliveryNotice/index.vue

@ -405,7 +405,7 @@ export default {
return
}
this.viewState = 2
this.$refs['divAdd'].showAdd({ sid: this.selectionList[0] })
this.$refs['divAdd'].showAdd({ sid: this.selectionList[0].sid })
},
toInfo(row) {
this.viewState = 4

2
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@ -170,6 +170,7 @@ export default {
deliveryDate: getCurrentDate(),
billState: '新建',
remarks: '',
isUpShelf: '',
useOrgSid: '',
createOrgSid: '',
list: [],
@ -287,6 +288,7 @@ export default {
deliveryDate: getCurrentDate(),
billState: '新建',
remarks: '',
isUpShelf: '',
useOrgSid: '',
createOrgSid: '',
list: [],

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

@ -343,13 +343,7 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
BeanUtil.copyProperties(wmsAnsListDetailsVo, detailsVo);
detailsVo.setIsQuality(0);
detailsVo.setQualityState(0);
if (StringUtils.isNotBlank(wmsAnsListDetailsVo.getWaitInCount())) {
detailsVo.setActualInCount(wmsAnsListDetailsVo.getWaitInCount());
detailsVo.setMaxCount(wmsAnsListDetailsVo.getWaitInCount());
} else {
detailsVo.setActualInCount(wmsAnsListDetailsVo.getOrderCount());
detailsVo.setMaxCount(wmsAnsListDetailsVo.getOrderCount());
}
detailsVo.setActualInCount("");
detailsVo.setRejectCount("");
detailsVo.setRejectReason("");
lists.add(detailsVo);

Loading…
Cancel
Save