生产过程优化

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

@@ -1,5 +1,6 @@
 package com.op.quality.service.impl;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -215,15 +216,16 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 			}
 		}
 		/** 不良品数据插入  */
+		BigDecimal noOkQuality = new BigDecimal(0);
 		List<QcCheckTaskDefect> defectList = qcCheckTaskProduce.getDefects();
-		if (CollectionUtils.isEmpty(defectList)) {
+		if (!CollectionUtils.isEmpty(defectList)) {
-			return 0;
-		} else {
 			for (QcCheckTaskDefect defect : defectList) {
-				defect.setBelongTo(beLongId);
+					defect.setBelongTo(beLongId);
 				qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
+				noOkQuality = noOkQuality.add(defect.getNoOkQuality());
 			}
 		}
+		qcCheckTaskProduce.setNoOkQuality(noOkQuality);
 		/**qc_check_task**/
         qcCheckTaskProduceMapper.insertQcCheckTaskProduce(qcCheckTaskProduce);
 
@@ -267,17 +269,19 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
         }
 		qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList);
 		/** 不良品数据修改 **/
+		BigDecimal noOkQuality = new BigDecimal(0);
 		List<QcCheckTaskDefect> defectList = qcCheckTaskProduce.getDefects();
-		if (CollectionUtils.isEmpty(defectList)) {
+		String belongTo = qcCheckTaskProduce.getRecordId();
-			return 0;
+		//不是空执行下一步，空不做操作
-		} else {
+		if (!CollectionUtils.isEmpty(defectList)) {
-			String belongTo = qcCheckTaskProduce.getRecordId();
 			qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo);
 			for (QcCheckTaskDefect defect : defectList) {
 				defect.setBelongTo(belongTo);
 				qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
+				noOkQuality = noOkQuality.add(defect.getNoOkQuality());
 			}
 		}
+		qcCheckTaskProduce.setNoOkQuality(noOkQuality);
 
         return qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce);
     }