'ams'

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

@@ -759,23 +759,26 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getSaleOrderListToCarrier")
-    public RESTfulResult getSaleOrderListToCarrier(@RequestBody(required = false) Map<String,Object> mapValue,
-                                                         Integer pageNum,
-                                                         Integer pageSize,
-                                                         Integer apiId,
-                                                         String carrierSsoId,
-                                                         String con) {
-        if (con != null  && !"".equals(con) && !"null".equals(con)) {
-            mapValue.put("con","%" + con + "%");
+    public RESTfulResult getSaleOrderListToCarrier(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId,
+                                                   String carrierSsoId,
+                                                   String con,
+                                                   @RequestParam(required = false) String startTime,
+                                                   @RequestParam(required = false) String endTime) {
+        if (con != null && !"".equals(con) && !"null".equals(con)) {
+            mapValue.put("con", "%" + con + "%");
         }
         if ((carrierSsoId != null && !"".equals(carrierSsoId)) && !"undefined".equals(carrierSsoId) && !"null".equals(carrierSsoId)) {
-            mapValue.put("carrierSsoId",carrierSsoId);
+            mapValue.put("carrierSsoId", carrierSsoId);
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         //不分页筛选数据
-        PageHelper.startPage(pageNum,pageSize);
+        PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListToCarrier(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, saleOrderList);
         return success(pageList);
     }
 
@@ -795,10 +798,13 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             String con) {
+                                             String con,
+                                             @RequestParam(required = false) String startTime,
+                                             @RequestParam(required = false)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.getSteelTruckNoList(mapValue);
@@ -829,10 +835,13 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             String con) {
+                                             String con,
+                                             @RequestParam(required = false) String startTime,
+                                             @RequestParam(required = false)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.getNoCarTruckNoList(mapValue);
@@ -971,21 +980,23 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     @PostMapping(value = "/updateCarAddress")
     @Transactional
     public RESTfulResult updateCarAddress(@RequestBody Map<String, Object> mapValue) throws Exception {
-        // 如果返回结果为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) {
-                head.put("wholeOrder",wholeOrder);
-                head.put("status",status);
-                head.put("reason",reason);
-                Map<String,Object> input = new HashMap<>();
-                input.put("head",head);
+        int result = amsSaleOrderService.updateCarAddress(mapValue);
+        if (result == 0) {
+            // 如果返回结果为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) {
+                head.put("wholeOrder", wholeOrder);
+                head.put("status", status);
+                head.put("reason", reason);
+                Map<String, Object> input = new HashMap<>();
+                input.put("head", head);
                 Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
-                totalMap.put("input",input);
+                totalMap.put("input", input);
                 String json = JSONUtils.toJSONString(totalMap);
                 System.out.println("--------------------------------------------");
                 System.out.println(json);
@@ -993,8 +1004,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                 Map<String, Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
                 System.out.println("--------------------------------------------");
                 System.out.println(resultMap);
+            }
         }
-        int result = amsSaleOrderService.updateCarAddress(mapValue);
         return success(result);
     }
 
@@ -1178,4 +1189,36 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         List<Map<String,Object>> mapList = amsSaleOrderService.getCarrierTruckNoAndMaterialList(map);
         return success(mapList);
     }
+
+    @ApiModelProperty(value = "关闭单个钢材物资分录")
+    @PostMapping("/closeSteelMaterialId")
+    public RESTfulResult closeSteelMaterialId(@RequestBody Map<String, Object> mapValue) {
+        int result = amsSaleOrderService.closeSteelMaterialId(mapValue);
+        if (result == 0) {
+            return failed("该物资已装货，无法关闭物资分录！！");
+        }
+        String reason = (String) mapValue.get("reason");
+        String number = (String) mapValue.get("number");
+        String closeEntryId = (String) mapValue.get("closeEntryId");
+        BigDecimal closeWlEntryId = DataChange.dataToBigDecimal(mapValue.get("saleMaterialId"));
+        String wholeOrder = "0";
+        String status = "close";
+        Map<String,Object> head = new HashMap<>();
+        head.put("number",number);
+        head.put("reason",reason);
+        head.put("closeEntryId",closeEntryId);
+        head.put("wholeOrder",wholeOrder);
+        head.put("closeWlEntryId",closeWlEntryId);
+        head.put("status",status);
+        Map<String,Object> input = new HashMap<>();
+        Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
+        input.put("head",head);
+        totalMap.put("input",input);
+        // 调用金蝶关闭接口
+        String json = JSONUtils.toJSONString(totalMap);
+        System.out.println(json);
+        Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
+        System.out.println(resultMap);
+        return success(result);
+    }
 }

