mes/nalinv-qms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 过程检验 不合格代码保存，检索

Browse Source
This commit is contained in:
luochen 2024-11-26 16:32:28 +08:00
parent f6f7bad7c4
commit 929d3ad0bc
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java
View File

@ -236,8 +236,8 @@ public class QmsInspecJobController {
@GetMapping("/selectAllNc")
@SysLog("查询不合格代码")
@ApiOperation(value = "查询不合格代码", notes = "查询不合格代码")
public Object selectAllNc(String inspecResultSid ) {
return qmsInspecResultNccodeService.selectAllNc(inspecResultSid);
public Object selectAllNc(QmsInspecResultNccodeDTO dto) {
return qmsInspecResultNccodeService.selectAllNc(dto);
}
/**

2
qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecResultNccodeService.java
View File

@ -38,5 +38,5 @@ public interface QmsInspecResultNccodeService extends ExpansionService<QmsInspec
*/
void saveNc(QmsInspecResultNccodeDTO dto);
List<QmsInspecResultNccodeDTO> selectAllNc(String inspecResultSid);
List<QmsInspecResultNccodeDTO> selectAllNc(QmsInspecResultNccodeDTO dto);
}

2
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecDetailServiceImpl.java
View File

@ -456,7 +456,7 @@ public class QmsInspecDetailServiceImpl extends ExpansionServiceImpl<QmsInspecDe
resultList.add(qmsInspecResult.getQcItemJudge());
}
if ("Y".equals(dto.getAvgJudge()) && "1".equals(dto.getItemType())) {
dto.setItemResult(sum.divide(new BigDecimal(qmsInspecResultList.size())));
dto.setItemResult(sum.divide(new BigDecimal(qmsInspecResultList.size()),2, BigDecimal.ROUND_HALF_UP));
} else if (!"1".equals(dto.getItemType())) {
dto.setItemResult(null);
}

5
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecResultNccodeServiceImpl.java
View File

@ -55,6 +55,7 @@ public class QmsInspecResultNccodeServiceImpl
.eq(QmsInspecResultNccode::getNcBasisBo, nc.getNcBasisBo())
.eq(QmsInspecResultNccode::getOperationBo, dto.getOperationBo()));
if (resultNccode != null) {
resultNccode.setInspecResultSid(dto.getInspecResultSid());
resultNccode.setNcQty(nc.getNcQty());
resultNccode.setNcDesc(nc.getNcDesc());
resultNccode.setUpdater(userName);
@ -78,7 +79,7 @@ public class QmsInspecResultNccodeServiceImpl
}
@Override
public List<QmsInspecResultNccodeDTO> selectAllNc(String inspecResultSid) {
return baseMapper.selectAllNc(inspecResultSid);
public List<QmsInspecResultNccodeDTO> selectAllNc(QmsInspecResultNccodeDTO dto) {
return baseMapper.selectAllNc(dto);
}
}

3
qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecResultNccodeMapper.java
View File

@ -5,6 +5,7 @@ import com.foreverwin.iep.qms.entity.QmsInspecResultNccode;
import com.foreverwin.mom.common.data.mybatis.expand.mapper.ExpansionBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.security.core.parameters.P;
import java.util.List;
@ -21,5 +22,5 @@ public interface QmsInspecResultNccodeMapper extends ExpansionBaseMapper<QmsInsp
List<QmsInspecResultNccodeDTO> selectNcByOperation(@Param("operationBo") String operationBo);
List<QmsInspecResultNccodeDTO> selectAllNc(@Param("inspecResultSid") String inspecResultSid);
List<QmsInspecResultNccodeDTO> selectAllNc(@Param("dto") QmsInspecResultNccodeDTO dto);
}

8
qms-db/src/main/resources/qms/mapper/QmsInspecResultNccodeMapper.xml
View File

@ -46,10 +46,10 @@
select a.*, b.NC_CODE, b.DESCRIPTION NC_CODE_DESC, b.type
from qms_inspec_result_nccode a
join nc_basis b on a.NC_BASIS_BO = b.HANDLE
<where>
<if test="inspecResultSid != null and inspecResultSid!= ''">
a.INSPEC_RESULT_SID = #{inspecResultSid}
where a.LOT_NO = #{dto.lotNo} and a.OPERATION_BO = #{dto.operationBo}
and a.RESOURCE_BO = #{dto.resourceBo} and a.ITEM = #{dto.item}
<if test="dto.inspecResultSid != null and dto.inspecResultSid!= ''">
and a.INSPEC_RESULT_SID = #{dto.inspecResultSid}
</if>
</where>
</select>
</mapper>