Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-temp-logic-20250508-46601' into yfai-20250418-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java

@@ -924,6 +924,8 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         assemblyList = assemblyList.stream().filter(o->MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue() == o.getAssemblyStatus()).collect(Collectors.toList());
         if(!CollectionUtils.isEmpty(assemblyList)){
             assemblyList.forEach(t->{
+                t.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+                t.setDescription(userName + "-" + TimeTool.getNowTime(true) + "-返工解绑软删除");
                 t.setSystemSyncStatus(CommonEnumUtil.FALSE);
                 t.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_20.getValue());
                 ConvertBean.serviceModelUpdate(t, userName);