puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev

Browse Source
mes-dev
jason 2 months ago
parent 92d28e9baa 6390c6b7b5
commit ca64d811ed
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
Unescape Escape View File

@ -309,7 +309,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
} }
} }
final Integer workCellType = getWorkCellType(model.getOrganizeCode(), model.getWorkCenterCode(), model.getWorkCellCode()); final Integer workCellType = getPartInspectionType(model.getOrganizeCode(), model.getWorkCenterCode(), model.getWorkCellCode());
//零件检测详情为空，则代表本次校验为合格。 //零件检测详情为空，则代表本次校验为合格。
if (CollectionUtils.isEmpty(model.getPartInspectionDetailList())) { if (CollectionUtils.isEmpty(model.getPartInspectionDetailList())) {
MesPartInspection partInspection = null; MesPartInspection partInspection = null;
@ -1416,7 +1416,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
detail.setSystemSyncDatetime(MesPcnExtConstWords.EMPTY); detail.setSystemSyncDatetime(MesPcnExtConstWords.EMPTY);
} }
private Integer getWorkCellType(String organizeCode, String workCenterCode, String workCellCode) { private Integer getPartInspectionType(String organizeCode, String workCenterCode, String workCellCode) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(workCellCode, "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(workCellCode, "workCellCode", packBean);
@ -1426,9 +1426,9 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
if (workCell.getType() == null) { if (workCell.getType() == null) {
MesPcnException.throwFlowException(String.format("工位【%s】未维护工位类型，请检查数据", workCellCode)); MesPcnException.throwFlowException(String.format("工位【%s】未维护工位类型，请检查数据", workCellCode));
} }
if (workCell.getType() == MesExtEnumUtil.MES_WORK_CELL_TYPE.PRODUCT_CELL.getValue()) { if (workCell.getType() == MesExtEnumUtil.MES_WORK_CELL_CHECK_TYPE.PRODUCT_CELL.getValue()) {
type = MesExtEnumUtil.MES_PART_INSPECTION_TYPE.ONLINE_CHECK; type = MesExtEnumUtil.MES_PART_INSPECTION_TYPE.ONLINE_CHECK;
} else if (workCell.getType() == MesExtEnumUtil.MES_WORK_CELL_TYPE.GP12_CELL.getValue()) { } else if (workCell.getType() == MesExtEnumUtil.MES_WORK_CELL_CHECK_TYPE.GP12_CELL.getValue()) {
type = MesExtEnumUtil.MES_PART_INSPECTION_TYPE.GP12_CHECK; type = MesExtEnumUtil.MES_PART_INSPECTION_TYPE.GP12_CHECK;
} else { } else {
MesPcnException.throwFlowException(String.format("工位【%s】维护了不支持的工位类型，请检查数据", workCellCode)); MesPcnException.throwFlowException(String.format("工位【%s】维护了不支持的工位类型，请检查数据", workCellCode));

Write Preview
Loading…
Cancel
Save