diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java index b70e6eee..07a6b718 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java @@ -93,6 +93,10 @@ public class MesBaseBarcodeInfo extends BaseEntity @Excel(name = "生产计划明细编号，关联mes_product_plan_detail的plan_detail_code;适合生产出入库等") private String planDetailCode; + /** 销售订单编号;适合生产出入库等 */ + @Excel(name = "销售订单ID;适合生产出入库等") + private String saleOrderId; + /** 销售订单编号;适合生产出入库等 */ @Excel(name = "销售订单编号;适合生产出入库等") private String saleorderCode; @@ -280,6 +284,15 @@ public class MesBaseBarcodeInfo extends BaseEntity { return planDetailCode; } + + public String getSaleOrderId() { + return saleOrderId; + } + + public void setSaleOrderId(String saleOrderId) { + this.saleOrderId = saleOrderId; + } + public void setSaleorderCode(String saleorderCode) { this.saleorderCode = saleorderCode; diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/HwQmsApplication.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/HwQmsApplication.java index 25b10c4a..0e478061 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/HwQmsApplication.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/HwQmsApplication.java @@ -20,7 +20,7 @@ public class HwQmsApplication public static void main(String[] args) { SpringApplication.run(HwQmsApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 能源模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + + System.out.println("(♥◠‿◠)ﾉﾞ 质检模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java index dfe4d0b6..ab413305 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java @@ -1,56 +1,138 @@ package com.hw.qms.controller; +import com.hw.common.core.constant.QmsConstants; import com.hw.common.core.exception.ServiceException; +import com.hw.common.core.web.controller.BaseController; import com.hw.common.core.web.domain.AjaxResult; import com.hw.common.core.web.page.TableDataInfo; +import com.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; import com.hw.common.security.annotation.RequiresPermissions; -import com.hw.qms.domain.MesBaseBarcodeInfo; -import com.hw.qms.domain.QmsCheckRule; -import com.hw.qms.domain.QmsCheckRuleProject; +import com.hw.qms.domain.*; +import com.hw.qms.domain.vo.QmsCheckResultDetailVo; import com.hw.qms.domain.vo.QmsMaterialCheckVo; import com.hw.qms.service.IMesBaseBarcodeInfoService; -import com.hw.qms.service.IQmsCheckRuleProjectService; +import com.hw.qms.service.IQmsCheckResultDetailService; +import com.hw.qms.service.IQmsCheckResultService; import com.hw.qms.service.IQmsCheckRuleService; 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 org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Description:PDA接口 + * @Description:质检PDA接口 * @ProjectName:HwMes * @Author:xins * @Date:2024-01-26 10:18 * @Version:1.0 */ @RestController -@RequestMapping("/qms/mobile") -public class QmsMobileController { - +@RequestMapping("/mobile") +public class QmsMobileController extends BaseController { @Autowired - private IQmsCheckRuleProjectService qmsCheckRuleProjectService; + private IQmsCheckRuleService qmsCheckRuleService; + @Autowired + private IQmsCheckResultService qmsCheckResultService; + @Autowired + private IQmsCheckResultDetailService qmsCheckResultDetailService; @Autowired private IMesBaseBarcodeInfoService mesBaseBarcodeInfoService; + /** + * 获取质检结果详情 + */ +// @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getCheckResultDetail") + public AjaxResult getCheckResultDetail(QmsMaterialCheckVo qmsMaterialCheckVo) { + Long checkResultDetailId = qmsMaterialCheckVo.getCheckResultDetailId(); + if (checkResultDetailId != null) {//如果是通过列表页点击进来则根据ID获取 + return success(qmsCheckResultDetailService.selectQmsCheckResultDetailByCheckResultDetailId(checkResultDetailId)); + } + + //扫描物料条码进入获取 + String materialBarcode = qmsMaterialCheckVo.getMaterialBarcode(); + QmsCheckResultDetail qmsCheckResultDetail = qmsCheckResultDetailService.getCheckResultDetail(materialBarcode); + if (qmsCheckResultDetail != null) {//如果有质检结果，则返回已经保存的质检结果，否则返回需要质检的项目 + return success(qmsCheckResultDetail); + } else { + MesBaseBarcodeInfo baseBarcodeInfo = mesBaseBarcodeInfoService.selectMesBaseBarcodeInfoByBarcodeInfo(materialBarcode); + if (baseBarcodeInfo == null) { + throw new ServiceException("此物料条码系统中不存在"); + } + Long materialId = baseBarcodeInfo.getMaterialId(); + QmsCheckRuleDetail queryCheckRuleDetail = new QmsCheckRuleDetail(); + queryCheckRuleDetail.setTargetId(materialId); + queryCheckRuleDetail.setTargetType(QmsConstants.QMS_CHECK_RULE_DETAIL_TARGET_TYPE_MATERIAL); + QmsCheckRule qmsCheckRule = qmsCheckRuleService.selectQmsCheckRuleByTarget(queryCheckRuleDetail); + Long checkResultId = qmsCheckResultService.insertCheckResult(baseBarcodeInfo, qmsCheckRule); + qmsCheckRule.setCheckResultId(checkResultId); + return success(qmsCheckRule); + } + } + + + /** + * 新增质检结果详情 + */ +// @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "质检结果详情", businessType = BusinessType.INSERT) + @PostMapping("/saveCheckResultDetail") + public AjaxResult saveCheckResultDetail(@RequestBody QmsCheckResultDetail qmsCheckResultDetail) { + if (qmsCheckResultDetail.getCheckResultDetailId() == null) { + return toAjax(qmsCheckResultDetailService.insertQmsCheckResultDetail(qmsCheckResultDetail)); + } else { + return toAjax(qmsCheckResultDetailService.updateQmsCheckResultDetail(qmsCheckResultDetail)); + } + + } + + /** * 获取质检结果 */ // @RequiresPermissions("qms:checkrule:list") - @GetMapping("/getCheckResult") - public AjaxResult getCheckResult(QmsMaterialCheckVo qmsMaterialCheckVo) { - String materialBarcode = qmsMaterialCheckVo.getMaterialBarcode(); - MesBaseBarcodeInfo baseBarcodeInfo = mesBaseBarcodeInfoService.selectMesBaseBarcodeInfoByBarcodeInfo(materialBarcode); - if (baseBarcodeInfo == null) { - throw new ServiceException("此物料条码系统中不存在"); - } - - - Long materialId = baseBarcodeInfo.getMaterialId(); - - List checkRuleProjects = qmsCheckRuleProjectService.getCheckRuleProjects(materialId); - return null; - + @GetMapping("/getCheckResults") + public TableDataInfo getCheckResults(QmsCheckResult qmsCheckResult) { + startPage(); + List list = qmsCheckResultService.selectQmsCheckResultJoinList(qmsCheckResult); + return getDataTable(list); } + + /** + * 获取批次质检结果信息 + */ +// @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getCheckResult") + public AjaxResult getCheckResult(QmsCheckResult qmsCheckResult) { + QmsCheckResultDetailVo qmsCheckResultDetailVo = qmsCheckResultDetailService.getCheckResultDetailVo(qmsCheckResult.getCheckResultId()); + int batchAmount = mesBaseBarcodeInfoService.selectBarcodeInfoCountByBatchcode(qmsCheckResult.getMaterialBatch()); + qmsCheckResultDetailVo.setBatchAmount(batchAmount); + qmsCheckResultDetailVo.setCheckMode(qmsCheckResult.getCheckMode()); + qmsCheckResultDetailVo.setCheckSample(qmsCheckResult.getCheckSample()); + return success(qmsCheckResultDetailVo); + } + + /** + * 获取批次质检结果详情列表 + */ +// @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getCheckResultDetails") + public TableDataInfo getCheckResultDetails(QmsCheckResultDetail qmsCheckResultDetail) { + startPage(); + List list = qmsCheckResultDetailService.selectQmsCheckResultDetailList(qmsCheckResultDetail); + return getDataTable(list); + } + + + /** + * 新增质检结果详情 + */ +// @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "质检结果", businessType = BusinessType.AUDIT) + @PostMapping("/auditCheckResult") + public AjaxResult auditCheckResult(@RequestBody QmsCheckResult qmsCheckResult) { + return toAjax(qmsCheckResultService.auditQmsCheckResult(qmsCheckResult)); + } + } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/MesBaseBarcodeInfo.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/MesBaseBarcodeInfo.java index 9d729365..a2b3bd86 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/MesBaseBarcodeInfo.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/MesBaseBarcodeInfo.java @@ -94,6 +94,9 @@ public class MesBaseBarcodeInfo extends BaseEntity @Excel(name = "生产计划明细编号，关联mes_product_plan_detail的plan_detail_code;适合生产出入库等") private String planDetailCode; + /** 销售订单ID;适合生产出入库等 */ + private String saleOrderId; + /** 销售订单编号;适合生产出入库等 */ @Excel(name = "销售订单编号;适合生产出入库等") private String saleorderCode; @@ -119,6 +122,10 @@ public class MesBaseBarcodeInfo extends BaseEntity @Excel(name = "绑定托盘时间", width = 30, dateFormat = "yyyy-MM-dd") private Date bindTime; + private String materialCode; + + private String materialName; + public void setBarcodeId(Long barcodeId) { this.barcodeId = barcodeId; @@ -281,6 +288,15 @@ public class MesBaseBarcodeInfo extends BaseEntity { return planDetailCode; } + + public String getSaleOrderId() { + return saleOrderId; + } + + public void setSaleOrderId(String saleOrderId) { + this.saleOrderId = saleOrderId; + } + public void setSaleorderCode(String saleorderCode) { this.saleorderCode = saleorderCode; @@ -336,6 +352,22 @@ public class MesBaseBarcodeInfo extends BaseEntity return bindTime; } + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResult.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResult.java index 26f656ee..032def4b 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResult.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResult.java @@ -9,7 +9,7 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 质检结果对象 qms_check_result - * + * * @author xins * @date 2024-01-23 */ @@ -20,6 +20,9 @@ public class QmsCheckResult extends BaseEntity /** 质检结果ID */ private Long checkResultId; + /** 质检规则ID */ + private Long checkRuleId; + /** 物料类型(1:原材料,2:半成品,3:成品) */ @Excel(name = "物料类型(1:原材料,2:半成品,3:成品)") private String materialType; @@ -48,6 +51,10 @@ public class QmsCheckResult extends BaseEntity @Excel(name = "生产计划明细编号") private String planDetailCode; + /** 销售订单ID */ + @Excel(name = "销售订单ID") + private String saleOrderId; + /** 销售订单编号 */ @Excel(name = "销售订单编号") private String saleorderCode; @@ -69,137 +76,158 @@ public class QmsCheckResult extends BaseEntity private String checkStatus; /** 预留字段1 */ - @Excel(name = "预留字段1") - private String attr1; + @Excel(name = "检验规则名称") + private String checkRuleName; + + private String materialCode; + + private String materialName; /** 质检结果详情信息 */ private List qmsCheckResultDetailList; - public void setCheckResultId(Long checkResultId) + public void setCheckResultId(Long checkResultId) { this.checkResultId = checkResultId; } - public Long getCheckResultId() + public Long getCheckResultId() { return checkResultId; } - public void setMaterialType(String materialType) + + public Long getCheckRuleId() { + return checkRuleId; + } + + public void setCheckRuleId(Long checkRuleId) { + this.checkRuleId = checkRuleId; + } + + public void setMaterialType(String materialType) { this.materialType = materialType; } - public String getMaterialType() + public String getMaterialType() { return materialType; } - public void setMaterialId(Long materialId) + public void setMaterialId(Long materialId) { this.materialId = materialId; } - public Long getMaterialId() + public Long getMaterialId() { return materialId; } - public void setMaterialBatch(String materialBatch) + public void setMaterialBatch(String materialBatch) { this.materialBatch = materialBatch; } - public String getMaterialBatch() + public String getMaterialBatch() { return materialBatch; } - public void setCheckMode(String checkMode) + public void setCheckMode(String checkMode) { this.checkMode = checkMode; } - public String getCheckMode() + public String getCheckMode() { return checkMode; } - public void setCheckSample(BigDecimal checkSample) + public void setCheckSample(BigDecimal checkSample) { this.checkSample = checkSample; } - public BigDecimal getCheckSample() + public BigDecimal getCheckSample() { return checkSample; } - public void setPlanCode(String planCode) + public void setPlanCode(String planCode) { this.planCode = planCode; } - public String getPlanCode() + public String getPlanCode() { return planCode; } - public void setPlanDetailCode(String planDetailCode) + public void setPlanDetailCode(String planDetailCode) { this.planDetailCode = planDetailCode; } - public String getPlanDetailCode() + public String getPlanDetailCode() { return planDetailCode; } - public void setSaleorderCode(String saleorderCode) + + public String getSaleOrderId() { + return saleOrderId; + } + + public void setSaleOrderId(String saleOrderId) { + this.saleOrderId = saleOrderId; + } + + public void setSaleorderCode(String saleorderCode) { this.saleorderCode = saleorderCode; } - public String getSaleorderCode() + public String getSaleorderCode() { return saleorderCode; } - public void setPoNo(String poNo) + public void setPoNo(String poNo) { this.poNo = poNo; } - public String getPoNo() + public String getPoNo() { return poNo; } - public void setPoLine(String poLine) + public void setPoLine(String poLine) { this.poLine = poLine; } - public String getPoLine() + public String getPoLine() { return poLine; } - public void setProjectNo(String projectNo) + public void setProjectNo(String projectNo) { this.projectNo = projectNo; } - public String getProjectNo() + public String getProjectNo() { return projectNo; } - public void setCheckStatus(String checkStatus) + public void setCheckStatus(String checkStatus) { this.checkStatus = checkStatus; } - public String getCheckStatus() + public String getCheckStatus() { return checkStatus; } - public void setAttr1(String attr1) - { - this.attr1 = attr1; + + public String getCheckRuleName() { + return checkRuleName; } - public String getAttr1() - { - return attr1; + public void setCheckRuleName(String checkRuleName) { + this.checkRuleName = checkRuleName; } public List getQmsCheckResultDetailList() @@ -212,6 +240,22 @@ public class QmsCheckResult extends BaseEntity this.qmsCheckResultDetailList = qmsCheckResultDetailList; } + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -233,7 +277,7 @@ public class QmsCheckResult extends BaseEntity .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) - .append("attr1", getAttr1()) + .append("checkRuleName", getCheckRuleName()) .append("qmsCheckResultDetailList", getQmsCheckResultDetailList()) .toString(); } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetail.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetail.java index eed83470..a6189bc9 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetail.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetail.java @@ -1,5 +1,6 @@ package com.hw.qms.domain; +import java.math.BigDecimal; import java.util.List; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -27,6 +28,30 @@ public class QmsCheckResultDetail extends BaseEntity @Excel(name = "物料条码") private String materialBarcode; + /** 物料ID，关联物料主键 */ + @Excel(name = "物料ID，关联物料主键") + private Long materialId; + + /** 检验规则ID(冗余，与质检结果中值相同),关联检验规则主键 */ + @Excel(name = "检验规则ID(冗余，与质检结果中值相同),关联检验规则主键") + private Long checkRuleId; + + /** 冗余，检验规则类型(1来料检验,2,半成品检验，3成品检验,4工序检验) */ + @Excel(name = "冗余，检验规则类型(1来料检验,2,半成品检验，3成品检验,4工序检验)") + private String checkRuleType; + + /** 冗余，检验规则名称 */ + @Excel(name = "冗余，检验规则名称") + private String checkRuleName; + + /** 冗余，检验方式(1,全检2,抽检) */ + @Excel(name = "冗余，检验方式(1,全检2,抽检)") + private String checkMode; + + /** 冗余，抽检比例 */ + @Excel(name = "冗余，抽检比例") + private BigDecimal checkSample; + /** 检验状态(0待检验,1检验中,2质检通过,3质检不通过) */ @Excel(name = "检验状态(0待检验,1检验中,2质检通过,3质检不通过)") private String checkStatus; @@ -70,6 +95,55 @@ public class QmsCheckResultDetail extends BaseEntity { return materialBarcode; } + + public Long getMaterialId() { + return materialId; + } + + public void setMaterialId(Long materialId) { + this.materialId = materialId; + } + + public Long getCheckRuleId() { + return checkRuleId; + } + + public void setCheckRuleId(Long checkRuleId) { + this.checkRuleId = checkRuleId; + } + + public String getCheckRuleType() { + return checkRuleType; + } + + public void setCheckRuleType(String checkRuleType) { + this.checkRuleType = checkRuleType; + } + + public String getCheckRuleName() { + return checkRuleName; + } + + public void setCheckRuleName(String checkRuleName) { + this.checkRuleName = checkRuleName; + } + + public String getCheckMode() { + return checkMode; + } + + public void setCheckMode(String checkMode) { + this.checkMode = checkMode; + } + + public BigDecimal getCheckSample() { + return checkSample; + } + + public void setCheckSample(BigDecimal checkSample) { + this.checkSample = checkSample; + } + public void setCheckStatus(String checkStatus) { this.checkStatus = checkStatus; @@ -125,16 +199,22 @@ public class QmsCheckResultDetail extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("checkResultDetailId", getCheckResultDetailId()) - .append("checkResultId", getCheckResultId()) - .append("materialBarcode", getMaterialBarcode()) - .append("checkStatus", getCheckStatus()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("qmsCheckResultDetailProjectList", getQmsCheckResultDetailProjectList()) + .append("checkResultDetailId", getCheckResultDetailId()) + .append("checkResultId", getCheckResultId()) + .append("materialBarcode", getMaterialBarcode()) + .append("materialId", getMaterialId()) + .append("checkRuleId", getCheckRuleId()) + .append("checkRuleType", getCheckRuleType()) + .append("checkRuleName", getCheckRuleName()) + .append("checkMode", getCheckMode()) + .append("checkSample", getCheckSample()) + .append("checkStatus", getCheckStatus()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("qmsCheckResultDetailProjectList", getQmsCheckResultDetailProjectList()) .toString(); } } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetailProject.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetailProject.java index 2aabf5aa..c3778614 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetailProject.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetailProject.java @@ -7,10 +7,10 @@ import com.hw.common.core.annotation.Excel; import com.hw.common.core.web.domain.BaseEntity; /** - * 质检结果详情项目信息对象 qms_check_result_detail_project - * + * 质检结果详情项目信息;质检检查每个项目的质检结果详情对象 qms_check_result_detail_project + * * @author xins - * @date 2024-01-23 + * @date 2024-02-26 */ public class QmsCheckResultDetailProject extends BaseEntity { @@ -35,87 +35,125 @@ public class QmsCheckResultDetailProject extends BaseEntity @Excel(name = "检验结果,具体值") private BigDecimal checkProjectResult; + /**检验项目顺序*/ + private Long projectStepOrder; + /** 标准值 */ @Excel(name = "标准值") private BigDecimal standardValue; - /** 上差值 */ - @Excel(name = "上差值") + /** 检验项目名称（冗余字段） */ + @Excel(name = "检验项目名称", readConverterExp = "冗=余字段") + private String checkProjectName; + + /** 检验项目属性(1定性,2定量),冗余字段 */ + @Excel(name = "检验项目属性(1定性,2定量),冗余字段") + private String checkProjectProperty; + + /** 上差值，检验时从检验项目复制过来的值 */ + @Excel(name = "上差值，检验时从检验项目复制过来的值") private BigDecimal upperDiff; - /** 下差值 */ - @Excel(name = "下差值") + /** 下差值，检验时从检验项目复制过来的值 */ + @Excel(name = "下差值，检验时从检验项目复制过来的值") private BigDecimal downDiff; - public void setResultDetailProjectId(Long resultDetailProjectId) + public void setResultDetailProjectId(Long resultDetailProjectId) { this.resultDetailProjectId = resultDetailProjectId; } - public Long getResultDetailProjectId() + public Long getResultDetailProjectId() { return resultDetailProjectId; } - public void setCheckResultDetailId(Long checkResultDetailId) + public void setCheckResultDetailId(Long checkResultDetailId) { this.checkResultDetailId = checkResultDetailId; } - public Long getCheckResultDetailId() + public Long getCheckResultDetailId() { return checkResultDetailId; } - public void setCheckProjectId(Long checkProjectId) + public void setCheckProjectId(Long checkProjectId) { this.checkProjectId = checkProjectId; } - public Long getCheckProjectId() + public Long getCheckProjectId() { return checkProjectId; } - public void setCheckProjectStatus(String checkProjectStatus) + public void setCheckProjectStatus(String checkProjectStatus) { this.checkProjectStatus = checkProjectStatus; } - public String getCheckProjectStatus() + public String getCheckProjectStatus() { return checkProjectStatus; } - public void setCheckProjectResult(BigDecimal checkProjectResult) + public void setCheckProjectResult(BigDecimal checkProjectResult) { this.checkProjectResult = checkProjectResult; } - public BigDecimal getCheckProjectResult() + public BigDecimal getCheckProjectResult() { return checkProjectResult; } - public void setStandardValue(BigDecimal standardValue) + + public Long getProjectStepOrder() { + return projectStepOrder; + } + + public void setProjectStepOrder(Long projectStepOrder) { + this.projectStepOrder = projectStepOrder; + } + + public void setStandardValue(BigDecimal standardValue) { this.standardValue = standardValue; } - public BigDecimal getStandardValue() + public BigDecimal getStandardValue() { return standardValue; } - public void setUpperDiff(BigDecimal upperDiff) + public void setCheckProjectName(String checkProjectName) + { + this.checkProjectName = checkProjectName; + } + + public String getCheckProjectName() + { + return checkProjectName; + } + public void setCheckProjectProperty(String checkProjectProperty) + { + this.checkProjectProperty = checkProjectProperty; + } + + public String getCheckProjectProperty() + { + return checkProjectProperty; + } + public void setUpperDiff(BigDecimal upperDiff) { this.upperDiff = upperDiff; } - public BigDecimal getUpperDiff() + public BigDecimal getUpperDiff() { return upperDiff; } - public void setDownDiff(BigDecimal downDiff) + public void setDownDiff(BigDecimal downDiff) { this.downDiff = downDiff; } - public BigDecimal getDownDiff() + public BigDecimal getDownDiff() { return downDiff; } @@ -129,6 +167,8 @@ public class QmsCheckResultDetailProject extends BaseEntity .append("checkProjectStatus", getCheckProjectStatus()) .append("checkProjectResult", getCheckProjectResult()) .append("standardValue", getStandardValue()) + .append("checkProjectName", getCheckProjectName()) + .append("checkProjectProperty", getCheckProjectProperty()) .append("upperDiff", getUpperDiff()) .append("downDiff", getDownDiff()) .append("createBy", getCreateBy()) diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRule.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRule.java index b48dc2d2..09554c3a 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRule.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRule.java @@ -47,6 +47,11 @@ public class QmsCheckRule extends BaseEntity /** 检验规则项目信息 */ private List qmsCheckRuleProjectList; + + /** 质检结果id */ + private Long checkResultId; + + public void setCheckRuleId(Long checkRuleId) { this.checkRuleId = checkRuleId; @@ -121,6 +126,14 @@ public class QmsCheckRule extends BaseEntity this.qmsCheckRuleProjectList = qmsCheckRuleProjectList; } + public Long getCheckResultId() { + return checkResultId; + } + + public void setCheckResultId(Long checkResultId) { + this.checkResultId = checkResultId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRuleProject.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRuleProject.java index 2b2a0140..f42f3e4c 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRuleProject.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRuleProject.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.hw.common.core.annotation.Excel; import com.hw.common.core.web.domain.BaseEntity; +import java.math.BigDecimal; + /** * 检验规则项目对象 qms_check_rule_project * @@ -31,6 +33,27 @@ public class QmsCheckRuleProject extends BaseEntity private Long targetId; + /**检验项目名称*/ + private String checkProjectName; + + /**检验项目属性*/ + private String checkProjectProperty; + + /**检验项目标准值*/ + private BigDecimal standardValue; + + /**检验项目上差值*/ + private BigDecimal upperDiff; + + /**检验项目下差值*/ + private BigDecimal downDiff; + + /**检验项目检验结果状态*/ + private String checkProjectStatus; + + /**检验项目检验结果值*/ + private String checkProjectResult; + public void setCheckRuleId(Long checkRuleId) { this.checkRuleId = checkRuleId; @@ -83,6 +106,62 @@ public class QmsCheckRuleProject extends BaseEntity this.targetId = targetId; } + public String getCheckProjectName() { + return checkProjectName; + } + + public void setCheckProjectName(String checkProjectName) { + this.checkProjectName = checkProjectName; + } + + public String getCheckProjectProperty() { + return checkProjectProperty; + } + + public void setCheckProjectProperty(String checkProjectProperty) { + this.checkProjectProperty = checkProjectProperty; + } + + public BigDecimal getStandardValue() { + return standardValue; + } + + public void setStandardValue(BigDecimal standardValue) { + this.standardValue = standardValue; + } + + public BigDecimal getUpperDiff() { + return upperDiff; + } + + public void setUpperDiff(BigDecimal upperDiff) { + this.upperDiff = upperDiff; + } + + public BigDecimal getDownDiff() { + return downDiff; + } + + public void setDownDiff(BigDecimal downDiff) { + this.downDiff = downDiff; + } + + public String getCheckProjectStatus() { + return checkProjectStatus; + } + + public void setCheckProjectStatus(String checkProjectStatus) { + this.checkProjectStatus = checkProjectStatus; + } + + public String getCheckProjectResult() { + return checkProjectResult; + } + + public void setCheckProjectResult(String checkProjectResult) { + this.checkProjectResult = checkProjectResult; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsCheckResultDetailVo.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsCheckResultDetailVo.java new file mode 100644 index 00000000..2f91721e --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsCheckResultDetailVo.java @@ -0,0 +1,73 @@ +package com.hw.qms.domain.vo; + +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; +import com.hw.qms.domain.QmsCheckResultDetailProject; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 质检结果详情对象 QmsCheckResultDetailVo,返回给前端的对象 + * + * @author xins + * @date 2024-01-23 + */ +public class QmsCheckResultDetailVo +{ + private static final long serialVersionUID = 1L; + + /** + * 批次数量 + */ + private int batchAmount; + private int passAmount; + + private int failAmount; + + private String checkMode; + + private BigDecimal checkSample; + + public int getBatchAmount() { + return batchAmount; + } + + public void setBatchAmount(int batchAmount) { + this.batchAmount = batchAmount; + } + + public int getPassAmount() { + return passAmount; + } + + public void setPassAmount(int passAmount) { + this.passAmount = passAmount; + } + + public int getFailAmount() { + return failAmount; + } + + public void setFailAmount(int failAmount) { + this.failAmount = failAmount; + } + + public String getCheckMode() { + return checkMode; + } + + public void setCheckMode(String checkMode) { + this.checkMode = checkMode; + } + + public BigDecimal getCheckSample() { + return checkSample; + } + + public void setCheckSample(BigDecimal checkSample) { + this.checkSample = checkSample; + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsMaterialCheckVo.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsMaterialCheckVo.java index 87649b48..ec4bf5e4 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsMaterialCheckVo.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsMaterialCheckVo.java @@ -16,8 +16,7 @@ import java.math.BigDecimal; @Data public class QmsMaterialCheckVo { - //物料条码 - @NotBlank(message="物料条码必须输入") private String materialBarcode; + private Long checkResultDetailId; } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/MesBaseBarcodeInfoMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/MesBaseBarcodeInfoMapper.java index 62d73799..1f0e8833 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/MesBaseBarcodeInfoMapper.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/MesBaseBarcodeInfoMapper.java @@ -69,4 +69,13 @@ public interface MesBaseBarcodeInfoMapper * @return 结果 */ public int deleteMesBaseBarcodeInfoByBarcodeIds(Long[] barcodeIds); + + /** + * 根据批次码获取批次数量 + * + * @param batchCode 批次码 + * @return 结果 + */ + public int selectBarcodeInfoCountByBatchcode(String batchCode); + } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultDetailMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultDetailMapper.java index b66ec328..50c1615d 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultDetailMapper.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultDetailMapper.java @@ -96,4 +96,12 @@ public interface QmsCheckResultDetailMapper */ public QmsCheckResultDetail selectQmsCheckResultDetailByMaterialBarcode(String materialBarcode); + /** + * 查询质检结果批次审核结果数量 + * + * @param qmsCheckResultDetail 质检结果详情 + * @return 质检结果详情 + */ + public int selectResultDetailQualityCountByResultDetailId(QmsCheckResultDetail qmsCheckResultDetail); + } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultDetailProjectMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultDetailProjectMapper.java new file mode 100644 index 00000000..0cea01a7 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultDetailProjectMapper.java @@ -0,0 +1,61 @@ +package com.hw.qms.mapper; + +import java.util.List; +import com.hw.qms.domain.QmsCheckResultDetailProject; + +/** + * 质检结果详情项目信息Mapper接口 + * + * @author xins + * @date 2024-02-27 + */ +public interface QmsCheckResultDetailProjectMapper +{ + /** + * 查询质检结果详情项目信息 + * + * @param resultDetailProjectId 质检结果详情项目信息主键 + * @return 质检结果详情项目信息 + */ + public QmsCheckResultDetailProject selectQmsCheckResultDetailProjectByResultDetailProjectId(Long resultDetailProjectId); + + /** + * 查询质检结果详情项目信息列表 + * + * @param qmsCheckResultDetailProject 质检结果详情项目信息 + * @return 质检结果详情项目信息集合 + */ + public List selectQmsCheckResultDetailProjectList(QmsCheckResultDetailProject qmsCheckResultDetailProject); + + /** + * 新增质检结果详情项目信息 + * + * @param qmsCheckResultDetailProject 质检结果详情项目信息 + * @return 结果 + */ + public int insertQmsCheckResultDetailProject(QmsCheckResultDetailProject qmsCheckResultDetailProject); + + /** + * 修改质检结果详情项目信息 + * + * @param qmsCheckResultDetailProject 质检结果详情项目信息 + * @return 结果 + */ + public int updateQmsCheckResultDetailProject(QmsCheckResultDetailProject qmsCheckResultDetailProject); + + /** + * 删除质检结果详情项目信息 + * + * @param resultDetailProjectId 质检结果详情项目信息主键 + * @return 结果 + */ + public int deleteQmsCheckResultDetailProjectByResultDetailProjectId(Long resultDetailProjectId); + + /** + * 批量删除质检结果详情项目信息 + * + * @param resultDetailProjectIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQmsCheckResultDetailProjectByResultDetailProjectIds(Long[] resultDetailProjectIds); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultMapper.java index 9cd1955e..b24197c7 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultMapper.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultMapper.java @@ -6,15 +6,15 @@ import com.hw.qms.domain.QmsCheckResultDetail; /** * 质检结果Mapper接口 - * + * * @author xins * @date 2024-01-23 */ -public interface QmsCheckResultMapper +public interface QmsCheckResultMapper { /** * 查询质检结果 - * + * * @param checkResultId 质检结果主键 * @return 质检结果 */ @@ -22,7 +22,7 @@ public interface QmsCheckResultMapper /** * 查询质检结果列表 - * + * * @param qmsCheckResult 质检结果 * @return 质检结果集合 */ @@ -30,7 +30,7 @@ public interface QmsCheckResultMapper /** * 新增质检结果 - * + * * @param qmsCheckResult 质检结果 * @return 结果 */ @@ -38,7 +38,7 @@ public interface QmsCheckResultMapper /** * 修改质检结果 - * + * * @param qmsCheckResult 质检结果 * @return 结果 */ @@ -46,7 +46,7 @@ public interface QmsCheckResultMapper /** * 删除质检结果 - * + * * @param checkResultId 质检结果主键 * @return 结果 */ @@ -54,7 +54,7 @@ public interface QmsCheckResultMapper /** * 批量删除质检结果 - * + * * @param checkResultIds 需要删除的数据主键集合 * @return 结果 */ @@ -62,26 +62,47 @@ public interface QmsCheckResultMapper /** * 批量删除质检结果详情 - * + * * @param checkResultIds 需要删除的数据主键集合 * @return 结果 */ public int deleteQmsCheckResultDetailByCheckResultIds(Long[] checkResultIds); - + /** * 批量新增质检结果详情 - * + * * @param qmsCheckResultDetailList 质检结果详情列表 * @return 结果 */ public int batchQmsCheckResultDetail(List qmsCheckResultDetailList); - + /** * 通过质检结果主键删除质检结果详情信息 - * + * * @param checkResultId 质检结果ID * @return 结果 */ public int deleteQmsCheckResultDetailByCheckResultId(Long checkResultId); + + + + + + /** + * 查询质检结果 + * + * @param materialBatch 物料批次号 + * @return 质检结果 + */ + public QmsCheckResult selectQmsCheckResultByMaterialBatch(String materialBatch); + + + /** + * 查询质检结果列表,Join material + * + * @param qmsCheckResult 质检结果 + * @return 质检结果集合 + */ + public List selectQmsCheckResultJoinList(QmsCheckResult qmsCheckResult); } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleMapper.java index 9d652313..24fc0fe9 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleMapper.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleMapper.java @@ -95,4 +95,16 @@ public interface QmsCheckRuleMapper */ public int batchQmsCheckRuleProject(List qmsCheckRuleProjectList); + + + + + /** + * 查询检验规则维护 + * + * @param qmsCheckRuleDetail 检验规则明细（targetId，targetType） + * @return 检验规则维护 + */ + public QmsCheckRule selectQmsCheckRuleByTarget(QmsCheckRuleDetail qmsCheckRuleDetail); + } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IMesBaseBarcodeInfoService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IMesBaseBarcodeInfoService.java index cf977426..3e331c0f 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IMesBaseBarcodeInfoService.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IMesBaseBarcodeInfoService.java @@ -68,4 +68,13 @@ public interface IMesBaseBarcodeInfoService * @return 结果 */ public int deleteMesBaseBarcodeInfoByBarcodeId(Long barcodeId); + + + /** + * 根据批次码获取批次数量 + * + * @param batchCode 批次码 + * @return 数量 + */ + public int selectBarcodeInfoCountByBatchcode(String batchCode); } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultDetailService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultDetailService.java index f310c608..53c3240a 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultDetailService.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultDetailService.java @@ -2,6 +2,7 @@ package com.hw.qms.service; import java.util.List; import com.hw.qms.domain.QmsCheckResultDetail; +import com.hw.qms.domain.vo.QmsCheckResultDetailVo; /** * 质检结果详情Service接口 @@ -65,4 +66,12 @@ public interface IQmsCheckResultDetailService * @return */ public QmsCheckResultDetail getCheckResultDetail(String materialBarcode); + + /** + * 查询质检结果批次审核结果数量 + * + * @param checkResultDetailId 质检结果详情主键 + * @return + */ + public QmsCheckResultDetailVo getCheckResultDetailVo(Long checkResultDetailId); } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultService.java index 4c14368a..0d496815 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultService.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultService.java @@ -1,19 +1,22 @@ package com.hw.qms.service; import java.util.List; + +import com.hw.qms.domain.MesBaseBarcodeInfo; import com.hw.qms.domain.QmsCheckResult; +import com.hw.qms.domain.QmsCheckRule; /** * 质检结果Service接口 - * + * * @author xins * @date 2024-01-23 */ -public interface IQmsCheckResultService +public interface IQmsCheckResultService { /** * 查询质检结果 - * + * * @param checkResultId 质检结果主键 * @return 质检结果 */ @@ -21,7 +24,7 @@ public interface IQmsCheckResultService /** * 查询质检结果列表 - * + * * @param qmsCheckResult 质检结果 * @return 质检结果集合 */ @@ -29,7 +32,7 @@ public interface IQmsCheckResultService /** * 新增质检结果 - * + * * @param qmsCheckResult 质检结果 * @return 结果 */ @@ -37,7 +40,7 @@ public interface IQmsCheckResultService /** * 修改质检结果 - * + * * @param qmsCheckResult 质检结果 * @return 结果 */ @@ -45,7 +48,7 @@ public interface IQmsCheckResultService /** * 批量删除质检结果 - * + * * @param checkResultIds 需要删除的质检结果主键集合 * @return 结果 */ @@ -53,9 +56,35 @@ public interface IQmsCheckResultService /** * 删除质检结果信息 - * + * * @param checkResultId 质检结果主键 * @return 结果 */ public int deleteQmsCheckResultByCheckResultId(Long checkResultId); + + /** + * 在扫描物料条码时，如果是第一次对此批次质检，需要插入质检结果记录 + * + * @param mesBaseBarcodeInfo + * @param qmsCheckRule + * @return checkResultId + */ + public Long insertCheckResult(MesBaseBarcodeInfo mesBaseBarcodeInfo, QmsCheckRule qmsCheckRule); + + /** + * 查询质检结果列表,Join material + * + * @param qmsCheckResult 质检结果 + * @return 质检结果 + */ + public List selectQmsCheckResultJoinList(QmsCheckResult qmsCheckResult); + + + /** + * 更新质检结果状态 + * + * @param qmsCheckResult 质检结果 + * @return 结果 + */ + public int auditQmsCheckResult(QmsCheckResult qmsCheckResult); } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleService.java index c182257d..7135a611 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleService.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleService.java @@ -73,4 +73,12 @@ public interface IQmsCheckRuleService * @param checkRuleProjectList */ public int batchInsertCheckRuleProject(List checkRuleProjectList); + + /** + * 查询检验规则维护，连接check_rule_project + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 检验规则维护 + */ + public QmsCheckRule selectQmsCheckRuleByTarget(QmsCheckRuleDetail qmsCheckRuleDetail); } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/MesBaseBarcodeInfoServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/MesBaseBarcodeInfoServiceImpl.java index 3835a498..2180ddae 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/MesBaseBarcodeInfoServiceImpl.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/MesBaseBarcodeInfoServiceImpl.java @@ -107,4 +107,20 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService { return mesBaseBarcodeInfoMapper.deleteMesBaseBarcodeInfoByBarcodeId(barcodeId); } + + + + + + /** + * 根据批次码获取批次数量 + * + * @param batchCode 批次码 + * @return 数量 + */ + @Override + public int selectBarcodeInfoCountByBatchcode(String batchCode) + { + return mesBaseBarcodeInfoMapper.selectBarcodeInfoCountByBatchcode(batchCode); + } } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultDetailServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultDetailServiceImpl.java index 74052fb8..942b8127 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultDetailServiceImpl.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultDetailServiceImpl.java @@ -1,12 +1,17 @@ package com.hw.qms.service.impl; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; import com.hw.common.core.constant.QmsConstants; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.qms.domain.MesBaseBarcodeInfo; import com.hw.qms.domain.QmsCheckRuleProject; +import com.hw.qms.domain.vo.QmsCheckResultDetailVo; import com.hw.qms.domain.vo.QmsMaterialCheckVo; +import com.hw.qms.mapper.QmsCheckResultDetailProjectMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,6 +35,9 @@ public class QmsCheckResultDetailServiceImpl implements IQmsCheckResultDetailSer @Autowired private QmsCheckResultDetailMapper qmsCheckResultDetailMapper; + @Autowired + private QmsCheckResultDetailProjectMapper qmsCheckResultDetailProjectMapper; + /** * 查询质检结果详情 * @@ -61,10 +69,19 @@ public class QmsCheckResultDetailServiceImpl implements IQmsCheckResultDetailSer @Transactional @Override public int insertQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail) { - qmsCheckResultDetail.setCreateTime(DateUtils.getNowDate()); - int rows = qmsCheckResultDetailMapper.insertQmsCheckResultDetail(qmsCheckResultDetail); - insertQmsCheckResultDetailProject(qmsCheckResultDetail); - return rows; + Date currentDate = new Date(); + String userName = SecurityUtils.getUsername(); + qmsCheckResultDetail.setCreateTime(currentDate); + qmsCheckResultDetail.setCreateBy(userName); + QmsCheckResultDetail returnCheckResultDetail = handleQmsCheckResultDetailProject(qmsCheckResultDetail); + if (returnCheckResultDetail != null) { + qmsCheckResultDetail.setCheckStatus(returnCheckResultDetail.getCheckStatus()); + int rows = qmsCheckResultDetailMapper.insertQmsCheckResultDetail(qmsCheckResultDetail); + qmsCheckResultDetail.setQmsCheckResultDetailProjectList(returnCheckResultDetail.getQmsCheckResultDetailProjectList()); + batchQmsCheckResultDetailProject(qmsCheckResultDetail); + return rows; + } + return 0; } /** @@ -76,9 +93,18 @@ public class QmsCheckResultDetailServiceImpl implements IQmsCheckResultDetailSer @Transactional @Override public int updateQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail) { - qmsCheckResultDetail.setUpdateTime(DateUtils.getNowDate()); - qmsCheckResultDetailMapper.deleteQmsCheckResultDetailProjectByCheckResultDetailId(qmsCheckResultDetail.getCheckResultDetailId()); - insertQmsCheckResultDetailProject(qmsCheckResultDetail); + String userName = SecurityUtils.getUsername(); + Date currentDate = new Date(); + qmsCheckResultDetail.setUpdateTime(currentDate); + qmsCheckResultDetail.setUpdateBy(userName); + + QmsCheckResultDetail returnCheckResultDetail = handleQmsCheckResultDetailProject(qmsCheckResultDetail); + if (returnCheckResultDetail != null) { + qmsCheckResultDetail.setCheckStatus(returnCheckResultDetail.getCheckStatus()); + qmsCheckResultDetail.setQmsCheckResultDetailProjectList(returnCheckResultDetail.getQmsCheckResultDetailProjectList()); + batchUpdateQmsCheckResultDetailProject(qmsCheckResultDetail); + } + return qmsCheckResultDetailMapper.updateQmsCheckResultDetail(qmsCheckResultDetail); } @@ -113,10 +139,80 @@ public class QmsCheckResultDetailServiceImpl implements IQmsCheckResultDetailSer * * @param qmsCheckResultDetail 质检结果详情对象 */ - public void insertQmsCheckResultDetailProject(QmsCheckResultDetail qmsCheckResultDetail) { + public QmsCheckResultDetail handleQmsCheckResultDetailProject(QmsCheckResultDetail qmsCheckResultDetail) { + String checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_PASS;//质检结果检验状态 + List qmsCheckResultDetailProjectList = qmsCheckResultDetail.getQmsCheckResultDetailProjectList(); + if (StringUtils.isNotNull(qmsCheckResultDetailProjectList)) { + QmsCheckResultDetail returnCheckResultDetail = new QmsCheckResultDetail(); + List list = new ArrayList(); + for (QmsCheckResultDetailProject qmsCheckResultDetailProject : qmsCheckResultDetailProjectList) { + + String checkProjectProperty = qmsCheckResultDetailProject.getCheckProjectProperty(); + if (checkProjectProperty.equals(QmsConstants.QMS_CHECK_PROJECT_PROPERTY_QUALITATIVE)) {//如果是定性 + String checkProjectStatus = qmsCheckResultDetailProject.getCheckProjectStatus(); + if (checkProjectStatus != null) { + if (checkProjectStatus.equals(QmsConstants.QMS_CHECK_PROJECT_STATUS_FAIL)) { + checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_FAIL; + } + } else { + if (checkStatus.equals(QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_PASS)) { + checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_CHECKED; + } + } + } else {//如果是定量 + BigDecimal checkProjectResult = qmsCheckResultDetailProject.getCheckProjectResult(); + if (checkProjectResult != null) { + BigDecimal standardValue = qmsCheckResultDetailProject.getStandardValue(); + BigDecimal upperDiff = qmsCheckResultDetailProject.getUpperDiff(); + BigDecimal downDiff = qmsCheckResultDetailProject.getDownDiff(); + if (upperDiff == null && downDiff == null) { + if (checkProjectResult.compareTo(standardValue) == 0) { + qmsCheckResultDetailProject.setCheckProjectStatus(QmsConstants.QMS_CHECK_PROJECT_STATUS_PASS); + } else { + qmsCheckResultDetailProject.setCheckProjectStatus(QmsConstants.QMS_CHECK_PROJECT_STATUS_FAIL); + checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_FAIL; + } + } else { + if (upperDiff == null) {//如果没设置上差值，则标准值为上差值 + upperDiff = standardValue; + } else if (downDiff == null) {//如果没设置下差值，则标准值为下差值 + downDiff = standardValue; + } + if (checkProjectResult.compareTo(downDiff) >= 0 && checkProjectResult.compareTo(upperDiff) <= 0) { + qmsCheckResultDetailProject.setCheckProjectStatus(QmsConstants.QMS_CHECK_PROJECT_STATUS_PASS); + } else { + qmsCheckResultDetailProject.setCheckProjectStatus(QmsConstants.QMS_CHECK_PROJECT_STATUS_FAIL); + checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_FAIL; + } + } + } else { + if (checkStatus.equals(QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_PASS)) { + checkStatus = QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_CHECKED; + } + } + } + + list.add(qmsCheckResultDetailProject); + } + + returnCheckResultDetail.setCheckStatus(checkStatus); + returnCheckResultDetail.setQmsCheckResultDetailProjectList(list); + + return returnCheckResultDetail; + } + + + return null; + } + + + /** + * 批量插入质检结果详情项目信息(事务，需要用public，不能用private) + */ + public void batchQmsCheckResultDetailProject(QmsCheckResultDetail qmsCheckResultDetail) { List qmsCheckResultDetailProjectList = qmsCheckResultDetail.getQmsCheckResultDetailProjectList(); Long checkResultDetailId = qmsCheckResultDetail.getCheckResultDetailId(); - if (StringUtils.isNotNull(qmsCheckResultDetailProjectList)) { + if (StringUtils.isNotNull(checkResultDetailId)) { List list = new ArrayList(); for (QmsCheckResultDetailProject qmsCheckResultDetailProject : qmsCheckResultDetailProjectList) { qmsCheckResultDetailProject.setCheckResultDetailId(checkResultDetailId); @@ -128,9 +224,21 @@ public class QmsCheckResultDetailServiceImpl implements IQmsCheckResultDetailSer } } + /** + * 批量更新质检结果详情项目信息(事务，需要用public，不能用private) + */ + public void batchUpdateQmsCheckResultDetailProject(QmsCheckResultDetail qmsCheckResultDetail) { + List qmsCheckResultDetailProjectList = qmsCheckResultDetail.getQmsCheckResultDetailProjectList(); + for (QmsCheckResultDetailProject qmsCheckResultDetailProject : qmsCheckResultDetailProjectList) { + qmsCheckResultDetailProjectMapper.updateQmsCheckResultDetailProject(qmsCheckResultDetailProject); + } + + } + /** * 获取质检结果详情 + * * @param materialBarcode 物料条码 * @return */ @@ -141,4 +249,29 @@ public class QmsCheckResultDetailServiceImpl implements IQmsCheckResultDetailSer return checkResultDetail; } + + /** + * 查询质检结果批次审核结果数量 + * + * @param checkResultId 质检结果主键 + * @return + */ + @Override + public QmsCheckResultDetailVo getCheckResultDetailVo(Long checkResultId) { + QmsCheckResultDetail passResultDetail = new QmsCheckResultDetail(); + passResultDetail.setCheckResultId(checkResultId); + passResultDetail.setCheckStatus(QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_PASS); + int passAmount = qmsCheckResultDetailMapper.selectResultDetailQualityCountByResultDetailId(passResultDetail); + + QmsCheckResultDetail failResultDetail = new QmsCheckResultDetail(); + failResultDetail.setCheckResultId(checkResultId); + failResultDetail.setCheckStatus(QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_FAIL); + int failAmount = qmsCheckResultDetailMapper.selectResultDetailQualityCountByResultDetailId(failResultDetail); + + QmsCheckResultDetailVo checkResultDetailVo = new QmsCheckResultDetailVo(); + checkResultDetailVo.setPassAmount(passAmount); + checkResultDetailVo.setFailAmount(failAmount); + return checkResultDetailVo; + } + } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultServiceImpl.java index d27d5390..6b6ca34e 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultServiceImpl.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultServiceImpl.java @@ -1,20 +1,21 @@ package com.hw.qms.service.impl; +import java.util.Date; import java.util.List; import com.hw.common.core.constant.QmsConstants; import com.hw.common.core.utils.DateUtils; -import com.hw.qms.domain.MesBaseBarcodeInfo; -import com.hw.qms.domain.QmsCheckRuleProject; +import com.hw.common.security.utils.SecurityUtils; +import com.hw.qms.domain.*; import com.hw.qms.domain.vo.QmsMaterialCheckVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.ArrayList; + import com.hw.common.core.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; -import com.hw.qms.domain.QmsCheckResultDetail; import com.hw.qms.mapper.QmsCheckResultMapper; -import com.hw.qms.domain.QmsCheckResult; import com.hw.qms.service.IQmsCheckResultService; /** @@ -24,8 +25,7 @@ import com.hw.qms.service.IQmsCheckResultService; * @date 2024-01-23 */ @Service -public class QmsCheckResultServiceImpl implements IQmsCheckResultService -{ +public class QmsCheckResultServiceImpl implements IQmsCheckResultService { @Autowired private QmsCheckResultMapper qmsCheckResultMapper; @@ -36,8 +36,7 @@ public class QmsCheckResultServiceImpl implements IQmsCheckResultService * @return 质检结果 */ @Override - public QmsCheckResult selectQmsCheckResultByCheckResultId(Long checkResultId) - { + public QmsCheckResult selectQmsCheckResultByCheckResultId(Long checkResultId) { return qmsCheckResultMapper.selectQmsCheckResultByCheckResultId(checkResultId); } @@ -48,8 +47,7 @@ public class QmsCheckResultServiceImpl implements IQmsCheckResultService * @return 质检结果 */ @Override - public List selectQmsCheckResultList(QmsCheckResult qmsCheckResult) - { + public List selectQmsCheckResultList(QmsCheckResult qmsCheckResult) { return qmsCheckResultMapper.selectQmsCheckResultList(qmsCheckResult); } @@ -61,8 +59,7 @@ public class QmsCheckResultServiceImpl implements IQmsCheckResultService */ @Transactional @Override - public int insertQmsCheckResult(QmsCheckResult qmsCheckResult) - { + public int insertQmsCheckResult(QmsCheckResult qmsCheckResult) { qmsCheckResult.setCreateTime(DateUtils.getNowDate()); int rows = qmsCheckResultMapper.insertQmsCheckResult(qmsCheckResult); insertQmsCheckResultDetail(qmsCheckResult); @@ -77,8 +74,7 @@ public class QmsCheckResultServiceImpl implements IQmsCheckResultService */ @Transactional @Override - public int updateQmsCheckResult(QmsCheckResult qmsCheckResult) - { + public int updateQmsCheckResult(QmsCheckResult qmsCheckResult) { qmsCheckResult.setUpdateTime(DateUtils.getNowDate()); qmsCheckResultMapper.deleteQmsCheckResultDetailByCheckResultId(qmsCheckResult.getCheckResultId()); insertQmsCheckResultDetail(qmsCheckResult); @@ -93,8 +89,7 @@ public class QmsCheckResultServiceImpl implements IQmsCheckResultService */ @Transactional @Override - public int deleteQmsCheckResultByCheckResultIds(Long[] checkResultIds) - { + public int deleteQmsCheckResultByCheckResultIds(Long[] checkResultIds) { qmsCheckResultMapper.deleteQmsCheckResultDetailByCheckResultIds(checkResultIds); return qmsCheckResultMapper.deleteQmsCheckResultByCheckResultIds(checkResultIds); } @@ -107,8 +102,7 @@ public class QmsCheckResultServiceImpl implements IQmsCheckResultService */ @Transactional @Override - public int deleteQmsCheckResultByCheckResultId(Long checkResultId) - { + public int deleteQmsCheckResultByCheckResultId(Long checkResultId) { qmsCheckResultMapper.deleteQmsCheckResultDetailByCheckResultId(checkResultId); return qmsCheckResultMapper.deleteQmsCheckResultByCheckResultId(checkResultId); } @@ -118,20 +112,16 @@ public class QmsCheckResultServiceImpl implements IQmsCheckResultService * * @param qmsCheckResult 质检结果对象 */ - public void insertQmsCheckResultDetail(QmsCheckResult qmsCheckResult) - { + public void insertQmsCheckResultDetail(QmsCheckResult qmsCheckResult) { List qmsCheckResultDetailList = qmsCheckResult.getQmsCheckResultDetailList(); Long checkResultId = qmsCheckResult.getCheckResultId(); - if (StringUtils.isNotNull(qmsCheckResultDetailList)) - { + if (StringUtils.isNotNull(qmsCheckResultDetailList)) { List list = new ArrayList(); - for (QmsCheckResultDetail qmsCheckResultDetail : qmsCheckResultDetailList) - { + for (QmsCheckResultDetail qmsCheckResultDetail : qmsCheckResultDetailList) { qmsCheckResultDetail.setCheckResultId(checkResultId); list.add(qmsCheckResultDetail); } - if (list.size() > 0) - { + if (list.size() > 0) { qmsCheckResultMapper.batchQmsCheckResultDetail(list); } } @@ -141,4 +131,70 @@ public class QmsCheckResultServiceImpl implements IQmsCheckResultService + + + + /** + * 在扫描物料条码时，如果是第一次对此批次质检，需要插入质检结果记录 + * + * @param mesBaseBarcodeInfo + * @param qmsCheckRule + * @return checkResultId + */ + @Override + public Long insertCheckResult(MesBaseBarcodeInfo mesBaseBarcodeInfo, QmsCheckRule qmsCheckRule) { + String batchCode = mesBaseBarcodeInfo.getBatchCode(); + QmsCheckResult qmsCheckResult = qmsCheckResultMapper.selectQmsCheckResultByMaterialBatch(batchCode); + if (qmsCheckResult == null) { + qmsCheckResult = new QmsCheckResult(); + String barcodeType = mesBaseBarcodeInfo.getBarcodeType();//条码类型（1原材料,2半成品,3成品,4背板） + qmsCheckResult.setCheckRuleId(qmsCheckRule.getCheckRuleId()); + qmsCheckResult.setMaterialType(barcodeType); + qmsCheckResult.setMaterialId(mesBaseBarcodeInfo.getMaterialId()); + qmsCheckResult.setMaterialBatch(mesBaseBarcodeInfo.getBatchCode()); + qmsCheckResult.setCheckMode(qmsCheckResult.getCheckMode()); + qmsCheckResult.setCheckSample(qmsCheckRule.getCheckSample()); + qmsCheckResult.setPlanCode(mesBaseBarcodeInfo.getPlanCode()); + qmsCheckResult.setPlanDetailCode(mesBaseBarcodeInfo.getPlanDetailCode()); + qmsCheckResult.setSaleOrderId(mesBaseBarcodeInfo.getSaleOrderId()); + qmsCheckResult.setSaleorderCode(mesBaseBarcodeInfo.getSaleorderCode()); + qmsCheckResult.setPoNo(mesBaseBarcodeInfo.getPoNo()); + qmsCheckResult.setCheckStatus(QmsConstants.QMS_CHECK_RESULT_CHECK_STATUS_CHECKED); + qmsCheckResult.setCreateBy(SecurityUtils.getUsername()); + qmsCheckResult.setCreateTime(new Date()); + + qmsCheckResultMapper.insertQmsCheckResult(qmsCheckResult); + } + + return qmsCheckResult.getCheckResultId(); + + } + + + + /** + * 查询质检结果列表,Join material + * + * @param qmsCheckResult 质检结果 + * @return 质检结果 + */ + @Override + public List selectQmsCheckResultJoinList(QmsCheckResult qmsCheckResult) { + return qmsCheckResultMapper.selectQmsCheckResultJoinList(qmsCheckResult); + } + + + /** + * 更新质检结果状态 + * + * @param qmsCheckResult 质检结果 + * @return 结果 + */ + @Override + public int auditQmsCheckResult(QmsCheckResult qmsCheckResult) { + qmsCheckResult.setUpdateTime(DateUtils.getNowDate()); + qmsCheckResult.setUpdateBy(SecurityUtils.getUsername()); + return qmsCheckResultMapper.updateQmsCheckResult(qmsCheckResult); + } + } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleServiceImpl.java index ffca6733..6e7e0e27 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleServiceImpl.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleServiceImpl.java @@ -167,5 +167,16 @@ public class QmsCheckRuleServiceImpl implements IQmsCheckRuleService { } + /** + * 查询检验规则维护，连接check_rule_project + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 检验规则维护 + */ + @Override + public QmsCheckRule selectQmsCheckRuleByTarget(QmsCheckRuleDetail qmsCheckRuleDetail) { + return qmsCheckRuleMapper.selectQmsCheckRuleByTarget(qmsCheckRuleDetail); + } + } diff --git a/hw-modules/hw-qms/src/main/resources/mapper/qms/MesBaseBarcodeInfoMapper.xml b/hw-modules/hw-qms/src/main/resources/mapper/qms/MesBaseBarcodeInfoMapper.xml index 8724ec67..7115fcfb 100644 --- a/hw-modules/hw-qms/src/main/resources/mapper/qms/MesBaseBarcodeInfoMapper.xml +++ b/hw-modules/hw-qms/src/main/resources/mapper/qms/MesBaseBarcodeInfoMapper.xml @@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -32,10 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select barcode_id, print_time, print_person, batch_flag, barcode_type, barcode_info, batch_code, pallet_info_code, material_id, manufacturer_id, amount, machine_name, po_no, production_date, accepted_date, last_outstock_date, plan_code, plan_detail_code, saleorder_code, project_no, serial_number, remark, bind_status, bind_by, bind_time, update_by, update_time from mes_base_barcode_info + select barcode_id, print_time, print_person, batch_flag, barcode_type, barcode_info, batch_code, pallet_info_code, material_id, manufacturer_id, amount, machine_name, po_no, production_date, accepted_date, last_outstock_date, plan_code, plan_detail_code, sale_order_id, saleorder_code, project_no, serial_number, remark, bind_status, bind_by, bind_time, update_by, update_time from mes_base_barcode_info - + select mbbi.barcode_id, mbbi.batch_flag, mbbi.barcode_type, mbbi.barcode_info, mbbi.batch_code, + mbbi.material_id, mbbi.amount, mbbi.po_no,mbbi.plan_code, mbbi.plan_detail_code, mbbi.sale_order_id, mbbi.saleorder_code, + mbmi.material_code,mbmi.material_name + from mes_base_barcode_info mbbi left join mes_base_material_info mbmi on mbbi.material_id = mbmi.material_id where barcode_info = #{barcodeInfo} limit 1 + + diff --git a/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultDetailMapper.xml b/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultDetailMapper.xml index 56805a83..7132ad56 100644 --- a/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultDetailMapper.xml +++ b/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultDetailMapper.xml @@ -8,6 +8,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + @@ -26,7 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -35,24 +44,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + - select check_result_detail_id, check_result_id, material_barcode, check_status, remark, create_by, create_time, update_by, update_time from qms_check_result_detail + select check_result_detail_id, check_result_id, material_barcode, material_id, check_rule_id, check_rule_type, check_rule_name, check_mode, check_sample, check_status, remark, create_by, create_time, update_by, update_time from qms_check_result_detail + + select a.check_result_detail_id, a.check_result_id, a.material_barcode, a.material_id, a.check_rule_id, a.check_rule_type, a.check_rule_name, a.check_mode, a.check_sample, a.check_status, a.remark, a.create_by, a.create_time, a.update_by, a.update_time, + b.result_detail_project_id as sub_result_detail_project_id, b.check_result_detail_id as sub_check_result_detail_id, + b.check_project_id as sub_check_project_id, b.check_project_status as sub_check_project_status, + b.check_project_result as sub_check_project_result, b.project_step_order as sub_project_step_order,b.standard_value as sub_standard_value, + b.check_project_name as sub_check_project_name, b.check_project_property as sub_check_project_property, + b.upper_diff as sub_upper_diff, b.down_diff as sub_down_diff + from qms_check_result_detail a + left join qms_check_result_detail_project b on b.check_result_detail_id = a.check_result_detail_id + + + @@ -61,23 +92,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" check_result_id, material_barcode, + material_id, + check_rule_id, + check_rule_type, + check_rule_name, + check_mode, + check_sample, check_status, remark, create_by, create_time, update_by, update_time, - + #{checkResultId}, #{materialBarcode}, + #{materialId}, + #{checkRuleId}, + #{checkRuleType}, + #{checkRuleName}, + #{checkMode}, + #{checkSample}, #{checkStatus}, #{remark}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, - + @@ -85,6 +128,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" check_result_id = #{checkResultId}, material_barcode = #{materialBarcode}, + material_id = #{materialId}, + check_rule_id = #{checkRuleId}, + check_rule_type = #{checkRuleType}, + check_rule_name = #{checkRuleName}, + check_mode = #{checkMode}, + check_sample = #{checkSample}, check_status = #{checkStatus}, remark = #{remark}, create_by = #{createBy}, @@ -118,22 +167,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into qms_check_result_detail_project( result_detail_project_id, check_result_detail_id, check_project_id, check_project_status, check_project_result, standard_value, upper_diff, down_diff, create_by, create_time, update_by, update_time) values - - ( #{item.resultDetailProjectId}, #{item.checkResultDetailId}, #{item.checkProjectId}, #{item.checkProjectStatus}, #{item.checkProjectResult}, #{item.standardValue}, #{item.upperDiff}, #{item.downDiff}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}) + insert into qms_check_result_detail_project( result_detail_project_id, check_result_detail_id, check_project_id, check_project_status, check_project_result,project_step_order, standard_value, check_project_name, check_project_property, upper_diff, down_diff, create_by, create_time, update_by, update_time) values + + ( #{item.resultDetailProjectId}, #{item.checkResultDetailId}, #{item.checkProjectId}, #{item.checkProjectStatus}, #{item.checkProjectResult}, #{item.projectStepOrder},#{item.standardValue}, #{item.checkProjectName}, #{item.checkProjectProperty}, #{item.upperDiff}, #{item.downDiff}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}) - + + + diff --git a/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultDetailProjectMapper.xml b/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultDetailProjectMapper.xml new file mode 100644 index 00000000..0db36b68 --- /dev/null +++ b/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultDetailProjectMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + select result_detail_project_id, check_result_detail_id, check_project_id, check_project_status, check_project_result, project_step_order, standard_value, check_project_name, check_project_property, upper_diff, down_diff, create_by, create_time, update_by, update_time from qms_check_result_detail_project + + + + + + + + insert into qms_check_result_detail_project + + check_result_detail_id, + check_project_id, + check_project_status, + check_project_result, + project_step_order, + standard_value, + check_project_name, + check_project_property, + upper_diff, + down_diff, + create_by, + create_time, + update_by, + update_time, + + + #{checkResultDetailId}, + #{checkProjectId}, + #{checkProjectStatus}, + #{checkProjectResult}, + #{projectStepOrder}, + #{standardValue}, + #{checkProjectName}, + #{checkProjectProperty}, + #{upperDiff}, + #{downDiff}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update qms_check_result_detail_project + + check_result_detail_id = #{checkResultDetailId}, + check_project_id = #{checkProjectId}, + check_project_status = #{checkProjectStatus}, + check_project_result = #{checkProjectResult}, + project_step_order = #{projectStepOrder}, + standard_value = #{standardValue}, + check_project_name = #{checkProjectName}, + check_project_property = #{checkProjectProperty}, + upper_diff = #{upperDiff}, + down_diff = #{downDiff}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where result_detail_project_id = #{resultDetailProjectId} + + + + delete from qms_check_result_detail_project where result_detail_project_id = #{resultDetailProjectId} + + + + delete from qms_check_result_detail_project where result_detail_project_id in + + #{resultDetailProjectId} + + + diff --git a/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultMapper.xml b/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultMapper.xml index a4d6e00c..740d73a6 100644 --- a/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultMapper.xml +++ b/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckResultMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -13,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -23,7 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + @@ -43,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select check_result_id, material_type, material_id, material_batch, check_mode, check_sample, plan_code, plan_detail_code, saleorder_code, po_no, po_line, project_no, check_status, remark, create_by, create_time, update_by, update_time, attr1 from qms_check_result + select check_result_id, material_type, material_id, material_batch, check_mode, check_sample, plan_code, plan_detail_code, saleorder_code, po_no, po_line, project_no, check_status, remark, create_by, create_time, update_by, update_time, check_rule_name from qms_check_result + select a.check_result_id, a.material_type, a.material_id, a.material_batch, a.check_mode, a.check_sample, a.plan_code, a.plan_detail_code, a.saleorder_code, a.po_no, a.po_line, a.project_no, a.check_status, a.remark, a.create_by, a.create_time, a.update_by, a.update_time + from qms_check_result a + where a.material_batch = #{materialBatch} + + + + + + + + + diff --git a/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckRuleMapper.xml b/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckRuleMapper.xml index dcef2586..a2fedd41 100644 --- a/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckRuleMapper.xml +++ b/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckRuleMapper.xml @@ -26,10 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + - select check_rule_id, check_rule_name, check_rule_type, check_mode, check_sample, check_rule_status, remark, create_by, create_time, update_by, update_time from qms_check_rule @@ -129,7 +133,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into qms_check_rule_project( check_rule_id, check_project_id, project_step_order) values @@ -137,4 +140,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + diff --git a/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckRuleProjectMapper.xml b/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckRuleProjectMapper.xml index 475599a5..7c2f0274 100644 --- a/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckRuleProjectMapper.xml +++ b/hw-modules/hw-qms/src/main/resources/mapper/qms/QmsCheckRuleProjectMapper.xml @@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -83,13 +83,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"