Merge remote-tracking branch 'origin/master'

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

@@ -203,7 +203,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     List<String> getEasPrimaryIds(Map<String, Object> map);
 
-    List<Map<String, Object>> getNextCarrier(BigDecimal addressId);
+    List<Map<String, Object>> getNextCarrier(Integer addressId);
 
     BigDecimal getPriceIdByPlaceId(BigDecimal placeId);
 

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

@@ -1191,7 +1191,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         List<Map<String,Object>> mapList = amsSaleOrderMapper.getCarrierByAddress(addressId);
         try {
             if(mapList != null  && mapList.size() != 1) {
-                mapList = amsSaleOrderMapper.getNextCarrier(addressId);
+                mapList = amsSaleOrderMapper.getNextCarrier(addressId.intValue());
             }
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -4693,7 +4693,7 @@
          FETCH NEXT 5000 ROWS ONLY
       </if>
     </select>
-  <select id="getNextCarrier" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+  <select id="getNextCarrier" resultType="java.util.Map" parameterType="java.lang.Integer">
     select adso.CARRIER_ID "carrierId" from AMS_SALE_ORDER_MATERIAL asom
     left join RMS_RECEIVE_PLACE rrp
     on rrp.PLACE_ID = asom.SALE_SHIPPING_ADDRESS_ID
@@ -4703,6 +4703,7 @@
     on rc.CARRIER_ID = adso.CARRIER_ID
     where rrp.ADDRESS_ID = #{addressId}
       and rc.CARRIER_TYPE = '销售钢材承运商'
+      and (rrp.ADDRESS_ID in (500105,500101,500154) and rrp.ADDRESS_DELIVERY_ADDRESS not like '%库%' OR rrp.ADDRESS_ID NOT IN ( 500105, 500101, 500154 ) )
     order by asom.SALE_ORDER_MATERIAL_ID desc
     fetch first 1 row only
   </select>