|
@@ -409,8 +409,11 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
WorkOrder workOrder = this.getById(workOrderDto.getId());
|
|
|
|
|
|
//如果定制且BOM未定制直接跳出
|
|
|
- if ("1".equals(workOrder.getIsCustomized())&&workOrderDto.getBomStatus()!=1){
|
|
|
- return;
|
|
|
+ if ("1".equals(workOrder.getIsCustomized())){
|
|
|
+ //如果BOM未定制
|
|
|
+ if (ObjectUtil.isEmpty(workOrder.getBomStatus())||workOrder.getBomStatus()!=1) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
//如果待生产数量为空(需要如果干预)直接跳过
|
|
|
if (ObjectUtil.isEmpty(workOrder.getProductionQuantity())){
|