Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -5,11 +5,7 @@ import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.AmsDispatchSaleOrderMapper;
-import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
 import com.steerinfo.dil.model.AmsDispatchSaleOrder;
-import com.steerinfo.dil.model.AmsSaleOrder;
-import com.steerinfo.dil.model.AmsSaleOrderCarrier;
-import com.steerinfo.dil.model.AmsSaleOrderMaterial;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.service.impl.AmsDispatchSaleOrderServiceImpl;
 import com.steerinfo.dil.service.impl.AmsSaleOrderCarrierServiceImpl;
@@ -17,13 +13,12 @@ import com.steerinfo.dil.service.impl.AmsSaleOrderMaterialServiceImpl;
 import com.steerinfo.dil.util.*;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-//import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -34,6 +29,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+//import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
+
 /**
  * AmsSaleOrder RESTful接口：
  * @author generator
@@ -487,7 +484,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                             String consigneeSsoId,
                                             String con,
                                             String startTime,
-                                            String endTime
+                                            String endTime,
+                                            String saler
                                             ){
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId",consigneeSsoId);
@@ -495,6 +493,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con",con);
         }
+        if (saler != null && !"".equals(saler) && !"null".equals(saler)){
+            mapValue.put("saler",saler);
+        }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfoes(mapValue);
@@ -514,13 +515,17 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                 String consigneeSsoId,
                                                 String con,
                                                 String startTime,
-                                                String endTime){
+                                                String endTime,
+                                                String saler){
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con",con);
         }
+        if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            mapValue.put("saler",saler);
+        }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReportedes(mapValue);
@@ -544,7 +549,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                          @RequestParam(required = false) Integer saleType,
                                                          String consigneeSsoId,
                                                          @RequestParam(required = false) String startTime,
-                                                         @RequestParam(required = false)String endTime
+                                                         @RequestParam(required = false)String endTime,
+                                                         String saler
                                                          ) {
         if (con != null  && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con", con);
@@ -555,6 +561,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         if (consigneeSsoId != null  && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
+        if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            mapValue.put("saler",saler);
+        }
         mapValue.put("saleType",saleType);
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
 //        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
@@ -847,10 +856,13 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             String con) {
+                                             String con,
+                                             String startTime,
+                                             String endTime) {
         if (con != null && !con.equals("undefined") && !con.equals("null")) {
             mapValue.put("con", "%" + con + "%");
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getHaveCarTruckNoList(mapValue);
@@ -957,17 +969,16 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "map", value = "修改收货地址", required = false, dataType = "java.util.Map")
     })
     @PostMapping(value = "/updateCarAddress")
-    public RESTfulResult updateCarAddress(@RequestBody Map<String, Object> mapValue) {
-        int result = amsSaleOrderService.updateCarAddress(mapValue);
+    @Transactional
+    public RESTfulResult updateCarAddress(@RequestBody Map<String, Object> mapValue) throws Exception {
         // 如果返回结果为0，则认定是关闭了车辆
-        if (result == 0) {
-            BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
-            List<Map<String,Object>> saleMaterialIdList = amsSaleOrderService.getSaleMaterialId(saleOrderMaterialId);
-            String wholeOrder = "0";
-            String status = "close";
-            String reason = "收货地址修改超过片区范围";
-            // 循环调用关闭金蝶分录接口
-            for (Map<String, Object> head : saleMaterialIdList) {
+        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
+        List<Map<String,Object>> saleMaterialIdList = amsSaleOrderService.getSaleMaterialId(saleOrderMaterialId);
+        String wholeOrder = "0";
+        String status = "close";
+        String reason = "收货地址修改超过片区范围";
+        // 循环调用关闭金蝶分录接口
+        for (Map<String, Object> head : saleMaterialIdList) {
                 head.put("wholeOrder",wholeOrder);
                 head.put("status",status);
                 head.put("reason",reason);
@@ -976,11 +987,14 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                 Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
                 totalMap.put("input",input);
                 String json = JSONUtils.toJSONString(totalMap);
+                System.out.println("--------------------------------------------");
                 System.out.println(json);
+                System.out.println("--------------------------------------------");
                 Map<String, Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
+                System.out.println("--------------------------------------------");
                 System.out.println(resultMap);
-            }
         }
+        int result = amsSaleOrderService.updateCarAddress(mapValue);
         return success(result);
     }
 
@@ -1067,7 +1081,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                             String con,
                                                   String consigneeSsoId,
                                                   @RequestParam(required = false) String startTime,
-                                                  @RequestParam(required = false) String endTime
+                                                  @RequestParam(required = false) String endTime,String saler
     ) {
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con", con);
@@ -1075,6 +1089,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId", consigneeSsoId);
         }
+        if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            mapValue.put("saler", saler);
+        }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);
@@ -1148,7 +1165,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             String json = JSONUtils.toJSONString(totalMap);
             System.out.println(json);
             Map<String, Object> s = joinFeign.pushCarNumberToEas(totalMap);
+            System.out.println("-------------------------------------");
             System.out.println(s);
+            System.out.println("-------------------------------------");
             return success(result);
         }
     }

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -472,7 +472,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             BigDecimal number;
             BigDecimal materialNumber = (BigDecimal) map.get("materialNumber");
             BigDecimal materialWeight = (BigDecimal) map.get("materialWeight");
-            if (materialNumber != null && materialNumber.toString().length() != 0) {
+            String materialName =(String) map.get("materialName");
+            if (materialNumber != null && materialNumber.toString().length() != 0 && !materialName.equals("钒渣")) {
                 number = materialNumber;
             }
             else {
@@ -661,10 +662,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             // 钢材米数
             BigDecimal steelMeters = DataChange.dataToBigDecimal(map.get("steelMeters"));
             // 判断物资是否是盘螺或盘元/盘圆
-            if (materialName != null && (!materialName.toString().contains("盘螺") || !materialName.toString().contains("盘元") || !materialName.toString().contains("盘圆"))) {
-                if (steelMeters != null && !steelMeters.toString().equals("0")) {
-                    amsSaleMaterial.setSteelMeter(steelMeters);
-                }
+            if (materialName != null && (materialName.toString().contains("盘螺") || materialName.toString().contains("盘元") || materialName.toString().contains("盘圆"))) {
+                amsSaleMaterial.setSteelMeter(null);
+            }
+            else {
+                amsSaleMaterial.setSteelMeter(steelMeters);
             }
             // 是否磅重销售（0：磅重；1：理重）
             BigDecimal isPoundSale = DataChange.dataToBigDecimal(map.get("isPoundSale"));

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -718,7 +718,8 @@
     a_s_order.SALE_UNIT_PRICE "saleUnitPrice",
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
-    a_s_order.INSERT_TIME "insertTime"
+    a_s_order.INSERT_TIME "insertTime",
+
     from AMS_SALE_ORDER a_s_order
     left join (select sale_material.SALE_ORDER_ID saleOrderId,
     sum(tt.sum1) saleSum1,
@@ -853,7 +854,6 @@
     from AMS_SALE_TRUCKNO_MATERIAL truckno_material group by
     truckno_material.SALE_ORDER_MATERIAL_ID) tt
     on tt.s_order_material = sale_material.SALE_ORDER_MATERIAL_ID
-
     group by
     sale_material.SALE_ORDER_ID) allmaterial_info
     on a_s_order.SALE_ORDER_ID=allmaterial_info.saleOrderId
@@ -1525,7 +1525,7 @@
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
     left join RMS_CONSIGNEE r_consignee
     on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
-    LEFT JOIN AMS_SALE_ORDER_MATEIRAL ASOM
+    LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
     ON ASOM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
     LEFT JOIN RMS_RECEIVE_PLACE RRP
     ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
@@ -1537,6 +1537,8 @@
     ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    LEFT JOIN RMS_SALER R_SALER
+    ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS=0 and a_s_order.DELETED=0
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
@@ -1544,6 +1546,9 @@
     <if test="consigneeSsoId != null" >
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>
+    <if test="saler != null" >
+      and  R_SALER.SALER_NAME = #{saler}
+    </if>
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
     </if>
@@ -1565,10 +1570,10 @@
           "materialName" like '%${item}%'
         </foreach>
       </if>
-      <if test="materialSpecification != null">
+      <if test="specificationModel != null">
         and
-        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
-          "materialSpecification" like '%${item}%'
+        <foreach collection="specificationModel" item="item" open="(" separator="or" close=")">
+          "specificationModel" like '%${item}%'
         </foreach>
       </if>
       <if test="materialModel != null">
@@ -1661,16 +1666,27 @@
     RM.MATERIAL_MODEL "materialModel",
     RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
     ASM.MATERIAL_NUMBER "materialNumber",
-    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel"
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
+    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace"
     from AMS_SALE_ORDER a_s_order
     left join RMS_SHIPPER r_shipper
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
     left join RMS_CONSIGNEE r_consignee
     on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
+    left join AMS_SALE_ORDER_MATERIAL ASOM
+    on asom.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    left join RMS_RECEIVE_PLACE RRP
+    on RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRP.ADDRESS_ID = RRA.ADDRESS_ID
+    LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+    ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN AMS_SALE_MATERIAL ASM
-    ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    LEFT JOIN RMS_SALER R_SALER
+    ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS=1
     and a_s_order.DELETED = 0
     <if test="con != null">
@@ -1685,6 +1701,9 @@
     </if>
     <if test="consigneeSsoId != null">
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
+    </if>
+    <if test="saler != null" >
+      and  R_SALER.SALER_NAME = #{saler}
     </if>
         )
     <where>
@@ -1934,6 +1953,7 @@
     RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
     ASM.MATERIAL_NUMBER "materialNumber",
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
+    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
     ASM.SALE_WAREHOUSE "saleWareHouse",
     a_s_order.DELETED "deleted"
     from AMS_SALE_ORDER a_s_order
@@ -1941,10 +1961,20 @@
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
     left join RMS_CONSIGNEE r_consignee
     on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
+    left join AMS_SALE_ORDER_MATERIAL ASOM
+    on asom.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    left join RMS_RECEIVE_PLACE RRP
+    on RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRP.ADDRESS_ID = RRA.ADDRESS_ID
+    LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+    ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN AMS_SALE_MATERIAL ASM
-    ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    LEFT JOIN RMS_SALER R_SALER
+    ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is null
     and a_s_order.DELETED = 0
@@ -1967,6 +1997,9 @@
     <if test="saleType == null">
       and a_s_order.SALE_TYPE is null
     </if>
+    <if test="saler != null" >
+      and  R_SALER.SALER_NAME = #{saler}
+    </if>
     <if test="consigneeSsoId != null">
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>
@@ -2239,7 +2272,6 @@
     on t_t_result.result_total_id=t_w_result.result_total_id
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
-  
     ) sumWeight
     on sumWeight.SALE_ORDER_ID=ASO.SALE_ORDER_ID
     left join (
@@ -2256,7 +2288,6 @@
     where t_w_result.RESULT_NET_WEIGHT is null and o_order.order_status in (2,4,5)
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
-  
     ) sumWeight2
     on sumWeight2.SALE_ORDER_ID=ASO.SALE_ORDER_ID
     left join (
@@ -2268,7 +2299,7 @@
     on o_order.order_id=t_t_result.order_id
     left join Tmstruck_Weight_Result t_w_result
     on t_t_result.result_total_id=t_w_result.result_total_id
-    where t_w_result.RESULT_NET_WEIGHT is null and o_order.order_status in (2,4,5)
+    where  o_order.order_status in (2,4,5)
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
   
@@ -3125,7 +3156,7 @@
     ORDER BY ASOM.SALE_ORDER_MATERIAL_TRUCK_NO ASC
   </select>
 
-  <select id="getHaveCarTruckNoList" parameterType="java.util.Map" resultType="java.util.Map">
+  <select id="getHaveCarTruckNoList" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     SELECT * FROM (
     SELECT DISTINCT *
     FROM (
@@ -3151,7 +3182,8 @@
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "nameSpecificationModel",
     RCP.CAPACITY_NUMBER AS "capacityNumber",
     OO.DRIVER_TEL AS "drivelTel",
-    ASM.MATERIAL_NUMBER AS "materialNumber"
+    ASM.MATERIAL_NUMBER AS "materialNumber",
+    OO.ORDER_ID AS "orderId"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
     LEFT JOIN AMS_SALE_ORDER ASO
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
@@ -3184,6 +3216,14 @@
     AND OO.ORDER_ID IS NOT NULL
     AND OO.ORDER_STATUS IN (4,5)
     AND ASO.DELETED != 2
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASOM.INSERT_TIME
+    </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  ASOM.INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASOM.INSERT_TIME
+    </if>
+    ORDER BY ASOM.SALE_ORDER_MATERIAL_ID DESC
     ) "HAVECAR"
     <where>
       <if test="con != null" >
@@ -3277,7 +3317,7 @@
         </foreach>
       </if>
     </where>
-    <include refid="orderBy"></include>
+
 
   </select>
 
@@ -3616,7 +3656,8 @@
 
     ) carCount
     on carCount.SALE_ORDER_ID=a_s_order.SALE_ORDER_ID
-    where ASM.SALE_WAREHOUSE = '副产品库'
+    where (ASM.SALE_WAREHOUSE = '副产品库'
+    or ASM.SALE_WAREHOUSE = '钒渣库')
     and a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is null
     and a_s_order.DELETED = #{deleted}
@@ -3814,12 +3855,17 @@
     ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    LEFT JOIN RMS_SALER R_SALER
+    ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.DELETED = 1
     and a_s_order.SALE_TYPE = 1
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
+    <if test="saler != null" >
+      and  R_SALER.SALER_NAME = #{saler}
+    </if>
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
     </if>