From 72512329aeb24f9985dd85fc762885137b8992d2 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 12 Jan 2024 13:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/quality/controller/QuaController.java | 7 +++---- .../quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 3 ++- .../resources/mapper/quality/QcCheckTaskProduceMapper.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 71a878e42..a08ed161d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/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 getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome) { if(StringUtils.isNotBlank(qcCheckTaskIncome.getCheckStatus())){ qcCheckTaskIncome.setCheckStatus("'"+ qcCheckTaskIncome.getCheckStatus().replace(",","','")+"'"); } - startPage(); List 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]不能为空"); } - return success(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome)); + return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome)); } /** * 检验单位 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 7127788b5..0d197e742 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 @@ -548,6 +548,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { } @Override + @Transactional(rollbackFor = Exception.class) public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) { List 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()); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 31eb4ce1d..396c9db09 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/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,