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 53a7fa08..69979524 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 @@ -296,6 +296,7 @@ public class PaymentdocController { paymentdocitem0Entity.setRate(purchaseorderEntity.getRate()); paymentdocitem0Entity.setNotAmount(purchaseorderEntity.getNotAmount()); paymentdocitem0Entity.setCreatorTime(purchaseorderEntity.getCreatorTime()); + paymentdocitem0Entity.setBusinessDate(purchaseorderEntity.getBusinessDate()); } vo.setPaymentdocItem0List(JsonUtil.getJsonToList(PaymentdocItem0List,PaymentdocItem0Model.class )); List PaymentdocItem1List = paymentdocService.GetPaymentdocItem1List(id); 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 2e83affc..99fdc38b 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 @@ -155,4 +155,7 @@ public class PaymentdocItem0Entity { @TableField(exist = false) private List paymentdocEntities; + + @TableField(exist = false) + private Date businessDate; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java index 3ee40ac9..b40295ba 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocItem0Model.java @@ -1,5 +1,6 @@ package jnpf.paymentdoc.model.paymentdoc; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.List; import java.util.Date; @@ -114,4 +115,7 @@ public class PaymentdocItem0Model { private BigDecimal paymentAmount; @JsonProperty("requestAmount") private BigDecimal requestAmount; + + @JsonProperty("businessDate") + private Date businessDate; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java index 08c6ef85..2cc7f49e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java @@ -151,4 +151,6 @@ public class PurchaseorderEntity { @TableField("PAYMENT_TIME") private Integer paymentTime; + @TableField("BUSINESS_DATE") + private Date businessDate; } diff --git a/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue b/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue index 9ef5dbaa..7f1b8b39 100644 --- a/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue +++ b/SC-web/src/views/dashboard/admin/components/SaleTodayList.vue @@ -10,7 +10,7 @@ - + diff --git a/SC-web/src/views/extend/paymentdoc/form.vue b/SC-web/src/views/extend/paymentdoc/form.vue index 6024ac1d..faaea4f8 100644 --- a/SC-web/src/views/extend/paymentdoc/form.vue +++ b/SC-web/src/views/extend/paymentdoc/form.vue @@ -39,7 +39,7 @@ + value-format="timestamp" > @@ -300,18 +300,28 @@ - + + + + + + + + + + + +