jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

出货检验相关报表配置同步

Browse Source
tags/yfai-mes-ext-v1.0
yxw 2 years ago
parent 6e577ee102
commit de989fcc67
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File

56
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxOqcReportFormService.java
Unescape Escape View File

@ -157,7 +157,7 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
oqcCheckDb.setBadnessClassifyDetailCode(model.getBadnessClassifyDetailCode());
oqcCheckDb.setBadnessClassifyDetailName(model.getBadnessClassifyDetailName());
oqcCheckDb.setRemark(model.getRemark());
oqcCheckDb.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
oqcCheckRepository.save(oqcCheckDb);
}
@ -276,8 +276,9 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
continue;
}
oqcCheckDetailDb.setConfirmUser(userName);
ConvertBean.serviceModelUpdate(oqcCheckDetailDb, userName);
oqcCheckDetailDb.setConfirmTime(oqcCheckDetailDb.getModifyDatetime());
ConvertBean.serviceModelUpdate(oqcCheckDetailDb, userName);
oqcCheckDetailDb.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
oqcCheckDetailRepository.save(oqcCheckDetailDb);
}
}
@ -295,6 +296,7 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
oqcCheckDetailDb.setCheckTool(model.getCheckTool());
oqcCheckDetailDb.setRemark(model.getRemark());
oqcCheckDetailDb.setCheckResult(model.getCheckResult());
oqcCheckDetailDb.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
ConvertBean.serviceModelUpdate(oqcCheckDetailDb, AuthUtil.getSessionUser().getUserName());
oqcCheckDetailRepository.save(oqcCheckDetailDb);
}
@ -891,6 +893,7 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
oqcCheckDb.setBadnessClassifyCode(model.getBadnessClassifyCode());
oqcCheckDb.setBadnessClassifyDetailCode(model.getBadnessClassifyDetailCode());
oqcCheckDb.setBadnessClassifyDetailName(model.getBadnessClassifyDetailName());
oqcCheckDb.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
oqcCheckRepository.save(oqcCheckDb);
insertOqcCheckTravel(userName, oqcCheckDb);
return;
@ -910,6 +913,7 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
}
ConvertBean.serviceModelUpdate(oqcCheckDb, userName);
oqcCheckDb.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
oqcCheckRepository.save(oqcCheckDb);
insertOqcCheckTravel(userName, oqcCheckDb);
@ -926,6 +930,7 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
BeanUtils.copyProperties(sxQmsOqcCheckPackageDetail, oqcCheckPackageDetailTravel);
ConvertBean.serviceModelInitialize(oqcCheckPackageDetailTravel, userName);
oqcCheckPackageDetailTravel.setLastCheckResult(model.getCheckResult());
oqcCheckPackageDetailTravel.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
oqcCheckPackageDetailTravels.add(oqcCheckPackageDetailTravel);
});
@ -935,27 +940,25 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
//修改检验结果 同步给 WMS
List<MesOqcCheckPackageIf> oqcCheckPackageIfList = oqcCheckPackageIfRepository.findByProperty(new String[]{MesExtConstWords.OQC_NO, MesExtConstWords.ORGANIZE_CODE, MesExtConstWords.IS_VALID, MesExtConstWords.IS_DELETED},
new Object[]{oqcCheckDb.getOqcNo(), oqcCheckDb.getOrganizeCode(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.IS_DEAL.NO.getValue()});
String nowTime = TimeTool.getNowTime(true);
oqcCheckPackageIfList.forEach(o -> {
o.setCheckResult(model.getCheckResult());
o.setModifyDatetime(nowTime);
o.setModifyUser(userName);
});
if(!CollectionUtils.isEmpty(oqcCheckPackageIfList)) {
oqcCheckPackageIfRepository.saveAll(oqcCheckPackageIfList);
//reworkRangeService.saveReworkRangeByFinishProdAndDailyInspAndEmpInspAndCheckNG(oqcCheckDb, oqcCheckPackageIfList, null, false);
}
//oqcCheckPackageIfRepository.updateByProperties(new String[]{MesExtConstWords.OQC_NO, MesExtConstWords.ORGANIZE_CODE},
// new Object[]{ oqcCheckDb.getOqcNo(), oqcCheckDb.getOrganizeCode()},
// new String[]{MesExtConstWords.CHECK_RESULT, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME, MesExtConstWords.SYSTEM_SYNC_STATUS},
// new Object[]{model.getCheckResult(), userName, TimeTool.getNowTime(true), MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue()});
//List<MesOqcCheckPackageIf> oqcCheckPackageIfList = oqcCheckPackageIfRepository.findByProperty(new String[]{MesExtConstWords.OQC_NO, MesExtConstWords.ORGANIZE_CODE, MesExtConstWords.IS_VALID, MesExtConstWords.IS_DELETED},
// new Object[]{oqcCheckDb.getOqcNo(), oqcCheckDb.getOrganizeCode(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.IS_DEAL.NO.getValue()});
//if(!CollectionUtils.isEmpty(oqcCheckPackageIfList)) {
// String nowTime = TimeTool.getNowTime(true);
// oqcCheckPackageIfList.forEach(o -> {
// o.setCheckResult(model.getCheckResult());
// o.setModifyDatetime(nowTime);
// o.setModifyUser(userName);
// o.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
// o.setSystemSyncStatus2(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
// });
// oqcCheckPackageIfRepository.saveAll(oqcCheckPackageIfList);
// //reworkRangeService.saveReworkRangeByFinishProdAndDailyInspAndEmpInspAndCheckNG(oqcCheckDb, oqcCheckPackageIfList, null, false);
//}
oqcCheckPackageIfRepository.updateByProperties(new String[]{MesExtConstWords.OQC_NO, MesExtConstWords.ORGANIZE_CODE, MesExtConstWords.IS_VALID, MesExtConstWords.IS_DELETED},
new Object[]{ oqcCheckDb.getOqcNo(), oqcCheckDb.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()},
new String[]{MesExtConstWords.SYSTEM_SYNC_STATUS, "systemSyncStatus2", MesExtConstWords.CHECK_RESULT, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME, MesExtConstWords.SYSTEM_SYNC_STATUS},
new Object[]{MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), model.getCheckResult(), userName, TimeTool.getNowTime(true), MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue()});
}
@ -1099,6 +1102,7 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
}
oqcCheckDetailDb.setRemark(detail.getRemark());
ConvertBean.serviceModelUpdate(oqcCheckDetailDb, userName);
oqcCheckDetailDb.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
oqcCheckDetailRepository.save(oqcCheckDetailDb);
}
@ -1128,11 +1132,12 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
statisticsOqcRepository.updateByProperties(
new String[]{MesExtConstWords.WORK_ORDER_NO,MesExtConstWords.WORK_TIME,MesExtConstWords.SHIFT_CODE,MesExtConstWords.IS_DELETED, MesExtConstWords.ORGANIZE_CODE,},
new Object[]{model.getWorkOrderNo(),model.getWorkTime(),model.getShiftCode(),CommonEnumUtil.IS_DEAL.NO.getValue(),model.getOrganizeCode()},
new String[]{"checkLimit",MesExtConstWords.MODIFY_USER,MesExtConstWords.MODIFY_DATE_TIME},
new Object[]{sumOqcQty,userName, TimeTool.getNowTime(true)});
new String[]{MesExtConstWords.SYSTEM_SYNC_STATUS, "checkLimit",MesExtConstWords.MODIFY_USER,MesExtConstWords.MODIFY_DATE_TIME},
new Object[]{MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), sumOqcQty,userName, TimeTool.getNowTime(true)});
oqcCheckDb.setOqcQty(model.getOqcQty());
ConvertBean.serviceModelUpdate(oqcCheckDb, userName);
oqcCheckDb.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
oqcCheckRepository.save(oqcCheckDb);
}
@ -1207,6 +1212,7 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
oqcPackageDetail.setCheckResult(model.getCheckResult());
oqcPackageDetail.setModifyDatetime(nowTime);
oqcPackageDetail.setModifyUser(userName);
oqcPackageDetail.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
saveOqcCheckPackageDetailList.add(oqcPackageDetail);
//oqcCheckPackageDetailRepository.save(oqcPackageDetail);
@ -1216,6 +1222,7 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
sxQmsOqcCheckPackageIf.setModifyUser(userName);
sxQmsOqcCheckPackageIf.setLastCheckResult(model.getCheckResult());
sxQmsOqcCheckPackageIf.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
sxQmsOqcCheckPackageIf.setSystemSyncStatus2(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
saveOqcCheckPackageIfList.add(sxQmsOqcCheckPackageIf);
// 修改条码结果 实际修改的是 最终检验结果 并同步给 WMS
@ -1228,6 +1235,7 @@ public class JxOqcReportFormService implements IJxOqcReportFormService {
BeanUtils.copyProperties(oqcPackageDetail, oqcCheckPackageDetailTravel);
ConvertBean.serviceModelInitialize(oqcCheckPackageDetailTravel, userName);
oqcCheckPackageDetailTravel.setLastCheckResult(model.getCheckResult());
oqcCheckPackageDetailTravel.setSystemSyncStatus(MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
insertOqcCheckPackageDetailTravelList.add(oqcCheckPackageDetailTravel);
//oqcCheckPackageDetailTravelRepository.insert(oqcCheckPackageDetailTravel);

Write Preview
Loading…
Cancel
Save