质量过程巡检+来料检验任务接口+报工sql调整

op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java

@@ -135,6 +135,15 @@ public class QcCheckTaskIncomeDTO extends BaseEntity {
 	private BigDecimal aNoOkquality;
 	private BigDecimal bNoOkquality;
 	private BigDecimal cNoOkquality;
+	private String orderType;
+
+	public String getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(String orderType) {
+		this.orderType = orderType;
+	}
 
 	public BigDecimal getSampleQuality() {
 		return sampleQuality;

op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java

@@ -147,11 +147,16 @@ public class QcStaticTableController extends BaseController {
 					if(mdata.getcNoOkquality()==null){
 						mdata.setcNoOkquality(new BigDecimal("0"));
 					}
-					BigDecimal defectRate = (mdata.getaNoOkquality().add(mdata.getbNoOkquality()).multiply(new BigDecimal("0.65"))
-						.add(mdata.getcNoOkquality()).multiply(new BigDecimal(0.35)))
-						.divide(new BigDecimal(mdata.getSampleQuality()))
-						.setScale(2, BigDecimal.ROUND_HALF_UP);
-					datas.add(defectRate.doubleValue());
+					if(!"0.00".equals(mdata.getSampleQuality())){
+						BigDecimal defectRate = (mdata.getaNoOkquality().add(mdata.getbNoOkquality()).multiply(new BigDecimal("0.65"))
+								.add(mdata.getcNoOkquality()).multiply(new BigDecimal(0.35)))
+								.divide(new BigDecimal(mdata.getSampleQuality()))
+								.setScale(2, BigDecimal.ROUND_HALF_UP);
+						datas.add(defectRate.doubleValue());
+					}else{
+						datas.add(0.00);
+					}
+
 				}else{
 					datas.add(0.00);
 				}

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

@@ -314,7 +314,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
             Date startTime = productTask.getCreateTime();
 
 			long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE);
-			if(mins>=15){
+			if(mins>=60){
 				int m = insertQcCheckTaskProduce(productTask);
 				logger.info("++++++++++++过程检验巡检任务生成" + m + "++++++++++++++");
 			}

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml

@@ -193,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="checkType != null">check_type,</if>
 			<if test="typeCode != null">type_code,</if>
 			<if test="sampleQuality != null">sample_quality,</if>
+			<if test="orderType != null">order_type,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="recordId != null">#{recordId},</if>
@@ -227,6 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="checkType != null">#{checkType},</if>
 			<if test="typeCode != null">#{typeCode},</if>
 			<if test="sampleQuality != null">#{sampleQuality},</if>
+			<if test="orderType != null">#{orderType},</if>
 		 </trim>
 	</insert>