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 b3cef92d..d6adfee2 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 @@ -249,6 +249,15 @@ public class QcCheckTaskIncomeController extends BaseController { List list = qcCheckTaskIncomeService.getWorkOrder(qcCheckTaskIncome); return getDataTable(list); } + /**获取入库工单列表**/ + @GetMapping("/getProductWorkOrder") + public TableDataInfo getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { + startPage(); + List list = qcCheckTaskIncomeService.getProductWorkOrder(qcCheckTaskIncome); + return getDataTable(list); + } + + @PutMapping("/getBatchList") public List getBatchList(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) { return qcCheckTaskIncomeService.getBatchList(qcCheckTaskIncome); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java index 7d8aac35..f7dfde3c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckUnqualifiedMapper.java @@ -80,4 +80,6 @@ public interface QcCheckUnqualifiedMapper { List getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); int updateWorkOrderBatchStatus(QcCheckTaskIncome qcCheckTaskIncome); + + List getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java index 74c785aa..981fb81d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -85,4 +85,6 @@ public interface IQcCheckTaskIncomeService { List getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome); List getBatchList(QcCheckTaskIncome qcCheckTaskIncome); + + List getProductWorkOrder(QcCheckTaskIncome 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 9c9cccb6..34a9b895 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 @@ -433,6 +433,22 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { return qcCheckTaskIncomeMapper.getBatchList(qcCheckTaskIncome); } + @Override + @DS("#header.poolName") + public List getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { + List dtos = qcCheckUnqualifiedMapper.getProductWorkOrder(qcCheckTaskIncome); + for(QcCheckTaskIncome dto:dtos){ + String statusName = ""; + if("w5".equals(dto.getStatus())){ + statusName = "质检完成"; + }else{ + statusName = "质检未完成"; + } + dto.setStatus(statusName); + } + return dtos; + } + @Override public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) { List details = qcCheckTaskIncome.getQcCheckTaskDetails(); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml index 6696008b..e8e19123 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml @@ -118,8 +118,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and workorder_code_sap like concat like ('%',#{orderNo}) order by product_date desc + - + insert into qc_check_unqualified id,