Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

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

@@ -98,6 +98,8 @@
         <result column="use_place" property="usePlace"/>
         <result column="discount" property="discount"/>
         <result column="sup_id" property="supId"/>
+        <result column="canOutingQty" property="canOutingQty"/>
+
     </resultMap>
 
     <!-- 通用条件列 -->

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

@@ -331,7 +331,7 @@
         i.wh_id as list_wh_id,
         sys.f_remove_zero(i.inv_qty)    as list_inv_qty,
         sys.f_remove_zero(i.usable_qty)  as list_usable_qty,
-        sys.f_remove_zero(toi.item_qty - toi.outing_qty -toi.out_qty + toi.return_qty)  as list_max_out_qty,
+        sys.f_remove_zero(toi.item_qty - toi.outing_qty -toi.out_qty  )  as list_max_out_qty,
         i.wh_name     as list_wh_name
     </sql>
 
@@ -1082,7 +1082,7 @@
         on i.sku_id = toi.sku_id and i.non_std_code = toi.non_std_code and i.cp_id = toi.cp_id
         <include refid="Condition"/>
         <if test="flgSource !=null and flgSource == true">
-            AND toi.item_qty - toi.outing_qty -toi.out_qty + toi.return_qty > 0
+            AND toi.item_qty - toi.outing_qty -toi.out_qty   > 0
         </if>
         <if test="searchText !=null">
             AND (  t.order_no LIKE concat('%', my_ex.likequery(#{searchText}), '%')