来料检验单行

ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcController.java

@@ -5,10 +5,15 @@ import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.collection.CollUtil;
 import com.ktg.common.constant.UserConstants;
+import com.ktg.mes.qc.domain.QcIqcLine;
+import com.ktg.mes.qc.domain.QcTemplateIndex;
 import com.ktg.mes.qc.domain.QcTemplateProduct;
+import com.ktg.mes.qc.service.IQcIqcLineService;
+import com.ktg.mes.qc.service.IQcTemplateIndexService;
 import com.ktg.mes.qc.service.IQcTemplateProductService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -42,6 +47,12 @@ public class QcIqcController extends BaseController
     @Autowired
     private IQcTemplateProductService qcTemplateProductService;
 
+    @Autowired
+    private IQcTemplateIndexService qcTemplateIndexService;
+
+    @Autowired
+    private IQcIqcLineService qcIqcLineService;
+
     /**
      * 查询来料检验单列表
      */
@@ -82,6 +93,7 @@ public class QcIqcController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('mes:qc:iqc:add')")
     @Log(title = "来料检验单", businessType = BusinessType.INSERT)
+    @Transactional
     @PostMapping
     public AjaxResult add(@RequestBody QcIqc qcIqc)
     {
@@ -97,7 +109,11 @@ public class QcIqcController extends BaseController
         }else{
             return AjaxResult.error("当前产品未配置检测模板！");
         }
-        return toAjax(qcIqcService.insertQcIqc(qcIqc));
+        qcIqc.setInspector(getUsername());
+        qcIqcService.insertQcIqc(qcIqc);
+        generateLine(qcIqc);
+        Long iqcId = qcIqc.getIqcId();
+        return AjaxResult.success(iqcId); //将生成的ID返回给页面
     }
 
     /**
@@ -105,6 +121,7 @@ public class QcIqcController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('mes:qc:iqc:edit')")
     @Log(title = "来料检验单", businessType = BusinessType.UPDATE)
+    @Transactional
     @PutMapping
     public AjaxResult edit(@RequestBody QcIqc qcIqc)
     {
@@ -119,7 +136,10 @@ public class QcIqcController extends BaseController
         }else{
             return AjaxResult.error("当前产品未配置检测模板！");
         }
-        return toAjax(qcIqcService.updateQcIqc(qcIqc));
+        qcIqcLineService.deleteByIqcId(qcIqc.getIqcId());
+        int ret = qcIqcService.updateQcIqc(qcIqc);
+        generateLine(qcIqc);
+        return toAjax(ret);
     }
 
     /**
@@ -127,9 +147,46 @@ public class QcIqcController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('mes:qc:iqc:remove')")
     @Log(title = "来料检验单", businessType = BusinessType.DELETE)
+    @Transactional
 	@DeleteMapping("/{iqcIds}")
     public AjaxResult remove(@PathVariable Long[] iqcIds)
     {
+        for (Long iqcId:iqcIds
+             ) {
+            qcIqcLineService.deleteByIqcId(iqcId);
+        }
         return toAjax(qcIqcService.deleteQcIqcByIqcIds(iqcIds));
     }
+
+    /**
+     * 根据头信息生成行信息
+     * @param iqc
+     */
+    private void generateLine(QcIqc iqc){
+        QcTemplateIndex param = new QcTemplateIndex();
+        param.setTemplateId(iqc.getTemplateId());
+        List<QcTemplateIndex > indexs = qcTemplateIndexService.selectQcTemplateIndexList(param);
+        if(CollUtil.isNotEmpty(indexs)){
+            for (QcTemplateIndex index:indexs
+                 ) {
+                QcIqcLine line = new QcIqcLine();
+                line.setIqcId(iqc.getIqcId());
+                line.setIndexId(index.getIndexId());
+                line.setIndexCode(index.getIndexCode());
+                line.setIndexName(index.getIndexName());
+                line.setIndexType(index.getIndexType());
+                line.setQcTool(index.getQcTool());
+                line.setCheckMethod(index.getCheckMethod());
+                line.setStanderVal(index.getStanderVal());
+                line.setUnitOfMeasure(index.getUnitOfMeasure());
+                line.setThresholdMax(index.getThresholdMax());
+                line.setThresholdMin(index.getThresholdMin());
+                line.setCrQuantity(0L);
+                line.setMajQuantity(0L);
+                line.setMajQuantity(0L);
+                qcIqcLineService.insertQcIqcLine(line);
+            }
+        }
+    }
+
 }

ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcLineController.java

