aps-排程结束之后更新数据时重新更新冲突

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -807,9 +807,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     } else {
                         apsProcessOperationProcessEqu.setPlanprocessrall(process.getOpeProducePcNum());
                     }
-                    apsProcessOperationProcessEqu.setHasconflict(process.getHasConflict() == null ? "n" : process.getHasConflict());
-                    apsProcessOperationProcessEqu.setConflictdes(process.getConflictDes() == null ? "" : process.getConflictDes());
-                    apsProcessOperationProcessEqu.setSoftconflictdes(process.getSoftconflictdes() == null ? "" : process.getSoftconflictdes());
+                    apsProcessOperationProcessEqu.setHasconflict(process.getHasConflict());
+                    apsProcessOperationProcessEqu.setConflictdes(process.getConflictDes());
+                    apsProcessOperationProcessEqu.setSoftconflictdes(process.getSoftconflictdes());
                     apsProcessOperationProcessEqu.setDeleted("0");
                     apsProcessOperationProcessEqu.setUnfinishroll(apsProcessOperationProcessEqu.getPlanprocessrall());
                     apsProcessOperationProcessEqu.setLeavewaitworkroll(apsProcessOperationProcessEqu.getPlanprocessrall());
@@ -1029,9 +1029,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 } else {
                     apsProcessOperationProcessEqu.setPlanprocessrall(process.getOpeProducePcNum());
                 }
-                apsProcessOperationProcessEqu.setHasconflict(process.getHasConflict());
-                apsProcessOperationProcessEqu.setConflictdes(process.getConflictDes());
-                apsProcessOperationProcessEqu.setSoftconflictdes(process.getSoftconflictdes());
+                apsProcessOperationProcessEqu.setHasconflict(process.getHasConflict() == null ? "n" : process.getHasConflict());
+                apsProcessOperationProcessEqu.setConflictdes(process.getConflictDes() == null ? "" : process.getConflictDes());
+                apsProcessOperationProcessEqu.setSoftconflictdes(process.getSoftconflictdes() == null ? "" : process.getSoftconflictdes());
                 apsProcessOperationProcessEqu.setLockmark("y");
                 apsProcessOperationProcessEqu.setLockmarkdetail("y");
                 if (process.getOptionalEquipmentZg() != null && process.getOptionalEquipmentZg().size() > 0) {