From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
index 886decd..35b1ee8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
@@ -5,6 +5,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.DeviceMaintenance;
+import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.mapper.pp.DeviceMaintenanceMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -91,4 +92,21 @@
map.put("data", deviceMaintenanceMapper.openSelectIdMp(id));
return map;
}
+
+ public Boolean updateMaintenance(Map<String, Object> object) {
+ JSONObject dataJson = new JSONObject(object);
+ DeviceMaintenance deviceMaintenance = JSONObject.parseObject(JSONObject.toJSONString(dataJson.get("machine")), DeviceMaintenance.class);
+ if (!dataJson.isEmpty()) {
+ deviceMaintenanceMapper.updateMaintenanceMp(deviceMaintenance.getId(),deviceMaintenance.getDeviceName(),
+ deviceMaintenance.getType(),deviceMaintenance.getFaultTime(),deviceMaintenance.getFaultReason(),
+ deviceMaintenance.getMaintenanceTime(),deviceMaintenance.getMaintenanceIllustrate(),
+ deviceMaintenance.getStopTime(),deviceMaintenance.getStartTime(),deviceMaintenance.getProcess(),
+ deviceMaintenance.getPersonnel(),
+ deviceMaintenance.getCost()
+ );
+ return true;
+ } else {
+ return false;
+ }
+ }
}
--
Gitblit v1.8.0