sun15684712291/impm_zxf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序生产的时候 去掉关于天然气的信息

Browse Source
This commit is contained in:
sunyg
2025-09-16 17:46:59 +08:00
parent 80886d3c19
commit 0f53d86e8c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProMachineryJobServiceImpl.java
View File

@@ -713,9 +713,9 @@ public class ProMachineryJobServiceImpl extends ServiceImpl<ProMachineryJobMappe
LambdaQueryWrapper<ProMachineryJobProgress> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProMachineryJobProgress> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ProMachineryJobProgress::getJobId, req.getJobId()).eq(ProMachineryJobProgress::getProgressCode, JobProgressEnum.JL.getCode()); queryWrapper.eq(ProMachineryJobProgress::getJobId, req.getJobId()).eq(ProMachineryJobProgress::getProgressCode, JobProgressEnum.JL.getCode());
ProMachineryJobProgress jlProcess = machineryJobProgressMapper.selectOne(queryWrapper); 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为空 // 修改设备状态、设备生产工单id为空
DvMachinery dvMachineryUpdate = new DvMachinery(); DvMachinery dvMachineryUpdate = new DvMachinery();
dvMachineryUpdate.setMachineryId(job.getMachineryId()); dvMachineryUpdate.setMachineryId(job.getMachineryId());
@@ -723,10 +723,10 @@ public class ProMachineryJobServiceImpl extends ServiceImpl<ProMachineryJobMappe
dvMachineryUpdate.setStatus("STOP"); dvMachineryUpdate.setStatus("STOP");
machineryMapper.updateDvMachinery(dvMachineryUpdate); machineryMapper.updateDvMachinery(dvMachineryUpdate);
// 修改设备天然气 // 修改设备天然气
DvMachinery dvMachinery = new DvMachinery(); // DvMachinery dvMachinery = new DvMachinery();
dvMachinery.setMachineryId(job.getMachineryId()); // dvMachinery.setMachineryId(job.getMachineryId());
dvMachinery.setGas(req.getGas()); // dvMachinery.setGas(req.getGas());
machineryMapper.updateDvMachinery(dvMachinery); // machineryMapper.updateDvMachinery(dvMachinery);
} }
@Override @Override