Browse Source

完善代码

yuansh 1 month ago
parent
commit
7a5a5b052a

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProjectArchive.java

@@ -86,4 +86,6 @@ public class BaseProjectArchive implements Serializable {
 	@Excel(name = "备注(notes)", width = 15)
     @ApiModelProperty(value = "备注")
     private String notes;
+    //停用原因
+    private String closeReason;
 }

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurInquiryFormController.java

@@ -385,6 +385,8 @@ public class PurInquiryFormController {
                         a.setTaxAmountUsd(o.getTaxAmountUsd());
                         a.setExchangeRateUsd(o.getExchangeRateUsd());
                         a.setDiscount(o.getDiscount());
+                        a.setTaxPriceOriginal(o.getTaxPriceOriginal());
+                        a.setTaxAmountOriginal(o.getTaxAmountOriginal());
                         a.setNotes(o.getNotes());
                     }
 

+ 8 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryFormProduct.java

@@ -180,6 +180,14 @@ public class PurInquiryFormProduct implements Serializable {
     @TableField(exist = false)
     private java.math.BigDecimal discount;
 
+    @ApiModelProperty(value = "含税单价(原价)")
+    @TableField(exist = false)
+    private java.math.BigDecimal taxPriceOriginal;
+
+    @ApiModelProperty(value = "含税金额(原价)")
+    @TableField(exist = false)
+    private java.math.BigDecimal taxAmountOriginal;
+
     @TableField(exist = false)
     private Integer rowNumber;
 

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/mapper/xml/PurPurchaseQuotationProductMapper.xml

@@ -43,6 +43,8 @@
 					  , b.ship_inspection
 					  , b.notes
 					  , b.discount
+					  , b.tax_price_original
+					  , b.tax_amount_original
 					  , b.tax_amount
 					  , b.last_price
 					  , b.tax_price

+ 4 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/SupplierQuotationDetails.java

@@ -259,6 +259,10 @@ public class SupplierQuotationDetails {
 
     @ApiModelProperty(value = "折扣")
     private java.math.BigDecimal discount;
+    //含税单价(原价)
+    private java.math.BigDecimal taxPriceOriginal;
+    //含税金额(原价)
+    private java.math.BigDecimal taxAmountOriginal;
 
     @ApiModelProperty(value = "美元单价")
     private java.math.BigDecimal taxPriceUsd;