|
@@ -421,10 +421,11 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Order orderSuspend(Order model){
|
|
|
+
|
|
|
// 暂停订单,根据订单id找到相应的task,tasknode相应的信息,删除相应未执行的工序结点
|
|
|
// TODO 等代码稳定后增加资源锁,防止一边在加工,一边在暂停订单造成数据的不一致
|
|
|
QueryWrapper<TWorkpiece> queryTWorkpieceWrapper = new QueryWrapper<TWorkpiece>();
|
|
|
- queryTWorkpieceWrapper.eq("orderId", model.getId());
|
|
|
+ queryTWorkpieceWrapper.eq("planId", model.getId());
|
|
|
queryTWorkpieceWrapper.in("produceStatus",new ArrayList<String>(Arrays.asList("1", "2")));
|
|
|
List<TWorkpiece> tWorkpieces = workpieceMapper.selectList(queryTWorkpieceWrapper);
|
|
|
// 依次根据工件id删除相应的数据
|
|
@@ -459,13 +460,13 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
|
|
|
taskMapper.delete(tTaskWrapper);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
return model;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public Order orderEnable(Order model){
|
|
|
+ // 启用订单后判断如果当前计划未加工,直接
|
|
|
+
|
|
|
|
|
|
return model;
|
|
|
}
|