|
|
@@ -1791,7 +1791,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
|
|
|
if (node.OutLines.Count == 0 && procedureEntity.ModelType != 8)
|
|
|
{
|
|
|
// 8-1质量登记、3#质量登记、8-2重烧质量登记不判断
|
|
|
- if (procedureEntity.ProcedureID != 12 && procedureEntity.ProcedureID != 105 && procedureEntity.ProcedureID != 59)
|
|
|
+ if (procedureEntity.ProcedureID != 12 && procedureEntity.ProcedureID != 105 && procedureEntity.ProcedureID != 59 && procedureEntity.ProcedureID != 139)
|
|
|
{
|
|
|
MessageBox.Show("节点【" + node.Name + "】是孤立工序!", "Error");
|
|
|
// 选中该节点
|
|
|
@@ -1883,13 +1883,13 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
|
|
|
//过程节点校验
|
|
|
|
|
|
#region 中间节点不能设置为特殊返工工序
|
|
|
- if (procedureEntity.IsSpecialRework == (int)Constant.SpecialReworkFlag.Yes)
|
|
|
- {
|
|
|
- MessageBox.Show("中间节点【" + node.Name + "】不能设置为特殊返工工序!", "Error");
|
|
|
- // 选中该节点
|
|
|
- //SetSelectNode(node);
|
|
|
- return false;
|
|
|
- }
|
|
|
+ //if (procedureEntity.IsSpecialRework == (int)Constant.SpecialReworkFlag.Yes)
|
|
|
+ //{
|
|
|
+ // MessageBox.Show("中间节点【" + node.Name + "】不能设置为特殊返工工序!", "Error");
|
|
|
+ // // 选中该节点
|
|
|
+ // //SetSelectNode(node);
|
|
|
+ // return false;
|
|
|
+ //}
|
|
|
#endregion
|
|
|
|
|
|
#region 校验坯库工序
|