|
|
|
@ -144,18 +144,19 @@ public class MesRawPartChargingServiceImpl implements IMesRawPartChargingService
|
|
|
|
|
checkNotNull(mesRawPartChargingModel);
|
|
|
|
|
|
|
|
|
|
List<MesRawPartCharging> mesRawPartChargingList = findMesRawPartCharging(mesRawPartChargingModel);
|
|
|
|
|
if(CollectionUtils.isEmpty(mesRawPartChargingList)){
|
|
|
|
|
MesPcnException.throwMesBusiException("料筒条码【%s】未绑定,无需初始化", mesRawPartChargingModel.getPackageSn());
|
|
|
|
|
}
|
|
|
|
|
for (MesRawPartCharging mesRawPartCharging : mesRawPartChargingList) {
|
|
|
|
|
//删除绑定信息
|
|
|
|
|
mesRawPartCharging.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
|
|
|
|
|
ConvertBean.serviceModelUpdate(mesRawPartCharging,mesRawPartChargingModel.getUserName());
|
|
|
|
|
mesRawPartChargingRepository.update(mesRawPartCharging);
|
|
|
|
|
//保存日志
|
|
|
|
|
saveLog(mesRawPartChargingModel, mesRawPartCharging, MesExtEnumUtil.CHARGING_LOG_STATUS.CLEAR);
|
|
|
|
|
if(!CollectionUtils.isEmpty(mesRawPartChargingList)){
|
|
|
|
|
for (MesRawPartCharging mesRawPartCharging : mesRawPartChargingList) {
|
|
|
|
|
//删除绑定信息
|
|
|
|
|
mesRawPartCharging.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
|
|
|
|
|
ConvertBean.serviceModelUpdate(mesRawPartCharging,mesRawPartChargingModel.getUserName());
|
|
|
|
|
mesRawPartChargingRepository.update(mesRawPartCharging);
|
|
|
|
|
//保存日志
|
|
|
|
|
saveLog(mesRawPartChargingModel, mesRawPartCharging, MesExtEnumUtil.CHARGING_LOG_STATUS.CLEAR);
|
|
|
|
|
}
|
|
|
|
|
// MesPcnException.throwMesBusiException("料筒条码【%s】未绑定,无需初始化", mesRawPartChargingModel.getPackageSn());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private List<MesRawPackagePart> getMesRawPackagePartList(MesRawPartChargingModel mesRawPartChargingModel, MesRawPackageDetail packageDetail) {
|
|
|
|
|