优化对账单的查询接口

jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java

@@ -542,12 +542,8 @@ public class DepotHeadService {
                     }
                     if (type.equals("采购入库")) {
                         allPrice = p2.subtract(p1);
-                    } else if (type.equals("销售退货入库")) {
-                        allPrice = p2.subtract(p1);
                     } else if (type.equals("销售出库")) {
                         allPrice = p1.subtract(p2);
-                    } else if (type.equals("采购退货出库")) {
-                        allPrice = p1.subtract(p2);
                     } else if (type.equals("收款")) {
                         allPrice = BigDecimal.ZERO.subtract(p1);
                     } else if (type.equals("付款")) {

jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml

@@ -468,7 +468,7 @@
         select dh.number,concat(dh.sub_type,dh.type) as type,dh.discount_last_money,dh.other_money,dh.change_amount,s.supplier supplierName,
         date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depot_head dh
         left join jsh_supplier s on s.id=dh.organ_id and ifnull(s.delete_Flag,'0') !='1'
-        where s.type=#{supType} and (dh.sub_type!='其它' and dh.sub_type!='采购订单' and dh.sub_type!='销售订单')
+        where s.type=#{supType} and (dh.sub_type='采购' or dh.sub_type='销售')
         and dh.oper_time >=#{beginTime} and dh.oper_time <=#{endTime}
         <if test="organId != null">
             and dh.organ_id=#{organId}
@@ -495,7 +495,7 @@
         (
             select count(1) a from jsh_depot_head dh
             left join jsh_supplier s on s.id=dh.organ_id and ifnull(s.delete_Flag,'0') !='1'
-            where s.type=#{supType} and (dh.sub_type!='其它' and dh.sub_type!='采购订单' and dh.sub_type!='销售订单')
+            where s.type=#{supType} and (dh.sub_type='采购' or dh.sub_type='销售')
             and dh.oper_time >=#{beginTime} and dh.oper_time &lt;=#{endTime}
             <if test="organId != null">
                 and dh.organ_id=#{organId}