|
@@ -204,10 +204,11 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
|
|
|
.eq(BilletHotsend::getCcmNo, billetOriginalProductRecord.getCcmNo());
|
|
|
BilletHotsend billetHotsendInfos = billetHotsendBaseService.getOne(hotsendQuery, false);
|
|
|
if (billetHotsendInfos != null) {
|
|
|
- if (billetHotsendInfos.getDeleteStatus() == 1){
|
|
|
+ Integer deleteStatus = billetHotsendInfos.getDeleteStatus();
|
|
|
+ if (deleteStatus != null && deleteStatus == 1) { // 先检查是否为null
|
|
|
billetHotsendInfos.setDeleteStatus(null);
|
|
|
billetHotsendBaseService.updateById(billetHotsendInfos);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
return Result.error("当前炉号已存在于当前班次(炉次传递单)");
|
|
|
}
|
|
|
}
|