From 585d67894071cdbdc6b65d8dad2a0aca7a5a205a Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Mon, 24 Apr 2023 15:46:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E5=AD=90?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paymentdoc/entity/PaymentdocEntity.java | 3 + .../entity/PaymentdocItem0Entity.java | 5 ++ .../controller/PurchaseorderController.java | 36 +++++++++++ .../purchaseorder/PurchaseorderInfoVO.java | 12 ++++ .../basicInformation/purchaseorder/Detail.vue | 63 +++++++++++++++++++ .../scm/basicInformation/saleorder/index.vue | 8 +++ 6 files changed, 127 insertions(+) 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 9d265708..66fcf283 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 @@ -147,4 +147,7 @@ public class PaymentdocEntity { private String customerName; @TableField("num") private BigDecimal num; + + @TableField(exist = false) + private List PaymentdocEntityList1; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java index e52deac4..2e83affc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java @@ -7,6 +7,8 @@ import lombok.Data; import java.util.Date; import com.fasterxml.jackson.annotation.JsonProperty; import java.math.BigDecimal; +import java.util.List; + /** * * 付款申请明细 @@ -150,4 +152,7 @@ public class PaymentdocItem0Entity { private String supplierId; @TableField(exist = false) private BigDecimal requestAmount; + + @TableField(exist = false) + private List paymentdocEntities; } 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 5b25f3f2..59695678 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 @@ -25,6 +25,10 @@ import jnpf.materialvo.service.MaterialService; import jnpf.mobilePort.utils.FileCopy; import jnpf.payment.model.payment.PaymentListVO; import jnpf.payment.service.PaymentService; +import jnpf.paymentdoc.entity.PaymentdocEntity; +import jnpf.paymentdoc.entity.PaymentdocItem0Entity; +import jnpf.paymentdoc.service.PaymentdocItem0Service; +import jnpf.paymentdoc.service.PaymentdocService; import jnpf.permission.service.UserService; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; @@ -141,6 +145,10 @@ public class PurchaseorderController { private Receiptin_item0Service receiptin_item0Service; @Autowired private VehicleService vehicleService; + @Autowired + private PaymentdocItem0Service paymentdocItem0Service; + @Autowired + private PaymentdocService paymentdocService; /** * 归档 @@ -677,6 +685,32 @@ public class PurchaseorderController { vo.setInvoicesitemEntity(invoicesitemList.get(0)); } + QueryWrapper docItem0Wrapper = new QueryWrapper<>(); + docItem0Wrapper.lambda().eq(PaymentdocItem0Entity::getPurchaseorderId, id); + List paymentdocItem0EntityList = paymentdocItem0Service.list(docItem0Wrapper); + List PaymentdocEntity11 = new ArrayList<>(); + if ( paymentdocItem0EntityList != null) { + for (int i=0;i docWrapper = new QueryWrapper<>(); + docWrapper.lambda().eq(PaymentdocEntity::getId,paymentdocItem0EntityList.get(i).getPaymentdocId()); +// PaymentdocEntity paymentdocEntity1=new PaymentdocEntity(); +// paymentdocEntity1= (PaymentdocEntity) paymentdocService.list(docWrapper); + List paymentdocEntityList = paymentdocService.list(docWrapper); + PaymentdocEntity11.addAll(paymentdocEntityList); +// paymentdocItem0Entity.setPaymentdocEntities(paymentdocEntityList); +// vo.setPaymentdocEntity(JsonUtil.getJsonToList(paymentdocEntityList, PaymentdocEntity.class)); +// vo.setPaymentdocItem0EntityList(paymentdocItem0Entity); + + } + vo.setPaymentdocEntityList(PaymentdocEntity11); + } +// else { +// vo.setPaymentdocEntity(new PaymentdocEntity()); +// } + + + QueryWrapper receiptinWrapper = new QueryWrapper<>(); receiptinWrapper.lambda().eq(ReceiptinEntity::getSouceno, id); ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinWrapper); @@ -700,6 +734,8 @@ public class PurchaseorderController { purchasebackWrapper.lambda().eq(PurchasebackEntity::getPurchaseOrderId, id); List PurchasebackList = purchasebackService.list(purchasebackWrapper); vo.setPurchasebackList(PurchasebackList); + + List CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo()); for (CollectionpoEntity collectionpoEntity : CollectionitemList) { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java index f7bde4b0..f0dede39 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java @@ -4,6 +4,9 @@ package jnpf.purchaseorder.model.purchaseorder; import jnpf.payment.model.payment.PaymentListVO; +import jnpf.paymentdoc.entity.PaymentdocEntity; + +import jnpf.paymentdoc.entity.PaymentdocItem0Entity; import jnpf.purchaseback.entity.PurchasebackEntity; import jnpf.purchaseback.entity.Purchaseback_item0Entity; import jnpf.purchaseorder.entity.InvoicesitemEntity; @@ -174,4 +177,13 @@ public class PurchaseorderInfoVO{ @JsonProperty("receiptinEntity") private ReceiptinEntity receiptinEntity; + + @JsonProperty("PaymentdocEntity") + private List paymentdocEntityList; + +// @JsonProperty("PaymentdocEntity") +// private PaymentdocEntity paymentdocEntity; + + @JsonProperty("PaymentdocItem0Entity") + private PaymentdocItem0Entity paymentdocItem0EntityList; } \ No newline at end of file diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue index 053c23dc..87c013e2 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue @@ -493,6 +493,68 @@ + + + +
+

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -724,6 +786,7 @@ paymentList: [], purchasebackList: [], collectionitemList: [], + PaymentdocEntity:[], }, activeypnmkv: '0', rules: { diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue index 12707e73..9abdc663 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue @@ -322,6 +322,13 @@ width="130" align="center" /> +