订单的去处字段

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -839,9 +839,9 @@
         t.sum_amount as "sumAmount",
         t.sale_discount as "saleDiscount",
         sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "orderStatusName",
-        t.amt_receivable as "amtReceivable",
-        t.amt_handle as "amtHandle",
-        t.amt_residue as "amtResidue",
+--         t.amt_receivable as "amtReceivable",
+--         t.amt_handle as "amtHandle",
+--         t.amt_residue as "amtResidue",
         t.remarks,
         makestaff.staff_name as "makeStaffName",
         t.make_time as "makeTime"
@@ -896,9 +896,9 @@
         ,t.sum_amount as "sumAmount"
         ,t.sale_discount as "saleDiscount"
         ,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "orderStatusName"
-        ,t.amt_receivable as "amtReceivable"
-        ,t.amt_handle as "amtHandle"
-        ,t.amt_residue as "amtResidue"
+--          ,t.amt_receivable as "amtReceivable"
+--          ,t.amt_handle as "amtHandle"
+--          ,t.amt_residue as "amtResidue"
         ,t.remarks
         ,makestaff.staff_name as "makeStaffName"
         ,t.make_time as "makeTime"
@@ -1444,9 +1444,9 @@
              ,tpo.out_amt AS "outAmt"
              ,sys.f_remove_zero(tpo.return_qty) AS "returnQty"
              ,tpo.return_amt AS "returnAmt"
-             ,tpo.amt_receivable AS "amtReceivable"
-             ,tpo.amt_handle AS "amtHandle"
-             ,tpo.amt_residue AS "amtResidue"
+--              ,tpo.amt_receivable AS "amtReceivable"
+--              ,tpo.amt_handle AS "amtHandle"
+--              ,tpo.amt_residue AS "amtResidue"
              ,tpo.make_time AS "makeTime"
             ,tmc.cus_code AS "cusCode"
             ,tmc.cus_name  As "cusName"
@@ -2296,9 +2296,9 @@
         T.out_amt AS "outAmt",
         sys.f_remove_zero(T.return_qty) AS "returnQty",
         T.return_amt AS "returnAmt",
-        T.amt_receivable AS "amtReceivable",
-        T.amt_handle AS "amtHandle",
-        T.amt_residue AS "amtResidue",
+--         T.amt_receivable AS "amtReceivable",
+--         T.amt_handle AS "amtHandle",
+--         T.amt_residue AS "amtResidue",
         T.remarks AS "remarks",
         T.annex_paths AS "annexPaths",
         makestaff.staff_name AS "makeStaffName",

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

@@ -8,8 +8,8 @@
         order_id, order_no, order_type, org_id, staff_id, cus_id, address_area, address_name, address_no, address_gcj02,
         address_full, contact_name, contact_phone, sales_channel, delivery_date, sys.f_remove_zero(sum_quantity) as sum_quantity,
         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,
+        sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as return_qty, return_amt,
+        remarks, annex_paths, make_staff, make_time, flg_valid, cp_id,
         fact_amt,disc_amt,discount,flg_auto_handle,flg_handle_setting,outbound_processing_flag
     </sql>
 
@@ -42,9 +42,9 @@
         <result column="out_amt" property="outAmt"/>
         <result column="return_qty" property="returnQty"/>
         <result column="return_amt" property="returnAmt"/>
-        <result column="amt_receivable" property="amtReceivable"/>
-        <result column="amt_handle" property="amtHandle"/>
-        <result column="amt_residue" property="amtResidue"/>
+<!--        <result column="amt_receivable" property="amtReceivable"/>-->
+<!--        <result column="amt_handle" property="amtHandle"/>-->
+<!--        <result column="amt_residue" property="amtResidue"/>-->
         <result column="remarks" property="remarks"/>
         <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
         <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
@@ -99,9 +99,9 @@
         <result column="out_amt" property="outAmt"/>
         <result column="return_qty" property="returnQty"/>
         <result column="return_amt" property="returnAmt"/>
-        <result column="amt_receivable" property="amtReceivable"/>
-        <result column="amt_handle" property="amtHandle"/>
-        <result column="amt_residue" property="amtResidue"/>
+<!--        <result column="amt_receivable" property="amtReceivable"/>-->
+<!--        <result column="amt_handle" property="amtHandle"/>-->
+<!--        <result column="amt_residue" property="amtResidue"/>-->
         <result column="remarks" property="remarks"/>
         <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
         <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
@@ -180,9 +180,9 @@
         <result column="out_amt" property="outAmt"/>
         <result column="return_qty" property="returnQty"/>
         <result column="return_amt" property="returnAmt"/>
-        <result column="amt_receivable" property="amtReceivable"/>
-        <result column="amt_handle" property="amtHandle"/>
-        <result column="amt_residue" property="amtResidue"/>
+<!--        <result column="amt_receivable" property="amtReceivable"/>-->
+<!--        <result column="amt_handle" property="amtHandle"/>-->
+<!--        <result column="amt_residue" property="amtResidue"/>-->
         <result column="remarks" property="remarks"/>
         <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
         <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
