diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeController.java index f492dea9e..c39e8c843 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeController.java @@ -101,4 +101,5 @@ public class QcCheckTypeController extends BaseController { public AjaxResult remove(@PathVariable String[] ids) { return toAjax(qcCheckTypeService.deleteQcCheckTypeByIds(ids)); } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeFileController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeFileController.java new file mode 100644 index 000000000..8a72b8745 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeFileController.java @@ -0,0 +1,98 @@ +package com.op.quality.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.quality.domain.QcCheckTypeFile; +import com.op.quality.service.IQcCheckTypeFileService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 检验节点维护Controller + * + * @author Open Platform + * @date 2024-10-11 + */ +@RestController +@RequestMapping("/checkTypeFile") +public class QcCheckTypeFileController extends BaseController { + @Autowired + private IQcCheckTypeFileService qcCheckTypeFileService; + +/** + * 查询检验节点维护列表 + */ +//@RequiresPermissions("system:file:list") +@GetMapping("/list") + public TableDataInfo list(QcCheckTypeFile qcCheckTypeFile) { + startPage(); + List list = qcCheckTypeFileService.selectQcCheckTypeFileList(qcCheckTypeFile); + return getDataTable(list); + } + + /** + * 导出检验节点维护列表 + */ + //@RequiresPermissions("system:file:export") + @Log(title = "检验节点维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QcCheckTypeFile qcCheckTypeFile) { + List list = qcCheckTypeFileService.selectQcCheckTypeFileList(qcCheckTypeFile); + ExcelUtil util = new ExcelUtil(QcCheckTypeFile. class); + util.exportExcel(response, list, "检验节点维护数据"); + } + + /** + * 获取检验节点维护详细信息 + */ + //@RequiresPermissions("system:file:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(qcCheckTypeFileService.selectQcCheckTypeFileById(id)); + } + + /** + * 新增检验节点维护 + */ + //@RequiresPermissions("system:file:add") + @Log(title = "检验节点维护", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QcCheckTypeFile qcCheckTypeFile) { + return toAjax(qcCheckTypeFileService.insertQcCheckTypeFile(qcCheckTypeFile)); + } + + /** + * 修改检验节点维护 + */ + //@RequiresPermissions("system:file:edit") + @Log(title = "检验节点维护", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QcCheckTypeFile qcCheckTypeFile) { + return toAjax(qcCheckTypeFileService.updateQcCheckTypeFile(qcCheckTypeFile)); + } + + /** + * 删除检验节点维护 + */ + //@RequiresPermissions("system:file:remove") + @Log(title = "检验节点维护", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(qcCheckTypeFileService.deleteQcCheckTypeFileByIds(ids)); + } +} 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 ba1a88d6e..4def1a496 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 @@ -23,7 +23,7 @@ public class QcCheckTaskProduce extends BaseEntity { * id */ private String recordId; - + private String standardNo; /** * 检验任务编号 */ @@ -208,6 +208,14 @@ public class QcCheckTaskProduce extends BaseEntity { private String shiftId; private String bz;//备注 + public String getStandardNo() { + return standardNo; + } + + public void setStandardNo(String standardNo) { + this.standardNo = standardNo; + } + public String getBz() { return bz; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckType.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckType.java index a77cbacab..e130ef729 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckType.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckType.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; +import java.util.Date; + /** * 检验节点维护对象 qc_check_type * @@ -62,6 +64,33 @@ public class QcCheckType extends BaseEntity { private int taskNum; private String checkManCode; + private String fileNo; + private Date startTime; + private Date endTime; + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } public String getCheckManCode() { return checkManCode; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeFile.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeFile.java new file mode 100644 index 000000000..b3bf67bcf --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeFile.java @@ -0,0 +1,158 @@ +package com.op.quality.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 检验节点维护对象 qc_check_type_file + * + * @author Open Platform + * @date 2024-10-11 + */ +public class QcCheckTypeFile extends BaseEntity { +private static final long serialVersionUID=1L; + + /** id */ + private String id; + + /** 检验节点 */ + @Excel(name = "检验节点") + private String checkType; + private String checkName; + /** 有效期开始 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "有效期开始", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** 有效期结束 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "有效期结束", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + /** 文件编号 */ + @Excel(name = "文件编号") + private String fileNo; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String attr1; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + /** 备注 */ + @Excel(name = "备注") + private String bz; + + /** 版本 */ + @Excel(name = "版本") + private String fileVersion; + + public String getCheckName() { + return checkName; + } + + public void setCheckName(String checkName) { + this.checkName = checkName; + } + + public void setId(String id){ + this.id = id; + } + + public String getId(){ + return id; + } + public void setCheckType(String checkType){ + this.checkType = checkType; + } + + public String getCheckType(){ + return checkType; + } + public void setStartTime(Date startTime){ + this.startTime = startTime; + } + + public Date getStartTime(){ + return startTime; + } + public void setEndTime(Date endTime){ + this.endTime = endTime; + } + + public Date getEndTime(){ + return endTime; + } + public void setFileNo(String fileNo){ + this.fileNo = fileNo; + } + + public String getFileNo(){ + return fileNo; + } + public void setAttr1(String attr1){ + this.attr1 = attr1; + } + + public String getAttr1(){ + return attr1; + } + public void setFactoryCode(String factoryCode){ + this.factoryCode = factoryCode; + } + + public String getFactoryCode(){ + return factoryCode; + } + public void setDelFlag(String delFlag){ + this.delFlag = delFlag; + } + + public String getDelFlag(){ + return delFlag; + } + public void setBz(String bz){ + this.bz = bz; + } + + public String getBz(){ + return bz; + } + public void setFileVersion(String fileVersion){ + this.fileVersion = fileVersion; + } + + public String getFileVersion(){ + return fileVersion; + } + +@Override +public String toString(){ + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id",getId()) + .append("checkType",getCheckType()) + .append("startTime",getStartTime()) + .append("endTime",getEndTime()) + .append("fileNo",getFileNo()) + .append("attr1",getAttr1()) + .append("createBy",getCreateBy()) + .append("createTime",getCreateTime()) + .append("updateBy",getUpdateBy()) + .append("updateTime",getUpdateTime()) + .append("factoryCode",getFactoryCode()) + .append("delFlag",getDelFlag()) + .append("remark",getRemark()) + .append("bz",getBz()) + .append("fileVersion",getFileVersion()) + .toString(); + } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java index b8ac67e2c..f2b46e133 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java @@ -87,4 +87,6 @@ public interface QcCheckReportIncomeMapper { List getBatchsByTaskId(String recordId); QcCheckTaskProduce getLastXJ(QcCheckTaskProduce qcCheckTaskProduce); + + String getStandardNo(QcCheckReportIncome dto); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeFileMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeFileMapper.java new file mode 100644 index 000000000..ae17878d8 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeFileMapper.java @@ -0,0 +1,61 @@ +package com.op.quality.mapper; + +import java.util.List; + +import com.op.quality.domain.QcCheckTypeFile; + +/** + * 检验节点维护Mapper接口 + * + * @author Open Platform + * @date 2024-10-11 + */ +public interface QcCheckTypeFileMapper { + /** + * 查询检验节点维护 + * + * @param id 检验节点维护主键 + * @return 检验节点维护 + */ + public QcCheckTypeFile selectQcCheckTypeFileById(String id); + + /** + * 查询检验节点维护列表 + * + * @param qcCheckTypeFile 检验节点维护 + * @return 检验节点维护集合 + */ + public List selectQcCheckTypeFileList(QcCheckTypeFile qcCheckTypeFile); + + /** + * 新增检验节点维护 + * + * @param qcCheckTypeFile 检验节点维护 + * @return 结果 + */ + public int insertQcCheckTypeFile(QcCheckTypeFile qcCheckTypeFile); + + /** + * 修改检验节点维护 + * + * @param qcCheckTypeFile 检验节点维护 + * @return 结果 + */ + public int updateQcCheckTypeFile(QcCheckTypeFile qcCheckTypeFile); + + /** + * 删除检验节点维护 + * + * @param id 检验节点维护主键 + * @return 结果 + */ + public int deleteQcCheckTypeFileById(String id); + + /** + * 批量删除检验节点维护 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcCheckTypeFileByIds(String[] ids); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeMapper.java index cea099d28..704c0cd23 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeMapper.java @@ -62,4 +62,5 @@ public interface QcCheckTypeMapper { public int deleteQcCheckTypeByIds(String[] ids); List getTopTaskInfo(QcCheckType qcCheckType); + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeFileService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeFileService.java new file mode 100644 index 000000000..3f45cbe57 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeFileService.java @@ -0,0 +1,61 @@ +package com.op.quality.service; + +import java.util.List; + +import com.op.quality.domain.QcCheckTypeFile; + +/** + * 检验节点维护Service接口 + * + * @author Open Platform + * @date 2024-10-11 + */ +public interface IQcCheckTypeFileService { + /** + * 查询检验节点维护 + * + * @param id 检验节点维护主键 + * @return 检验节点维护 + */ + public QcCheckTypeFile selectQcCheckTypeFileById(String id); + + /** + * 查询检验节点维护列表 + * + * @param qcCheckTypeFile 检验节点维护 + * @return 检验节点维护集合 + */ + public List selectQcCheckTypeFileList(QcCheckTypeFile qcCheckTypeFile); + + /** + * 新增检验节点维护 + * + * @param qcCheckTypeFile 检验节点维护 + * @return 结果 + */ + public int insertQcCheckTypeFile(QcCheckTypeFile qcCheckTypeFile); + + /** + * 修改检验节点维护 + * + * @param qcCheckTypeFile 检验节点维护 + * @return 结果 + */ + public int updateQcCheckTypeFile(QcCheckTypeFile qcCheckTypeFile); + + /** + * 批量删除检验节点维护 + * + * @param ids 需要删除的检验节点维护主键集合 + * @return 结果 + */ + public int deleteQcCheckTypeFileByIds(String[] ids); + + /** + * 删除检验节点维护信息 + * + * @param id 检验节点维护主键 + * @return 结果 + */ + public int deleteQcCheckTypeFileById(String id); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java index b52ca5b18..b1de4b2c4 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java @@ -52,7 +52,13 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi @Override @DS("#header.poolName") public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) { - return qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); + QcCheckReportIncome dto = qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); + //查找受控文件--standardNo + String standardNo = qcCheckReportIncomeMapper.getStandardNo(dto); + if(StringUtils.isNotBlank(standardNo)){ + dto.setStandardNo(standardNo); + } + return dto; } /** diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportInventoryServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportInventoryServiceImpl.java index 5e351e1e0..ff52d576f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportInventoryServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportInventoryServiceImpl.java @@ -2,6 +2,7 @@ package com.op.quality.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; import com.op.quality.domain.*; @@ -51,7 +52,13 @@ public class QcCheckReportInventoryServiceImpl implements IQcCheckReportInventor @Override @DS("#header.poolName") public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) { - return qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); + QcCheckReportIncome dto = qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); + //查找受控文件--standardNo + String standardNo = qcCheckReportIncomeMapper.getStandardNo(dto); + if(StringUtils.isNotBlank(standardNo)){ + dto.setStandardNo(standardNo); + } + return dto; } /** diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index 977a8a41a..c877986aa 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -19,6 +19,8 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -57,6 +59,11 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer @DS("#header.poolName") public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) { QcCheckReportIncome dto = qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); + //查找受控文件--standardNo + String standardNo = qcCheckReportIncomeMapper.getStandardNo(dto); + if(StringUtils.isNotBlank(standardNo)){ + dto.setStandardNo(standardNo); + } return dto; } @@ -208,6 +215,29 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer public QcCheckTaskProduce getProduceReportXJ(QcCheckTaskProduce qcCheckTaskProduce) { QcCheckTaskProduce produce = qcCheckReportIncomeMapper.getTopInfo(qcCheckTaskProduce); + //查找受控文件--standardNo + QcCheckReportIncome dto0 = new QcCheckReportIncome(); + String dateFormat = "yyyy-MM-dd"; + + // 创建一个 SimpleDateFormat 对象 + SimpleDateFormat sdf = new SimpleDateFormat(dateFormat); + + try { + // 解析字符串为 Date 对象 + Date date = sdf.parse(produce.getCheckTimeStart()); + dto0.setIncomeTime(date); + System.out.println("解析后的日期: " + date); + } catch (ParseException e) { + // 捕获解析异常并打印错误消息 + System.err.println("解析日期字符串时出错: " + e.getMessage()); + } + + dto0.setCheckType("checkTypeSCXJ"); + String standardNo = qcCheckReportIncomeMapper.getStandardNo(dto0); + if(StringUtils.isNotBlank(standardNo)){ + produce.setStandardNo(standardNo); + } + //批次号去重 if(StringUtils.isNotBlank(produce.getIncomeBatchNo())){ List batchNos = Arrays.asList(produce.getIncomeBatchNo().split(";")); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java index 241495796..62cd790c7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java @@ -52,7 +52,11 @@ public class QcCheckReportProductServiceImpl implements IQcCheckReportProductSer @DS("#header.poolName") public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) { QcCheckReportIncome dto = qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); - + //查找受控文件--standardNo + String standardNo = qcCheckReportIncomeMapper.getStandardNo(dto); + if(StringUtils.isNotBlank(standardNo)){ + dto.setStandardNo(standardNo); + } //汇总批次号 List batchs = qcCheckReportIncomeMapper.getBatchsByTaskId(recordId); dto.setIncomeBatchNo(StringUtils.join(batchs, ";")); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeFileServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeFileServiceImpl.java new file mode 100644 index 000000000..f9b635545 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeFileServiceImpl.java @@ -0,0 +1,99 @@ +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.quality.mapper.QcCheckTypeFileMapper; +import com.op.quality.domain.QcCheckTypeFile; +import com.op.quality.service.IQcCheckTypeFileService; + +/** + * 检验节点维护Service业务层处理 + * + * @author Open Platform + * @date 2024-10-11 + */ +@Service +public class QcCheckTypeFileServiceImpl implements IQcCheckTypeFileService { + @Autowired + private QcCheckTypeFileMapper qcCheckTypeFileMapper; + + /** + * 查询检验节点维护 + * + * @param id 检验节点维护主键 + * @return 检验节点维护 + */ + @Override + @DS("#header.poolName") + public QcCheckTypeFile selectQcCheckTypeFileById(String id) { + return qcCheckTypeFileMapper.selectQcCheckTypeFileById(id); + } + + /** + * 查询检验节点维护列表 + * + * @param qcCheckTypeFile 检验节点维护 + * @return 检验节点维护 + */ + @Override + @DS("#header.poolName") + public List selectQcCheckTypeFileList(QcCheckTypeFile qcCheckTypeFile) { + return qcCheckTypeFileMapper.selectQcCheckTypeFileList(qcCheckTypeFile); + } + + /** + * 新增检验节点维护 + * + * @param qcCheckTypeFile 检验节点维护 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertQcCheckTypeFile(QcCheckTypeFile qcCheckTypeFile) { + qcCheckTypeFile.setCreateTime(DateUtils.getNowDate()); + qcCheckTypeFile.setId(IdUtils.fastSimpleUUID()); + return qcCheckTypeFileMapper.insertQcCheckTypeFile(qcCheckTypeFile); + } + + /** + * 修改检验节点维护 + * + * @param qcCheckTypeFile 检验节点维护 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateQcCheckTypeFile(QcCheckTypeFile qcCheckTypeFile) { + qcCheckTypeFile.setUpdateTime(DateUtils.getNowDate()); + return qcCheckTypeFileMapper.updateQcCheckTypeFile(qcCheckTypeFile); + } + + /** + * 批量删除检验节点维护 + * + * @param ids 需要删除的检验节点维护主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcCheckTypeFileByIds(String[] ids) { + return qcCheckTypeFileMapper.deleteQcCheckTypeFileByIds(ids); + } + + /** + * 删除检验节点维护信息 + * + * @param id 检验节点维护主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcCheckTypeFileById(String id) { + return qcCheckTypeFileMapper.deleteQcCheckTypeFileById(id); + } +} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index e93e66549..7eb0d7be8 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -274,6 +274,14 @@ and c.bz is not null order by c.create_time desc + insert into qc_check_task diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml index b653f29b7..0443bac64 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml @@ -66,9 +66,11 @@ and qct.check_no = #{checkNo} and qct.income_batch_no = #{incomeBatchNo} and qct.order_no = #{orderNo} - and qct.material_code = #{materialCode} - and qct.material_name like concat('%', - #{materialName}, '%') + + and qct.material_code like concat('%',#{materialCode}, '%') + + + and qct.material_name like concat('%',#{materialName}, '%') and qct.supplier_code = #{supplierCode} and qct.supplier_name like concat('%', diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeFileMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeFileMapper.xml new file mode 100644 index 000000000..86606d531 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeFileMapper.xml @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, check_type, start_time, end_time, file_no, attr1, create_by, + create_time, update_by, + update_time, factory_code, del_flag, remark, bz, file_version + from qc_check_type_file + + + + + + + + + insert into qc_check_type_file + + id, + + check_type, + + start_time, + + end_time, + + file_no, + + attr1, + + create_by, + + create_time, + + update_by, + + update_time, + + factory_code, + + del_flag, + + remark, + + bz, + + file_version, + + + + #{id}, + + #{checkType}, + + #{startTime}, + + #{endTime}, + + #{fileNo}, + + #{attr1}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + #{factoryCode}, + + #{delFlag}, + + #{remark}, + + #{bz}, + + #{fileVersion}, + + + + + + update qc_check_type_file + + check_type = + #{checkType}, + + start_time = + #{startTime}, + + end_time = + #{endTime}, + + file_no = + #{fileNo}, + + attr1 = + #{attr1}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + factory_code = + #{factoryCode}, + + del_flag = + #{delFlag}, + + remark = + #{remark}, + + bz = + #{bz}, + + file_version = + #{fileVersion}, + + + where id = #{id} + + + + delete from qc_check_type_file where id = #{id} + + + + update qc_check_type_file set del_flag = '1' where id in + + #{id} + + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml index 910b8f9e9..b06415f32 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml @@ -67,6 +67,7 @@ or CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120) ) + insert into qc_check_type