销售订单、明细添加字段

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -10,7 +10,7 @@
         sys.f_remove_zero(item_qty) as item_qty, price_std, amt_std, price_sale, item_amt, price_discount, non_std_code, out_status,
         sys.f_remove_zero(outing_qty) as outing_qty, outing_amt, sys.f_remove_zero(out_qty) as out_qty, out_amt,
         sys.f_remove_zero(return_qty) as return_qty, return_amt, remarks, flg_valid, cp_id, wh_id,
-        fact_price,fact_amt,disc_amt,use_place
+        fact_price,fact_amt,disc_amt,use_place,discount
     </sql>
 
     <sql id="Base_Column_List_Response">
@@ -18,7 +18,7 @@
         t.out_status, sys.f_remove_zero(t.outing_qty) as outing_qty, t.outing_amt, sys.f_remove_zero(t.out_qty) as out_qty, t.out_amt,
         sys.f_remove_zero(t.return_qty) as return_qty, t.return_amt, t.remarks, t.flg_valid, t.cp_id, t.wh_id
         ,t.box,t.piece,t.sub_unit_id,t.unit_id,t.pack_box,
-        t.fact_price,t.fact_amt,t.disc_amt,t,use_place
+        t.fact_price,t.fact_amt,t.disc_amt,t,use_place,t.discount
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -55,6 +55,7 @@
         <result column="fact_amt" property="factAmt"/>
         <result column="disc_amt" property="discAmt"/>
         <result column="use_place" property="usePlace"/>
+        <result column="discount" property="discount"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -96,6 +97,7 @@
         <result column="fact_amt" property="factAmt"/>
         <result column="disc_amt" property="discAmt"/>
         <result column="use_place" property="usePlace"/>
+        <result column="discount" property="discount"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -198,6 +200,7 @@
                t.fact_amt,
                t.disc_amt,
                t.use_place,
+               t.discount,
                t.non_std_code,
                t.out_status,
         sys.f_remove_zero(t.outing_qty) as outing_qty,
@@ -522,6 +525,9 @@
             <if test=" et!=null and et.usePlace != null">
                 use_place = #{et.usePlace,jdbcType=VARCHAR},
             </if>
+            <if test=" et!=null and et.discount != null">
+                discount = #{et.discount,jdbcType=VARCHAR},
+            </if>
         </set>
         where item_id = #{et.itemId,typeHandler=UuidTypeHandler}
         and item_qty >=(out_qty + outing_qty)
@@ -631,6 +637,7 @@
         t.fact_amt,
         t.disc_amt,
         t.use_place,
+        t.discount,
         t.non_std_code,
         t.out_status,
         sys.f_remove_zero(t.outing_qty) as outing_qty,

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -10,7 +10,7 @@
         sum_standard, sum_amount, sale_discount, order_status, out_status, sys.f_remove_zero(outing_qty) as outing_qty, outing_amt,
         sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as return_qty, return_amt, amt_receivable,
         amt_handle, amt_residue, remarks, annex_paths, make_staff, make_time, flg_valid, cp_id,
-        fact_amt,disc_amt
+        fact_amt,disc_amt,discount,flg_auto_handle,flg_handle_setting
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -53,6 +53,9 @@
         <result column="cp_id" property="cpId"/>
         <result column="fact_amt" property="factAmt"/>
         <result column="disc_amt" property="discAmt"/>
+        <result column="discount" property="discount"/>
+        <result column="flg_auto_handle" property="flgAutoHandle"/>
+        <result column="flg_handle_setting" property="flgHandleSetting"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -108,6 +111,9 @@
         <result column="orderItemResponseList" property="orderItemResponseList" typeHandler="JsonTypeHandler"/>
         <result column="fact_amt" property="factAmt"/>
         <result column="disc_amt" property="discAmt"/>
+        <result column="discount" property="discount"/>
+        <result column="flg_auto_handle" property="flgAutoHandle"/>
+        <result column="flg_handle_setting" property="flgHandleSetting"/>
 <!--            <collection property="orderItemResponseList" resultMap="orderItemListMap"  />-->
     </resultMap>
 
