From 41647ce882c14894e820b16d61779b0b84cef890 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 18 Jan 2024 18:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99SRM=E6=8F=90=E4=BE=9B=E6=9D=A5?=
 =?UTF-8?q?=E6=96=99=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QcCheckTaskIncomeController.java          | 28 +++++++++++++++++++
 .../impl/QcCheckTaskIncomeServiceImpl.java    |  4 +--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
index cdf0aa79..a5deccda 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
+++ b/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);
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index e25fb733..3b9175bf 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -169,7 +169,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 		qcCheckTaskIncome.setCreateTime(nowDate);
 		//String typeCode = qcCheckTaskIncomeMapper.getTypeCode(qcCheckTaskIncome.getCheckType());
 		qcCheckTaskIncome.setTypeCode("material");//大检验节点
-		/**qc_task_user start**/
+
 		if(StringUtils.isNotBlank(qcCheckTaskIncome.getCheckManName())){//管理系统创建任务
 			String checkManName = qcCheckTaskIncome.getCheckManName();
 			String checkManCode = qcCheckTaskIncome.getCheckManCode();
@@ -230,7 +230,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			}
 		}
 		qcCheckTaskIncome.setNoOkQuality(noOkQuality);
-
+		/**qc_task_user start**/
 		qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome);
 
 		/**qc_check_task_detail**/