diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java index 81ebd4aa..6b13355d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java @@ -154,4 +154,8 @@ public class ContractFileEntity { /** 进度*/ @TableField(exist = false) private String schedule; + + /** 保证金*/ + @TableField("BOND") + private BigDecimal bond; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileInfoVO.java index 786c991b..67ef9a65 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileInfoVO.java @@ -94,6 +94,10 @@ public class ContractFileInfoVO{ @JsonProperty("amount") private String amount; + /** 保证金*/ + @JsonProperty("bond") + private String bond; + /** 库存组织 **/ @JsonProperty("organization") private String organization; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListVO.java index 47f7080d..553bb703 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListVO.java @@ -3,8 +3,10 @@ package jnpf.contractfile.model.contractfile; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; @@ -120,6 +122,10 @@ public class ContractFileListVO{ @JsonProperty("amount") private String amount; + /** 保证金*/ + @JsonProperty("bond") + private String bond; + /** 库存组织 **/ @JsonProperty("organization") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java index b55873de..ca12f30f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java @@ -142,6 +142,11 @@ public class PurchaseorderListVO{ @JsonProperty("poundlistEntityList") private List poundlistEntityList; +// @JsonProperty("businessDate") +// private Long businessDate; + + /** 制单时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonProperty("businessDate") - private Long businessDate; + private Date businessDate; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java index 22a66e5e..6a6153ed 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java @@ -120,8 +120,10 @@ public class SaleorderitemListVO{ @TableField("bidSection") private String bidSection; + /** 制单时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonProperty("businessDate") - private Long businessDate; + private Date businessDate; @TableField(exist = false) private String contractName; diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index a0d106e3..622b2151 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -368,6 +368,13 @@ width="150" align="center" /> + +