@@ -0,0 +1,104 @@
+package com.ktg.mes.qc.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.core.domain.AjaxResult;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.mes.qc.domain.QcIqcLine;
+import com.ktg.mes.qc.service.IQcIqcLineService;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.common.core.page.TableDataInfo;
+
+/**
+ * 来料检验单行Controller
+ * 
+ * @author yinjinlu
+ * @date 2022-05-19
+ */
+@RestController
+@RequestMapping("/mes/qc/iqcline")
+public class QcIqcLineController extends BaseController
+{
+    @Autowired
+    private IQcIqcLineService qcIqcLineService;
+
+    /**
+     * 查询来料检验单行列表
+     */
+    @PreAuthorize("@ss.hasPermi('mes:qc:iqcline:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(QcIqcLine qcIqcLine)
+    {
+        startPage();
+        List<QcIqcLine> list = qcIqcLineService.selectQcIqcLineList(qcIqcLine);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出来料检验单行列表
+     */
+    @PreAuthorize("@ss.hasPermi('mes:qc:iqcline:export')")
+    @Log(title = "来料检验单行", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, QcIqcLine qcIqcLine)
+    {
+        List<QcIqcLine> list = qcIqcLineService.selectQcIqcLineList(qcIqcLine);
+        ExcelUtil<QcIqcLine> util = new ExcelUtil<QcIqcLine>(QcIqcLine.class);
+        util.exportExcel(response, list, "来料检验单行数据");
+    }
+
+    /**
+     * 获取来料检验单行详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('mes:qc:iqcline:query')")
+    @GetMapping(value = "/{lineId}")
+    public AjaxResult getInfo(@PathVariable("lineId") Long lineId)
+    {
+        return AjaxResult.success(qcIqcLineService.selectQcIqcLineByLineId(lineId));
+    }
+
+    /**
+     * 新增来料检验单行
+     */
+    @PreAuthorize("@ss.hasPermi('mes:qc:iqcline:add')")
+    @Log(title = "来料检验单行", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody QcIqcLine qcIqcLine)
+    {
+        return toAjax(qcIqcLineService.insertQcIqcLine(qcIqcLine));
+    }
+
+    /**
+     * 修改来料检验单行
+     */
+    @PreAuthorize("@ss.hasPermi('mes:qc:iqcline:edit')")
+    @Log(title = "来料检验单行", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody QcIqcLine qcIqcLine)
+    {
+        return toAjax(qcIqcLineService.updateQcIqcLine(qcIqcLine));
+    }
+
+    /**
+     * 删除来料检验单行
+     */
+    @PreAuthorize("@ss.hasPermi('mes:qc:iqcline:remove')")
+    @Log(title = "来料检验单行", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{lineIds}")
+    public AjaxResult remove(@PathVariable Long[] lineIds)
+    {
+        return toAjax(qcIqcLineService.deleteQcIqcLineByLineIds(lineIds));
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqc.java

@@ -135,6 +135,8 @@ public class QcIqc extends BaseEntity
     @Excel(name = "检测人员")
     private String inspector;
 
+    private String inspectorName;
+
     /** 单据状态 */
     @Excel(name = "单据状态")
     private String status;
@@ -417,7 +419,15 @@ public class QcIqc extends BaseEntity
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getInspectorName() {
+        return inspectorName;
+    }
+
+    public void setInspectorName(String inspectorName) {
+        this.inspectorName = inspectorName;
+    }
+
+    public String getStatus()
     {
         return status;
     }
@@ -460,46 +470,42 @@ public class QcIqc extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return "QcIqc{" +
-            .append("iqcId", getIqcId())
+                "iqcId=" + iqcId +
-            .append("iqcCode", getIqcCode())
+                ", iqcCode='" + iqcCode + '\'' +
-            .append("iqcName", getIqcName())
+                ", iqcName='" + iqcName + '\'' +
-            .append("templateId", getTemplateId())
+                ", templateId=" + templateId +
-            .append("vendorId", getVendorId())
+                ", vendorId=" + vendorId +
-            .append("vendorCode", getVendorCode())
+                ", vendorCode='" + vendorCode + '\'' +
-            .append("vendorName", getVendorName())
+                ", vendorName='" + vendorName + '\'' +
-            .append("vendorNick", getVendorNick())
+                ", vendorNick='" + vendorNick + '\'' +
-            .append("vendorBatch", getVendorBatch())
+                ", vendorBatch='" + vendorBatch + '\'' +
-            .append("itemId", getItemId())
+                ", itemId=" + itemId +
-            .append("itemCode", getItemCode())
+                ", itemCode='" + itemCode + '\'' +
-            .append("itemName", getItemName())
+                ", itemName='" + itemName + '\'' +
-            .append("specification", getSpecification())
+                ", specification='" + specification + '\'' +
-            .append("unitOfMeasure", getUnitOfMeasure())
+                ", unitOfMeasure='" + unitOfMeasure + '\'' +
-            .append("quantityMinCheck", getQuantityMinCheck())
+                ", quantityMinCheck=" + quantityMinCheck +
-            .append("quantityMaxUnqualified", getQuantityMaxUnqualified())
+                ", quantityMaxUnqualified=" + quantityMaxUnqualified +
-            .append("quantityRecived", getQuantityRecived())
+                ", quantityRecived=" + quantityRecived +
-            .append("quantityCheck", getQuantityCheck())
+                ", quantityCheck=" + quantityCheck +
-            .append("quantityUnqualified", getQuantityUnqualified())
+                ", quantityUnqualified=" + quantityUnqualified +
-            .append("crRate", getCrRate())
+                ", crRate=" + crRate +
-            .append("majRate", getMajRate())
+                ", majRate=" + majRate +
-            .append("minRate", getMinRate())
+                ", minRate=" + minRate +
-            .append("crQuantity", getCrQuantity())
+                ", crQuantity=" + crQuantity +
-            .append("majQuantity", getMajQuantity())
+                ", majQuantity=" + majQuantity +
-            .append("minQuantity", getMinQuantity())
+                ", minQuantity=" + minQuantity +
-            .append("checkResult", getCheckResult())
+                ", checkResult='" + checkResult + '\'' +
-            .append("reciveDate", getReciveDate())
+                ", reciveDate=" + reciveDate +
-            .append("inspectDate", getInspectDate())
+                ", inspectDate=" + inspectDate +
-            .append("inspector", getInspector())
+                ", inspector='" + inspector + '\'' +
-            .append("status", getStatus())
+                ", inspectorName='" + inspectorName + '\'' +
-            .append("remark", getRemark())
+                ", status='" + status + '\'' +
-            .append("attr1", getAttr1())
+                ", attr1='" + attr1 + '\'' +
-            .append("attr2", getAttr2())
+                ", attr2='" + attr2 + '\'' +
-            .append("attr3", getAttr3())
+                ", attr3=" + attr3 +
-            .append("attr4", getAttr4())
+                ", attr4=" + attr4 +
-            .append("createBy", getCreateBy())
+                '}';
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
     }
 }

ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqcLine.java

@@ -0,0 +1,291 @@
+package com.ktg.mes.qc.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.BaseEntity;
+
+/**
+ * 来料检验单行对象 qc_iqc_line
+ * 
+ * @author yinjinlu
+ * @date 2022-05-19
+ */
+public class QcIqcLine extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 记录ID */
+    private Long lineId;
+
+    /** 检验单ID */
+    @Excel(name = "检验单ID")
+    private Long iqcId;
+
+    /** 检测项ID */
+    @Excel(name = "检测项ID")
+    private Long indexId;
+
+    /** 检测项编码 */
+    @Excel(name = "检测项编码")
+    private String indexCode;
+
+    /** 检测项名称 */
+    @Excel(name = "检测项名称")
+    private String indexName;
+
+    /** 检测项类型 */
+    @Excel(name = "检测项类型")
+    private String indexType;
+
+    /** 检测工具 */
+    @Excel(name = "检测工具")
+    private String qcTool;
+
+    /** 检测要求 */
+    @Excel(name = "检测要求")
+    private String checkMethod;
+
+    /** 标准值 */
+    @Excel(name = "标准值")
+    private BigDecimal standerVal;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unitOfMeasure;
+
+    /** 误差上限 */
+    @Excel(name = "误差上限")
+    private BigDecimal thresholdMax;
+
+    /** 误差下限 */
+    @Excel(name = "误差下限")
+    private BigDecimal thresholdMin;
+
+    /** 致命缺陷数量 */
+    @Excel(name = "致命缺陷数量")
+    private Long crQuantity;
+
+    /** 严重缺陷数量 */
+    @Excel(name = "严重缺陷数量")
+    private Long majQuantity;
+
+    /** 轻微缺陷数量 */
+    @Excel(name = "轻微缺陷数量")
+    private Long minQuantity;
+
+    /** 预留字段1 */
+    private String attr1;
+
+    /** 预留字段2 */
+    private String attr2;
+
+    /** 预留字段3 */
+    private Long attr3;
+
+    /** 预留字段4 */
+    private Long attr4;
+
+    public void setLineId(Long lineId) 
+    {
+        this.lineId = lineId;
+    }
+
+    public Long getLineId() 
+    {
+        return lineId;
+    }
+    public void setIqcId(Long iqcId) 
+    {
+        this.iqcId = iqcId;
+    }
+
+    public Long getIqcId() 
+    {
+        return iqcId;
+    }
+    public void setIndexId(Long indexId) 
+    {
+        this.indexId = indexId;
+    }
+
+    public Long getIndexId() 
+    {
+        return indexId;
+    }
+    public void setIndexCode(String indexCode) 
+    {
+        this.indexCode = indexCode;
+    }
+
+    public String getIndexCode() 
+    {
+        return indexCode;
+    }
+    public void setIndexName(String indexName) 
+    {
+        this.indexName = indexName;
+    }
+
+    public String getIndexName() 
+    {
+        return indexName;
+    }
+    public void setIndexType(String indexType) 
+    {
+        this.indexType = indexType;
+    }
+
+    public String getIndexType() 
+    {
+        return indexType;
+    }
+    public void setQcTool(String qcTool) 
+    {
+        this.qcTool = qcTool;
+    }
+
+    public String getQcTool() 
+    {
+        return qcTool;
+    }
+    public void setCheckMethod(String checkMethod) 
+    {
+        this.checkMethod = checkMethod;
+    }
+
+    public String getCheckMethod() 
+    {
+        return checkMethod;
+    }
+    public void setStanderVal(BigDecimal standerVal) 
+    {
+        this.standerVal = standerVal;
+    }
+
+    public BigDecimal getStanderVal() 
+    {
+        return standerVal;
+    }
+    public void setUnitOfMeasure(String unitOfMeasure) 
+    {
+        this.unitOfMeasure = unitOfMeasure;
+    }
+
+    public String getUnitOfMeasure() 
+    {
+        return unitOfMeasure;
+    }
+    public void setThresholdMax(BigDecimal thresholdMax) 
+    {
+        this.thresholdMax = thresholdMax;
+    }
+
+    public BigDecimal getThresholdMax() 
+    {
+        return thresholdMax;
+    }
+    public void setThresholdMin(BigDecimal thresholdMin) 
+    {
+        this.thresholdMin = thresholdMin;
+    }
+
+    public BigDecimal getThresholdMin() 
+    {
+        return thresholdMin;
+    }
+    public void setCrQuantity(Long crQuantity) 
+    {
+        this.crQuantity = crQuantity;
+    }
+
+    public Long getCrQuantity() 
+    {
+        return crQuantity;
+    }
+    public void setMajQuantity(Long majQuantity) 
+    {
+        this.majQuantity = majQuantity;
+    }
+
+    public Long getMajQuantity() 
+    {
+        return majQuantity;
+    }
+    public void setMinQuantity(Long minQuantity) 
+    {
+        this.minQuantity = minQuantity;
+    }
+
+    public Long getMinQuantity() 
+    {
+        return minQuantity;
+    }
+    public void setAttr1(String attr1) 
+    {
+        this.attr1 = attr1;
+    }
+
+    public String getAttr1() 
+    {
+        return attr1;
+    }
+    public void setAttr2(String attr2) 
+    {
+        this.attr2 = attr2;
+    }
+
+    public String getAttr2() 
+    {
+        return attr2;
+    }
+    public void setAttr3(Long attr3) 
+    {
+        this.attr3 = attr3;
+    }
+
+    public Long getAttr3() 
+    {
+        return attr3;
+    }
+    public void setAttr4(Long attr4) 
+    {
+        this.attr4 = attr4;
+    }
+
+    public Long getAttr4() 
+    {
+        return attr4;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("lineId", getLineId())
+            .append("iqcId", getIqcId())
+            .append("indexId", getIndexId())
+            .append("indexCode", getIndexCode())
+            .append("indexName", getIndexName())
+            .append("indexType", getIndexType())
+            .append("qcTool", getQcTool())
+            .append("checkMethod", getCheckMethod())
+            .append("standerVal", getStanderVal())
+            .append("unitOfMeasure", getUnitOfMeasure())
+            .append("thresholdMax", getThresholdMax())
+            .append("thresholdMin", getThresholdMin())
+            .append("crQuantity", getCrQuantity())
+            .append("majQuantity", getMajQuantity())
+            .append("minQuantity", getMinQuantity())
+            .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();
+    }
+}

ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIqcLineMapper.java

@@ -0,0 +1,63 @@
+package com.ktg.mes.qc.mapper;
+
+import java.util.List;
+import com.ktg.mes.qc.domain.QcIqcLine;
+
+/**
+ * 来料检验单行Mapper接口
+ * 
+ * @author yinjinlu
+ * @date 2022-05-19
+ */
+public interface QcIqcLineMapper 
+{
+    /**
+     * 查询来料检验单行
+     * 
+     * @param lineId 来料检验单行主键
+     * @return 来料检验单行
+     */
+    public QcIqcLine selectQcIqcLineByLineId(Long lineId);
+
+    /**
+     * 查询来料检验单行列表
+     * 
+     * @param qcIqcLine 来料检验单行
+     * @return 来料检验单行集合
+     */
+    public List<QcIqcLine> selectQcIqcLineList(QcIqcLine qcIqcLine);
+
+    /**
+     * 新增来料检验单行
+     * 
+     * @param qcIqcLine 来料检验单行
+     * @return 结果
+     */
+    public int insertQcIqcLine(QcIqcLine qcIqcLine);
+
+    /**
+     * 修改来料检验单行
+     * 
+     * @param qcIqcLine 来料检验单行
+     * @return 结果
+     */
+    public int updateQcIqcLine(QcIqcLine qcIqcLine);
+
+    /**
+     * 删除来料检验单行
+     * 
+     * @param lineId 来料检验单行主键
+     * @return 结果
+     */
+    public int deleteQcIqcLineByLineId(Long lineId);
+
+    public int deleteByIqcId(Long iqcId);
+
+    /**
+     * 批量删除来料检验单行
+     * 
+     * @param lineIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteQcIqcLineByLineIds(Long[] lineIds);
+}

ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIqcLineService.java

@@ -0,0 +1,69 @@
+package com.ktg.mes.qc.service;
+
+import java.util.List;
+import com.ktg.mes.qc.domain.QcIqcLine;
+
+/**
+ * 来料检验单行Service接口
+ * 
+ * @author yinjinlu
+ * @date 2022-05-19
+ */
+public interface IQcIqcLineService 
+{
+    /**
+     * 查询来料检验单行
+     * 
+     * @param lineId 来料检验单行主键
+     * @return 来料检验单行
+     */
+    public QcIqcLine selectQcIqcLineByLineId(Long lineId);
+
+    /**
+     * 查询来料检验单行列表
+     * 
+     * @param qcIqcLine 来料检验单行
+     * @return 来料检验单行集合
+     */
+    public List<QcIqcLine> selectQcIqcLineList(QcIqcLine qcIqcLine);
+
+    /**
+     * 新增来料检验单行
+     * 
+     * @param qcIqcLine 来料检验单行
+     * @return 结果
+     */
+    public int insertQcIqcLine(QcIqcLine qcIqcLine);
+
+    /**
+     * 修改来料检验单行
+     * 
+     * @param qcIqcLine 来料检验单行
+     * @return 结果
+     */
+    public int updateQcIqcLine(QcIqcLine qcIqcLine);
+
+    /**
+     * 批量删除来料检验单行
+     * 
+     * @param lineIds 需要删除的来料检验单行主键集合
+     * @return 结果
+     */
+    public int deleteQcIqcLineByLineIds(Long[] lineIds);
+
+    /**
+     * 删除所有行信息
+     * @param iqcId
+     * @return
+     */
+    public int deleteByIqcId(Long iqcId);
+
+
+    /**
+     * 删除来料检验单行信息
+     * 
+     * @param lineId 来料检验单行主键
+     * @return 结果
+     */
+    public int deleteQcIqcLineByLineId(Long lineId);
+}

ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIqcLineServiceImpl.java

@@ -0,0 +1,101 @@
+package com.ktg.mes.qc.service.impl;
+
+import java.util.List;
+import com.ktg.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ktg.mes.qc.mapper.QcIqcLineMapper;
+import com.ktg.mes.qc.domain.QcIqcLine;
+import com.ktg.mes.qc.service.IQcIqcLineService;
+
+/**
+ * 来料检验单行Service业务层处理
+ * 
+ * @author yinjinlu
+ * @date 2022-05-19
+ */
+@Service
+public class QcIqcLineServiceImpl implements IQcIqcLineService 
+{
+    @Autowired
+    private QcIqcLineMapper qcIqcLineMapper;
+
+    /**
+     * 查询来料检验单行
+     * 
+     * @param lineId 来料检验单行主键
+     * @return 来料检验单行
+     */
+    @Override
+    public QcIqcLine selectQcIqcLineByLineId(Long lineId)
+    {
+        return qcIqcLineMapper.selectQcIqcLineByLineId(lineId);
+    }
+
+    /**
+     * 查询来料检验单行列表
+     * 
+     * @param qcIqcLine 来料检验单行
+     * @return 来料检验单行
+     */
+    @Override
+    public List<QcIqcLine> selectQcIqcLineList(QcIqcLine qcIqcLine)
+    {
+        return qcIqcLineMapper.selectQcIqcLineList(qcIqcLine);
+    }
+
+    /**
+     * 新增来料检验单行
+     * 
+     * @param qcIqcLine 来料检验单行
+     * @return 结果
+     */
+    @Override
+    public int insertQcIqcLine(QcIqcLine qcIqcLine)
+    {
+        qcIqcLine.setCreateTime(DateUtils.getNowDate());
+        return qcIqcLineMapper.insertQcIqcLine(qcIqcLine);
+    }
+
+    /**
+     * 修改来料检验单行
+     * 
+     * @param qcIqcLine 来料检验单行
+     * @return 结果
+     */
+    @Override
+    public int updateQcIqcLine(QcIqcLine qcIqcLine)
+    {
+        qcIqcLine.setUpdateTime(DateUtils.getNowDate());
+        return qcIqcLineMapper.updateQcIqcLine(qcIqcLine);
+    }
+
+    /**
+     * 批量删除来料检验单行
+     * 
+     * @param lineIds 需要删除的来料检验单行主键
+     * @return 结果
+     */
+    @Override
+    public int deleteQcIqcLineByLineIds(Long[] lineIds)
+    {
+        return qcIqcLineMapper.deleteQcIqcLineByLineIds(lineIds);
+    }
+
+    @Override
+    public int deleteByIqcId(Long iqcId) {
+        return qcIqcLineMapper.deleteByIqcId(iqcId);
+    }
+
+    /**
+     * 删除来料检验单行信息
+     * 
+     * @param lineId 来料检验单行主键
+     * @return 结果
+     */
+    @Override
+    public int deleteQcIqcLineByLineId(Long lineId)
+    {
+        return qcIqcLineMapper.deleteQcIqcLineByLineId(lineId);
+    }
+}

ktg-mes/src/main/resources/mapper/qc/QcIqcLineMapper.xml

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.mes.qc.mapper.QcIqcLineMapper">
+    
+    <resultMap type="QcIqcLine" id="QcIqcLineResult">
+        <result property="lineId"    column="line_id"    />
+        <result property="iqcId"    column="iqc_id"    />
+        <result property="indexId"    column="index_id"    />
+        <result property="indexCode"    column="index_code"    />
+        <result property="indexName"    column="index_name"    />
+        <result property="indexType"    column="index_type"    />
+        <result property="qcTool"    column="qc_tool"    />
+        <result property="checkMethod"    column="check_method"    />
+        <result property="standerVal"    column="stander_val"    />
+        <result property="unitOfMeasure"    column="unit_of_measure"    />
+        <result property="thresholdMax"    column="threshold_max"    />
+        <result property="thresholdMin"    column="threshold_min"    />
+        <result property="crQuantity"    column="cr_quantity"    />
+        <result property="majQuantity"    column="maj_quantity"    />
+        <result property="minQuantity"    column="min_quantity"    />
+        <result property="remark"    column="remark"    />
+        <result property="attr1"    column="attr1"    />
+        <result property="attr2"    column="attr2"    />
+        <result property="attr3"    column="attr3"    />
+        <result property="attr4"    column="attr4"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectQcIqcLineVo">
+        select line_id, iqc_id, index_id, index_code, index_name, index_type, qc_tool, check_method, stander_val, unit_of_measure, threshold_max, threshold_min, cr_quantity, maj_quantity, min_quantity, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_iqc_line
+    </sql>
+
+    <select id="selectQcIqcLineList" parameterType="QcIqcLine" resultMap="QcIqcLineResult">
+        <include refid="selectQcIqcLineVo"/>
+        <where>  
+            <if test="iqcId != null "> and iqc_id = #{iqcId}</if>
+            <if test="indexId != null "> and index_id = #{indexId}</if>
+            <if test="indexCode != null  and indexCode != ''"> and index_code = #{indexCode}</if>
+            <if test="indexName != null  and indexName != ''"> and index_name like concat('%', #{indexName}, '%')</if>
+            <if test="indexType != null  and indexType != ''"> and index_type = #{indexType}</if>
+            <if test="qcTool != null  and qcTool != ''"> and qc_tool = #{qcTool}</if>
+            <if test="checkMethod != null  and checkMethod != ''"> and check_method = #{checkMethod}</if>
+            <if test="standerVal != null "> and stander_val = #{standerVal}</if>
+            <if test="unitOfMeasure != null  and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="thresholdMax != null "> and threshold_max = #{thresholdMax}</if>
+            <if test="thresholdMin != null "> and threshold_min = #{thresholdMin}</if>
+            <if test="crQuantity != null "> and cr_quantity = #{crQuantity}</if>
+            <if test="majQuantity != null "> and maj_quantity = #{majQuantity}</if>
+            <if test="minQuantity != null "> and min_quantity = #{minQuantity}</if>
+        </where>
+    </select>
+    
+    <select id="selectQcIqcLineByLineId" parameterType="Long" resultMap="QcIqcLineResult">
+        <include refid="selectQcIqcLineVo"/>
+        where line_id = #{lineId}
+    </select>
+        
+    <insert id="insertQcIqcLine" parameterType="QcIqcLine" useGeneratedKeys="true" keyProperty="lineId">
+        insert into qc_iqc_line
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="iqcId != null">iqc_id,</if>
+            <if test="indexId != null">index_id,</if>
+            <if test="indexCode != null">index_code,</if>
+            <if test="indexName != null">index_name,</if>
+            <if test="indexType != null">index_type,</if>
+            <if test="qcTool != null">qc_tool,</if>
+            <if test="checkMethod != null">check_method,</if>
+            <if test="standerVal != null">stander_val,</if>
+            <if test="unitOfMeasure != null">unit_of_measure,</if>
+            <if test="thresholdMax != null">threshold_max,</if>
+            <if test="thresholdMin != null">threshold_min,</if>
+            <if test="crQuantity != null">cr_quantity,</if>
+            <if test="majQuantity != null">maj_quantity,</if>
+            <if test="minQuantity != null">min_quantity,</if>
+            <if test="remark != null">remark,</if>
+            <if test="attr1 != null">attr1,</if>
+            <if test="attr2 != null">attr2,</if>
+            <if test="attr3 != null">attr3,</if>
+            <if test="attr4 != null">attr4,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="iqcId != null">#{iqcId},</if>
+            <if test="indexId != null">#{indexId},</if>
+            <if test="indexCode != null">#{indexCode},</if>
+            <if test="indexName != null">#{indexName},</if>
+            <if test="indexType != null">#{indexType},</if>
+            <if test="qcTool != null">#{qcTool},</if>
+            <if test="checkMethod != null">#{checkMethod},</if>
+            <if test="standerVal != null">#{standerVal},</if>
+            <if test="unitOfMeasure != null">#{unitOfMeasure},</if>
+            <if test="thresholdMax != null">#{thresholdMax},</if>
+            <if test="thresholdMin != null">#{thresholdMin},</if>
+            <if test="crQuantity != null">#{crQuantity},</if>
+            <if test="majQuantity != null">#{majQuantity},</if>
+            <if test="minQuantity != null">#{minQuantity},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="attr1 != null">#{attr1},</if>
+            <if test="attr2 != null">#{attr2},</if>
+            <if test="attr3 != null">#{attr3},</if>
+            <if test="attr4 != null">#{attr4},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateQcIqcLine" parameterType="QcIqcLine">
+        update qc_iqc_line
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="iqcId != null">iqc_id = #{iqcId},</if>
+            <if test="indexId != null">index_id = #{indexId},</if>
+            <if test="indexCode != null">index_code = #{indexCode},</if>
+            <if test="indexName != null">index_name = #{indexName},</if>
+            <if test="indexType != null">index_type = #{indexType},</if>
+            <if test="qcTool != null">qc_tool = #{qcTool},</if>
+            <if test="checkMethod != null">check_method = #{checkMethod},</if>
+            <if test="standerVal != null">stander_val = #{standerVal},</if>
+            <if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
+            <if test="thresholdMax != null">threshold_max = #{thresholdMax},</if>
+            <if test="thresholdMin != null">threshold_min = #{thresholdMin},</if>
+            <if test="crQuantity != null">cr_quantity = #{crQuantity},</if>
+            <if test="majQuantity != null">maj_quantity = #{majQuantity},</if>
+            <if test="minQuantity != null">min_quantity = #{minQuantity},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="attr1 != null">attr1 = #{attr1},</if>
+            <if test="attr2 != null">attr2 = #{attr2},</if>
+            <if test="attr3 != null">attr3 = #{attr3},</if>
+            <if test="attr4 != null">attr4 = #{attr4},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where line_id = #{lineId}
+    </update>
+
+    <delete id="deleteQcIqcLineByLineId" parameterType="Long">
+        delete from qc_iqc_line where line_id = #{lineId}
+    </delete>
+
+    <delete id="deleteByIqcId" parameterType="Long">
+        delete from qc_iqc_line where iqc_id =#{iqcId}
+    </delete>
+
+    <delete id="deleteQcIqcLineByLineIds" parameterType="String">
+        delete from qc_iqc_line where line_id in 
+        <foreach item="lineId" collection="array" open="(" separator="," close=")">
+            #{lineId}
+        </foreach>
+    </delete>
+</mapper>

ktg-mes/src/main/resources/mapper/qc/QcIqcMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reciveDate"    column="recive_date"    />
         <result property="inspectDate"    column="inspect_date"    />
         <result property="inspector"    column="inspector"    />
+        <result property="inspectorName" column="inspector_name"    />
         <result property="status"    column="status"    />
         <result property="remark"    column="remark"    />
         <result property="attr1"    column="attr1"    />
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQcIqcVo">
-        select iqc_id, iqc_code, iqc_name, template_id, vendor_id, vendor_code, vendor_name, vendor_nick, vendor_batch, item_id, item_code, item_name, specification, unit_of_measure, quantity_min_check, quantity_max_unqualified, quantity_recived, quantity_check, quantity_unqualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, recive_date, inspect_date, inspector, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_iqc
+        select iqc_id, iqc_code, iqc_name, template_id, vendor_id, vendor_code, vendor_name, vendor_nick, vendor_batch, item_id, item_code, item_name, specification, unit_of_measure, quantity_min_check, quantity_max_unqualified, quantity_recived, quantity_check, quantity_unqualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, recive_date, inspect_date, inspector,u.nick_name as inspector_name, q.status, q.remark, attr1, attr2, attr3, attr4, q.create_by, q.create_time, q.update_by, q.update_time from qc_iqc q left join sys_user u on u.user_name = q.inspector
     </sql>
 
     <select id="selectQcIqcList" parameterType="QcIqc" resultMap="QcIqcResult">