aps-明细更新时间和更新人，修改冲突信息时不进行更新,批次号流转时操作，不更新时间和人

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsBlankOrderDao.java

@@ -73,9 +73,9 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
 //            "and PROCESSID NOT IN (select ID from aps_process_operation where DELETED='0' and BLANKID in (${hasIds}) AND LOCKMARK='y')")
 //    void setProDetailLockMark(@Param("hasIds") String hasIds);
 
-    @Select("UPDATE aps_process_operation_process_equ set LOCKMARK='n',MODIFYUSERID = #{userId},MODIFYUSERNAME = #{userName} where DELETED='0' and BLANKID in (${hasIds}) " +
+    @Select("UPDATE aps_process_operation_process_equ set LOCKMARK='n' where DELETED='0' and BLANKID in (${hasIds}) " +
             "and (LOCKMARKDETAIL is null or  LOCKMARKDETAIL != 'y')")
-    void setProDetailLockMark(@Param("hasIds") String hasIds,@Param("userId") String userId,@Param("userName") String userName);
+    void setProDetailLockMark(@Param("hasIds") String hasIds);
 
     @Select("select * FROM (\n" +
             "select PROCESSDEVICEID,PLANSTARTDATE,PLANENDDATE,GROUP_CONCAT(PROCESSID) PROCESSID from (select * from aps_process_operation_process_equ " +

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

@@ -271,7 +271,7 @@ public class ApsServiceImpl implements ApsService {
             // 更新排程明细数据锁定状态为否
             /*processOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>().set(ApsProcessOperationProcessEquDo::getLockmark,"n")
                     .in(ApsProcessOperationProcessEquDo::getBlankid,blankOrderIds));*/
-            apsBlankOrderDao.setProDetailLockMark(blankidStrs, currentUser.getId(), currentUser.getName());
+            apsBlankOrderDao.setProDetailLockMark(blankidStrs);
         }
         // 排程
         List<ProductionScheduleVo> productionScheduleVos = new ArrayList<>();
@@ -645,7 +645,7 @@ public class ApsServiceImpl implements ApsService {
             // 更新排程明细数据锁定状态为否
             /*processOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>().set(ApsProcessOperationProcessEquDo::getLockmark,"n")
                     .in(ApsProcessOperationProcessEquDo::getBlankid,blankOrderIds));*/
-            apsBlankOrderDao.setProDetailLockMark(blankidStrs, currentUser.getId(), currentUser.getName());
+            apsBlankOrderDao.setProDetailLockMark(blankidStrs);
         }
         // 排程
         List<ProductionScheduleVo> productionScheduleVos = new ArrayList<>();