dongke 1 год назад
Родитель
Сommit
de2d80cdf2

+ 0 - 4
src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -56,7 +56,6 @@
         <result column="discount" property="discount"/>
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="flg_handle_setting" property="flgHandleSetting"/>
-        <result column="outbound_processing_flag" property="outboundProcessingFlag"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -1037,9 +1036,6 @@
             <if test=" et!=null and et.flgHandleSetting != null">
                 flg_handle_setting =#{et.flgHandleSetting,jdbcType=BOOLEAN},
             </if>
-            <if test=" et!=null and et.outboundProcessingFlag != null">
-                outbound_processing_flag =#{et.outboundProcessingFlag,jdbcType=BOOLEAN},
-            </if>
         </set>
         where order_id =#{et.orderId,typeHandler=UuidTypeHandler}
         and sum_quantity >= (out_qty + outing_qty)

+ 2 - 0
src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -280,6 +280,8 @@ public class OrderItem extends PageInfo<OrderItem> implements Serializable {
     @ApiModelProperty(value = "使用位置")
     private String usePlace;
 
+    @ApiModelProperty(value = "成本单价")
+    private BigDecimal costPrice;
     /**
      * 折扣
      */

+ 2 - 1
src/main/java/com/dk/mdm/model/vo/sale/OrderItemVO.java

@@ -295,7 +295,8 @@ public class OrderItemVO extends PageInfo<OrderItemVO> implements Serializable {
     @ApiModelProperty(value = "折扣")
     private BigDecimal discount;
 
-
+    @ApiModelProperty(value = "成本单价")
+    private BigDecimal costPrice;
 
     private static final long serialVersionUID = 1L;