sql修改

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -620,6 +620,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                t.s_order_item_id,
                t.item_index,
                t.sku_id,
+               t.from_id,
                tmgs.sku_images,
                tmgb.brand_name,
                tmgb.short_name,

src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.xml

@@ -195,6 +195,10 @@
         <if test="orgName != null and orgName != ''">
             AND tmo.org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
         </if>
+
+        <if test="sumAmtReceivableHandleFlag != null and sumAmtReceivableHandleFlag == true">
+            AND t.sum_amt_receivable_handle > 0
+        </if>
     </sql>
 
     <sql id="idsForeach">

src/main/java/com/dk/mdm/model/query/mac/RecPayQuery.java

@@ -293,6 +293,9 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
 
     private List<String> rpTypeList;
 
+    @ApiModelProperty(value = "已核销查询标识")
+    private Boolean sumAmtReceivableHandleFlag;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -303,7 +303,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
         //退款的时候 判断资金账户金额是否充足
         BigDecimal result = accountResponse.getReceipt().add(outboundVO.getSumAmtRec());//getSumAmtRec 退款是负值 所以相加
         if (result.compareTo(BigDecimal.ZERO) < 0) {
-            return ResponseResultUtil.error(ResponseCodeEnum.NOT_LESS_THAN_ZERO);
+            return ResponseResultUtil.error(ResponseCodeEnum.NOT_LESS_RECEIPT_ZERO);
         }
         //新建退货出库
         saleReturnOutboundInsert(outboundVO);