aps-提交报验结果明细后需要更新在制品字段拼接备注bug修复以及检验不合格时在制品状态和在制品类型没有更新bug修复testin1740/1754

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

@@ -531,8 +531,9 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     ApsProcessOperationOutMaterDo::setProdoutroll, cpScNum, 1);
             calculateAboutRollNum(apsProcessOperationOutMaterDo, ApsProcessOperationOutMaterDo::getProdleaveoutroll,
                     ApsProcessOperationOutMaterDo::setProdleaveoutroll, cpPlanNum, -1);
-            // 不合格在制品更新
-            if (currentOutputUnqualifiedNum > 0) {
+            // 不合格在制品更新 //避免输出物料存在不合格而在制品没有更新在制品状态以及在制品类型
+            int oldOutputUnqualifiedNum = (int) currentReportOutputs.stream().filter(reportOutputDo -> NO.equals(reportOutputDo.getQualified())).count();
+            if (currentOutputUnqualifiedNum > 0||oldOutputUnqualifiedNum>0) {
                 // 更新备料的在制品状态
                 updateWorkInProgressInventoryStatus(0, currentReportOutputs.size(), NO, apsWorkInProgressInventoryDos,
                         currentReportOutputs, WAITING, REJECTS);
@@ -1166,15 +1167,31 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 String formatMajor = handleDefect(apsReportOutputDo.getMajor(),defectTypes);
                 String formatMinor = handleDefect(apsReportOutputDo.getMinor(),defectTypes);
                 if (StringUtils.isNotBlank(formatMajor)&&StringUtils.isNotBlank(formatMinor)){
-                    data.setRemark("主要缺陷："+formatMajor+"；次要缺陷："+formatMinor+"；"+apsReportOutputDo.getCheckremark());
+                    if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())){
+                        data.setRemark("主要缺陷："+formatMajor+"；次要缺陷："+formatMinor+"；检验备注："+apsReportOutputDo.getCheckremark()+"；");
+                    }else {
+                        data.setRemark("主要缺陷："+formatMajor+"；次要缺陷："+formatMinor+"；");
+                    }
                 }else {
                     if (StringUtils.isNotBlank(formatMajor)){
-                        data.setRemark("主要缺陷："+formatMajor+"；"+apsReportOutputDo.getCheckremark());
-                    }
-                    if (StringUtils.isNotBlank(formatMinor)){
-                        data.setRemark("次要缺陷："+formatMinor+"；"+apsReportOutputDo.getCheckremark());
+                        if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())){
+                            data.setRemark("主要缺陷："+formatMajor+"；检验备注："+apsReportOutputDo.getCheckremark()+"；");
+                        }else {
+                            data.setRemark("主要缺陷："+formatMajor+"；");
+                        }
+                    }else {
+                        if (StringUtils.isNotBlank(formatMinor)){
+                            if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())){
+                                data.setRemark("次要缺陷："+formatMinor+"；检验备注："+apsReportOutputDo.getCheckremark()+"；");
+                            }else {
+                                data.setRemark("次要缺陷："+formatMinor+"；");
+                            }
+                        }else {
+                            if (StringUtils.isNotBlank(apsReportOutputDo.getCheckremark())){
+                                data.setRemark("检验备注："+apsReportOutputDo.getCheckremark()+"；");
+                            }
+                        }
                     }
-                    data.setRemark(apsReportOutputDo.getCheckremark());
                 }
             });
         });