@@ -198,6 +204,10 @@
         <result column="channel_id" property="channelId" typeHandler="UuidTypeHandler"/>
         <result column="fact_amt" property="factAmt"/>
         <result column="disc_amt" property="discAmt"/>
+        <result column="discount" property="discount"/>
+        <result column="flg_auto_handle" property="flgAutoHandle"/>
+        <result column="flg_handle_setting" property="flgHandleSetting"/>
+
         <collection property="orderItemResponseList" resultMap="itemListMap" columnPrefix="list_"/>
 
     </resultMap>
@@ -832,6 +842,9 @@
             op_app_code,
             fact_amt,
             disc_amt,
+            discount,
+            flg_auto_handle,
+            flg_handle_setting,
         </trim>
         )
         values
@@ -875,6 +888,9 @@
                 #{item.opAppCode},
                 #{item.factAmt},
                 #{item.discAmt},
+                #{item.discount},
+                #{item.flgAutoHandle},
+                #{item.flgHandleSetting},
             </trim>
             )
         </foreach>
@@ -992,6 +1008,15 @@
             <if test=" et!=null and et.discAmt != null">
                 disc_amt =#{et.discAmt,jdbcType=NUMERIC},
             </if>
+            <if test=" et!=null and et.discount != null">
+                discount =#{et.discount,jdbcType=NUMERIC},
+            </if>
+            <if test=" et!=null and et.flgAutoHandle != null">
+                flg_auto_handle =#{et.flgAutoHandle,jdbcType=BOOLEAN},
+            </if>
+            <if test=" et!=null and et.flgHandleSetting != null">
+                flg_handle_setting =#{et.flgHandleSetting,jdbcType=BOOLEAN},
+            </if>
         </set>
         where order_id =#{et.orderId,typeHandler=UuidTypeHandler}
         and sum_quantity >= (out_qty + outing_qty)

src/main/java/com/dk/mdm/model/pojo/sale/Order.java

@@ -354,6 +354,18 @@ public class Order extends PageInfo<Order> implements Serializable {
     @ApiModelProperty(value = "优惠金额")
     private BigDecimal discAmt;
 
+    @Excel(name = "折扣")
+    @ApiModelProperty(value = "折扣")
+    private String discount;
+
+    @Excel(name = "自动办理标识")
+    @ApiModelProperty(value = "自动办理标识")
+    private Boolean flgAutoHandle;
+
+    @Excel(name = "自动办理参数")
+    @ApiModelProperty(value = "自动办理参数")
+    private Boolean flgHandleSetting;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -275,6 +275,13 @@ public class OrderItem extends PageInfo<OrderItem> implements Serializable {
     @ApiModelProperty(value = "使用位置")
     private String usePlace;
 
+    /**
+     * 折扣
+     */
+    @Excel(name = "折扣")
+    @ApiModelProperty(value = "折扣")
+    private String discount;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -411,6 +411,13 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @ApiModelProperty(value = "使用位置")
     private String usePlace;
 
+    /**
+     * 折扣
+     */
+    @Excel(name = "折扣")
+    @ApiModelProperty(value = "折扣")
+    private String discount;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/response/sale/OrderResponse.java

@@ -414,6 +414,17 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
 
     private String channelId;
 
+    @Excel(name = "折扣")
+    @ApiModelProperty(value = "折扣")
+    private String discount;
+
+    @ApiModelProperty(value = "自动办理标识")
+    private Boolean flgAutoHandle;
+
+    @ApiModelProperty(value = "自动办理参数")
+    private Boolean flgHandleSetting;
+
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/vo/sale/OrderItemVO.java

@@ -279,6 +279,13 @@ public class OrderItemVO extends PageInfo<OrderItemVO> implements Serializable {
     @ApiModelProperty(value = "使用位置")
     private String usePlace;
 
+    /**
+     * 折扣
+     */
+    @ApiModelProperty(value = "折扣")
+    private String discount;
+
+
 
     private static final long serialVersionUID = 1L;