接口映射,自定义脚本页面开发

tags/yfai-pcn-ext-v1.7
jun 9 months ago
parent 573d95cbd6
commit 5cb72f5c38

@ -256,6 +256,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
mesProduceSnPrintModel.setOrganizeCode(organizeCode); mesProduceSnPrintModel.setOrganizeCode(organizeCode);
List<MesProduceSn> snList = new ArrayList<>(); List<MesProduceSn> snList = new ArrayList<>();
sn.setDescription(String.format("源条码:%s",sn.getProductSn())); sn.setDescription(String.format("源条码:%s",sn.getProductSn()));
sn.setLotNo(TimeTool.getToday());
sn.setProductSn(doGererateSerialNo(mesPart, organizeCode, requestModel.getUserName())); sn.setProductSn(doGererateSerialNo(mesPart, organizeCode, requestModel.getUserName()));
snList.add(sn); snList.add(sn);
mesProduceSnPrintModel.getMesProduceSnList().addAll(snList); mesProduceSnPrintModel.getMesProduceSnList().addAll(snList);
@ -534,7 +535,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
return produceSn; return produceSn;
} }
private MesMove createMove(String sn, String oldSn, String organizeCode, String userName) { private MesMove createMove(String oldSn, String sn, String organizeCode, String userName) {
MesMove move = new MesMove(); MesMove move = new MesMove();
move.setOrganizeCode(organizeCode); move.setOrganizeCode(organizeCode);
move.setFactoryCode(organizeCode); move.setFactoryCode(organizeCode);

@ -710,14 +710,8 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
DdlPackBean packBean = DdlPackBean.getDdlPackBean(org); DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
DdlPreparedPack.getStringEqualPack(part.getPartTypeCode(), "partTypeCode", packBean); DdlPreparedPack.getStringEqualPack(part.getPartTypeCode(), "partTypeCode", packBean);
MesPartTypePicture partTypePicture = partTypePictureRepository.getByProperty(packBean);
//若不存在则提示零件类别不存在 return partTypePictureRepository.getByProperty(packBean);
if (null == partTypePicture) {
throw new ImppBusiException(String.format("【%s】物料号对应的【%s】零件类别不存在请检查数据", part.getPartNo(), part.getPartTypeCode()));
}
return partTypePicture;
} }
private List<MesLocationConfig> checkLocationConfig(String org) { private List<MesLocationConfig> checkLocationConfig(String org) {

@ -235,14 +235,8 @@ public class MesNcProcessingService implements IMesNcProcessingService {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(org); DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
DdlPreparedPack.getStringEqualPack(part.getPartTypeCode(), "partTypeCode", packBean); DdlPreparedPack.getStringEqualPack(part.getPartTypeCode(), "partTypeCode", packBean);
MesPartTypePicture partTypePicture = partTypePictureRepository.getByProperty(packBean);
//若不存在则提示零件类别不存在 return partTypePictureRepository.getByProperty(packBean);
if (StringUtils.isEmpty(partTypePicture)) {
throw new ImppBusiException(String.format("【%s】物料号对应的【%s】零件类别不存在请检查数据", part.getPartNo(), part.getPartTypeCode()));
}
return partTypePicture;
} }
private List<MesPartTypeDefect> checkPartTypeDefect(MesPart part, String org) { private List<MesPartTypeDefect> checkPartTypeDefect(MesPart part, String org) {

Loading…
Cancel
Save