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

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

@@ -3211,7 +3211,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 } else {
                     data.setHasconflict("y");
                 }
-                data.setModifydate(new Date());
             });
             if (!equDos.isEmpty()) {
                 apsProcessOperationProcessEquService.updateBatchById(equDos);
@@ -3229,7 +3228,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 } else {
                     data.setHasconflict("y");
                 }
-                data.setModifydate(new Date());
             });
             if (!equDos.isEmpty()) {
                 apsProcessOperationProcessEquService.updateBatchById(equDos);
@@ -3268,7 +3266,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 updateDo.setHasconflict("y");
             }
             updateDo.setId(apsProcessOperationProcessEquDo.getId());
-            updateDo.setModifydate(new Date());
+            updateDo.setModifydate(apsProcessOperationProcessEquDo.getModifydate());
+            updateDo.setModifyuserid(apsProcessOperationProcessEquDo.getModifyuserid());
+            updateDo.setModifyusername(apsProcessOperationProcessEquDo.getModifyusername());
             updates.add(updateDo);
         }
         if (!updates.isEmpty()) {
@@ -3555,7 +3555,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         if (ObjectUtil.isNotEmpty(req.getBatchNumbers())) {
             batchNumberList = new LinkedList<>(Arrays.asList(req.getBatchNumbers().split(",")));
         }
-
         for (String s : batchNumberList) {
             if (addMaterialLock.contains(s)) {
                 log.error("批次号" + s + "正被操作，请稍后重试");

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

@@ -2483,14 +2483,14 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             newNextprocessesids += nextprocessesid + ",";
                         }
                     }
-                    ApsProcessOperationProcessEquDo operationProcessEquDo = new ApsProcessOperationProcessEquDo();
-                    operationProcessEquDo.setId(processEquDo.getId());
+                    LambdaUpdateWrapper<ApsProcessOperationProcessEquDo> wrapper = new LambdaUpdateWrapper<>();
+                    wrapper.eq(ApsProcessOperationProcessEquDo::getId,processEquDo.getId());
                     if (StringUtils.isBlank(newNextprocessesids)) {
-                        operationProcessEquDo.setNextprocessesids("");
+                        wrapper.set(ApsProcessOperationProcessEquDo::getNextprocessesids,"");
                     } else {
-                        operationProcessEquDo.setNextprocessesids(newNextprocessesids.substring(0, newNextprocessesids.length() - 1));
+                        wrapper.set(ApsProcessOperationProcessEquDo::getNextprocessesids,newNextprocessesids.substring(0, newNextprocessesids.length() - 1));
                     }
-                    apsProcessOperationProcessEquService.updateById(operationProcessEquDo);
+                    apsProcessOperationProcessEquService.update(wrapper);
                 }
             }
             return R.ok();

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

@@ -119,6 +119,8 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             return R.error("该报工记录已报工或已取消，请刷新页面后重试");
         }
 
+        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+
         //删除报工记录
         this.removeById(recordId);
         //删除报工输出物料
@@ -211,6 +213,9 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
          */
         Integer newLeaveWaitWorkRoll = apsProcessOperationProcessEquDo.getPlanprocessrall() - newStartingRoll - apsProcessOperationProcessEquDo.getCancelroll();
         processEquUpdateWrapper.set(ApsProcessOperationProcessEquDo::getLeavewaitworkroll, newLeaveWaitWorkRoll);
+        processEquUpdateWrapper.set(ApsProcessOperationProcessEquDo::getModifydate, DateUtil.date())
+                .set(ApsProcessOperationProcessEquDo::getModifyuserid, currentUser.getId())
+                .set(ApsProcessOperationProcessEquDo::getModifyusername, currentUser.getName());
         //更新
         apsProcessOperationProcessEquService.update(processEquUpdateWrapper);
 
