From af4f0111f1ec13926ae59168dabf05d0c3517b22 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Fri, 12 Jan 2024 17:51:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E9=AA=8CABC?= =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=95=B0=E6=8D=AE=E5=8A=A8=E6=80=81=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=EF=BC=8C=E6=8A=BD=E6=A0=B7=E8=A7=84=E5=88=99=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E7=89=A9=E6=96=99=E7=BB=84=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QcDefectTypeController.java | 6 + .../QcMaterialGroupDetailController.java | 8 +- .../op/quality/domain/QcCheckTaskProduce.java | 9 ++ .../mapper/QcCheckTaskDefectMapper.java | 69 +++++++++ .../op/quality/mapper/QcDefectTypeMapper.java | 2 + .../mapper/QcMaterialGroupDetailMapper.java | 2 + .../service/IQcCheckTaskDefectService.java | 64 +++++++++ .../quality/service/IQcDefectTypeService.java | 2 + .../IQcMaterialGroupDetailService.java | 14 +- .../impl/QcCheckTaskDefectServiceImpl.java | 117 +++++++++++++++ .../impl/QcCheckTaskProduceServiceImpl.java | 35 ++++- .../service/impl/QcDefectTypeServiceImpl.java | 6 + .../QcMaterialGroupDetailServiceImpl.java | 5 + .../quality/QcCheckTaskDefectMapper.xml | 134 ++++++++++++++++++ .../mapper/quality/QcDefectTypeMapper.xml | 6 + .../quality/QcMaterialGroupDetailMapper.xml | 4 + 16 files changed, 480 insertions(+), 3 deletions(-) create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java create mode 100644 op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java index 980096f2..5a0405d2 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java @@ -89,4 +89,10 @@ public class QcDefectTypeController extends BaseController { public AjaxResult remove(@PathVariable String[] defectIds) { return toAjax(qcDefectTypeService.deleteQcDefectTypeByDefectIds(defectIds)); } + + @GetMapping("/getDefectTypeListByDefectType/{defectType}") + public TableDataInfo getDefectTypeListByDefectType(@PathVariable("defectType") String defectType) { + List list = qcDefectTypeService.getDefectTypeListByDefectType(defectType); + return getDataTable(list); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java index 73d670bd..142d4c26 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java @@ -74,7 +74,13 @@ public class QcMaterialGroupDetailController extends BaseController { @Log(title = "物料组成员", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody QcMaterialGroupDetail qcMaterialGroupDetail) { - return toAjax(qcMaterialGroupDetailService.insertQcMaterialGroupDetail(qcMaterialGroupDetail)); + Boolean isNotUnique = qcMaterialGroupDetailService.validationGroupDetailData(qcMaterialGroupDetail.getMaterialCode()); + if (isNotUnique) { + return AjaxResult.error("此物料已在组中，请重新选择！"); + } else { + return toAjax(qcMaterialGroupDetailService.insertQcMaterialGroupDetail(qcMaterialGroupDetail)); + } + } /** diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java index 324b3107..120227d3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java @@ -149,6 +149,15 @@ public class QcCheckTaskProduce extends BaseEntity { private BigDecimal cNoOkquality; private String checkName; private List checkInfos; + private List defects; + + public List getDefects() { + return defects; + } + + public void setDefects(List defects) { + this.defects = defects; + } public List getCheckInfos() { return checkInfos; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java new file mode 100644 index 00000000..8129434a --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDefectMapper.java @@ -0,0 +1,69 @@ +package com.op.quality.mapper; + +import java.util.List; + +import com.op.quality.domain.QcCheckTaskDefect; +import org.apache.ibatis.annotations.Mapper; + +/** + * 来料检验任务--不良数量Mapper接口 + * + * @author Open Platform + * @date 2024-01-11 + */ +@Mapper +public interface QcCheckTaskDefectMapper { + /** + * 查询来料检验任务--不良数量 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 来料检验任务--不良数量 + */ + public QcCheckTaskDefect selectQcCheckTaskDefectByRecordId(String recordId); + + /** + * 查询来料检验任务--不良数量列表 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 来料检验任务--不良数量集合 + */ + public List selectQcCheckTaskDefectList(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 新增来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + public int insertQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 修改来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + public int updateQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 删除来料检验任务--不良数量 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 结果 + */ + public int deleteQcCheckTaskDefectByRecordId(String recordId); + + /** + * 批量删除来料检验任务--不良数量 + * + * @param recordIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcCheckTaskDefectByRecordIds(String[] recordIds); + + public int deleteQcCheckTaskDefectByBelongTo(String belongTo); + + public List selectDefectByBelongTo(String belongTo); + + +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java index 156516a0..02d99afd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java @@ -67,4 +67,6 @@ public interface QcDefectTypeMapper { */ int selectSerialNumber(); + public List getDefectTypeListByDefectType(String defectType); + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupDetailMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupDetailMapper.java index 421feea7..9ea8fe20 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupDetailMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupDetailMapper.java @@ -64,4 +64,6 @@ public interface QcMaterialGroupDetailMapper { public QcMaterialGroupDetail getGroupByMaterial(String materialCode); public List validationData(String materialCode); + + public List validationGroupDetailData(String materialCode); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java new file mode 100644 index 00000000..731fb90d --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskDefectService.java @@ -0,0 +1,64 @@ +package com.op.quality.service; + +import java.util.List; +import com.op.quality.domain.QcCheckTaskDefect; + +/** + * 来料检验任务--不良数量Service接口 + * + * @author Open Platform + * @date 2024-01-11 + */ +public interface IQcCheckTaskDefectService { + /** + * 查询来料检验任务--不良数量 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 来料检验任务--不良数量 + */ + public QcCheckTaskDefect selectQcCheckTaskDefectByRecordId(String recordId); + + /** + * 查询来料检验任务--不良数量列表 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 来料检验任务--不良数量集合 + */ + public List selectQcCheckTaskDefectList(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 新增来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + public int insertQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 修改来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + public int updateQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect); + + /** + * 批量删除来料检验任务--不良数量 + * + * @param recordIds 需要删除的来料检验任务--不良数量主键集合 + * @return 结果 + */ + public int deleteQcCheckTaskDefectByRecordIds(String[] recordIds); + + /** + * 删除来料检验任务--不良数量信息 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 结果 + */ + public int deleteQcCheckTaskDefectByRecordId(String recordId); + + public int deleteQcCheckTaskDefectByBelongTo(String belongTo); + + public List selectDefectByBelongTo(String belongTo); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java index e1f4f2d2..1403564c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java @@ -59,4 +59,6 @@ public interface IQcDefectTypeService { * @return 结果 */ public int deleteQcDefectTypeByDefectId(String defectId); + + public List getDefectTypeListByDefectType(String defectType); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupDetailService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupDetailService.java index 6a4c1cce..e7bf2714 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupDetailService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupDetailService.java @@ -58,5 +58,17 @@ public interface IQcMaterialGroupDetailService { */ public int deleteQcMaterialGroupDetailById(String id); - public boolean validationData(String id); + /** + * 验证此成员下有没有检测规则 + * @param materialCode + * @return + */ + public boolean validationData(String materialCode); + + /** + * 成员的唯一性校验 + * @param materialCode + * @return + */ + public boolean validationGroupDetailData(String materialCode); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java new file mode 100644 index 00000000..3e68774b --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java @@ -0,0 +1,117 @@ +package com.op.quality.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.quality.mapper.QcCheckTaskDefectMapper; +import com.op.quality.domain.QcCheckTaskDefect; +import com.op.quality.service.IQcCheckTaskDefectService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +/** + * 来料检验任务--不良数量Service业务层处理 + * + * @author Open Platform + * @date 2024-01-11 + */ +@Service +public class QcCheckTaskDefectServiceImpl implements IQcCheckTaskDefectService { + @Autowired + private QcCheckTaskDefectMapper qcCheckTaskDefectMapper; + + /** + * 查询来料检验任务--不良数量 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 来料检验任务--不良数量 + */ + @Override + @DS("#header.poolName") + public QcCheckTaskDefect selectQcCheckTaskDefectByRecordId(String recordId) { + return qcCheckTaskDefectMapper.selectQcCheckTaskDefectByRecordId(recordId); + } + + /** + * 查询来料检验任务--不良数量列表 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 来料检验任务--不良数量 + */ + @Override + @DS("#header.poolName") + public List selectQcCheckTaskDefectList(QcCheckTaskDefect qcCheckTaskDefect) { + return qcCheckTaskDefectMapper.selectQcCheckTaskDefectList(qcCheckTaskDefect); + } + + /** + * 新增来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect) { + qcCheckTaskDefect.setRecordId(IdUtils.fastSimpleUUID()); + qcCheckTaskDefect.setCreateBy(SecurityUtils.getUsername()); + qcCheckTaskDefect.setCreateTime(DateUtils.getNowDate()); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + qcCheckTaskDefect.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); + return qcCheckTaskDefectMapper.insertQcCheckTaskDefect(qcCheckTaskDefect); + } + + /** + * 修改来料检验任务--不良数量 + * + * @param qcCheckTaskDefect 来料检验任务--不良数量 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateQcCheckTaskDefect(QcCheckTaskDefect qcCheckTaskDefect) { + qcCheckTaskDefect.setUpdateTime(DateUtils.getNowDate()); + qcCheckTaskDefect.setUpdateBy(SecurityUtils.getUsername()); + return qcCheckTaskDefectMapper.updateQcCheckTaskDefect(qcCheckTaskDefect); + } + + /** + * 批量删除来料检验任务--不良数量 + * + * @param recordIds 需要删除的来料检验任务--不良数量主键 + * @return 结果 + */ + @Override + public int deleteQcCheckTaskDefectByRecordIds(String[] recordIds) { + return qcCheckTaskDefectMapper.deleteQcCheckTaskDefectByRecordIds(recordIds); + } + + /** + * 删除来料检验任务--不良数量信息 + * + * @param recordId 来料检验任务--不良数量主键 + * @return 结果 + */ + @Override + public int deleteQcCheckTaskDefectByRecordId(String recordId) { + return qcCheckTaskDefectMapper.deleteQcCheckTaskDefectByRecordId(recordId); + } + + @Override + public int deleteQcCheckTaskDefectByBelongTo(String belongTo) { + return qcCheckTaskDefectMapper.deleteQcCheckTaskDefectByBelongTo(belongTo); + } + + @Override + public List selectDefectByBelongTo(String belongTo) { + return qcCheckTaskDefectMapper.selectDefectByBelongTo(belongTo); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index 99118b52..8968e71f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -21,6 +21,7 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.quality.domain.*; import com.op.quality.mapper.*; +import com.op.quality.service.IQcCheckTaskDefectService; import com.op.quality.service.IQcCheckTaskUserService; import com.op.system.api.RemoteUserService; import com.op.system.api.domain.SysUser; @@ -74,6 +75,9 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService @Autowired private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper; + @Autowired + private IQcCheckTaskDefectService qcCheckTaskDefectService; + /** * 查询生产过程检验任务 * @@ -92,6 +96,12 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService if (StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) { qcCheckTaskProduce.setCheckManCode(qcCheckTaskUser.getManCodes()); } + //获取不良品检验信息 + List qcCheckTaskDefectList = qcCheckTaskDefectService.selectDefectByBelongTo(recordId); + if (!CollectionUtils.isEmpty(qcCheckTaskDefectList)) { + qcCheckTaskProduce.setDefects(qcCheckTaskDefectList); + } + return qcCheckTaskProduce; } @@ -204,7 +214,17 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService logger.info("检查人新增"+m+"成功"); } } - /**qc_check_task**/ + /** 不良品数据插入 */ + List defectList = qcCheckTaskProduce.getDefects(); + if (CollectionUtils.isEmpty(defectList)) { + return 0; + } else { + for (QcCheckTaskDefect defect : defectList) { + defect.setBelongTo(beLongId); + qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + } + } + /**qc_check_task**/ qcCheckTaskProduceMapper.insertQcCheckTaskProduce(qcCheckTaskProduce); /**qc_check_task_detail**/ @@ -246,6 +266,19 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService qcCheckTaskUserList.add(qcCheckTaskUser); } qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList); + /** 不良品数据修改 **/ + List defectList = qcCheckTaskProduce.getDefects(); + if (CollectionUtils.isEmpty(defectList)) { + return 0; + } else { + String belongTo = qcCheckTaskProduce.getRecordId(); + qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo); + for (QcCheckTaskDefect defect : defectList) { + defect.setBelongTo(belongTo); + qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + } + } + return qcCheckTaskProduceMapper.updateQcCheckTaskProduce(qcCheckTaskProduce); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java index 8f69798a..4a6ed61e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java @@ -166,4 +166,10 @@ public class QcDefectTypeServiceImpl implements IQcDefectTypeService { public int deleteQcDefectTypeByDefectId(String defectId) { return qcDefectTypeMapper.deleteQcDefectTypeByDefectId(defectId); } + + @Override + @DS("#header.poolName") + public List getDefectTypeListByDefectType(String defectType) { + return qcDefectTypeMapper.getDefectTypeListByDefectType(defectType); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java index 0d8325da..cd41c9ec 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java @@ -111,4 +111,9 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS public boolean validationData(String materialCode) { return qcMaterialGroupDetailMapper.validationData(materialCode).size() > 0; } + + @Override + public boolean validationGroupDetailData(String materialCode) { + return qcMaterialGroupDetailMapper.validationGroupDetailData(materialCode).size() > 0; + } } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml new file mode 100644 index 00000000..03a3d560 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select record_id, defect_code, defect_subclass, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag, belong_to, ok_quality, noOk_quality from qc_check_task_defect + + + + + + + + insert into qc_check_task_defect + + record_id, + defect_code, + defect_subclass, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + factory_code, + del_flag, + belong_to, + ok_quality, + noOk_quality, + + + #{recordId}, + #{defectCode}, + #{defectSubclass}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + #{belongTo}, + #{okQuality}, + #{noOkQuality}, + + + + + update qc_check_task_defect + + defect_code = #{defectCode}, + defect_subclass = #{defectSubclass}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + del_flag = #{delFlag}, + belong_to = #{belongTo}, + ok_quality = #{okQuality}, + noOk_quality = #{noOkQuality}, + + where record_id = #{recordId} + + + + delete from qc_check_task_defect where record_id = #{recordId} + + + + delete from qc_check_task_defect where record_id in + + #{recordId} + + + + + delete from qc_check_task_defect where belong_to = #{belongTo} + + + + + \ No newline at end of file diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml index 9bc55f47..cf33f635 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml @@ -128,4 +128,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{defectId} + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml index 47207f0f..38d27186 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml @@ -110,4 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from qc_check_type_project where material_code = #{materialCode} +