From 1c3347c112708d2428530e4cc60a35c9d4c53aed Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Mon, 29 Aug 2022 22:34:04 +0800 Subject: [PATCH] =?UTF-8?q?IPQC=E7=9A=84=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/qc/controller/QcIpqcController.java | 33 +++++++++++++ .../com/ktg/mes/qc/domain/QcTemplate.java | 47 ++++++++++++------- .../ktg/mes/qc/mapper/QcTemplateMapper.java | 7 +++ .../mes/qc/service/IQcTemplateService.java | 6 +++ .../service/impl/QcTemplateServiceImpl.java | 5 ++ .../resources/mapper/qc/QcTemplateMapper.xml | 8 ++++ 6 files changed, 89 insertions(+), 17 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java index 4f722c8..11aa3ee 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java @@ -4,6 +4,11 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ktg.common.constant.UserConstants; +import com.ktg.common.utils.StringUtils; +import com.ktg.mes.pro.domain.ProWorkorder; +import com.ktg.mes.pro.service.IProWorkorderService; +import com.ktg.mes.qc.domain.QcTemplate; +import com.ktg.mes.qc.service.IQcTemplateService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -36,6 +41,12 @@ public class QcIpqcController extends BaseController @Autowired private IQcIpqcService qcIpqcService; + @Autowired + private IProWorkorderService proWorkorderService; + + @Autowired + private IQcTemplateService qcTemplateService; + /** * 查询过程检验单列表 */ @@ -83,6 +94,28 @@ public class QcIpqcController extends BaseController return AjaxResult.error("检测单编码已存在!"); } + //根据工单获取产品信息 + ProWorkorder workorder = proWorkorderService.selectProWorkorderByWorkorderId(qcIpqc.getWorkorderId()); + qcIpqc.setWorkorderId(workorder.getWorkorderId()); + qcIpqc.setWorkorderCode(workorder.getWorkorderCode()); + qcIpqc.setWorkorderName(workorder.getWorkorderName()); + qcIpqc.setItemId(workorder.getProductId()); + qcIpqc.setItemCode(workorder.getProductCode()); + qcIpqc.setItemName(workorder.getProductName()); + qcIpqc.setSpecification(workorder.getProductSpc()); + qcIpqc.setUnitOfMeasure(workorder.getUnitOfMeasure()); + + //根据产品和检测类型获取检测模板 + QcTemplate param = new QcTemplate(); + param.setQcTypes(qcIpqc.getIpqcType()); + param.setItemId(workorder.getProductId()); + QcTemplate template = qcTemplateService.selectQcTemplateByProductAndQcType(param); + if(StringUtils.isNotNull(template)){ + qcIpqc.setTemplateId(template.getTemplateId()); + }else{ + return AjaxResult.error("当前工单生产的产品未配置此类型的检验模板!"); + } + return toAjax(qcIpqcService.insertQcIpqc(qcIpqc)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplate.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplate.java index f294ef1..6b6c2eb 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplate.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplate.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ktg.common.annotation.Excel; import com.ktg.common.core.domain.BaseEntity; +import java.util.Arrays; + /** * 检测模板对象 qc_template * @@ -35,6 +37,11 @@ public class QcTemplate extends BaseEntity */ private String[] qcTypesParam; + /** + * 物料ID + */ + private Long itemId; + /** 是否启用 */ @Excel(name = "是否启用") private String enableFlag; @@ -105,7 +112,16 @@ public class QcTemplate extends BaseEntity { return enableFlag; } - public void setAttr1(String attr1) + + public Long getItemId() { + return itemId; + } + + public void setItemId(Long itemId) { + this.itemId = itemId; + } + + public void setAttr1(String attr1) { this.attr1 = attr1; } @@ -144,21 +160,18 @@ public class QcTemplate extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("templateId", getTemplateId()) - .append("templateCode", getTemplateCode()) - .append("templateName", getTemplateName()) - .append("qcTypes", getQcTypes()) - .append("enableFlag", getEnableFlag()) - .append("remark", getRemark()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("attr4", getAttr4()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return "QcTemplate{" + + "templateId=" + templateId + + ", templateCode='" + templateCode + '\'' + + ", templateName='" + templateName + '\'' + + ", qcTypes='" + qcTypes + '\'' + + ", qcTypesParam=" + Arrays.toString(qcTypesParam) + + ", itemId=" + itemId + + ", enableFlag='" + enableFlag + '\'' + + ", attr1='" + attr1 + '\'' + + ", attr2='" + attr2 + '\'' + + ", attr3=" + attr3 + + ", attr4=" + attr4 + + '}'; } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateMapper.java b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateMapper.java index 53dd078..e13036d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateMapper.java @@ -28,6 +28,13 @@ public interface QcTemplateMapper public List selectQcTemplateList(QcTemplate qcTemplate); + /** + * 根据检测类型和产品查找对应的检测模板 + * @param qcTemplate + */ + public QcTemplate selectQcTemplateByProductAndQcType(QcTemplate qcTemplate); + + public QcTemplate checkTemplateCodeUnique(QcTemplate qcTemplate); /** diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateService.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateService.java index 098907c..0cd5668 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateService.java @@ -27,6 +27,12 @@ public interface IQcTemplateService */ public List selectQcTemplateList(QcTemplate qcTemplate); + /** + * 根据检测类型和产品查找对应的检测模板 + * @param qcTemplate + */ + public QcTemplate selectQcTemplateByProductAndQcType(QcTemplate qcTemplate); + /** * 检测模板编号是否唯一 * @param qcTemplate diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateServiceImpl.java index 0e5c419..2fb0e72 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateServiceImpl.java @@ -47,6 +47,11 @@ public class QcTemplateServiceImpl implements IQcTemplateService return qcTemplateMapper.selectQcTemplateList(qcTemplate); } + @Override + public QcTemplate selectQcTemplateByProductAndQcType(QcTemplate qcTemplate) { + return qcTemplateMapper.selectQcTemplateByProductAndQcType(qcTemplate); + } + @Override public String checkTemplateCodeUnique(QcTemplate qcTemplate) { QcTemplate template = qcTemplateMapper.checkTemplateCodeUnique(qcTemplate); diff --git a/ktg-mes/src/main/resources/mapper/qc/QcTemplateMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcTemplateMapper.xml index 2c42cd4..90097aa 100644 --- a/ktg-mes/src/main/resources/mapper/qc/QcTemplateMapper.xml +++ b/ktg-mes/src/main/resources/mapper/qc/QcTemplateMapper.xml @@ -45,6 +45,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where template_code = #{templateCode} + + insert into qc_template