生产管理修改

liweidong
李涛 2 weeks ago
parent fd0375d6d8
commit 34747639ae
  1. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
  2. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java

@ -233,7 +233,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
page.setSize(999);
List<StatementVO> statementVOS = baseMapper.selectOemStatementPage(page, query);
if (statementVOS == null || statementVOS.isEmpty()) {
return R.fail(String.format("【%】无未结算的结算单", woCode));
return R.fail(String.format("[%]无未结算的结算单", woCode));
}
return oemSettleAccounts(statementVOS, BigDecimal.ZERO, date);
}

@ -229,7 +229,11 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
// todo 计算主工序对应的金额
// bsTeamWagesLevelService.countTeamSalary(wo.getWoId());
// 调用外协结算
oemStatementService.autoSettlement(wo.getWoCode(), now);
try {
oemStatementService.autoSettlement(wo.getWoCode(), now);
} catch (Exception e) {
log.error("外协结算失败", e);
}
}
}
if (paType.equals(PlateAround.AFTER_PLAN_IN)) {

Loading…
Cancel
Save