src/main/java/com/steerinfo/dil/mapper/AmsSaleMaterialMapper.java

@@ -3,6 +3,9 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.AmsSaleMaterial;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -12,4 +15,16 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
     BigDecimal selectMaxId();
     // 得到物资出现次数
     Integer getMaterialCount(BigDecimal materialId);
+    // 根据路段顺序号逆序找到装货实际
+    List<Map<String, Object>> findLoadIdList(BigDecimal saleOrderMaterialId);
+    // 根据路段顺序号逆序找到计量实际
+    List<Map<String, Object>> findWeightIdList(BigDecimal saleOrderMaterialId);
+    //
+    int deleteLoadResult(BigDecimal loadId);
+    //
+    int deleteWeightResult(BigDecimal weightId);
+
+    int updateOrderMaterialToClose(Map<String, Object> mapValue);
+
+    int deleteWmspOutResult(Map<String, Object> mapValue);
 }

src/main/java/com/steerinfo/dil/service/IAmsSaleOrderService.java

@@ -161,4 +161,6 @@ public interface IAmsSaleOrderService {
     List<Map<String, Object>> getSaleMaterialId(BigDecimal saleOrderMaterialId);
     // 查询下发给承运商的车序号信息
     List<Map<String, Object>> getCarrierTruckNoAndMaterialList(Map<String, Object> map);
+    // 关闭单个钢材物资分录
+    int closeSteelMaterialId(Map<String, Object> mapValue);
 }

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

@@ -961,19 +961,25 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         amsSaleOrder.setDeleted(new BigDecimal(1));
         // 如果是已经上传金蝶的销售订单，则同步删除
         AmsSaleOrder amsSaleOrder1 = amsSaleOrderMapper.selectByPrimaryKey(saleOrderId);
-        if (amsSaleOrder1.getSaleOrderStatus().intValue() == 2 || amsSaleOrder1.getSaleOrderStatus().intValue() == 4) {
-            Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
-            Map<String, Object> head = (Map<String, Object>) input.get("head");
-            head.put("status","close");
-            // 获得金蝶接口配置
-            Map<String, Object> totalMap = easUtil.getTotalMap();
-            // 组装报文
+        if (amsSaleOrder1.getSaleOrderStatus().intValue() == 1 || amsSaleOrder1.getSaleOrderStatus().intValue() == 2 || amsSaleOrder1.getSaleOrderStatus().intValue() == 4) {
+            String reason = "修改物资关闭上一条销售订单";
+            String number = amsSaleOrder1.getSaleNumber();
+            String wholeOrder = "1";
+            String status = "close";
+            Map<String,Object> head = new HashMap<>();
+            head.put("number",number);
+            head.put("reason",reason);
+            head.put("wholeOrder",wholeOrder);
+            head.put("status",status);
+            Map<String,Object> input = new HashMap<>();
+            Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
+            input.put("head",head);
             totalMap.put("input",input);
-            System.out.println(totalMap);
+            // 调用金蝶关闭接口
             String json = JSONUtils.toJSONString(totalMap);
             System.out.println(json);
-            Map<String,Object> s = joinFeign.pushSaleOrderToEas(totalMap);
-            System.out.println(s);
+            Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
+            System.out.println(resultMap);
         }
         // 如果是副产品订单则关闭时同步关闭未进厂的运单
         Map<String,Object> map = new HashMap<>();
@@ -1302,9 +1308,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             // 得到销售订单物资表主键
             List<Map<String,Object>> saleMaterialIdList = amsSaleOrderMapper.getSaleMaterialId(saleOrderMaterialId);
             for (Map<String, Object> map : saleMaterialIdList) {
-                // 删除销售订单物资子表
+                // 关闭销售订单物资子表
                 BigDecimal saleMaterialId = (BigDecimal) map.get("saleMaterialId");
-                amsSaleMaterialMapper.deleteByPrimaryKey(saleMaterialId);
+                AmsSaleMaterial amsSaleMaterial = new AmsSaleMaterial();
+                amsSaleMaterial.setDeleted(new BigDecimal(0));
+                amsSaleMaterial.setSaleMaterialId(saleMaterialId);
+                amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
             }
             return 0;
         }
@@ -1596,7 +1605,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public int updateCapacityNumberInFactory(Map<String, Object> mapValue) {
         Object lineSequence = mapValue.get("lineSequence");
         int result = 0;
-        if (lineSequence == null || lineSequence.equals("0") || lineSequence.equals("1") || lineSequence.equals("2")) {
+        if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
             result += amsSaleOrderMapper.updateCapacityNumberInFactory(mapValue);
         }
         return result;
@@ -1628,4 +1637,50 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         }
         return mapList;
     }
