楚江ERP-订货单变更记录增加总数量、包装费字段

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.xingyun.sc.entity.OrderInfoChangeRecord;
 import com.lframework.xingyun.sc.entity.OrderInfoChangeRecord;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
+
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
@@ -189,7 +191,13 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> {
      * 总数量
      * 总数量
      */
      */
     @ApiModelProperty("总数量")
     @ApiModelProperty("总数量")
-    private String sumNumber;
+    private Double totalQuantity;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private BigDecimal packagingFee;
 
 
     /**
     /**
      * 变更前规格数据
      * 变更前规格数据

@@ -7,6 +7,7 @@ import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
@@ -165,6 +166,16 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto {
     private String customerTier;
     private String customerTier;
 
 
     /**
     /**
+     * 总数量
+     */
+    private Double totalQuantity;
+
+    /**
+     * 包装费
+     */
+    private BigDecimal packagingFee;
+
+    /**
      * 订货单ID
      * 订货单ID
      */
      */
     private String orderId;
     private String orderId;

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.vo.order.change;
 
 
 
 
 import javax.validation.Valid;
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 
 
@@ -179,6 +180,18 @@ public class CreateOrderChangeRecordVo implements BaseVo, Serializable {
     private String customerCreditId;
     private String customerCreditId;
 
 
     /**
     /**
+     * 总数量
+     */
+    @ApiModelProperty("总数量")
+    private Double totalQuantity;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private BigDecimal packagingFee;
+
+    /**
      * 规格变更记录
      * 规格变更记录
      */
      */
     @ApiModelProperty(value = "规格变更记录", required = true)
     @ApiModelProperty(value = "规格变更记录", required = true)

@@ -5,6 +5,7 @@ import lombok.Data;
 
 
 import javax.validation.Valid;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 
 
@@ -184,6 +185,18 @@ public class UpdateOrderChangeRecordVo implements BaseVo, Serializable {
     private String customerCreditId;
     private String customerCreditId;
 
 
     /**
     /**
+     * 总数量
+     */
+    @ApiModelProperty("总数量")
+    private Double totalQuantity;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private BigDecimal packagingFee;
+
+    /**
      * 规格变更记录
      * 规格变更记录
      */
      */
     @Valid
     @Valid

@@ -142,6 +142,7 @@
     <select id="queryCanRevokeOrChangeList" resultMap="PurchaseOrderInfo">
     <select id="queryCanRevokeOrChangeList" resultMap="PurchaseOrderInfo">
         <include refid="PurchaseOrderInfo_sql"/>
         <include refid="PurchaseOrderInfo_sql"/>
         <where>
         <where>
+            AND tb.type = 'PRODUCTION'
             <if test="vo.orderNo != null and vo.orderNo != ''">
             <if test="vo.orderNo != null and vo.orderNo != ''">
                 AND tb.order_no = #{vo.orderNo}
                 AND tb.order_no = #{vo.orderNo}
             </if>
             </if>