diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java index 65d75788..2ed01e06 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java @@ -240,6 +240,11 @@ public class QcStaticTableController extends BaseController { return qcStaticTableService.getSupplierList(typeCode); } + @GetMapping("/getProjectList/{checkType}") + public List getProjectList(@PathVariable("checkType") String checkType) { + return qcStaticTableService.getProjectList(checkType); + } + /** * 巡检记录报表 */ @@ -318,8 +323,4 @@ public class QcStaticTableController extends BaseController { public QcStaticTable getDLTableAvgInfo(QcStaticTable qcStaticTable) { return qcStaticTableService.getDLTableAvgInfo(qcStaticTable); } - @GetMapping("/getDLDetailList") - public List getDLDetailList(QcStaticTable qcStaticTable) { - return qcStaticTableService.getDLDetailList(qcStaticTable); - } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java index 339555f9..15c4629e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java @@ -66,4 +66,6 @@ public interface QcStaticTableMapper { Map picsMap(QcStaticTable qcStaticTable); List getDLTableTitle(QcStaticTable qcStaticTable); + + List getProjectList(String checkType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java index 151811eb..f04847f5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java @@ -46,5 +46,5 @@ public interface IQcStaticTableService { QcStaticTable getDLTableAvgInfo(QcStaticTable qcStaticTable); - List getDLDetailList(QcStaticTable qcStaticTable); + List getProjectList(String checkType); } 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 3a3b68c8..9f910a44 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 @@ -649,10 +649,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2"); qcCheckUnqualifiedMapper.updateQualityStatus(qcCheckTaskIncome); }else if("produce".equals(qcCheckTaskIncome.getTypeCode())){ - /**pro_order_workorder_batch-->status->w5**/ - qcCheckTaskIncome.setStatus("2"); - qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome); + if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())&&"N".equals(result)){ + /**pro_order_workorder_batch-->qc_status->2**/ + qcCheckTaskIncome.setStatus("2"); + qcCheckUnqualifiedMapper.updateWorkOrderBatchStatus(qcCheckTaskIncome); QcCheckTaskIncome recheck = new QcCheckTaskIncome(); recheck.setOldBelongTo(belongId); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index a14d21a9..cfc1f8cd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -532,8 +532,8 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { @Override @DS("#header.poolName") - public List getDLDetailList(QcStaticTable qcStaticTable) { - return null; + public List getProjectList(String checkType) { + return qcStaticTableMapper.getProjectList(checkType); } private List getHourProductionTitle(QcStaticTable qcStaticTable) { 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 2259bea6..c19a7dd3 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 @@ -275,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where order_no = #{orderNo} - update pro_order_workorder_batch set qc_status = #{status} where batch_code = #{incomeBatchNo} and check_type = #{checkType} + update pro_order_workorder_batch set qc_status = #{status} where batch_code = #{incomeBatchNo} update wms_product_put set check_status = #{status} where batch_number = #{incomeBatchNo} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index 400e8e8b..d22d2dc0 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -303,4 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) q GROUP BY q.material_code,q.material_name, q.ymdms,q.rule_name,q.project_no +