yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

销售问题

Browse Source
product
杨世强 2 years ago
parent 5a869c987a
commit 08452758d1
6 changed files with 83 additions and 79 deletions
Show Stats Download Patch File Download Diff File

63
SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
Unescape View File

@ -33,6 +33,7 @@ import jnpf.util.file.UploadUtil;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
@ -218,10 +219,21 @@ public class CollectionController {
public ActionResult create(@RequestBody @Valid CollectionCrForm collectionCrForm) throws DataException {
List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class);
for (Collection_item0Entity collectionItem0Entity : Collection_item0List){
if (collectionItem0Entity.getAmount() == null ){
return ActionResult.fail("请输入收款金额");
}
if (collectionItem0Entity.getSalesorderId() != null){
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionCrForm.getCollection_item0List().get(0).getSalesorderId());
if (saleorderitemEntity.getAmountCollected() == null){
saleorderitemEntity.setAmountCollected(new BigDecimal(0));
saleorderitemEntity.setAmountCollected(new BigDecimal("0"));
}
if (saleorderitemEntity.getPrice() == null){
saleorderitemEntity.setPrice(new BigDecimal("0"));
}
BigDecimal notAmount = new BigDecimal("0");
notAmount = saleorderitemEntity.getPrice().subtract(saleorderitemEntity.getAmountCollected());
if (collectionItem0Entity.getAmount().compareTo(notAmount) == 1){
return ActionResult.fail("收款金额不能大于订单金额-已收款金额");
}
if (saleorderitemEntity.getAmountCollected().equals(saleorderitemEntity.getPrice()) ||
saleorderitemEntity.getAmountCollected().compareTo(saleorderitemEntity.getPrice()) == 1){
@ -230,39 +242,24 @@ public class CollectionController {
}else {
return ActionResult.fail("销售订单不存在");
}
}
// if (collectionCrForm.getCollection_item0List().size()>0) {
//
// SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionCrForm.getCollection_item0List().get(0).getSalesorderId());
// if (saleorderitemEntity.getAmountCollected() == null){
// saleorderitemEntity.setAmountCollected(new BigDecimal(0));
// }
// if (saleorderitemEntity.getAmountCollected().equals(saleorderitemEntity.getPrice()) ||
// saleorderitemEntity.getAmountCollected().compareTo(saleorderitemEntity.getPrice()) == 1){
// return ActionResult.fail("已回完款，无需回款");
// }
// }else {
// return ActionResult.fail("销售订单不存在");
// }
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
collectionCrForm.setCreatorUserName(userInfo.getUserId());
collectionCrForm.setCreatorTime(DateUtil.getNow());
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
collectionCrForm.setCreatorUserName(userInfo.getUserId());
collectionCrForm.setCreatorTime(DateUtil.getNow());
// collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class);
entity.setId(mainId);
entity.setStatus("0");
collectionService.save(entity);
CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class);
entity.setId(mainId);
entity.setStatus("0");
collectionService.save(entity);
// List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class);
for(Collection_item0Entity entitys : Collection_item0List){
for(Collection_item0Entity entitys : Collection_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setCollectionId(entity.getId());
collection_item0Service.save(entitys);
}
return ActionResult.success("创建成功");
return ActionResult.success("创建成功");
}
return ActionResult.fail("请填写收款明细");
}
@ -519,16 +516,6 @@ public class CollectionController {
List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionUpForm.getCollection_item0List(),Collection_item0Entity.class);
for(Collection_item0Entity entitys : Collection_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setCollectionId(entity.getId());
collection_item0Service.save(entitys);

34
SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
Unescape View File

@ -2,7 +2,7 @@
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1000px">
width="1500px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
@ -28,7 +28,7 @@
<el-form-item label="币别 "
prop="currency" >
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
@ -47,7 +47,7 @@
<el-form-item label="数量"
prop="quantity" >
<el-input-number v-model="dataForm.quantity"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
placeholder="数字文本" :step="1" :style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
@ -57,7 +57,7 @@
prop="contractId" >
<popupSelect v-model="dataForm.contractId"
placeholder="请选择" clearable field="contractId" interfaceId="398361758806411909" :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
@ -86,7 +86,7 @@
prop="salesOrderId" >
<popupSelect v-model="dataForm.salesOrderId"
placeholder="请选择" clearable field="salesOrderId" interfaceId="400235058386036741" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
@ -98,7 +98,7 @@
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="398362084892576389" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
@ -183,7 +183,7 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注信息" align="center" width="130">
<el-table-column prop="remark" label="备注信息" align="center" width="250">
<template slot-scope="scope">
<el-input v-model="scope.row.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -227,14 +227,14 @@
<el-table-column prop="invoiceQuantity" label="发票数量" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceQuantity"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}' @change="invoiceQuantitySum">
</el-input>
</template>
</el-table-column>
<el-table-column prop="involceAmount" label="发票金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.involceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}' @change="involceAmountSum">
</el-input>
</template>
</el-table-column>
@ -365,6 +365,22 @@
},
mounted() {},
methods: {
invoiceQuantitySum(){
debugger
let sum = 0;
for (let i =0;i<this.dataForm.arinvoices_item0List.length;i++){
sum = sum + parseFloat(this.dataForm.arinvoices_item0List[i].invoiceQuantity)
}
this.dataForm.invoiceQuantity = sum
debugger
},
involceAmountSum(){
let sum = 0;
for (let i =0;i<this.dataForm.arinvoices_item0List.length;i++){
sum = sum + parseFloat(this.dataForm.arinvoices_item0List[i].involceAmount)
}
this.dataForm.invoiceAmount = sum
},
importData(param){
param.checkedList.forEach((column, index) => {
if(column.taxRate == '0.13'){

8
SC-web/src/views/scm/basicInformation/collection/Form.vue
Unescape View File

@ -25,7 +25,7 @@
<el-form-item label="合同名称" prop="contractId">
<popupSelect v-model="dataForm.contractId" placeholder="请选择" clearable field="contractId"
interfaceId="399835312982972805" :bissId="dataForm.customerId" :columnOptions="contractNamecolumnOptions" propsValue="id"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" @change="contractSelect"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
>
</popupSelect>
</el-form-item>
@ -414,13 +414,13 @@
mounted() {},
methods: {
paymentTypeChange(e){
this.dataForm.paymentType = e;
this.paymentType = e;
},
currencyChange(e){
this.dataForm.currency = e;
this.currency = e;
},
settlementTypeChange(e){
this.dataForm.settlementType = e;
this.settlementType = e;
},
getSummaries(param) {
const { columns, data } = param;

2
SC-web/src/views/scm/basicInformation/receiptout/Form.vue
Unescape View File

@ -69,7 +69,7 @@
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
popupTitle="选择数据" popupWidth="800px" disabled
hasPage :pageSize="20" >
</popupSelect>
</el-form-item>

2
SC-web/src/views/scm/basicInformation/saleback/Form.vue
Unescape View File

@ -331,8 +331,10 @@
var sumNum = 0;
var excludeFields = [];
for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
debugger
excludeFields.push(this.dataForm.saleback_item0List[i].vehicleId);
if(a == this.dataForm.saleback_item0List[i].vehicleId){
debugger
// this.dataForm.saleback_item0List[i].vehicleId = b.vehicle_id;
this.dataForm.saleback_item0List[i].materialId = b.material_id;
this.dataForm.saleback_item0List[i].settlement = b.settlement;

53
SC-web/src/views/scm/basicInformation/saleorder/Form.vue
Unescape View File

@ -22,7 +22,7 @@
placeholder="请选择" clearable field="contractCode" interfaceId="391146878474963333"
:columnOptions="contractCodecolumnOptions" propsValue="id" relationField="contract_name"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px" @change="contractSelect"
popupTitle="选择数据" popupWidth="800px" @change="contractSelect" disabled
>
</popupSelect>
@ -35,7 +35,7 @@
placeholder="请选择" clearable field="costomerCode" interfaceId="398016916830126469"
:columnOptions="costomerCodecolumnOptions" propsValue="id" relationField="supplier_nm"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
</el-form-item>
@ -55,7 +55,7 @@
<el-form-item label="对方合同"
prop="contractNo">
<el-input v-model="dataForm.contractNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
@ -64,7 +64,7 @@
<el-form-item label="垫资金额"
prop="advanceAmount">
<el-input-number v-model="dataForm.advanceAmount"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
placeholder="数字文本" :step="1" :style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
@ -73,7 +73,7 @@
<el-form-item label="重量"
prop="num">
<el-input-number v-model="dataForm.num"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
placeholder="数字文本" :step="1" :style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
@ -82,7 +82,7 @@
<el-form-item label="金额"
prop="price">
<el-input-number v-model="dataForm.price"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
placeholder="数字文本" :step="1" :style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
@ -91,22 +91,21 @@
<el-form-item label="不含税金额"
prop="notPrice">
<el-input-number v-model="dataForm.notPrice"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
placeholder="数字文本" :step="1" :style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="备注信息"
prop="remark">
<el-input v-model="dataForm.remark"
<el-col :span="8">
<el-form-item label="考核金额"
prop="assessmentPirce">
<el-input v-model="dataForm.assessmentPirce"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="所属标段"
prop="bidSection">
<el-input v-model="dataForm.bidSection"
@ -115,10 +114,10 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="考核金额"
prop="assessmentPirce">
<el-input v-model="dataForm.assessmentPirce"
<el-col :span="8">
<el-form-item label="备注信息"
prop="remark">
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
@ -145,7 +144,7 @@
:columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="vehicle_id"
relationField="ticketno"
popupType="dialog" :excludeFields="excludeFields"
popupWidth="800px" @change="poundInfoSelect">
popupWidth="800px" @change="poundInfoSelect" disabled>
</popupSelect>
</template>
</el-table-column>
@ -156,7 +155,7 @@
interfaceId="398108817931470725"
:columnOptions="salesorder_item0materialIdcolumnOptions" propsValue="id"
relationField="item_name" popupType="dialog"
popupWidth="800px"
popupWidth="800px" disabled
>
</popupSelect>
</template>
@ -164,7 +163,7 @@
<el-table-column prop="poundType" label="类型" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.poundType"
placeholder="请选择" clearable :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
@ -173,14 +172,14 @@
<el-table-column prop="netWeight" label="净重" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.netWeight"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="单位" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.unit"
placeholder="请选择" clearable :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
@ -189,7 +188,7 @@
<el-table-column prop="advance" label="是否垫资" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.advance"
placeholder="请选择" clearable :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
@ -206,14 +205,14 @@
<el-table-column prop="settlement" label="结算重量" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.settlement"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rate" label="税率 " align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.rate"
placeholder="请选择" clearable :style='{"width":"100%"}' @change="computeNoPrice">
placeholder="请选择" clearable :style='{"width":"100%"}' @change="computeNoPrice" >
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
@ -222,14 +221,14 @@
<el-table-column prop="price" label="金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.price"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="noPrice" label="不含税金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.noPrice"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>

Write Preview
Loading…
Cancel
Save