|
|
@@ -6311,7 +6311,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
|
|
|
.sorted(Comparator.comparing(RouteCostItem::getOceanFreight))
|
|
|
.collect(Collectors.toList());
|
|
|
if (price.compareTo(minCostItem.get(0).getOceanFreight()) < 0) {
|
|
|
- text.append("提单号:").append(bills.getMblno()).append("箱型:").append(containers.getCntrTypeCode()).append("应收海运费用大于成本中心销售价,发送失败!");
|
|
|
+ text.append("提单号:").append(bills.getMblno()).append("箱型:").append(containers.getCntrTypeCode()).append("应收海运费:"+price+"大于成本中心海运费:"+minCostItem.get(0).getOceanFreight()+",发送失败!");
|
|
|
}
|
|
|
if (containerNumberItemList.stream().filter(e -> e.getPid().equals(containers.getPid()))
|
|
|
.mapToInt(SeaContainerNumberItem::getOccupyNum).sum() != containers.getQuantity()) {
|
|
|
@@ -6326,7 +6326,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
|
|
|
String pageStatus = "this.$store.getters.domSaleStatus";
|
|
|
String messageBody = "发送下货纸:" + text;
|
|
|
billUtils.sendMessage(bills, url, pageLabel, pageStatus, messageBody, "2", bills.getOperatorId(), "成本中心");
|
|
|
- return R.success(text.toString());
|
|
|
+// return R.success(text.toString());
|
|
|
+ throw new RuntimeException("未查到应收海运费,发送失败!");
|
|
|
} else {
|
|
|
return R.success("操作成功");
|
|
|
}
|