Merge remote-tracking branch 'origin/master'

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

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

@@ -135,6 +135,34 @@ public class QcCheckTaskIncomeController extends BaseController {
 	public AjaxResult createIncomeTask(@RequestBody QcCheckTaskIncomeDTO qcCheckTaskIncome0) {
 		QcCheckTaskIncome qcCheckTaskIncome = new QcCheckTaskIncome();
 		BeanUtils.copyProperties(qcCheckTaskIncome0,qcCheckTaskIncome);
+
+        if(StringUtils.isBlank(qcCheckTaskIncome.getOrderNo())){
+            return error("[orderNo]不能为空");
+        }
+        if(StringUtils.isBlank(qcCheckTaskIncome.getMaterialName())){
+            return error("[materialName]不能为空");
+        }
+        if(StringUtils.isBlank(qcCheckTaskIncome.getMaterialCode())){
+            return error("[materialCode]不能为空");
+        }
+        if(StringUtils.isBlank(qcCheckTaskIncome.getCheckType())){
+            return error("[checkType]不能为空");
+        }
+        if(StringUtils.isBlank(qcCheckTaskIncome.getFactoryCode())){
+            return error("[factoryCode]不能为空");
+        }
+		if(StringUtils.isBlank(qcCheckTaskIncome.getSupplierCode())){
+			return error("[supplierCode]不能为空");
+		}
+		if(StringUtils.isBlank(qcCheckTaskIncome.getSupplierName())){
+			return error("[supplierName]不能为空");
+		}
+		if(qcCheckTaskIncome.getIncomeTime()==null){
+			return error("[incomeTime]不能为空");
+		}
+        logger.info("来料检验任务生成开始================================");
+        logger.info("来料检验任务生成参数："+ JSONObject.toJSONString(qcCheckTaskIncome));
+
 		int r = qcCheckTaskIncomeService.insertQcCheckTaskIncome(qcCheckTaskIncome);
 		if(r>0){
 			return toAjax(r);