From d4fad6e89f931d74f3e6927a78e42e2a99253c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Mon, 27 Mar 2023 17:48:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CollectionController.java | 16 ++++++ .../controller/InvoicesController.java | 8 +++ .../controller/PaymentdocController.java | 10 ++++ .../paymentdoc/entity/PaymentdocEntity.java | 6 +++ .../model/paymentdoc/PaymentdocListVO.java | 7 +++ .../controller/PurchaseorderController.java | 54 +++++++++++-------- .../mapper/PurchaseorderitemMapper.java | 2 + .../service/PurchaseorderitemService.java | 2 + .../impl/PurchaseorderitemServiceImpl.java | 5 ++ .../purchaseorder/PurchaseorderMapper.xml | 24 +++++++++ SC-web/src/views/extend/paymentdoc/form.vue | 10 ++-- .../scm/basicInformation/arinvoices/Form.vue | 12 +++-- .../scm/basicInformation/collection/Form.vue | 6 ++- .../scm/basicInformation/invoices/Form.vue | 4 +- .../scm/basicInformation/payment/Form.vue | 11 +++- .../scm/basicInformation/paymentdoc/index.vue | 14 +++++ .../basicInformation/poundlist/salesForm.vue | 2 +- .../scm/basicInformation/receiptin/Detail.vue | 2 +- .../scm/basicInformation/receiptin/Form.vue | 2 +- .../scm/basicInformation/receiptout/Form.vue | 6 ++- .../scm/basicInformation/saleback/Form.vue | 6 ++- .../scm/basicInformation/saleorder/Form.vue | 6 ++- .../saleorder/arinvoicesForm.vue | 6 ++- .../saleorder/collectionForm.vue | 6 ++- .../saleorder/receiptoutForm.vue | 6 ++- .../saleorder/salebackForm.vue | 6 ++- .../scm/basicInformation/tradeupload/Form.vue | 28 +++++----- .../basicInformation/tradeupload/Form2.vue | 2 +- 28 files changed, 209 insertions(+), 60 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java index 18de608a..1f993d67 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java @@ -278,6 +278,14 @@ public class CollectionController { public ActionResult create(@RequestBody @Valid CollectionCrForm collectionCrForm) throws DataException { List Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class); for (Collection_item0Entity collectionItem0Entity : Collection_item0List){ + if (StringUtils.isNotEmpty(collectionItem0Entity.getSalesorderId())){ + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(collectionItem0Entity.getSalesorderId()); + if (saleorderitemEntity.getInvoiceAmount() != null && saleorderitemEntity.getPrice() != null){ + if (saleorderitemEntity.getInvoiceAmount().compareTo(saleorderitemEntity.getPrice()) != 0){ + return ActionResult.fail("订单金额与发票金额不一致,无法回款"); + } + } + } if (collectionItem0Entity.getAmount() == null ){ return ActionResult.fail("请输入收款金额"); } @@ -574,6 +582,14 @@ public class CollectionController { List Collection_item0List = JsonUtil.getJsonToList(collectionUpForm.getCollection_item0List(),Collection_item0Entity.class); for(Collection_item0Entity entitys : Collection_item0List){ + if (StringUtils.isNotEmpty(entitys.getSalesorderId())){ + SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(entitys.getSalesorderId()); + if (saleorderitemEntity.getInvoiceAmount() != null && saleorderitemEntity.getPrice() != null){ + if (saleorderitemEntity.getInvoiceAmount().compareTo(saleorderitemEntity.getPrice()) != 0){ + return ActionResult.fail("订单金额与发票金额不一致,无法回款"); + } + } + } if (entitys.getAmount() == null ){ return ActionResult.fail("请输入收款金额"); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java index 64d82238..f61efd18 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java @@ -420,6 +420,14 @@ public class InvoicesController { @PutMapping("/{id}") @Transactional public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid InvoicesUpForm invoicesUpForm) throws DataException { + if (StringUtils.isNotEmpty(invoicesUpForm.getPurchaseorderId())){ + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(invoicesUpForm.getPurchaseorderId()); + if (StringUtils.isNotEmpty(purchaseorderEntity.getStatus())){ + if (purchaseorderEntity.getStatus().equals("2") || purchaseorderEntity.getStatus().equals("3")){ + return ActionResult.fail("已入库或已归档,无法修改"); + } + } + } UserInfo userInfo=userProvider.get(); InvoicesEntity entity= invoicesService.getInfo(id); if(entity!=null){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java index b7f56180..43b4eb96 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java @@ -22,6 +22,7 @@ import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; import jnpf.purchaseback.entity.PurchaseorderEntity; import jnpf.purchaseback.service.PurchaseorderService; +import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; import jnpf.base.entity.ProvinceEntity; @@ -65,6 +66,7 @@ import jnpf.util.GeneraterSwapUtil; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; import jnpf.util.file.UploadUtil; import jnpf.util.enums.FileTypeEnum; @@ -124,6 +126,14 @@ public class PaymentdocController { for(PaymentdocEntity entity:list){ Map supplierIdMap = new HashMap<>(); entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap)); + + + QueryWrapper PaymentdocItem1EntityqueryWrapper = new QueryWrapper<>(); + PaymentdocItem1EntityqueryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, entity.getId()); + PaymentdocItem1EntityqueryWrapper.lambda().select(PaymentdocItem1Entity::getPoundlistId); + List poundlistIdList = paymentdocItem1Service.listObjs(PaymentdocItem1EntityqueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); + List poundlistEntityList = poundlistService.queryPoundListByIds(poundlistIdList); + entity.setPoundlistEntityList(poundlistEntityList); /*QueryWrapper PaymentqueryWrapper = new QueryWrapper<>(); PaymentqueryWrapper.lambda().eq(PaymentEntity::getPaymentno, entity.getDocumentNo()); List paymentEntityList = paymentService.list(PaymentqueryWrapper); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java index 951b620c..9203f964 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java @@ -3,6 +3,7 @@ package jnpf.paymentdoc.entity; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.*; import jnpf.payment.entity.PaymentEntity; +import jnpf.poundlist.entity.PoundlistEntity; import lombok.Data; import java.util.Date; @@ -10,6 +11,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.math.BigDecimal; import java.math.BigDecimal; import java.math.BigDecimal; +import java.util.List; + /** * * 付款申请主表 @@ -136,4 +139,7 @@ public class PaymentdocEntity { @TableField("payment_amount_history") private String paymentAmountHistory; + + @TableField(exist = false) + private List poundlistEntityList; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java index 387dd86a..85358679 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java @@ -3,12 +3,16 @@ package jnpf.paymentdoc.model.paymentdoc; +import com.baomidou.mybatisplus.annotation.TableField; +import jnpf.poundlist.entity.PoundlistEntity; import lombok.Data; import java.sql.Time; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.math.BigDecimal; +import java.util.List; + /** * * @@ -144,4 +148,7 @@ public class PaymentdocListVO{ private String isStop; @JsonProperty("docStatus") private String docStatus; + + @JsonProperty("poundlistEntityList") + private List poundlistEntityList; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 2f8e9f76..2d9a4d90 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -52,6 +52,7 @@ import jnpf.util.file.UploadUtil; import jnpf.warehouse.service.WareHouseService; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; @@ -679,25 +680,26 @@ public class PurchaseorderController { PurchaseorderInfoVO vo = JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class); //子表数据转换 - List jg_purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id); + List jg_purchaseorder_item0List = purchaseorderitemService.queryPurchaseOrderItemInfo(id); +// List jg_purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id); List jg_purchaseorder_item0ModelList = JsonUtil.getJsonToList(jg_purchaseorder_item0List, Purchaseorder_item0Model.class); - for (Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList) { - Map vehicleIdMap = new HashMap<>(); - jg_purchaseorder_item0Model.setVehicleName(generaterSwapUtil.getPopupSelectValue("389754644018016581", "vehicle_id", "ticketno", jg_purchaseorder_item0Model.getVehicleId(), vehicleIdMap)); - Map materialIdMap = new HashMap<>(); - jg_purchaseorder_item0Model.setMaterialName(generaterSwapUtil.getPopupSelectValue("397736371898382533", "id", "item_name", jg_purchaseorder_item0Model.getMaterialId(), materialIdMap)); - PoundlistEntity poundlistEntity = poundlistService.getById(jg_purchaseorder_item0Model.getPoundlistId()); - jg_purchaseorder_item0Model.setPoundDate(poundlistEntity.getPoundDate()); - - SupplierEntity supplierEntity = supplierService.getById(jg_purchaseorder_item0Model.getSupplierId()); - if (supplierEntity != null) { - jg_purchaseorder_item0Model.setSupplierName(supplierEntity.getSupplierName()); - } - UserEntity userEntity = userService.getById(poundlistEntity.getBusinessId()); - if (userEntity != null) { - jg_purchaseorder_item0Model.setBusinessName(userEntity.getRealName()); - } - } +// for (Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList) { +// Map vehicleIdMap = new HashMap<>(); +// jg_purchaseorder_item0Model.setVehicleName(generaterSwapUtil.getPopupSelectValue("389754644018016581", "vehicle_id", "ticketno", jg_purchaseorder_item0Model.getVehicleId(), vehicleIdMap)); +// Map materialIdMap = new HashMap<>(); +// jg_purchaseorder_item0Model.setMaterialName(generaterSwapUtil.getPopupSelectValue("397736371898382533", "id", "item_name", jg_purchaseorder_item0Model.getMaterialId(), materialIdMap)); +// PoundlistEntity poundlistEntity = poundlistService.getById(jg_purchaseorder_item0Model.getPoundlistId()); +// jg_purchaseorder_item0Model.setPoundDate(poundlistEntity.getPoundDate()); +// +// SupplierEntity supplierEntity = supplierService.getById(jg_purchaseorder_item0Model.getSupplierId()); +// if (supplierEntity != null) { +// jg_purchaseorder_item0Model.setSupplierName(supplierEntity.getSupplierName()); +// } +// UserEntity userEntity = userService.getById(poundlistEntity.getBusinessId()); +// if (userEntity != null) { +// jg_purchaseorder_item0Model.setBusinessName(userEntity.getRealName()); +// } +// } vo.setPurchaseorder_item0List(jg_purchaseorder_item0ModelList); List jg_invoices_item0List = purchaseorderitemService.GetInvoices_item0itemList(id); List jg_invoices_item0ModelList = JsonUtil.getJsonToList(jg_invoices_item0List, Invoices_item0itemModel.class); @@ -775,10 +777,18 @@ public class PurchaseorderController { //附表数据转换 //添加到详情表单对象中 - Map contractCodeMap = new HashMap<>(); - vo.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229", "id", "contract_name", vo.getContractCode(), contractCodeMap)); - Map supplierIdMap = new HashMap<>(); - vo.setSupplierName(generaterSwapUtil.getPopupSelectValue("397751667988199621", "id", "supplier_name", vo.getSupplierId(), supplierIdMap)); + ContractFileEntity contractFileEntity = contractFileService.getInfo(vo.getContractCode()); + if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){ + vo.setContractName(contractFileEntity.getContractName()); + } + SupplierEntity supplierEntity = supplierService.getInfo(vo.getSupplierId()); + if (ObjectUtils.isNotEmpty(supplierEntity) && StringUtils.isNotEmpty(supplierEntity.getSupplierName())){ + vo.setSupplierName(supplierEntity.getSupplierName()); + } +// Map contractCodeMap = new HashMap<>(); +// vo.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229", "id", "contract_name", vo.getContractCode(), contractCodeMap)); +// Map supplierIdMap = new HashMap<>(); +// vo.setSupplierName(generaterSwapUtil.getPopupSelectValue("397751667988199621", "id", "supplier_name", vo.getSupplierId(), supplierIdMap)); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); return ActionResult.success(vo); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java index 3608951d..a61e49d4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; import jnpf.purchaseorder.entity.PurchaseorderitemEntity; import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination; import org.apache.ibatis.annotations.Param; @@ -26,4 +27,5 @@ public interface PurchaseorderitemMapper extends BaseMapper> getWordExcelInfo(@Param("ew")Wrapper queryWrapper); List> getVehicleInfo(@Param("ew")Wrapper queryWrapper); IPage queryByKeyword(@Param("page") Page page, @Param("purchaseorderPagination") PurchaseorderPagination purchaseorderPagination); + List queryPurchaseOrderItem(String id); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java index 73e2728e..81b07e3b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java @@ -58,5 +58,7 @@ public interface PurchaseorderitemService extends IService dataList) throws ParseException, DataException; List getPoundList(String id); + + List queryPurchaseOrderItemInfo(String id); //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index 66792d99..577391e0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -1781,5 +1781,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl queryPurchaseOrderItemInfo(String id) { + return purchaseorderitemMapper.queryPurchaseOrderItem(id); + } //列表子表数据方法 } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml index 64535074..bfd38c5c 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml @@ -251,4 +251,28 @@ + + diff --git a/SC-web/src/views/extend/paymentdoc/form.vue b/SC-web/src/views/extend/paymentdoc/form.vue index 0af9d816..03c7c781 100644 --- a/SC-web/src/views/extend/paymentdoc/form.vue +++ b/SC-web/src/views/extend/paymentdoc/form.vue @@ -139,7 +139,7 @@ --> -