|
@@ -478,9 +478,14 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
List<Map<String,Object>> mapList = amsSaleOrderMapper.getCokeSaleOrderList(mapValue);
|
|
|
String statusStr;
|
|
|
for (Map<String, Object> resultMap : mapList) {
|
|
|
+ BigDecimal saleOrderId = (BigDecimal) resultMap.get("saleOrderId");
|
|
|
+ BigDecimal netWeight = amsSaleOrderMapper.getNetWeight(saleOrderId);
|
|
|
+ BigDecimal carNum = amsSaleOrderMapper.getCarNum(saleOrderId);
|
|
|
BigDecimal saleOrderStatus = (BigDecimal) resultMap.get("saleOrderStatus");
|
|
|
statusStr = saleOrderStatus.intValue() == 2 ? "销售公司已审批" : "财务已审批";
|
|
|
resultMap.put("statusStr",statusStr);
|
|
|
+ resultMap.put("netWeight",netWeight);
|
|
|
+ resultMap.put("carNum",carNum);
|
|
|
}
|
|
|
return mapList;
|
|
|
}
|