楚江ERP:补货单-新增包装费和单价

@@ -145,6 +145,12 @@ public class GetReplenishmentOrderLineBo extends BaseBo<ReplenishmentOrderLine>
     @ApiModelProperty("前端用ID")
     @ApiModelProperty("前端用ID")
     private String itemId;
     private String itemId;
 
 
+    @ApiModelProperty("单价")
+    private BigDecimal salesPrice;
+
+    @ApiModelProperty("包装费")
+    private BigDecimal packagingFee;
+
     public GetReplenishmentOrderLineBo() {
     public GetReplenishmentOrderLineBo() {
 
 
     }
     }

@@ -130,6 +130,16 @@ public class ReplenishmentOrderLine extends BaseEntity implements BaseDto {
     private String itemId;
     private String itemId;
 
 
     /**
     /**
+     * 单价
+     */
+    private BigDecimal salesPrice;
+
+    /**
+     * 包装费
+     */
+    private BigDecimal packagingFee;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -87,6 +87,8 @@ public class ReplenishmentOrderLineServiceImpl extends BaseMpServiceImpl<Repleni
         data.setRemarks(vo.getRemarks());
         data.setRemarks(vo.getRemarks());
         data.setShowOrder(vo.getShowOrder());
         data.setShowOrder(vo.getShowOrder());
         data.setItemId(vo.getItemId());
         data.setItemId(vo.getItemId());
+        data.setSalesPrice(vo.getSalesPrice());
+        data.setPackagingFee(vo.getPackagingFee());
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -127,6 +129,8 @@ public class ReplenishmentOrderLineServiceImpl extends BaseMpServiceImpl<Repleni
                 .set(ReplenishmentOrderLine::getRemarks, vo.getRemarks())
                 .set(ReplenishmentOrderLine::getRemarks, vo.getRemarks())
                 .set(ReplenishmentOrderLine::getShowOrder, vo.getShowOrder())
                 .set(ReplenishmentOrderLine::getShowOrder, vo.getShowOrder())
                 .set(ReplenishmentOrderLine::getItemId, vo.getItemId())
                 .set(ReplenishmentOrderLine::getItemId, vo.getItemId())
+                .set(ReplenishmentOrderLine::getSalesPrice, vo.getSalesPrice())
+                .set(ReplenishmentOrderLine::getPackagingFee, vo.getPackagingFee())
                 .eq(ReplenishmentOrderLine::getId, vo.getId());
                 .eq(ReplenishmentOrderLine::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -141,4 +141,12 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
      */
      */
     @ApiModelProperty(value = "前端用ID")
     @ApiModelProperty(value = "前端用ID")
     private String itemId;
     private String itemId;
+
+    @ApiModelProperty("单价")
+    @TypeMismatch(message = "单价格式有误！")
+    private BigDecimal salesPrice;
+
+    @ApiModelProperty("包装费")
+    @TypeMismatch(message = "包装费格式有误！")
+    private BigDecimal packagingFee;
 }
 }

@@ -139,4 +139,10 @@ public class UpdateReplenishmentOrderLineVo implements BaseVo, Serializable {
     @ApiModelProperty(value = "前端用ID")
     @ApiModelProperty(value = "前端用ID")
     private String itemId;
     private String itemId;
 
 
+    @ApiModelProperty("单价")
+    private BigDecimal salesPrice;
+
+    @ApiModelProperty("包装费")
+    private BigDecimal packagingFee;
+
 }
 }

@@ -22,7 +22,8 @@
         <result column="supplementary_quantity" property="supplementaryQuantity"/>
         <result column="supplementary_quantity" property="supplementaryQuantity"/>
         <result column="confirmed_delivery_date" property="confirmedDeliveryDate"/>
         <result column="confirmed_delivery_date" property="confirmedDeliveryDate"/>
         <result column="remarks" property="remarks"/>
         <result column="remarks" property="remarks"/>
-        <result column="show_order" property="showOrder"/>
+        <result column="sales_price" property="salesPrice"/>
+        <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"/>
@@ -52,6 +53,8 @@
                tb.confirmed_delivery_date,
                tb.confirmed_delivery_date,
                tb.remarks,
                tb.remarks,
                tb.show_order,
                tb.show_order,
+               tb.sales_price,
+               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,