From f4a8acb4a84754410b6bb976e829e7f37e1c6fdd Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Sat, 10 Sep 2022 08:35:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QcTemplateIndexMobController.java | 46 +++++++ .../com/ktg/mes/qc/domain/QcMobParam.java | 114 ++++++++++++++++++ 2 files changed, 160 insertions(+) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcTemplateIndexMobController.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcMobParam.java diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcTemplateIndexMobController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcTemplateIndexMobController.java new file mode 100644 index 0000000..0f9a934 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcTemplateIndexMobController.java @@ -0,0 +1,46 @@ +package com.ktg.mes.qc.controller; + +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.utils.StringUtils; +import com.ktg.mes.qc.domain.QcMobParam; +import com.ktg.mes.qc.domain.QcTemplate; +import com.ktg.mes.qc.domain.QcTemplateIndex; +import com.ktg.mes.qc.service.IQcTemplateIndexService; +import com.ktg.mes.qc.service.IQcTemplateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/mobile/qc/templateindex") +public class QcTemplateIndexMobController { + + @Autowired + private IQcTemplateService qcTemplateService; + + @Autowired + private IQcTemplateIndexService qcTemplateIndexService; + + /** + * 根据物料产品和质检类型查询对应的质检模板行信息 + */ + @GetMapping("/getLines") + public AjaxResult getLines(QcMobParam param){ + + //根据物料和质检类型查询模板 + QcTemplate template = qcTemplateService.findTemplateByProductIdAndQcType(param); + if(StringUtils.isNull(template)){ + return AjaxResult.error("当前生产的产品未配置此类型的检验模板,请联系质量管理人员!"); + } + + //根据模板查询模板行 + QcTemplateIndex p = new QcTemplateIndex(); + p.setTemplateId(template.getTemplateId()); + List indexList = qcTemplateIndexService.selectQcTemplateIndexList(p); + return AjaxResult.success(indexList); + } + +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcMobParam.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcMobParam.java new file mode 100644 index 0000000..dc3c16c --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcMobParam.java @@ -0,0 +1,114 @@ +package com.ktg.mes.qc.domain; + +import com.ktg.common.core.domain.BaseEntity; + +/** + * 专门用于移动端质量管理各种数据查询的参数传递 + */ +public class QcMobParam extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 检验单的ID,可以是IQC检验单、PQC过程检验单、OQC出货检验单 + */ + private Long qcId; + + /** + * 对应的物料/产品ID + */ + private Long itemId; + + /** + * 对应的物料/产品编码 + */ + private String itemCode; + + /** + * 对应的物料/产品名称 + */ + private String itemName; + + /** + * 检验类型:IQC、FIRST、FINAL、PATROL、CHECK、SELF、FQC、OQC + */ + private String qcType; + + /** + * 检验模板ID + */ + private String templateId; + + /** + * 检验单行ID + */ + private Long lineId; + + public Long getQcId() { + return qcId; + } + + public void setQcId(Long qcId) { + this.qcId = qcId; + } + + public Long getItemId() { + return itemId; + } + + public void setItemId(Long itemId) { + this.itemId = itemId; + } + + public String getItemCode() { + return itemCode; + } + + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getQcType() { + return qcType; + } + + public void setQcType(String qcType) { + this.qcType = qcType; + } + + public String getTemplateId() { + return templateId; + } + + public void setTemplateId(String templateId) { + this.templateId = templateId; + } + + public Long getLineId() { + return lineId; + } + + public void setLineId(Long lineId) { + this.lineId = lineId; + } + + @Override + public String toString() { + return "QcMobParam{" + + "qcId=" + qcId + + ", itemId=" + itemId + + ", itemCode='" + itemCode + '\'' + + ", itemName='" + itemName + '\'' + + ", qcType='" + qcType + '\'' + + ", templateId='" + templateId + '\'' + + ", lineId=" + lineId + + '}'; + } +}