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

提交3.26

Browse Source
product
17602169347 2 years ago
parent 8f4529e98d
commit 15dbe41fdc
17 changed files with 880 additions and 825 deletions
Show Stats Download Patch File Download Diff File

4
SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java
Unescape View File

@ -213,6 +213,8 @@ public class PaymentController {
List<PaymentEntity> list= paymentService.getList(paymentPagination);
//处理id字段转名称，若无需转或者为空可删除
for(PaymentEntity entity:list){
Map<String,Object> supplierIdMap = new HashMap<>();
entity.setSuppliername(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher()));
}
List<PaymentListVO> listVO=JsonUtil.getJsonToList(list,PaymentListVO.class);
@ -431,6 +433,8 @@ public class PaymentController {
@GetMapping("/{id}")
public ActionResult<PaymentInfoVO> info(@PathVariable("id") String id){
PaymentEntity entity= paymentService.getInfo(id);
Map<String,Object> supplierIdMap = new HashMap<>();
entity.setSuppliername(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
PaymentInfoVO vo=JsonUtil.getJsonToBean(entity, PaymentInfoVO.class);
//子表

1
SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java
Unescape View File

@ -117,5 +117,4 @@ public class PaymentEntity {
private String voucher;
@TableField("supplier_id")
private String supplierId;
}

2
SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java
Unescape View File

@ -110,4 +110,6 @@ public class PaymentListVO{
/** 供应商 **/
@JsonProperty("supplierId")
private String supplierId;
@JsonProperty("supplierName")
private String supplierName;
}

4
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
Unescape View File

@ -124,7 +124,7 @@ public class PaymentdocController {
for(PaymentdocEntity entity:list){
Map<String,Object> supplierIdMap = new HashMap<>();
entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
QueryWrapper<PaymentEntity> PaymentqueryWrapper = new QueryWrapper<>();
/*QueryWrapper<PaymentEntity> PaymentqueryWrapper = new QueryWrapper<>();
PaymentqueryWrapper.lambda().eq(PaymentEntity::getPaymentno, entity.getDocumentNo());
List<PaymentEntity> paymentEntityList = paymentService.list(PaymentqueryWrapper);
if(paymentEntityList != null && paymentEntityList.size() > 0){
@ -134,7 +134,7 @@ public class PaymentdocController {
}else{
entity.setPaymentEntity(new PaymentEntity());
}
}
}*/
}
List<PaymentdocListVO> listVO=JsonUtil.getJsonToList(list,PaymentdocListVO.class);
for(PaymentdocListVO paymentdocVO:listVO){

10
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
Unescape View File

@ -221,11 +221,9 @@ public class PurchaseorderController {
purchaseorder_item0Wrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, purchaseorderVO.getId());
purchaseorder_item0Wrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId);
List<String> poundIdList = purchaseorder_item0Service.listObjs(purchaseorder_item0Wrapper).stream().map(o -> (String) o).collect(Collectors.toList());
QueryWrapper<PoundlistEntity> poundlistWrapper = new QueryWrapper<>();
poundlistWrapper.lambda().in(PoundlistEntity::getId, poundIdList);
List<PoundlistEntity> poundlistEntityList = new ArrayList<>();
if(poundIdList.size() > 0){
poundlistEntityList = poundlistService.list(poundlistWrapper);
poundlistEntityList = poundlistService.queryPoundListByIds(poundIdList);
}
purchaseorderVO.setPoundlistEntityList(poundlistEntityList);
}
@ -660,6 +658,12 @@ public class PurchaseorderController {
PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
entity.setStatus("3");
purchaseorderitemService.updateById(entity);
List<Purchaseorder_item0Entity> purchaseorder_item0EntityList = purchaseorderitemService.GetPurchaseorder_item0List(id);
for (Purchaseorder_item0Entity purchaseorder_item0Entity : purchaseorder_item0EntityList) {
PoundlistEntity poundlistEntity = poundlistService.getById(purchaseorder_item0Entity.getPoundlistId());
poundlistEntity.setPurchaseStatus("3");
poundlistService.updateById(poundlistEntity);
}
return ActionResult.success("归档成功");
}

1
SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml
Unescape View File

@ -168,6 +168,7 @@ WHERE a.delete_mark = 0 and
<foreach collection="poundlistIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
ORDER BY a.advance DESC,a.pound_date ASC
</select>
<select id="queryPoundListByIdsRenkuan" resultType="jnpf.poundlist.entity.PoundlistEntity">

5
SC-web/src/views/extend/paymentdoc/form.vue
Unescape View File

@ -566,7 +566,7 @@
</template>
</el-table-column>
<el-table-column prop="paymentamount" label="付款金额" align="center"
width="250">
width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.paymentamount" placeholder="请输入"
clearable :style='{"width":"100%"}' :disabled="true">
@ -574,7 +574,7 @@
</template>
</el-table-column>
<el-table-column prop="settlementtype" label="付款方式" align="center"
width="250">
width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.settlementtype" placeholder="请选择" clearable
:style='{"width":"100%"}' :disabled="true">
@ -1119,6 +1119,7 @@
})
},
request() {
this.visible = false
var _data = this.dataList()
if (!this.dataForm.id) {
request({

10
SC-web/src/views/scm/basicInformation/invoices/Form.vue
Unescape View File

@ -236,7 +236,7 @@
:style='{"width":"100%"}' @change="invoiceQuantityChange">
</el-input> -->
<el-input-number v-model="scope.row.invoiceQuantity" placeholder="数字文本" :step="1"
:style='{"width":"100%"}' @change="invoiceQuantityChange" :precision="6">
:style='{"width":"100%"}' @change="invoiceQuantityChange(scope.row)" :precision="6">
</el-input-number>
</template>
@ -247,7 +247,7 @@
:style='{"width":"100%"}'>
</el-input> -->
<el-input-number v-model="scope.row.invoiceAmount" placeholder="数字文本" :step="1" :precision="6"
:style='{"width":"100%"}' @change="invoiceAmountChange">
:style='{"width":"100%"}' @change="invoiceAmountChange(scope.row)">
</el-input-number>
</template>
@ -263,7 +263,7 @@
<el-table-column prop="taxAmount" label="税额" width="200">
<template slot-scope="scope">
<el-input-number v-model="scope.row.taxAmount" placeholder="数字文本" :step="1" :precision="6"
:style='{"width":"100%"}'>
:style='{"width":"100%"}' :disabled="true">
</el-input-number>
</template>
@ -271,7 +271,7 @@
<el-table-column prop="amountNotTax" label="不含税金额" width="200">
<template slot-scope="scope">
<el-input-number v-model="scope.row.amountNotTax" placeholder="数字文本" :step="1" :precision="6"
:style='{"width":"100%"}'>
:style='{"width":"100%"}' :disabled="true">
</el-input-number>
</template>
@ -586,7 +586,7 @@
return sums;
},
invoiceQuantityChange(e) {
invoiceQuantityChange(row) {
var invoiceQuantity = 0;
this.dataForm.invoicesitem0List.forEach((item, index) => {
invoiceQuantity = invoiceQuantity + parseFloat(item.invoiceQuantity);

8
SC-web/src/views/scm/basicInformation/invoices/index.vue
Unescape View File

@ -53,8 +53,8 @@
</el-button> -->
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<!-- <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button> -->
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
@ -95,8 +95,8 @@
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> -->
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
</template>

17
SC-web/src/views/scm/basicInformation/payment/index.vue
Unescape View File

@ -57,6 +57,7 @@
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="documentno" label="单据编号" fixed="left" sortable width="200" align="center" />
<el-table-column prop="paymentno" label="来源单号" fixed="left" sortable width="200" align="center" />
<el-table-column prop="suppliername" label="供应商" fixed="left" sortable width="200" align="center" />
<el-table-column label="单据状态" sortable width="140" prop="status" align="center" >
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
@ -88,7 +89,7 @@
<template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
@ -306,12 +307,20 @@
this.listLoading = false
})
},
handleDel(id) {
handleDel(row) {
if(row.status != '0'){
this.$message({
type: 'error',
message: '已提交或认款的付款单无法删除',
duration: 1500,
})
return
}
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/payment/Payment/${id}`,
url: `/api/payment/Payment/${row.id}`,
method: 'DELETE'
}).then(res => {
this.$message({
@ -489,7 +498,7 @@
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "businessdate",
sidx: "creatorTime",
}
this.initData()
},

3
SC-web/src/views/scm/basicInformation/poundlist/Detail.vue
Unescape View File

@ -737,6 +737,9 @@
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.unit = _dataAll.unit
this.transportType = _dataAll.transportType
this.advance = _dataAll.advance
_dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
_dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
if(_dataAll.originPlace.length > 0){

11
SC-web/src/views/scm/basicInformation/poundlist/Form.vue
Unescape View File

@ -33,7 +33,7 @@
<popupSelect v-model="dataForm.customerId" placeholder="请选择客户" clearable field="customerId"
interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id"
relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage
:pageSize="20" @change="customerSelect">
:pageSize="20" @change="customerSelect" :disabled="true">
</popupSelect>
</el-form-item>
@ -43,7 +43,7 @@
<popupSelect v-model="dataForm.salesId" placeholder="请选择合同" clearable field="salesId"
interfaceId="396203872441416837" :columnOptions="salesIdcolumnOptions" propsValue="id"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" :bissId="dataForm.customerId"
hasPage :pageSize="20">
hasPage :pageSize="20" :disabled="true">
</popupSelect>
</el-form-item>
@ -53,7 +53,7 @@
<popupSelect v-model="dataForm.supplierId" placeholder="请选择供应商" clearable field="supplierId"
interfaceId="382494924156735557" :columnOptions="supplierIdcolumnOptions" propsValue="id"
relationField="supplier_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage
:pageSize="20" >
:pageSize="20" :disabled="true">
</popupSelect>
</el-form-item>
@ -63,7 +63,7 @@
<popupSelect v-model="dataForm.purchaseId" placeholder="请选择合同" clearable field="purchaseId"
interfaceId="397408984857931205" :columnOptions="salesIdcolumnOptions" propsValue="id"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" @change="customerSelect2">
hasPage :pageSize="20" @change="customerSelect2" :disabled="true">
</popupSelect>
</el-form-item>
@ -737,6 +737,9 @@
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.unit = _dataAll.unit
this.transportType = _dataAll.transportType
this.advance = _dataAll.advance
_dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
_dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
if(_dataAll.originPlace.length > 0){

4
SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
Unescape View File

@ -237,13 +237,13 @@
</el-table-column>
<el-table-column prop="taxAmount" label="税额" width="200">
<template slot-scope="scope">
<el-input-number v-model="scope.row.taxAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
<el-input-number v-model="scope.row.taxAmount" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
</el-input-number>
</template>
</el-table-column>
<el-table-column prop="amountNotTax" label="不含税金额" width="200">
<template slot-scope="scope">
<el-input-number v-model="scope.row.amountNotTax" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}'>
<el-input-number v-model="scope.row.amountNotTax" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' :disabled="true">
</el-input-number>
</template>
</el-table-column>

8
SC-web/src/views/scm/basicInformation/receiptin/index.vue
Unescape View File

@ -56,8 +56,8 @@
</el-button> -->
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<!-- <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button> -->
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
@ -97,8 +97,8 @@
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> -->
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
</template>

3
SC-web/src/views/scm/basicInformation/tradeupload/Detail.vue
Unescape View File

@ -711,6 +711,9 @@
let _dataAll = dataAll
_dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
_dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
this.unit = _dataAll.unit
this.transportType = _dataAll.transportType
this.advance = _dataAll.advance
if(_dataAll.originPlace.length > 0){
_dataAll.originPlace = JSON.parse(_dataAll.originPlace)
}else{

1611
SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
View File

File diff suppressed because it is too large Load Diff

3
SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
Unescape View File

@ -702,6 +702,9 @@
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.unit = _dataAll.unit
this.transportType = _dataAll.transportType
this.advance = _dataAll.advance
_dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
_dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
if(_dataAll.originPlace.length > 0){

Write Preview
Loading…
Cancel
Save