|
|
@@ -674,7 +674,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
amsSaleOrderMaterial.setSaleShippingAddressId((BigDecimal) placeIdList.get(0).get("placeId"));
|
|
|
}
|
|
|
}
|
|
|
- if (amsSaleOrderMaterial.getSaleShippingAddressId() != null && isSelfMention.equals("否")) {
|
|
|
+ if (amsSaleOrderMaterial.getSaleShippingAddressId() != null && isSelfMention.equals("否") && DataChange.dataToBigDecimal(map.get("carrierId")).intValue() == 0) {
|
|
|
// 自动匹配承运商
|
|
|
List<Map<String, Object>> carrierList = getCarrierByAddress(amsSaleOrderMaterial.getSaleShippingAddressId());
|
|
|
BigDecimal carrierCount = null;
|
|
|
@@ -708,6 +708,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
dispatchToCarrier(list);
|
|
|
}
|
|
|
}
|
|
|
+ if (isSelfMention.equals("否") && DataChange.dataToBigDecimal(map.get("carrierId")).intValue() != 0) {
|
|
|
+ //说明有承运商
|
|
|
+ List<Map<String, Object>> list = new ArrayList<>();
|
|
|
+ Map<String, Object> carrierMap = new HashMap<>();
|
|
|
+ carrierMap.put("carrierId",map.get("carrierId"));
|
|
|
+ carrierMap.put("saleOrderMaterialId",saleOrderMaterialId);
|
|
|
+ list.add(carrierMap);
|
|
|
+ dispatchToCarrier(list);
|
|
|
+ }
|
|
|
// 收货方姓名
|
|
|
String consigneeName = String.valueOf(map.get("saleOrderConsignee"));
|
|
|
// 收货方电话
|
|
|
@@ -1211,6 +1220,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
BigDecimal carrierId =DataChange.dataToBigDecimal(map.get("carrierId"));
|
|
|
// 得到车序号表主键
|
|
|
BigDecimal saleOrderMaterialId =DataChange.dataToBigDecimal(map.get("saleOrderMaterialId"));
|
|
|
+ //判断该车序号有没有被授权
|
|
|
AmsDispatchSaleOrder amsDispatchSaleOrder = new AmsDispatchSaleOrder();
|
|
|
BigDecimal dispatchId = amsDispatchSaleOrderMapper.selectOtherId();
|
|
|
amsDispatchSaleOrder.setDispatchId(dispatchId);
|
