diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMachineryJobServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMachineryJobServiceImpl.java index 33cbbd8..051b50e 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMachineryJobServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMachineryJobServiceImpl.java @@ -713,9 +713,9 @@ public class ProMachineryJobServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ProMachineryJobProgress::getJobId, req.getJobId()).eq(ProMachineryJobProgress::getProgressCode, JobProgressEnum.JL.getCode()); ProMachineryJobProgress jlProcess = machineryJobProgressMapper.selectOne(queryWrapper); - BigDecimal gasCost = jlProcess == null ? req.getGas() : req.getGas().subtract(jlProcess.getGas()); + //BigDecimal gasCost = jlProcess == null ? req.getGas() : req.getGas().subtract(jlProcess.getGas()); // 修改设备生产记录状态 - machineryJobMapper.updateById(ProMachineryJob.builder().jobId(job.getJobId()).gasCost(gasCost).jobStatus("FINISHED").endTime(now).updateBy(currentUser.getUserName()).updateTime(now).build()); + machineryJobMapper.updateById(ProMachineryJob.builder().jobId(job.getJobId()).gasCost(new BigDecimal(0)).jobStatus("FINISHED").endTime(now).updateBy(currentUser.getUserName()).updateTime(now).build()); // 修改设备状态、设备生产工单id为空 DvMachinery dvMachineryUpdate = new DvMachinery(); dvMachineryUpdate.setMachineryId(job.getMachineryId()); @@ -723,10 +723,10 @@ public class ProMachineryJobServiceImpl extends ServiceImpl