|
@@ -334,10 +334,12 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
|
|
|
|
if (req.getIsNeedPublish()) {
|
|
if (req.getIsNeedPublish()) {
|
|
//=============发布排程================
|
|
//=============发布排程================
|
|
- List<String> blankIds = apsBlankOrderDoList.stream().map(ApsBlankOrderDo::getId).collect(Collectors.toList());
|
|
|
|
- R publish = apsBlankOrderService.publish(blankIds);
|
|
|
|
- if (!publish.getCode().equals("200")) {
|
|
|
|
- throw new RuntimeException(publish.getMsg());
|
|
|
|
|
|
+ List<String> blankIds = apsBlankOrderDoList.stream().filter(item -> item.getProductstatus().equals(SaveConstans.ProductionStatus.TO_BE_PUBLISHED)).map(ApsBlankOrderDo::getId).collect(Collectors.toList());
|
|
|
|
+ if (ObjectUtil.isNotEmpty(blankIds)) {
|
|
|
|
+ R publish = apsBlankOrderService.publish(blankIds);
|
|
|
|
+ if (!publish.getCode().equals("200")) {
|
|
|
|
+ throw new RuntimeException(publish.getMsg());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -762,7 +764,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
ApsProductionOrderDo nowApsProductionOrderDo = this.getById(req.getOrderId());
|
|
ApsProductionOrderDo nowApsProductionOrderDo = this.getById(req.getOrderId());
|
|
|
|
|
|
//如果 评审状态 不一致
|
|
//如果 评审状态 不一致
|
|
- if(!oldApsProductionOrderDo.getAuditstatus().equals(nowApsProductionOrderDo.getAuditstatus())){
|
|
|
|
|
|
+ if (!oldApsProductionOrderDo.getAuditstatus().equals(nowApsProductionOrderDo.getAuditstatus())) {
|
|
return R.error("该订单已被其他人提交,不能保存或提交");
|
|
return R.error("该订单已被其他人提交,不能保存或提交");
|
|
}
|
|
}
|
|
|
|
|