楚江ERP：物料行增加加工费

@@ -154,11 +154,13 @@ create table if not exists  `tbl_contract_distributor_line`
     `length_tol_neg`       DECIMAL(10, 4) COMMENT '长度公差负',
     `status`               VARCHAR(50) COMMENT '状态',
     `quantity`             DECIMAL(15, 4)  COMMENT '数量',
+    `processing_fee`       DECIMAL(15, 4)  COMMENT '加工费',
     `unit_price`           DECIMAL(15, 4)  COMMENT '单价',
     `amount_excluding_tax` DECIMAL(15, 2) COMMENT '不含税金额',
     `total_amount`         DECIMAL(15, 2) COMMENT '总金额',
     `delivery_date`        DATE COMMENT '发货日期',
     `show_order`           INT      DEFAULT 0 COMMENT '排序',
+    `item_id`              varchar(50)    COMMENT '前端用ID',
     `create_by_id`         varchar(32)    not null comment '创建人ID',
     `create_by`            varchar(20)    not null comment '创建人',
     `update_by_id`         varchar(32)    not null comment '更新人ID',

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.bo.contract;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.xingyun.sc.entity.ContractDistributorLine;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -79,6 +81,12 @@ public class GetContractDistributorLineBo extends BaseBo<ContractDistributorLine
     private BigDecimal quantity;
 
     /**
+     * 加工费
+     */
+    @ApiModelProperty(value = "加工费")
+    private BigDecimal processingFee;
+
+    /**
      * 单价
      */
     @ApiModelProperty("单价")
@@ -157,6 +165,12 @@ public class GetContractDistributorLineBo extends BaseBo<ContractDistributorLine
     @ApiModelProperty("长度公差负")
     private BigDecimal lengthTolNeg;
 
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty(value = "前端用ID")
+    private String itemId;
+
     public GetContractDistributorLineBo() {
 
     }

@@ -454,7 +454,6 @@ public class ContractDistributorStandardController extends DefaultBaseController
             throw new DefaultClientException("参数错误！");
         }
 
-        // todo ymk 锁规接口待完善
         contractDistributorStandardService.specificationLock(vo);
 
         contractDistributorStandardService.cleanCacheByKey(vo.getId());

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -75,6 +76,11 @@ public class ContractDistributorLine extends BaseEntity implements BaseDto {
     private BigDecimal quantity;
 
     /**
+     * 加工费
+     */
+    private BigDecimal processingFee;
+
+    /**
      * 单价
      */
     private BigDecimal unitPrice;
@@ -100,6 +106,11 @@ public class ContractDistributorLine extends BaseEntity implements BaseDto {
     private Integer showOrder;
 
     /**
+     * 前端用ID
+     */
+    private String itemId;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -73,6 +73,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         data.setLength(vo.getLength());
         data.setStatus(vo.getStatus());
         data.setQuantity(vo.getQuantity());
+        data.setProcessingFee(vo.getProcessingFee());
         data.setUnitPrice(vo.getUnitPrice());
         data.setAmountExcludingTax(vo.getAmountExcludingTax());
         data.setTotalAmount(vo.getTotalAmount());
@@ -85,6 +86,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         data.setWidthTolNeg(vo.getWidthTolNeg());
         data.setLengthTolPos(vo.getLengthTolPos());
         data.setLengthTolNeg(vo.getLengthTolNeg());
+        data.setItemId(vo.getItemId());
 
         getBaseMapper().insert(data);
 
@@ -114,6 +116,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
                 .set(ContractDistributorLine::getLength, vo.getLength())
                 .set(ContractDistributorLine::getStatus, vo.getStatus())
                 .set(ContractDistributorLine::getQuantity, vo.getQuantity())
+                .set(ContractDistributorLine::getProcessingFee, vo.getProcessingFee())
                 .set(ContractDistributorLine::getUnitPrice, vo.getUnitPrice())
                 .set(ContractDistributorLine::getAmountExcludingTax, vo.getAmountExcludingTax())
                 .set(ContractDistributorLine::getTotalAmount, vo.getTotalAmount())
@@ -126,6 +129,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
                 .set(ContractDistributorLine::getWidthTolNeg, vo.getWidthTolNeg())
                 .set(ContractDistributorLine::getLengthTolPos, vo.getLengthTolPos())
                 .set(ContractDistributorLine::getLengthTolNeg, vo.getLengthTolNeg())
+                .set(ContractDistributorLine::getItemId, vo.getItemId())
                 .eq(ContractDistributorLine::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);

@@ -92,6 +92,14 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
     private BigDecimal quantity;
 
     /**
+     * 加工费
+     */
+    @ApiModelProperty(value = "加工费")
+    @TypeMismatch(message = "加工费格式有误！")
+    @IsNumberPrecision(message = "加工费最多允许4位小数！", value = 4)
+    private BigDecimal processingFee;
+
+    /**
      * 单价
      */
     @ApiModelProperty(value = "单价")
@@ -178,4 +186,9 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
     @TypeMismatch(message = "长度公差负格式有误！")
     private BigDecimal lengthTolNeg;
 
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty(value = "前端用ID")
+    private String itemId;
 }

@@ -96,6 +96,14 @@ public class UpdateContractDistributorLineVo implements BaseVo, Serializable {
     private BigDecimal quantity;
 
     /**
+     * 加工费
+     */
+    @ApiModelProperty(value = "加工费")
+    @TypeMismatch(message = "加工费格式有误！")
+    @IsNumberPrecision(message = "加工费最多允许4位小数！", value = 4)
+    private BigDecimal processingFee;
+
+    /**
      * 单价
      */
     @ApiModelProperty(value = "单价")
@@ -181,5 +189,10 @@ public class UpdateContractDistributorLineVo implements BaseVo, Serializable {
     @TypeMismatch(message = "长度公差负格式有误！")
     private BigDecimal lengthTolNeg;
 
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty(value = "前端用ID")
+    private String itemId;
 }
 

@@ -13,6 +13,7 @@
         <result column="length" property="length"/>
         <result column="status" property="status"/>
         <result column="quantity" property="quantity"/>
+        <result column="processing_fee" property="processingFee"/>
         <result column="unit_price" property="unitPrice"/>
         <result column="amount_excluding_tax" property="amountExcludingTax"/>
         <result column="total_amount" property="totalAmount"/>
@@ -31,6 +32,7 @@
         <result column="width_tol_neg" property="widthTolNeg"/>
         <result column="length_tol_pos" property="lengthTolPos"/>
         <result column="length_tol_neg" property="lengthTolNeg"/>
+        <result column="item_id" property="itemId"/>
     </resultMap>
 
     <sql id="ContractDistributorLine_sql">
@@ -44,6 +46,7 @@
                tb.length,
                tb.status,
                tb.quantity,
+               tb.processing_fee,
                tb.unit_price,
                tb.amount_excluding_tax,
                tb.total_amount,
@@ -61,7 +64,8 @@
                tb.width_tol_pos,
                tb.width_tol_neg,
                tb.length_tol_pos,
-               tb.length_tol_neg
+               tb.length_tol_neg,
+               tb.item_id
         FROM tbl_contract_distributor_line AS tb
     </sql>