@@ -282,7 +282,7 @@
         t.order_status, 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.amt_receivable, amt_handle, amt_residue,
+--         t.amt_receivable, amt_handle, amt_residue,
         t.remarks, t.annex_paths, t.make_staff, t.make_time,
         t.flg_valid, t.cp_id,
         tmo.org_name,
@@ -409,15 +409,15 @@
             <if test="returnAmt != null">
                 AND t.return_amt = #{returnAmt}
             </if>
-            <if test="amtReceivable != null">
-                AND t.amt_receivable = #{amtReceivable}
-            </if>
-            <if test="amtHandle != null">
-                AND t.amt_handle = #{amtHandle}
-            </if>
-            <if test="amtResidue != null">
-                AND t.amt_residue = #{amtResidue}
-            </if>
+<!--            <if test="amtReceivable != null">-->
+<!--                AND t.amt_receivable = #{amtReceivable}-->
+<!--            </if>-->
+<!--            <if test="amtHandle != null">-->
+<!--                AND t.amt_handle = #{amtHandle}-->
+<!--            </if>-->
+<!--            <if test="amtResidue != null">-->
+<!--                AND t.amt_residue = #{amtResidue}-->
+<!--            </if>-->
             <if test="remarks != null and remarks != ''">
                 AND t.remarks LIKE concat('%',my_ex.likequery(#{remarks}),'%')
             </if>
@@ -534,9 +534,9 @@
                t.out_amt,
         sys.f_remove_zero(t.return_qty) as return_qty,
                t.return_amt,
-               t.amt_receivable,
-               t.amt_handle,
-               t.amt_residue,
+--                t.amt_receivable,
+--                t.amt_handle,
+--                t.amt_residue,
                t.remarks,
                t.annex_paths,
                makestaff.staff_name                              as "makeStaffName",
@@ -643,9 +643,9 @@
         T.out_amt AS "outAmt",
         sys.f_remove_zero(T.return_qty) AS "returnQty",
         T.return_amt AS "returnAmt",
-        T.amt_receivable AS "amtReceivable",
-        T.amt_handle AS "amtHandle",
-        T.amt_residue AS "amtResidue",
+--         T.amt_receivable AS "amtReceivable",
+--         T.amt_handle AS "amtHandle",
+--         T.amt_residue AS "amtResidue",
         T.remarks AS "remarks",
         T.annex_paths AS "annexPaths",
         makestaff.staff_name AS "makeStaffName",
@@ -778,9 +778,9 @@
                t.out_amt,
                sys.f_remove_zero(t.return_qty) as  return_qty,
                t.return_amt,
-               t.amt_receivable,
-               t.amt_handle,
-               t.amt_residue,
+--                t.amt_receivable,
+--                t.amt_handle,
+--                t.amt_residue,
                t.remarks,
                t.annex_paths,
                t.make_staff,
@@ -852,9 +852,7 @@
             out_amt,
             return_qty,
             return_amt,
-            amt_receivable,
-            amt_handle,
-            amt_residue,
+
             remarks,
             annex_paths,
             make_staff,
@@ -899,9 +897,7 @@
                 #{item.outAmt},
                 #{item.returnQty},
                 #{item.returnAmt},
-                #{item.amtReceivable},
-                #{item.amtHandle},
-                #{item.amtResidue},
+
                 #{item.remarks},
                 #{item.annexPaths},
                 #{item.makeStaff}::uuid,
@@ -998,15 +994,15 @@
             <if test=" et!=null and et.returnAmt != null">
                 return_amt =#{et.returnAmt,jdbcType=NUMERIC},
             </if>
-            <if test=" et!=null and et.amtReceivable != null">
-                amt_receivable =#{et.amtReceivable,jdbcType=NUMERIC},
-            </if>
-            <if test=" et!=null and et.amtHandle != null">
-                amt_handle =#{et.amtHandle,jdbcType=NUMERIC},
-            </if>
-            <if test=" et!=null and et.amtResidue != null">
-                amt_residue =#{et.amtResidue,jdbcType=NUMERIC},
-            </if>
+<!--            <if test=" et!=null and et.amtReceivable != null">-->
+<!--                amt_receivable =#{et.amtReceivable,jdbcType=NUMERIC},-->
+<!--            </if>-->
+<!--            <if test=" et!=null and et.amtHandle != null">-->
+<!--                amt_handle =#{et.amtHandle,jdbcType=NUMERIC},-->
+<!--            </if>-->
+<!--            <if test=" et!=null and et.amtResidue != null">-->
+<!--                amt_residue =#{et.amtResidue,jdbcType=NUMERIC},-->
+<!--            </if>-->
             <if test=" et!=null and et.remarks != null">
                 remarks =#{et.remarks,jdbcType=VARCHAR},
             </if>

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

@@ -264,28 +264,28 @@ public class Order extends PageInfo<Order> implements Serializable {
     private BigDecimal returnAmt;
 
 
-    /**
-     * 应收金额
-     */
-    @Excel(name = "应收金额")
-    @ApiModelProperty(value = "应收金额")
-    private BigDecimal amtReceivable;
-
-
-    /**
-     * 还款金额
-     */
-    @Excel(name = "还款金额")
-    @ApiModelProperty(value = "还款金额")
-    private BigDecimal amtHandle;
-
-
-    /**
-     * 剩余应收
-     */
-    @Excel(name = "剩余应收")
-    @ApiModelProperty(value = "剩余应收")
-    private BigDecimal amtResidue;
+//    /**
+//     * 应收金额
+//     */
+//    @Excel(name = "应收金额")
+//    @ApiModelProperty(value = "应收金额")
+//    private BigDecimal amtReceivable;
+//
+//
+//    /**
+//     * 还款金额
+//     */
+//    @Excel(name = "还款金额")
+//    @ApiModelProperty(value = "还款金额")
+//    private BigDecimal amtHandle;
+//
+//
+//    /**
+//     * 剩余应收
+//     */
+//    @Excel(name = "剩余应收")
+//    @ApiModelProperty(value = "剩余应收")
+//    private BigDecimal amtResidue;
 
 
     /**

src/main/java/com/dk/mdm/model/query/sale/OrderQuery.java

@@ -268,29 +268,29 @@ public class OrderQuery extends PageInfo<OrderQuery> implements Serializable {
     @ApiModelProperty(value = "已出库退货金额")
     private BigDecimal returnAmt;
 
-
-    /**
-     * 应收金额
-     */
-    @Excel(name = "应收金额")
-    @ApiModelProperty(value = "应收金额")
-    private BigDecimal amtReceivable;
-
-
-    /**
-     * 还款金额
-     */
-    @Excel(name = "还款金额")
-    @ApiModelProperty(value = "还款金额")
-    private BigDecimal amtHandle;
-
-
-    /**
-     * 剩余应收
-     */
-    @Excel(name = "剩余应收")
-    @ApiModelProperty(value = "剩余应收")
-    private BigDecimal amtResidue;
+//    240626
+//    /**
+//     * 应收金额
+//     */
+//    @Excel(name = "应收金额")
+//    @ApiModelProperty(value = "应收金额")
+//    private BigDecimal amtReceivable;
+//
+//
+//    /**
+//     * 还款金额
+//     */
+//    @Excel(name = "还款金额")
+//    @ApiModelProperty(value = "还款金额")
+//    private BigDecimal amtHandle;
+//
+//
+//    /**
+//     * 剩余应收
+//     */
+//    @Excel(name = "剩余应收")
+//    @ApiModelProperty(value = "剩余应收")
+//    private BigDecimal amtResidue;
 
 
     /**

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

@@ -281,28 +281,28 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
     private BigDecimal returnAmt;
 
 
-    /**
-     * 应收金额
-     */
-    @Excel(name = "应收金额")
-    @ApiModelProperty(value = "应收金额")
-    private BigDecimal amtReceivable;
-
-
-    /**
-     * 还款金额
-     */
-    @Excel(name = "还款金额")
-    @ApiModelProperty(value = "还款金额")
-    private BigDecimal amtHandle;
-
-
-    /**
-     * 剩余应收
-     */
-    @Excel(name = "剩余应收")
-    @ApiModelProperty(value = "剩余应收")
-    private BigDecimal amtResidue;
+//    /**
+//     * 应收金额
+//     */
+//    @Excel(name = "应收金额")
+//    @ApiModelProperty(value = "应收金额")
+//    private BigDecimal amtReceivable;
+//
+//
+//    /**
+//     * 还款金额
+//     */
+//    @Excel(name = "还款金额")
+//    @ApiModelProperty(value = "还款金额")
+//    private BigDecimal amtHandle;
+//
+//
+//    /**
+//     * 剩余应收
+//     */
+//    @Excel(name = "剩余应收")
+//    @ApiModelProperty(value = "剩余应收")
+//    private BigDecimal amtResidue;
 
 
     /**

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

@@ -270,28 +270,28 @@ public class OrderVO extends PageInfo<OrderVO> implements Serializable {
     private BigDecimal returnAmt;
 
 
-    /**
-     * 应收金额
-     */
-    @Excel(name = "应收金额")
-    @ApiModelProperty(value = "应收金额")
-    private BigDecimal amtReceivable;
-
-
-    /**
-     * 还款金额
-     */
-    @Excel(name = "还款金额")
-    @ApiModelProperty(value = "还款金额")
-    private BigDecimal amtHandle;
-
-
-    /**
-     * 剩余应收
-     */
-    @Excel(name = "剩余应收")
-    @ApiModelProperty(value = "剩余应收")
-    private BigDecimal amtResidue;
+//    /**
+//     * 应收金额
+//     */
+//    @Excel(name = "应收金额")
+//    @ApiModelProperty(value = "应收金额")
+//    private BigDecimal amtReceivable;
+//
+//
+//    /**
+//     * 还款金额
+//     */
+//    @Excel(name = "还款金额")
+//    @ApiModelProperty(value = "还款金额")
+//    private BigDecimal amtHandle;
+//
+//
+//    /**
+//     * 剩余应收
+//     */
+//    @Excel(name = "剩余应收")
+//    @ApiModelProperty(value = "剩余应收")
+//    private BigDecimal amtResidue;
 
 
     /**