问题修复18

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java

@@ -204,4 +204,6 @@ public interface MesReportWorkMapper {
 
     @MapKey("shiftId")
     List<Map<String, String>> getPlanNumber(String shiftId);
+
+    List<String> getUnionRemark(String workorderCode);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java

@@ -267,7 +267,13 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			mesReportWork.setUpdateTime(nowTime);
 			mesReportWork.setUpdateBy(updateBy);
 		}
-
+        //统一备注
+        List<String> remarks = mesReportWorkMapper.getUnionRemark(mesReportWorks.get(0).getWorkorderCode());
+		if(!CollectionUtils.isEmpty(remarks)){
+			for(MesReportWork mesReportWork:mesReportWorks){
+				mesReportWork.setRemark(remarks.get(0));
+			}
+		}
 		return mesReportWorkMapper.submitReportPS(mesReportWorks);
 	}
 

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -1083,6 +1083,9 @@ WHERE
 	AND c.shift_id=#{shiftId}
 
 	</select>
+	<select id="getUnionRemark" resultType="java.lang.String">
+		select remark from mes_report_work where workorder_code = #{workorderCode} and del_flag = '0' and remark is not null
+	</select>
 
 	<insert id="insertMesReportWork" parameterType="MesReportWork">
 		insert into mes_report_work

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -729,7 +729,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		BigDecimal sampleQuality = new BigDecimal("0");
 		for(QcCheckTaskDetail detail:details){
 			detail.setUpdateTime(nowTime);
-			sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality()==null?"0":detail.getSampleQuality()));
+			sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality().equals("")?"0":detail.getSampleQuality()));
 			//上传附件
 			if (StringUtils.isNotEmpty(detail.getFileListStr())) {
 				qmsFileMapper.clearBaseFileBatch(detail.getRecordId());//清理
@@ -1007,7 +1007,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		BigDecimal sampleQuality = new BigDecimal("0");
 		for(QcCheckTaskDetail detail:details){
 			detail.setUpdateTime(nowTime);
-			sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality()==null?"0":detail.getSampleQuality()));
+			sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality().equals("")?"0":detail.getSampleQuality()));
 			//上传附件
 			if (StringUtils.isNotEmpty(detail.getFileListStr())) {
 				qmsFileMapper.clearBaseFileBatch(detail.getRecordId());//清理
@@ -1029,6 +1029,18 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 				System.out.println("base_file:"+n);
 			}
 
+			/**去掉测量值0**/
+			String actualValueStr = detail.getActualValue();
+			if(StringUtils.isNotBlank(actualValueStr)){
+				JSONArray codeArray = JSONArray.parseArray(actualValueStr);
+				for (int c1 = 0; c1 < codeArray.size(); c1++) {
+					if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) {
+						codeArray.remove(codeArray.get(c1));
+					}
+				}
+				detail.setActualValue(codeArray.toJSONString());
+			}
+
 		}
 		if(qcCheckTaskIncome.getSampleQuality()!=null && qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){
 			qcCheckTask.setSampleQuality(sampleQuality);
@@ -1040,7 +1052,6 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);
 		logger.info("qc_check_task:"+n);
 		/**更新qc_check_task_detail**/
-
 		n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details);
 		logger.info("更新qc_check_task_detail:"+n);
 
@@ -1359,10 +1370,17 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	}
 
 	public static void main(String args[]){
-		String str = "11,,22,";
+		String actualValueStr = "[\"1:0.03\",\"2:0\",\"3:0.34\"]";
-		System.out.println(str.split(",")[0]);
+		try {
-		System.out.println(str.split(",")[1]);
+			JSONArray codeArray = JSONArray.parseArray(actualValueStr);
-		System.out.println(str.split(",")[2]);
+			for (int c1 = 0; c1 < codeArray.size(); c1++) {
-
+				if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) {
+					codeArray.remove(codeArray.get(c1));
+				}
+			}
+			System.out.println(codeArray.toJSONString());
+		} catch (Exception e) {
+			System.out.println();
+		}
 	}
 }