质量问题修改7

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

@@ -158,14 +158,13 @@ public class QuaController extends BaseController {
      * 获取待检验信息列表
      */
     @GetMapping(value = "getCheckTaskList")
-    public TableDataInfo getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome) {
+    public List<QcCheckTaskIncome> getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome) {
 
         if(StringUtils.isNotBlank(qcCheckTaskIncome.getCheckStatus())){
             qcCheckTaskIncome.setCheckStatus("'"+ qcCheckTaskIncome.getCheckStatus().replace(",","','")+"'");
         }
-        startPage();
         List<QcCheckTaskIncome> list = qcProCheckService.getCheckTaskList(qcCheckTaskIncome);
-        return getDataTable(list);
+        return list;
     }
     /**
      * 获取待检验信息列表
@@ -189,7 +188,7 @@ public class QuaController extends BaseController {
         if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){
             return error("[List<QcCheckTaskDetail>]不能为空");
         }
-        return success(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome));
+        return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome));
     }
     /**
      * 检验单位

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

@@ -548,6 +548,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) {
 		List<QcCheckTaskDetail> details = qcCheckTaskIncome.getQcCheckTaskDetails();
 		DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
@@ -656,7 +657,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 				//TODO;不走OA
 				oaR.put("code","200");
 			}
-			if((oaR.get("code").toString()).equals("200")){
+			if(oaR!=null && (oaR.get("code").toString()).equals("200")){
 				/**qc_check_unqualified**/
 				unqualified.setRequestid(oaR.get("data").toString());
 			}

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

@@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join pro_order_workorder pow on qct.order_no = pow.workorder_code
 		where check_type = 'checkTypeSCXJ'
 		  and CONVERT(varchar(10),income_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
-		  and pow.status = 'w2'
+		  and pow.status = 'w2' and pow.parent_order = '0'
           group by qct.factory_code,
 			   qct.order_no,qct.material_code,qct.material_name,
 			   qct.quality,qct.unit,qct.supplier_code,qct.supplier_name,