修改单导入调整

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMdfFormServiceImpl.java

@@ -290,7 +290,6 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
                     stringBuilder.append("项目工号" + procode + "不存在，");
                 } else {
                     importMdfVo.setProjectdlprojid(procode);
-                    importMdfVo.setProjectid(codeParts.get(0).getDtserialid());
                     importMdfVo.setProjectdlprojname(codeParts.get(0).getDlprojname());
                 }
             }
@@ -366,7 +365,7 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
                     importMdfVo.setErrordesigndtpartname(partNos.get(0).getDtpartname());
                 }
             } else {
-                stringBuilder.append("错误源头图号不能为空，");
+                importMdfVo.setErrordesigndtdrawingno(partno);
             }
 
             //设计人
@@ -458,7 +457,7 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
                     importMdfVo.setTaskdesigndtpartname(taskdesigns.get(0).getDtpartname());
                 }
             } else {
-                stringBuilder.append("修改图号(任务单部件)不能为空，");
+                importMdfVo.setTaskdesigndtdrawingno(taskdesign);
             }
 
             //修改图号(次级部件)
@@ -496,7 +495,7 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
             if (mandayStr != null && StringUtils.isNotEmpty(mandayStr)) {
                 String toAmount = convertToTwoDecimalPlaces(mandayStr);
                 if (toAmount.equals("金额要为数字，")) {
-                    stringBuilder.append(toAmount);
+                    stringBuilder.append("人工" + toAmount);
                 } else {
                     importMdfVo.setManday(new BigDecimal(toAmount));
                 }
@@ -507,7 +506,7 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
             if (materStr != null && StringUtils.isNotEmpty(materStr)) {
                 String toAmount = convertToTwoDecimalPlaces(materStr);
                 if (toAmount.equals("金额要为数字，")) {
-                    stringBuilder.append(toAmount);
+                    stringBuilder.append("材料" + toAmount);
                 } else {
                     importMdfVo.setMater(new BigDecimal(toAmount));
                 }
@@ -518,7 +517,7 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
             if (equipStr != null && StringUtils.isNotEmpty(equipStr)) {
                 String toAmount = convertToTwoDecimalPlaces(equipStr);
                 if (toAmount.equals("金额要为数字，")) {
-                    stringBuilder.append(toAmount);
+                    stringBuilder.append("设备" + toAmount);
                 } else {
                     importMdfVo.setEquip(new BigDecimal(toAmount));
                 }
@@ -529,7 +528,7 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
             if (otherStr != null && StringUtils.isNotEmpty(otherStr)) {
                 String toAmount = convertToTwoDecimalPlaces(otherStr);
                 if (toAmount.equals("金额要为数字，")) {
-                    stringBuilder.append(toAmount);
+                    stringBuilder.append("其他" + toAmount);
                 } else {
                     importMdfVo.setOther(new BigDecimal(toAmount));
                 }
@@ -560,7 +559,7 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
                             f -> new ImportMdfVo(f.getSourcename(), f.getNumbername(), f.getRectifycode(), f.getManageadminnickname(), f.getProducename())
                     ));
                     if (formListMap.size() > 1) {
-                        allStrBuilder.append("项目工号" + fm.getProjectdlprojid() + "修改单编号" + fm.getSourcenumbercode() + "有" + formListMap.size() + "行数据重复，请检查");
+                        allStrBuilder.append("项目工号" + fm.getProjectdlprojid() + "，修改单编号" + fm.getSourcenumbercode() + "有" + formListMap.size() + "行数据重复，请检查");
                     } else {
                         String formid = SecurityUtil.getUUID();
                         //错误源头图号分组
@@ -572,27 +571,28 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
                                     p -> new ImportMdfVo(p.getDtdesigner(), p.getDtwhocollate(), p.getDtwhoapprove(), p.getModifyby(), p.getErrorroutine(), p.getErroragain(), p.getErrorhard(), p.getErrortable())
                             ));
                             if (mdfVoListMap.size() > 1) {
-                                allStrBuilder.append("项目工号" + fm.getProjectdlprojid() + "修改单编号" + fm.getSourcenumbercode() + "错误源头图号" + sno + "有" + mdfVoListMap.size() + "行数据重复，请检查");
+                                allStrBuilder.append("项目工号" + fm.getProjectdlprojid() + "，修改单编号" + fm.getSourcenumbercode() + "，错误源头图号" + sno + "有" + mdfVoListMap.size() + "行数据重复，请检查");
                             } else {
                                 //修改图号(任务单部件)分组
                                 Map<String, List<ImportMdfVo>> rowListMap = flist.stream().collect(Collectors.groupingBy(s -> s.getTaskdesigndtdrawingno()));
                                 rowListMap.forEach((rno, rlist) -> {
                                     //排号分组
-                                    Map<ImportMdfVo, List<ImportMdfVo>> mdfVos = rlist.stream().collect(Collectors.groupingBy(
-                                            m -> new ImportMdfVo(m.getMinordesigndtdrawingno(), m.getMinordesigndtpartname(), m.getContent(), m.getManday(), m.getMater(), m.getEquip(), m.getOther())
-                                    ));
-                                    if (mdfVos.size() > 1) {
-                                        allStrBuilder.append("项目工号" + fm.getProjectdlprojid() + "修改单编号" + fm.getSourcenumbercode() + "错误源头图号" + sno + "修改图号(任务单部件)" + rno + "有" + mdfVos.size() + "行数据重复，请检查");
-                                    } else {
+//                                    Map<ImportMdfVo, List<ImportMdfVo>> mdfVos = rlist.stream().collect(Collectors.groupingBy(
+//                                            m -> new ImportMdfVo(m.getMinordesigndtdrawingno(), m.getMinordesigndtpartname(), m.getContent(), m.getManday(), m.getMater(), m.getEquip(), m.getOther())
+//                                    ));
+//                                    if (mdfVos.size() > 1) {
+//                                        allStrBuilder.append("项目工号" + fm.getProjectdlprojid() + "，修改单编号" + fm.getSourcenumbercode() + "，错误源头图号" + sno + "，修改图号(任务单部件)" + rno + "有" + mdfVos.size() + "行数据重复，请检查");
+//                                    } else {
+                                    for (int r = 0; r < rlist.size(); r++) {
                                         String rowid = SecurityUtil.getUUID();
-                                        QcsMdfRowDo qcsMdfRowDo = BeanUtil.toBean(rlist.get(0), QcsMdfRowDo.class);
+                                        QcsMdfRowDo qcsMdfRowDo = BeanUtil.toBean(rlist.get(r), QcsMdfRowDo.class);
                                         qcsMdfRowDo.setId(rowid);
                                         qcsMdfRowDo.setFormid(formid);
                                         qcsMdfRowDo.setSectionid(sectionid);
                                         qcsMdfRowDo.setRoption(ropJson);
                                         qcsMdfRowDoList.add(qcsMdfRowDo);
 
-                                        QcsMdfDetailDo qcsMdfDetailDo = BeanUtil.toBean(rlist.get(0), QcsMdfDetailDo.class);
+                                        QcsMdfDetailDo qcsMdfDetailDo = BeanUtil.toBean(rlist.get(r), QcsMdfDetailDo.class);
                                         qcsMdfDetailDo.setId(SecurityUtil.getUUID());
                                         qcsMdfDetailDo.setRowid(rowid);
                                         qcsMdfDetailDo.setFormid(formid);
@@ -601,7 +601,7 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
                                         qcsMdfDetailDo.setDeptid(unitId);
                                         qcsMdfDetailDo.setDeptname(finalDeptName);
                                         qcsMdfDetailDo.setMdfreason(slist.get(0).getSourcename());
-                                        if (rlist.get(0).getProducename().equals("未下料")) {
+                                        if (rlist.get(r).getProducename().equals("未下料")) {
                                             qcsMdfDetailDo.setManday(null);
                                             qcsMdfDetailDo.setMater(null);
                                             qcsMdfDetailDo.setEquip(null);
@@ -619,6 +619,7 @@ public class QcsMdfFormServiceImpl extends ServiceImpl<QcsMdfFormDao, QcsMdfForm
                                             qcsMdfDetailDo.setDutydeptname(finalDeptName);
                                         }
                                         qcsMdfDetailDoList.add(qcsMdfDetailDo);
+//                                    }
                                     }
                                 });
                             }