+
+    /**
+     * 同步关闭金蝶物资分录
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public int closeSteelMaterialId(Map<String, Object> mapValue) {
+        int result = 0;
+        Object orderId = mapValue.get("orderId");
+        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
+        List<Map<String,Object>> loadIdList =  amsSaleMaterialMapper.findLoadIdList(saleOrderMaterialId);
+        List<Map<String,Object>> weightIdList =  amsSaleMaterialMapper.findWeightIdList(saleOrderMaterialId);
+        String reason = (String) mapValue.get("reason");
+        BigDecimal saleMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleMaterialId"));
+        // 如果还未派车
+        if (orderId == null) {
+            // 订单子表设为关闭状态
+            AmsSaleMaterial amsSaleMaterial = new AmsSaleMaterial();
+            amsSaleMaterial.setSaleMaterialId(saleMaterialId);
+            amsSaleMaterial.setDeleted(new BigDecimal(0));
+            amsSaleMaterial.setInsertUpdateRemark(reason);
+            result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
+            return result;
+        }
+        // 已派车
+        if (loadIdList == null || loadIdList.size() == 0) {
+            return result;
+        }
+        // 订单子表设为关闭状态
+        AmsSaleMaterial amsSaleMaterial = new AmsSaleMaterial();
+        amsSaleMaterial.setSaleMaterialId(saleMaterialId);
+        amsSaleMaterial.setDeleted(new BigDecimal(0));
+        amsSaleMaterial.setInsertUpdateRemark(reason);
+        result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
+        // 删除实绩表
+        Map<String, Object> loadMap = loadIdList.get(0);
+        Map<String, Object> weightMap = weightIdList.get(0);
+        BigDecimal loadId = (BigDecimal) loadMap.get("loadId");
+        BigDecimal weightId = (BigDecimal) weightMap.get("weightId");
+        result += amsSaleMaterialMapper.updateOrderMaterialToClose(mapValue);
+        result += amsSaleMaterialMapper.deleteLoadResult(loadId);
+        result += amsSaleMaterialMapper.deleteWeightResult(weightId);
+        result += amsSaleMaterialMapper.deleteWmspOutResult(mapValue);
+        return result;
+    }
 }

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

@@ -501,5 +501,72 @@
     FROM RMS_MATERIAL RM
     WHERE RM.MATERIAL_ID = #{materialId}
   </select>
+  
+  <select id="findLoadIdList" parameterType="DECIMAL" resultType="java.util.Map">
+    SELECT TLR.RESULT_ID AS "loadId"
+    FROM OMSTRUCK_ORDER OO
+           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                     ON OO.ORDER_ID = TTR.ORDER_ID
+           LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                     ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+    WHERE OO.ORDER_TYPE = 1
+      AND OO.ORDER_STATUS IN (4, 5)
+      AND TLR.MATERIAL_ID IS NULL
+      AND OO.ORDER_PLAN_ID = #{saleOrderMaterialId}
+    ORDER BY TLR.SEGMENT_SQE DESC
+  </select>
+
+  <select id="findWeightIdList" parameterType="DECIMAL" resultType="java.util.Map">
+    SELECT TWR.WEIGHT_TASK_RESULT_ID AS "weightId"
+    FROM OMSTRUCK_ORDER OO
+           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                     ON OO.ORDER_ID = TTR.ORDER_ID
+           LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                     ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+    WHERE OO.ORDER_TYPE = 1
+      AND OO.ORDER_STATUS IN (4, 5)
+      AND TWR.MATERIAL_ID IS NULL
+      AND OO.ORDER_PLAN_ID = #{saleOrderMaterialId}
+    ORDER BY TWR.TARE_SEGMENT_SQE DESC
+  </select>
+  
+  <delete id="deleteLoadResult" parameterType="DECIMAL" >
+    DELETE FROM TMSTRUCK_LOAD_RESULT WHERE RESULT_ID = #{loadId}
+  </delete>
+
+  <delete id="deleteWeightResult" parameterType="DECIMAL" >
+    DELETE FROM TMSTRUCK_WEIGHT_RESULT WHERE WEIGHT_TASK_RESULT_ID = #{weightId}
+  </delete>
+
+  <delete id="updateOrderMaterialToClose" parameterType="java.util.Map" >
+    UPDATE OMSTRUCK_ORDER_MATERIAL OOM
+    SET OOM.MATERIAL_PRIORITY = 71
+    WHERE OOM.ORDER_ID =
+          (
+            SELECT OO.ORDER_ID
+            FROM OMSTRUCK_ORDER OO
+            WHERE OO.ORDER_TYPE = 1
+              AND OO.ORDER_PLAN_ID = #{saleOrderMaterialId})
+      AND OOM.MATERIAL_ID =
+          (SELECT ASM.MATERIAL_ID
+           FROM AMS_SALE_MATERIAL ASM
+           WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId})
+  </delete>
+
+  <delete id="deleteWmspOutResult" parameterType="java.util.Map" >
+    DELETE
+    FROM WMSP_OUTBOUND_RESULT_MATERIAL WORM
+    WHERE WORM.OUTBOUND_RESULT_ID =
+          (SELECT
+           FROM WMSP_OUTBOUND_RESULT WOR
+                  LEFT JOIN OMSTRUCK_ORDER OO
+                            ON OO.ORDER_ID = WOR.BILL_LADING_ID
+           WHERE OO.ORDER_TYPE = 1
+             AND OO.ORDER_PLAN_ID = #{saleOrderMaterialId})
+      AND WORM.MATERIAL_ID =
+          (SELECT ASM.MATERIAL_ID
+           FROM AMS_SALE_MATERIAL ASM
+           WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId})
+  </delete>
 
 </mapper>

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

@@ -1540,6 +1540,7 @@
     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
+    and ASM.DELETED IS NULL
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
@@ -1689,6 +1690,7 @@
     ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS=1
     and a_s_order.DELETED = 0
+    AND ASM.DELETED IS NULL
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
@@ -1982,6 +1984,7 @@
     where a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is null
     and a_s_order.DELETED = 0
+    and ASM.DELETED IS NULL
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
@@ -2497,6 +2500,7 @@
       </if>
       AND OO.ORDER_ID IS NULL
       AND ADSO.DISPATCH_ID IS NOT NULL
+      AND ASM.DELETED IS NULL
     ORDER BY ASOM.SALE_ORDER_MATERIAL_TRUCK_NO ASC
   </select>
 
@@ -2583,6 +2587,14 @@
     and a_s_order.DELETED = 0
     and ADSO.DISPATCH_TYPE = 2
     and OO.ORDER_ID IS NULL
+    AND ASM.DELETED IS NULL
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = a_s_order.INSERT_TIME
+    </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  a_s_order.INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  a_s_order.INSERT_TIME
+    </if>
     <if test="carrierSsoId != null" >
       and RC.CARRIER_SSO_ID = #{carrierSsoId}
     </if>
@@ -2882,6 +2894,14 @@
     AND ASOM.ISSUE_STATUS IS NULL
     AND ADSO.CARRIER_ID IS NULL
     AND ASO.DELETED = 0
+    AND ASM.DELETED IS NULL
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
+    </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  ASO.INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASO.INSERT_TIME
+    </if>
     <if test="con != null" >
       AND RCO.CONSIGNEE_COMPANY_NAME LIKE #{con}
     </if>
@@ -3033,6 +3053,14 @@
     AND ADSO.DISPATCH_TYPE = 2
     AND OO.ORDER_ID IS NULL
     AND ASO.DELETED = 0
+    AND ASM.DELETED IS NULL
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
+    </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  ASO.INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASO.INSERT_TIME
+    </if>
     ) "NOCAR"
     <where>
       <if test="con != null" >
@@ -3223,6 +3251,7 @@
     AND OO.ORDER_ID IS NOT NULL
     AND OO.ORDER_STATUS IN (4,5)
     AND ASO.DELETED != 2
+    AND ASM.DELETED IS NULL
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASOM.INSERT_TIME
     </if>
@@ -3408,7 +3437,8 @@
     RRA.ADDRESS_PROVINCE "addressProvince",
     RRA.ADDRESS_DISTRICT "addressDistrict",
     RRA.ADDRESS_TOWN "addressTown",
-    ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel"
+    ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
+    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS "addressPlace"
     FROM AMS_SALE_ORDER ASO
     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
@@ -3420,9 +3450,6 @@
     AND RRP.PLACE_ID IS NOT NULL
     ORDER BY ASOM.SALE_ORDER_MATERIAL_ID DESC
     )
-    WHERE rownum <![CDATA[
-    <
-    ]]> 2
   </select>
 
   <select id="getSalerByReceiveId" parameterType="DECIMAL" resultType="java.util.Map" >