From 0f53d86e8c31e6a0d7f1fa7d4f67be8cab9a5919 Mon Sep 17 00:00:00 2001
From: sunyugang <sun_shine1229@163.com>
Date: Tue, 16 Sep 2025 17:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=20=E5=8E=BB=E6=8E=89=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E5=A4=A9=E7=84=B6=E6=B0=94=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pro/service/impl/ProMachineryJobServiceImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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<ProMachineryJobMappe
         LambdaQueryWrapper<ProMachineryJobProgress> 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<ProMachineryJobMappe
         dvMachineryUpdate.setStatus("STOP");
         machineryMapper.updateDvMachinery(dvMachineryUpdate);
         // 修改设备天然气
-        DvMachinery dvMachinery = new DvMachinery();
-        dvMachinery.setMachineryId(job.getMachineryId());
-        dvMachinery.setGas(req.getGas());
-        machineryMapper.updateDvMachinery(dvMachinery);
+//        DvMachinery dvMachinery = new DvMachinery();
+//        dvMachinery.setMachineryId(job.getMachineryId());
+//        dvMachinery.setGas(req.getGas());
+//        machineryMapper.updateDvMachinery(dvMachinery);
     }
 
     @Override