楚江ERP:订货单物料行-增加包装费

@@ -141,6 +141,12 @@ public class GetPurchaseOrderLineBo extends BaseBo<PurchaseOrderLine> {
     @ApiModelProperty("考核超协")
     @ApiModelProperty("考核超协")
     private String assessmentExceedsAgreement;
     private String assessmentExceedsAgreement;
 
 
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private BigDecimal packagingFee;
+
     public GetPurchaseOrderLineBo() {
     public GetPurchaseOrderLineBo() {
 
 
     }
     }

@@ -238,6 +238,11 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private String assessmentExceedsAgreement;
     private String assessmentExceedsAgreement;
 
 
     /**
     /**
+     * 包装费
+     */
+    private BigDecimal packagingFee;
+
+    /**
      * 考核超协是否变更
      * 考核超协是否变更
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -125,6 +125,9 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (!StringUtil.isBlank(vo.getAssessmentExceedsAgreement())) {
         if (!StringUtil.isBlank(vo.getAssessmentExceedsAgreement())) {
             data.setAssessmentExceedsAgreement(vo.getAssessmentExceedsAgreement());
             data.setAssessmentExceedsAgreement(vo.getAssessmentExceedsAgreement());
         }
         }
+        if (vo.getPackagingFee() != null) {
+            data.setPackagingFee(vo.getPackagingFee());
+        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -164,6 +167,7 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                 .set(PurchaseOrderLine::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
                 .set(PurchaseOrderLine::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
                 .set(PurchaseOrderLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
                 .set(PurchaseOrderLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
                 .set(PurchaseOrderLine::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
                 .set(PurchaseOrderLine::getAssessmentExceedsAgreement, StringUtil.isBlank(vo.getAssessmentExceedsAgreement()) ? null : vo.getAssessmentExceedsAgreement())
+                .set(PurchaseOrderLine::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
                 .eq(PurchaseOrderLine::getId, vo.getId());
                 .eq(PurchaseOrderLine::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -168,4 +168,12 @@ public class CreatePurchaseOrderLineVo implements BaseVo, Serializable {
     @Length(message = "考核超协最多允许20个字符！")
     @Length(message = "考核超协最多允许20个字符！")
     private String assessmentExceedsAgreement;
     private String assessmentExceedsAgreement;
 
 
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    @TypeMismatch(message = "包装费格式有误！")
+    @IsNumberPrecision(message = "包装费最多允许4位小数！", value = 4)
+    private BigDecimal packagingFee;
+
 }
 }

@@ -168,4 +168,12 @@ public class UpdatePurchaseOrderLineVo implements BaseVo, Serializable {
     @Length(message = "考核超协最多允许20个字符！")
     @Length(message = "考核超协最多允许20个字符！")
     private String assessmentExceedsAgreement;
     private String assessmentExceedsAgreement;
 
 
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    @TypeMismatch(message = "包装费格式有误！")
+    @IsNumberPrecision(message = "包装费最多允许4位小数！", value = 4)
+    private BigDecimal packagingFee;
+
 }
 }

@@ -24,6 +24,7 @@
         <result column="delivery_date" property="deliveryDate"/>
         <result column="delivery_date" property="deliveryDate"/>
         <result column="show_order" property="showOrder"/>
         <result column="show_order" property="showOrder"/>
         <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
         <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
+        <result column="packaging_fee" property="packagingFee"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -55,6 +56,7 @@
             tb.delivery_date,
             tb.delivery_date,
             tb.show_order,
             tb.show_order,
             tb.assessment_exceeds_agreement,
             tb.assessment_exceeds_agreement,
+            tb.packaging_fee,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,