修改

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

@@ -3137,10 +3137,16 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     }
                 }
                 if (isSelfMention.equals("是")) {
+                    BigDecimal carrierId = null;
                     // 根据收货单位id查询出收货单位名称
-                    String consigneeName = amsSaleOrderMapper.selectConsigneeName(receiveId);
+                    if (place != null && place.contains("欧冶")) {
+                        String placeRemark = amsSaleOrderMapper.selectPlaceRemark(place);
+                        carrierId = amsSaleOrderMapper.selectCarrierId(placeRemark);
+                    }else{
+                        String consigneeName = amsSaleOrderMapper.selectConsigneeName(receiveId);
+                        carrierId = amsSaleOrderMapper.selectCarrierId(consigneeName);
+                    }
                     // 根据收货单位名称查询承运商id
-                    BigDecimal carrierId = amsSaleOrderMapper.selectCarrierId(consigneeName);
                     List<Map<String, Object>> list = new ArrayList<>();
                     Map<String,Object> map1 = new HashMap<>();
                     // 传入车序号主键和承运商id
@@ -3151,7 +3157,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                         dispatchToCarrier(list);
                     }
                 }
-                if (isSelfMention.equals("否") && DataChange.dataToBigDecimal(map.get("carrierId")).intValue() != 0) {
+                if (DataChange.dataToBigDecimal(map.get("carrierId")).intValue() != 0) {
                     //说明有承运商
                     List<Map<String, Object>> list = new ArrayList<>();
                     Map<String, Object> carrierMap = new HashMap<>();