楚江ERP:规格变更-新增变更说明字段

@@ -231,6 +231,12 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> {
     private Boolean output;
     private Boolean output;
 
 
     /**
     /**
+     * 变更说明
+     */
+    @ApiModelProperty("变更说明")
+    private String changeDescription;
+
+    /**
      * 变更前规格数据
      * 变更前规格数据
      */
      */
     @ApiModelProperty("变更前规格数据")
     @ApiModelProperty("变更前规格数据")

@@ -211,6 +211,11 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto {
     private Boolean output;
     private Boolean output;
 
 
     /**
     /**
+     * 变更说明
+     */
+    private String changeDescription;
+
+    /**
      * 变更前规格数据
      * 变更前规格数据
      * 非持久化字段
      * 非持久化字段
      */
      */

@@ -244,6 +244,9 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         if (vo.getPackagingFee() != null) {
         if (vo.getPackagingFee() != null) {
             data.setPackagingFee(vo.getPackagingFee());
             data.setPackagingFee(vo.getPackagingFee());
         }
         }
+        if (vo.getChangeDescription() != null) {
+            data.setChangeDescription(vo.getChangeDescription());
+        }
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
         // 处理订货单订货单物料行
         // 处理订货单订货单物料行
         List<CreatePurchaseOrderLineVo> orderLineVoList = vo.getOrderSpecList();
         List<CreatePurchaseOrderLineVo> orderLineVoList = vo.getOrderSpecList();
@@ -299,6 +302,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                 .set(OrderInfoChangeRecord::getCustomerCreditId, StringUtil.isBlank(vo.getCustomerCreditId()) ? null : vo.getCustomerCreditId())
                 .set(OrderInfoChangeRecord::getCustomerCreditId, StringUtil.isBlank(vo.getCustomerCreditId()) ? null : vo.getCustomerCreditId())
                 .set(OrderInfoChangeRecord::getTotalQuantity, vo.getTotalQuantity() == null ? null : vo.getTotalQuantity())
                 .set(OrderInfoChangeRecord::getTotalQuantity, vo.getTotalQuantity() == null ? null : vo.getTotalQuantity())
                 .set(OrderInfoChangeRecord::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
                 .set(OrderInfoChangeRecord::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
+                .set(OrderInfoChangeRecord::getChangeDescription, vo.getChangeDescription() == null ? null : vo.getChangeDescription())
                 .eq(OrderInfoChangeRecord::getId, vo.getId());
                 .eq(OrderInfoChangeRecord::getId, vo.getId());
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
         // 获取厂房数据
         // 获取厂房数据

@@ -195,4 +195,10 @@ public class CreateOrderChangeRecordVo implements BaseVo, Serializable {
     @ApiModelProperty(value = "规格变更记录", required = true)
     @ApiModelProperty(value = "规格变更记录", required = true)
     @NotEmpty(message = "请输入规格变更记录！")
     @NotEmpty(message = "请输入规格变更记录！")
     List<CreatePurchaseOrderLineVo> orderSpecList;
     List<CreatePurchaseOrderLineVo> orderSpecList;
+
+    /**
+     * 变更说明
+     */
+    @ApiModelProperty("变更说明")
+    private String changeDescription;
 }
 }

@@ -202,4 +202,10 @@ public class UpdateOrderChangeRecordVo implements BaseVo, Serializable {
     @ApiModelProperty(value = "规格变更记录", required = true)
     @ApiModelProperty(value = "规格变更记录", required = true)
     @NotEmpty(message = "请输入规格变更记录！")
     @NotEmpty(message = "请输入规格变更记录！")
     List<CreatePurchaseOrderLineVo> orderSpecList;
     List<CreatePurchaseOrderLineVo> orderSpecList;
+
+    /**
+     * 变更说明
+     */
+    @ApiModelProperty("变更说明")
+    private String changeDescription;
 }
 }

@@ -34,6 +34,7 @@
         <result column="customer_credit_id" property="customerCreditId"/>
         <result column="customer_credit_id" property="customerCreditId"/>
         <result column="customer_tier" property="customerTier"/>
         <result column="customer_tier" property="customerTier"/>
         <result column="total_quantity" property="totalQuantity"/>
         <result column="total_quantity" property="totalQuantity"/>
+        <result column="change_description" property="changeDescription"/>
         <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"/>
@@ -76,6 +77,7 @@
             cc.company_suggested_category AS customer_tier,
             cc.company_suggested_category AS customer_tier,
             tb.total_quantity,
             tb.total_quantity,
             tb.output,
             tb.output,
+            tb.change_description,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,