From 15dbe41fdc17bd392641c6631b8619c17283b43f Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Sun, 26 Mar 2023 13:12:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A43.26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/controller/PaymentController.java | 4 + .../jnpf/payment/entity/PaymentEntity.java | 1 - .../payment/model/payment/PaymentListVO.java | 2 + .../controller/PaymentdocController.java | 4 +- .../controller/PurchaseorderController.java | 10 +- .../mapper/poundlist/PoundlistMapper.xml | 1 + SC-web/src/views/extend/paymentdoc/form.vue | 5 +- .../scm/basicInformation/invoices/Form.vue | 10 +- .../scm/basicInformation/invoices/index.vue | 8 +- .../scm/basicInformation/payment/index.vue | 17 +- .../scm/basicInformation/poundlist/Detail.vue | 3 + .../scm/basicInformation/poundlist/Form.vue | 11 +- .../purchaseorder/InvoicesForm.vue | 4 +- .../scm/basicInformation/receiptin/index.vue | 8 +- .../basicInformation/tradeupload/Detail.vue | 3 + .../scm/basicInformation/tradeupload/Form.vue | 1611 +++++++++-------- .../basicInformation/tradeupload/Form2.vue | 3 + 17 files changed, 880 insertions(+), 825 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java index 9e91649c..5dc0cc37 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java @@ -213,6 +213,8 @@ public class PaymentController { List list= paymentService.getList(paymentPagination); //处理id字段转名称，若无需转或者为空可删除 for(PaymentEntity entity:list){ + Map supplierIdMap = new HashMap<>(); + entity.setSuppliername(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap)); entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher())); } List listVO=JsonUtil.getJsonToList(list,PaymentListVO.class); @@ -431,6 +433,8 @@ public class PaymentController { @GetMapping("/{id}") public ActionResult info(@PathVariable("id") String id){ PaymentEntity entity= paymentService.getInfo(id); + Map supplierIdMap = new HashMap<>(); + entity.setSuppliername(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap)); PaymentInfoVO vo=JsonUtil.getJsonToBean(entity, PaymentInfoVO.class); //子表 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java index aa5e1c0b..a8de1098 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java @@ -117,5 +117,4 @@ public class PaymentEntity { private String voucher; @TableField("supplier_id") private String supplierId; - } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java index 9b97dcbe..3cc084e0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java @@ -110,4 +110,6 @@ public class PaymentListVO{ /** 供应商 **/ @JsonProperty("supplierId") private String supplierId; + @JsonProperty("supplierName") + private String supplierName; } \ No newline at end of file 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 64f565c3..376bb1ed 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 @@ -124,7 +124,7 @@ public class PaymentdocController { for(PaymentdocEntity entity:list){ Map supplierIdMap = new HashMap<>(); entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap)); - QueryWrapper PaymentqueryWrapper = new QueryWrapper<>(); + /*QueryWrapper PaymentqueryWrapper = new QueryWrapper<>(); PaymentqueryWrapper.lambda().eq(PaymentEntity::getPaymentno, entity.getDocumentNo()); List paymentEntityList = paymentService.list(PaymentqueryWrapper); if(paymentEntityList != null && paymentEntityList.size() > 0){ @@ -134,7 +134,7 @@ public class PaymentdocController { }else{ entity.setPaymentEntity(new PaymentEntity()); } - } + }*/ } List listVO=JsonUtil.getJsonToList(list,PaymentdocListVO.class); for(PaymentdocListVO paymentdocVO:listVO){ 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 e5cf7c39..ac121ef3 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 @@ -221,11 +221,9 @@ public class PurchaseorderController { purchaseorder_item0Wrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, purchaseorderVO.getId()); purchaseorder_item0Wrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId); List poundIdList = purchaseorder_item0Service.listObjs(purchaseorder_item0Wrapper).stream().map(o -> (String) o).collect(Collectors.toList()); - QueryWrapper poundlistWrapper = new QueryWrapper<>(); - poundlistWrapper.lambda().in(PoundlistEntity::getId, poundIdList); List 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_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("归档成功"); } diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml index 8506fee7..d913fb9b 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml @@ -168,6 +168,7 @@ WHERE a.delete_mark = 0 and #{item} + ORDER BY a.advance DESC,a.pound_date ASC