diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java deleted file mode 100644 index be633136..00000000 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportFirstController.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.op.quality.controller; - -import com.op.common.core.utils.DateUtils; -import com.op.common.core.utils.poi.ExcelUtil; -import com.op.common.core.web.controller.BaseController; -import com.op.common.core.web.domain.AjaxResult; -import com.op.common.core.web.page.TableDataInfo; -import com.op.common.log.annotation.Log; -import com.op.common.log.enums.BusinessType; -import com.op.common.security.annotation.RequiresPermissions; -import com.op.common.security.utils.SecurityUtils; -import com.op.quality.domain.QcBomComponent; -import com.op.quality.domain.QcCheckReportIncome; -import com.op.quality.domain.QcCheckTaskDetail; -import com.op.quality.domain.QcSupplier; -import com.op.quality.service.IQcCheckReportFirstService; -import com.op.system.api.domain.SysUser; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.List; - -/** - * 来料检验Controller - * - * @author Open Platform - * @date 2023-10-19 - */ -@RestController -@RequestMapping("/qcFirstReport") -public class QcCheckReportFirstController extends BaseController { - @Autowired - private IQcCheckReportFirstService qcCheckReportFirstService; - - /** - * 查询来料检验列表 - */ - @RequiresPermissions("quality:firstReport:list") - @GetMapping("/list") - public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) { - - //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ - qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate()+" 00:00:00");//start - LocalDate date = LocalDate.now(); - LocalDate dateEnd = date.plusDays(1); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String dateEndStr = dtf.format(dateEnd)+" 23:59:59"; - qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end - } - -// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ -// qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start -// qcCheckReportIncome.setCheckTimeEnd(qcCheckReportIncome.getIncomeTimeStart());//end -// } - - startPage(); - List list = qcCheckReportFirstService.selectQcCheckReportIncomeList(qcCheckReportIncome); - return getDataTable(list); - } - - /** - * 导出来料检验列表 - */ - @RequiresPermissions("quality:firstReport:export") - @Log(title = "来料检验", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, QcCheckReportIncome qcCheckReportIncome) { - - //默认时间范围T 00:00:00~T+1 00:00:00 - if(StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())){ - qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start - LocalDate date = LocalDate.now(); - LocalDate dateEnd = date.plusDays(1); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; - qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end - } - -// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ -// qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start -// qcCheckReportIncome.setCheckTimeEnd(qcCheckReportIncome.getIncomeTimeStart());//end -// } - - List list = qcCheckReportFirstService.selectQcCheckReportIncomeList(qcCheckReportIncome); - ExcelUtil util = new ExcelUtil(QcCheckReportIncome.class); - util.exportExcel(response, list, "来料检验数据"); - } - - /** - * 获取来料检验详细信息 - */ - @RequiresPermissions("quality:firstReport:query") - @GetMapping(value = "/{recordId}") - public AjaxResult getInfo(@PathVariable("recordId") String recordId) { - return success(qcCheckReportFirstService.selectQcCheckReportIncomeByRecordId(recordId)); - } - - /** - * 新增来料检验 - */ - @RequiresPermissions("quality:firstReport:add") - @Log(title = "来料检验", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody QcCheckReportIncome qcCheckReportIncome) { - int r = qcCheckReportFirstService.insertQcCheckReportIncome(qcCheckReportIncome); - if(r>0){ - return toAjax(r); - } - return error("添加失败：请检查物料的关联检测项"); - } - - /** - * 修改来料检验 - */ - @RequiresPermissions("quality:firstReport:edit") - @Log(title = "来料检验", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody QcCheckReportIncome qcCheckReportIncome) { - return toAjax(qcCheckReportFirstService.updateQcCheckReportIncome(qcCheckReportIncome)); - } - - /** - * 删除来料检验 - */ - @RequiresPermissions("quality:firstReport:remove") - @Log(title = "来料检验", businessType = BusinessType.DELETE) - @DeleteMapping("/{recordIds}") - public AjaxResult remove(@PathVariable String[] recordIds) { - return toAjax(qcCheckReportFirstService.deleteQcCheckReportIncomeByRecordIds(recordIds)); - } - - /** - * 查询BOM物料管理列表 - */ - @GetMapping("/getQcListBom") - public TableDataInfo getQcListBom(QcBomComponent bomComponent) { - startPage(); - List list = qcCheckReportFirstService.getQcListBom(bomComponent); - return getDataTable(list); - } - /** - * 查询供应商列表 - */ - @GetMapping("/getQcListSupplier") - public TableDataInfo getQcListSupplier(QcSupplier qcSupplier) { - startPage(); - List list = qcCheckReportFirstService.getQcListSupplier(qcSupplier); - return getDataTable(list); - } - /** - * 查询人员列表 - */ - @GetMapping("/getQcListUser") - public TableDataInfo getQcListUser(SysUser sysUser) { - startPage(); - List list = qcCheckReportFirstService.getQcListUser(sysUser); - return getDataTable(list); - } - - /** - * 状态修改 - */ - @PutMapping("/changeIncomeStatus") - public AjaxResult changeIncomeStatus(@RequestBody QcCheckReportIncome qcCheckReportIncome) { - qcCheckReportIncome.setUpdateBy(SecurityUtils.getUsername()); - qcCheckReportIncome.setUpdateTime(DateUtils.getNowDate()); - return toAjax(qcCheckReportFirstService.updateIncomeStatus(qcCheckReportIncome)); - } - - /** - * 检验项目弹窗列表 - * @param - * @return - */ - @GetMapping("/getCkeckProjectList") - public TableDataInfo getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { - List list = qcCheckReportFirstService.getCkeckProjectList(qcCheckTaskDetail); - return getDataTable(list); - } -} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProjectType.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProjectType.java index 5b63d8f1..eb549d76 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProjectType.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcProjectType.java @@ -36,6 +36,12 @@ public class QcProjectType extends BaseEntity { /** 删除标识1删除0正常 */ private String delFlag; + @Excel(name = "检验标准") + private String standardNo; + + @Excel(name = "版本") + private String version; + public void setId(String id) { this.id = id; } @@ -79,6 +85,22 @@ public class QcProjectType extends BaseEntity { return delFlag; } + public String getStandardNo() { + return standardNo; + } + + public void setStandardNo(String standardNo) { + this.standardNo = standardNo; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -92,6 +114,8 @@ public class QcProjectType extends BaseEntity { .append("updateTime", getUpdateTime()) .append("factoryCode", getFactoryCode()) .append("delFlag", getDelFlag()) + .append("standard", getStandardNo()) + .append("version", getVersion()) .toString(); } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java deleted file mode 100644 index 8b0de07c..00000000 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportFirstService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.op.quality.service; - -import com.op.quality.domain.QcBomComponent; -import com.op.quality.domain.QcCheckReportIncome; -import com.op.quality.domain.QcCheckTaskDetail; -import com.op.quality.domain.QcSupplier; -import com.op.system.api.domain.SysUser; - -import java.util.List; - -/** - * 来料报告Service接口 - * - * @author Open Platform - * @date 2023-10-19 - */ -public interface IQcCheckReportFirstService { - /** - * 查询来料报告 - * - * @param recordId 来料报告主键 - * @return 来料检验 - */ - public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId); - - /** - * 查询来料报告列表 - * - * @param qcCheckReportIncome 来料报告 - * @return 来料检验集合 - */ - public List selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome); - - /** - * 新增来料报告 - * - * @param qcCheckReportIncome 来料报告 - * @return 结果 - */ - public int insertQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome); - - /** - * 修改来料报告 - * - * @param qcCheckReportIncome 来料报告 - * @return 结果 - */ - public int updateQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome); - - /** - * 批量删除来料报告 - * - * @param recordIds 需要删除的来料报告主键集合 - * @return 结果 - */ - public int deleteQcCheckReportIncomeByRecordIds(String[] recordIds); - - /** - * 删除来料报告信息 - * - * @param recordId 来料报告主键 - * @return 结果 - */ - public int deleteQcCheckReportIncomeByRecordId(String recordId); - - public List getQcListBom(QcBomComponent bomComponent); - - public List getQcListSupplier(QcSupplier qcSupplier); - - public List getQcListUser(SysUser sysUser); - - int updateIncomeStatus(QcCheckReportIncome qcCheckReportIncome); - - List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail); - - public List getPrintData(QcCheckReportIncome qcCheckReportIncome); - -} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java deleted file mode 100644 index 1e243b33..00000000 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportFirstServiceImpl.java +++ /dev/null @@ -1,207 +0,0 @@ -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.uuid.IdUtils; -import com.op.common.security.utils.SecurityUtils; -import com.op.quality.domain.*; -import com.op.quality.mapper.QcCheckReportIncomeMapper; -import com.op.quality.mapper.QcCheckTaskDetailMapper; -import com.op.quality.mapper.QcCheckTypeProjectMapper; -import com.op.quality.mapper.QcMaterialGroupDetailMapper; -import com.op.quality.service.IQcCheckReportFirstService; -import com.op.quality.service.IQcCheckReportIncomeService; -import com.op.system.api.domain.SysUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.List; - -/** - * 来料检验Service业务层处理 - * - * @author Open Platform - * @date 2023-10-19 - */ -@Service -public class QcCheckReportFirstServiceImpl implements IQcCheckReportFirstService { - @Autowired - private QcCheckReportIncomeMapper qcCheckReportIncomeMapper; - - @Autowired - private QcCheckTypeProjectMapper qcCheckTypeProjectMapper; - - @Autowired - private QcMaterialGroupDetailMapper qcMaterialGroupDetailMapper; - - @Autowired - private QcCheckTaskDetailMapper qcCheckTaskDetailMapper; - - /** - * 查询来料检验 - * - * @param recordId 来料检验主键 - * @return 来料检验 - */ - @Override - @DS("#header.poolName") - public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) { - return qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId); - } - - /** - * 查询来料检验列表 - * - * @param qcCheckReportIncome 来料检验 - * @return 来料检验 - */ - @Override - @DS("#header.poolName") - public List selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome) { - qcCheckReportIncome.setDelFlag("0"); - qcCheckReportIncome.setTypeCode("produce"); - qcCheckReportIncome.setCheckType("checkTypeSC"); - return qcCheckReportIncomeMapper.selectQcCheckReportIncomeList(qcCheckReportIncome); - } - - /** - * 新增来料检验 - * - * @param qcCheckReportIncome 来料检验 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome) { - - String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); - int liushuiNum = qcCheckReportIncomeMapper.getTodayMaxNum(qcCheckReportIncome); - String liushuiStr = String.format("%04d", liushuiNum); - - String createBy = SecurityUtils.getUsername(); - Date nowDate= DateUtils.getNowDate(); - //获取当前所选工厂 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String key = "#header.poolName"; - String factoryCode = request.getHeader(key.substring(8)).replace("ds_",""); - - qcCheckReportIncome.setCheckNo(bpDD+liushuiStr); - - /**qc_check_task_income**/ - String beLongId = IdUtils.fastSimpleUUID(); - qcCheckReportIncome.setRecordId(beLongId); - qcCheckReportIncome.setFactoryCode(factoryCode); - qcCheckReportIncome.setCreateTime(nowDate); - qcCheckReportIncomeMapper.insertQcCheckReportIncome(qcCheckReportIncome); - - /**取检测项**/ - QcCheckTypeProject qctp= new QcCheckTypeProject(); - qctp.setTypeId(qcCheckReportIncome.getCheckType());//生产过程检验 - qctp.setMaterialCode(qcCheckReportIncome.getMaterialCode());//特性 - /**qc_check_type_project**/ - List items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp); - if(CollectionUtils.isEmpty(items)){ - /**qc_material_group_detail**/ - QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckReportIncome.getMaterialCode()); - if(group == null){ - return 0;//没有找到检测项目 - } - qctp.setGroupId(group.getGroupId());//共性 - items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); - } - - /**qc_check_task_detail**/ - if(CollectionUtils.isEmpty(items)){ - return 0;//没有找到检测项目 - } - - for(QcCheckTaskDetail item:items){ - item.setRecordId(IdUtils.fastSimpleUUID()); - item.setBelongTo(beLongId); - item.setCreateTime(nowDate); - item.setCreateBy(createBy); - item.setFactoryCode(factoryCode); - item.setStatus("N"); - } - return qcCheckTaskDetailMapper.addBatch(items); - } - - /** - * 修改来料检验 - * - * @param qcCheckReportIncome 来料检验 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome) { - qcCheckReportIncome.setUpdateTime(DateUtils.getNowDate()); - return qcCheckReportIncomeMapper.updateQcCheckReportIncome(qcCheckReportIncome); - } - - /** - * 批量删除来料检验 - * - * @param recordIds 需要删除的来料检验主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteQcCheckReportIncomeByRecordIds(String[] recordIds) { - return qcCheckReportIncomeMapper.deleteQcCheckReportIncomeByRecordIds(recordIds); - } - - /** - * 删除来料检验信息 - * - * @param recordId 来料检验主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteQcCheckReportIncomeByRecordId(String recordId) { - return qcCheckReportIncomeMapper.deleteQcCheckReportIncomeByRecordId(recordId); - } - - @Override - @DS("#header.poolName") - public List getQcListBom(QcBomComponent bomComponent) { - return qcCheckReportIncomeMapper.getQcListBom(bomComponent); - } - - @Override - @DS("#header.poolName") - public List getQcListSupplier(QcSupplier qcSupplier) { - return qcCheckReportIncomeMapper.getQcListSupplier(qcSupplier); - } - - @Override - @DS("master") - public List getQcListUser(SysUser sysUser) { - return qcCheckReportIncomeMapper.getQcListUser(sysUser); - } - - @Override - @DS("#header.poolName") - public int updateIncomeStatus(QcCheckReportIncome qcCheckReportIncome) { - return qcCheckReportIncomeMapper.updateQcCheckReportIncome(qcCheckReportIncome); - } - - @Override - @DS("#header.poolName") - public List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { - return qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); - } - - @Override - @DS("#header.poolName") - public List getPrintData(QcCheckReportIncome qcCheckReportIncome) { - return null; - } - -} 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 4b7f9f48..f15925ab 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 @@ -35,13 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name,sample_quality, - check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, + check_time, check_result, status, check_type, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_task diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml index fb48d98d..95970101 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml @@ -15,10 +15,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, project_type_code, project_type_name, attr1, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_project_type + select id, project_type_code, project_type_name, attr1, create_by, create_time, update_by, update_time, + factory_code, del_flag, standard_no, version from qc_project_type @@ -49,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, factory_code, del_flag, + standard_no, + version = #{version} #{id}, @@ -61,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{factoryCode}, #{delFlag}, + #{standardNo} + #{version} @@ -76,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, factory_code = #{factoryCode}, del_flag = #{delFlag}, + standard_no = #{standardNo}, + version = #{version}, where id = #{id}