@@ -683,10 +688,13 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                     LinkedList<String> strings = batchNumberList.stream().map(String::toUpperCase).collect(Collectors.toCollection(LinkedList::new));
                     if (strings.contains(req.getInputBatchNumber())) {
                         strings.remove(req.getInputBatchNumber());
-                        ApsProcessOperationProcessEquDo equDo = new ApsProcessOperationProcessEquDo();
-                        equDo.setId(apsProcessOperationProcessEquDo.getId());
-                        equDo.setBachmaterialprocess(String.join(",", strings));
-                        apsProcessOperationProcessEquService.updateById(equDo);
+//                        ApsProcessOperationProcessEquDo equDo = new ApsProcessOperationProcessEquDo();
+//                        equDo.setId(apsProcessOperationProcessEquDo.getId());
+//                        equDo.setBachmaterialprocess(String.join(",", strings));
+//                        apsProcessOperationProcessEquService.updateById(equDo);
+                        apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                                .set(ApsProcessOperationProcessEquDo::getBachmaterialprocess, String.join(",", strings))
+                                .eq(ApsProcessOperationProcessEquDo::getId, apsProcessOperationProcessEquDo.getId()));
                     }
                 }
             }
@@ -1121,6 +1129,9 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
              * 修复报工后未完工卷数没更新的bug
              */
             processEquWrapper.set(ApsProcessOperationProcessEquDo::getUnfinishroll, unfinishroll);
+            processEquWrapper.set(ApsProcessOperationProcessEquDo::getModifydate, DateUtil.date())
+                    .set(ApsProcessOperationProcessEquDo::getModifyuserid, currentUser.getId())
+                    .set(ApsProcessOperationProcessEquDo::getModifyusername, currentUser.getName());
             //更新
             apsProcessOperationProcessEquService.update(processEquWrapper);
 
@@ -1796,10 +1807,13 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                 oldList = batchNumberList.stream().map(String::toUpperCase).collect(Collectors.toCollection(LinkedList::new));
                 oldList.removeAll(inputBatchNumberList);
                 String newBatch = String.join(",", oldList);
-                ApsProcessOperationProcessEquDo needUpdate = new ApsProcessOperationProcessEquDo();
-                needUpdate.setId(apsProcessOperationProcessEquDo.getId());
-                needUpdate.setBachmaterialprocess(newBatch);
-                apsProcessOperationProcessEquService.updateById(needUpdate);
+//                ApsProcessOperationProcessEquDo needUpdate = new ApsProcessOperationProcessEquDo();
+//                needUpdate.setId(apsProcessOperationProcessEquDo.getId());
+//                needUpdate.setBachmaterialprocess(newBatch);
+//                apsProcessOperationProcessEquService.updateById(needUpdate);
+                apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                        .set(ApsProcessOperationProcessEquDo::getBachmaterialprocess, newBatch)
+                        .eq(ApsProcessOperationProcessEquDo::getId, apsProcessOperationProcessEquDo.getId()));
             }
 
 

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

@@ -722,7 +722,9 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     apsProcessOperationProcessEquDo = new ApsProcessOperationProcessEquDo();
                     apsProcessOperationProcessEquDo.setId(equDo.getId());
                     apsProcessOperationProcessEquDo.setBachmaterialprocess(strAppendListConvertStr(equDo.getBachmaterialprocess(), needGetBatchNumberList));
-                    apsProcessOperationProcessEquDo.setModifydate(new Date());
+                    apsProcessOperationProcessEquDo.setModifydate(equDo.getModifydate());
+                    apsProcessOperationProcessEquDo.setModifyuserid(equDo.getModifyuserid());
+                    apsProcessOperationProcessEquDo.setModifyusername(equDo.getModifyusername());
                     log.debug("将批次号：{}流转给工序作业明细:{}", needGetBatchNumberList, equDo.getId());
                     updateProcessEquData.add(apsProcessOperationProcessEquDo);
                     outPutNumbers.removeAll(needGetBatchNumberList);